kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Improve Image sync" (resolve openfl/openfl#1976)

Browse Source 
This reverts commit 3d4d10dfde.
This commit is contained in:
Joshua Granick
2018-08-07 17:05:19 -07:00
parent 3d4d10dfde
commit 41b12ebcdc
3 changed files with 25 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lime/_internal/backend/html5/HTML5Window.hx
View File

@@ -99,7 +99,6 @@ class HTML5Window {
#if dom
attributes.context.type = DOM;
attributes.context.version = "";
renderType = DOM;
#end
if (Reflect.hasField (attributes, "allowHighDPI") && attributes.allowHighDPI && renderType != DOM) {

14
src/lime/_internal/graphics/ImageCanvasUtil.hx
View File

@@ -59,7 +59,7 @@ class ImageCanvasUtil {
} else {
if (image.__type == DATA && buffer.__srcImageData != null && image.dirty) {
if (image.type == DATA && buffer.__srcImageData != null && image.dirty) {
buffer.__srcContext.putImageData (buffer.__srcImageData, 0, 0);
image.dirty = false;
@@ -84,7 +84,7 @@ class ImageCanvasUtil {
}
#end
image.__type = CANVAS;
image.type = CANVAS;
}
@@ -103,9 +103,9 @@ class ImageCanvasUtil {
if (buffer.__srcCanvas != null && buffer.data == null) {
createImageData (image);
if (image.__type == CANVAS) image.dirty = false;
if (image.type == CANVAS) image.dirty = false;
} else if (image.__type == CANVAS && buffer.__srcCanvas != null && image.dirty) {
} else if (image.type == CANVAS && buffer.__srcCanvas != null && image.dirty) {
if (buffer.__srcImageData == null) {
@@ -130,7 +130,7 @@ class ImageCanvasUtil {
}
#end
image.__type = DATA;
image.type = DATA;
}
@@ -430,11 +430,11 @@ class ImageCanvasUtil {
if (image == null) return;
#if (js && html5)
if (image.__type == CANVAS && (image.buffer.__srcCanvas != null || image.buffer.data != null)) {
if (image.type == CANVAS && (image.buffer.__srcCanvas != null || image.buffer.data != null)) {
convertToCanvas (image, clear);
} else if (image.__type == DATA) {
} else if (image.type == DATA) {
convertToData (image, clear);

88
src/lime/graphics/Image.hx
View File

@@ -175,7 +175,7 @@ class Image {
/**
The current `ImageType`, representing what is being used to store the `Image`'s graphics
**/
public var type (get, set):ImageType;
public var type:ImageType;
/**
The `version` of the `Image` increases each time it is modified, helpful to determining
@@ -201,8 +201,6 @@ class Image {
**/
public var y:Float;
@:noCompletion private var __type:ImageType;
#if commonjs
private static function __init__ () {
@@ -215,8 +213,7 @@ class Image {
"premultiplied": { get: p.get_premultiplied, set: p.set_premultiplied },
"rect": { get: p.get_rect },
"src": { get: p.get_src, set: p.set_src },
"transparent": { get: p.get_transparent, set: p.set_transparent },
"type": { get: p.get_type, set: p.set_type }
"transparent": { get: p.get_transparent, set: p.set_transparent }
});
}
@@ -256,13 +253,13 @@ class Image {
}
__type = type;
this.type = type;
if (buffer == null) {
if (width > 0 && height > 0) {
switch (__type) {
switch (this.type) {
case CANVAS:
@@ -498,7 +495,7 @@ class Image {
case CANVAS:
if (alphaImage != null || sourceImage.__type != CANVAS) {
if (alphaImage != null || sourceImage.type != CANVAS) {
ImageCanvasUtil.convertToData (this);
ImageCanvasUtil.convertToData (sourceImage);
@@ -748,7 +745,7 @@ class Image {
var buffer = new ImageBuffer (null, canvas.width, canvas.height);
buffer.src = canvas;
var image = new Image (buffer);
image.__type = CANVAS;
image.type = CANVAS;
return image;
}
@@ -792,7 +789,7 @@ class Image {
var buffer = new ImageBuffer (null, image.width, image.height);
buffer.src = image;
var _image = new Image (buffer);
_image.__type = CANVAS;
_image.type = CANVAS;
return _image;
}
@@ -1986,24 +1983,20 @@ class Image {
@:noCompletion private function get_data ():UInt8Array {
#if (js && html5)
if (buffer.data == null && buffer.width > 0 && buffer.height > 0) {
ImageCanvasUtil.convertToData (this);
#if (js && html5)
} else {
ImageCanvasUtil.convertToData (this);
ImageCanvasUtil.sync (this, false);
#elseif flash
var pixels = buffer.__srcBitmapData.getPixels (buffer.__srcBitmapData.rect);
buffer.data = new UInt8Array (Bytes.ofData (pixels));
#end
}
#elseif flash
if (buffer.data == null && buffer.width > 0 && buffer.height > 0) {
var pixels = buffer.__srcBitmapData.getPixels (buffer.__srcBitmapData.rect);
buffer.data = new UInt8Array (Bytes.ofData (pixels));
}
#end
return buffer.data;
@@ -2071,10 +2064,9 @@ class Image {
}
if (newWidth == buffer.width && newHeight == buffer.height) {
if (newWidth == buffer.width && newHeight == buffer.height)
{
return value;
}
switch (type) {
@@ -2173,14 +2165,10 @@ class Image {
@:noCompletion private function get_src ():Dynamic {
#if (js && html5)
if (__type != CANVAS) {
if (buffer.__srcCanvas == null && (buffer.data != null || type == DATA)) {
ImageCanvasUtil.convertToCanvas (this);
} else {
ImageCanvasUtil.sync (this, false);
}
#end
@@ -2213,44 +2201,4 @@ class Image {
}
@:noCompletion private function get_type ():ImageType {
return __type;
}
@:noCompletion private function set_type (value:ImageType):ImageType {
if (__type != null) {
if (__type != value) {
switch (value) {
case CANVAS:
ImageCanvasUtil.convertToCanvas (this);
case DATA:
ImageCanvasUtil.convertToData (this);
default:
}
} else {
ImageCanvasUtil.sync (this, false);
}
}
return __type = value;
}
}