92276 2012-07-25 12:16:56 -0700 fix test in beginLayerClippedToImage to check for immutability if we're going to do a shallow-copy 2012-07-25 14:47:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 reed reed senorblanco webkit.review.bot oldest_to_newest 678328 0 reed 2012-07-25 12:16:56 -0700 fix test in beginLayerClippedToImage to check for immutability if we're going to do a shallow-copy 678330 1 154414 reed 2012-07-25 12:19:51 -0700 Created attachment 154414 Patch 678341 2 154414 senorblanco 2012-07-25 12:30:57 -0700 Comment on attachment 154414 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154414&action=review Please clean up the ChangeLog. > Source/WebCore/ChangeLog:8 > + Additional information of the change such as approach, rationale. Please add per-function descriptions below (OOPS!). You'll need to delete this line, or replace it with what it asks for. > Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:292 > + else { > + // We need to make a deep-copy of the pixels themselves, so they don't > + // change on us between now and when we want to apply them in restore() > + bitmap->copyTo(&m_state->m_imageBufferClip, SkBitmap::kARGB_8888_Config); If we need this to work on the GPU at some point, we should probably try a deepCopyTo() first. 678342 3 154417 reed 2012-07-25 12:38:13 -0700 Created attachment 154417 Patch 678343 4 reed 2012-07-25 12:38:32 -0700 update CL comments 678344 5 154417 senorblanco 2012-07-25 12:39:38 -0700 Comment on attachment 154417 Patch OK, thanks for the cleanup. r=me 678497 6 154417 webkit.review.bot 2012-07-25 14:47:42 -0700 Comment on attachment 154417 Patch Clearing flags on attachment: 154417 Committed r123665: <http://trac.webkit.org/changeset/123665> 678498 7 webkit.review.bot 2012-07-25 14:47:45 -0700 All reviewed patches have been landed. Closing bug. 154414 2012-07-25 12:19:51 -0700 2012-07-25 12:38:09 -0700 Patch bug-92276-20120725151941.patch text/plain 2568 reed SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMzY0MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA3LTI1ICBNaWtlIFJl ZWQgIDxyZWVkQGdvb2dsZS5jb20+CisKKyAgICAgICAgZml4IHRlc3QgaW4gYmVnaW5MYXllckNs aXBwZWRUb0ltYWdlIHRvIGNoZWNrIGZvciBpbW11dGFiaWxpdHkgaWYgd2UncmUgZ29pbmcgdG8g ZG8gYSBzaGFsbG93LWNvcHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkyMjc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkaXRpb25hbCBpbmZvcm1hdGlvbiBvZiB0aGUgY2hhbmdlIHN1Y2ggYXMgYXBw cm9hY2gsIHJhdGlvbmFsZS4gUGxlYXNlIGFkZCBwZXItZnVuY3Rpb24gZGVzY3JpcHRpb25zIGJl bG93IChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBFeGlzdGluZyBzdmcgbGF5b3V0 dGVzdHMgd29yayB3LyBvciB3L291dCB0aGlzIGNoYW5nZSwgYnV0IGF0IHRoZSBuZXh0IFNraWEg ZGVwcyByb2xsLCB3ZSBzZWUKKyAgICAgICAgZmFpbHVyZXMgdy9vIHRoaXMgY2hhbmdlLiBUaGUg Y2hhbmdlIGlzIG1vcmUgImNvcnJlY3QiLCB0aG91Z2ggdGhlIHByb2JsZW0gY2FzZSBkb2VzIG5v dCBleGhpYml0IGl0c2VsZiB1bnRpbAorICAgICAgICBTa2lhIHJldi4gNDcyMiBvciBsYXRlciBs YW5kcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0 U2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lhOjpiZWdpbkxh eWVyQ2xpcHBlZFRvSW1hZ2UpOgorCiAyMDEyLTA3LTI1ICAnUGF2ZWwgRmVsZG1hbicgIDxwZmVs ZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogZm9sbG93IHVwIHRv IHIxMjM2MTIsIGZpeGluZyBDU1MgdmFsdWUgc3VnZ2VzdC4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRl eHRTa2lhLmNwcAkocmV2aXNpb24gMTIzNjQyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcAkod29ya2luZyBjb3B5KQpAQCAt Mjg0LDE3ICsyODQsMTIgQEAgdm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpiZWdpbkxheWVyQ2xp cAogICAgIH0KIAogICAgIC8vIENvcHkgb2ZmIHRoZSBpbWFnZSBhcyB8aW1hZ2VCdWZmZXJ8IG1h eSBiZSBkZWxldGVkIGJlZm9yZSByZXN0b3JlIGlzIGludm9rZWQuCi0gICAgaWYgKCFiaXRtYXAt PnBpeGVsUmVmKCkpIHsKLSAgICAgICAgLy8gVGhlIGJpdG1hcCBvd25zIGl0J3MgcGl4ZWxzLiBU aGlzIGhhcHBlbnMgd2hlbiB3ZSd2ZSBhbGxvY2F0ZWQgdGhlCi0gICAgICAgIC8vIHBpeGVscyBp biBzb21lIHdheSBhbmQgYXNzaWduZWQgdGhlbSBkaXJlY3RseSB0byB0aGUgYml0bWFwIChhcwot ICAgICAgICAvLyBoYXBwZW5zIHdoZW4gd2UgYWxsb2NhdGUgYSBESUIpLiBJbiB0aGlzIGNhc2Ug dGhlIGFzc2lnbm1lbnQgb3BlcmF0b3IKLSAgICAgICAgLy8gZG9lcyBub3QgY29weSB0aGUgcGl4 ZWxzLCByYXRoZXIgdGhlIGNvcGllZCBiaXRtYXAgZW5kcyB1cAotICAgICAgICAvLyByZWZlcmVu Y2luZyB0aGUgc2FtZSBwaXhlbHMuIEFzIHRoZSBwaXhlbHMgbWF5IG5vdCBsaXZlIGFzIGxvbmcg YXMgd2UKLSAgICAgICAgLy8gbmVlZCBpdCB0bywgd2UgY29weSB0aGUgaW1hZ2UuCi0gICAgICAg IGJpdG1hcC0+Y29weVRvKCZtX3N0YXRlLT5tX2ltYWdlQnVmZmVyQ2xpcCwgU2tCaXRtYXA6OmtB UkdCXzg4ODhfQ29uZmlnKTsKLSAgICB9IGVsc2UgewotICAgICAgICAvLyBJZiB0aGVyZSBpcyBh IHBpeGVsIHJlZiwgd2UgY2FuIHNhZmVseSB1c2UgdGhlIGFzc2lnbm1lbnQgb3BlcmF0b3IuCisg ICAgaWYgKGJpdG1hcC0+aXNJbW11dGFibGUoKSkKICAgICAgICAgbV9zdGF0ZS0+bV9pbWFnZUJ1 ZmZlckNsaXAgPSAqYml0bWFwOworICAgIGVsc2UgeworICAgICAgICAvLyBXZSBuZWVkIHRvIG1h a2UgYSBkZWVwLWNvcHkgb2YgdGhlIHBpeGVscyB0aGVtc2VsdmVzLCBzbyB0aGV5IGRvbid0Cisg ICAgICAgIC8vIGNoYW5nZSBvbiB1cyBiZXR3ZWVuIG5vdyBhbmQgd2hlbiB3ZSB3YW50IHRvIGFw cGx5IHRoZW0gaW4gcmVzdG9yZSgpCisgICAgICAgIGJpdG1hcC0+Y29weVRvKCZtX3N0YXRlLT5t X2ltYWdlQnVmZmVyQ2xpcCwgU2tCaXRtYXA6OmtBUkdCXzg4ODhfQ29uZmlnKTsKICAgICB9CiB9 CiAK 154417 2012-07-25 12:38:13 -0700 2012-07-25 14:47:42 -0700 Patch bug-92276-20120725153803.patch text/plain 3083 reed SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMzY0MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA3LTI1ICBNaWtlIFJl ZWQgIDxyZWVkQGdvb2dsZS5jb20+CisKKyAgICAgICAgZml4IHRlc3QgaW4gYmVnaW5MYXllckNs aXBwZWRUb0ltYWdlIHRvIGNoZWNrIGZvciBpbW11dGFiaWxpdHkgaWYgd2UncmUgZ29pbmcgdG8g ZG8gYSBzaGFsbG93LWNvcHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkyMjc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUGxhdGZvcm1Db250ZXh0U2tpYTo6YmVnaW5MYXllckNsaXBwZWRUb0ltYWdlCisK KyAgICAgICAgVGhpcyBmdW5jdGlvbiB3YW50cyB0byBhcHBseSB0aGUgcHJvdmlkZWQgSW1hZ2VC dWZmZXIgYXMgYSBjbGlwLiBTa2lhIGRvZXMgbm90IHN1cHBvcnQgdGhpcyBuYXRpdmVseSB5ZXQs CisgICAgICAgIHNvIHRoZSBjb2RlIG1ha2VzIGEgImNvcHkiIG9mIHRoYXQgaW1hZ2VCdWZmZXIs IHRvIGJlIGFwcGxpZWQgbGF0ZXIuIFRoZSBvbGQgY29kZSwgd2FudGluZyB0byBhdm9pZCBhCisg ICAgICAgIGRlZXAgY29weSBpZiBwb3NzaWJsZSwgY2hlY2tlZCBmb3IgdGhlIHByZXNlbmNlIG9m IGEgU2tQaXhlbFJlZi4gSWYgaXQgZm91bmQgb25lLCBpdCBtYWRlIGEgc2hhbGxvdyBjb3B5Lgor ICAgICAgICBUaGlzIGlzIGZsYXdlZCwgc2luY2UgdGhlIGNvbnRlbnRzIG9mIGEgcGl4ZWxyZWYg YXJlIG5vdCBndWFyYW50ZWVkIHRvIGJlIGltbXV0YWJsZS4gVGhlIG5ldyBjb2RlIGNoZWNrcwor ICAgICAgICBhZ2FpbnN0IHRoaXMgYXR0cmlidXRlOiBpZiB0aGUgYml0bWFwIGlzICJpbW11dGFi bGUiIHRoZW4gd2UgY2FuIG1ha2UgYSBzaGFsbG93LWNvcHksIGVsc2Ugd2UgbWFrZSBhCisgICAg ICAgIGRlZXAgY29weS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIEV4aXN0aW5nIHN2ZyBsYXlv dXR0ZXN0cyB3b3JrIHcvIG9yIHcvb3V0IHRoaXMgY2hhbmdlLCBidXQgYXQgdGhlIG5leHQgU2tp YSBkZXBzIHJvbGwsIHdlIHNlZQorICAgICAgICBmYWlsdXJlcyB3L28gdGhpcyBjaGFuZ2UuIFRo ZSBjaGFuZ2UgaXMgbW9yZSAiY29ycmVjdCIsIHRob3VnaCB0aGUgcHJvYmxlbSBjYXNlIGRvZXMg bm90IGV4aGliaXQgaXRzZWxmIHVudGlsCisgICAgICAgIFNraWEgcmV2LiA0NzIyIG9yIGxhdGVy IGxhbmRzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRl eHRTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OmJlZ2lu TGF5ZXJDbGlwcGVkVG9JbWFnZSk6CisKIDIwMTItMDctMjUgICdQYXZlbCBGZWxkbWFuJyAgPHBm ZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBmb2xsb3cgdXAg dG8gcjEyMzYxMiwgZml4aW5nIENTUyB2YWx1ZSBzdWdnZXN0LgpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29u dGV4dFNraWEuY3BwCShyZXZpc2lvbiAxMjM2NDIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yODQsMTcgKzI4NCwxMiBAQCB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OmJlZ2luTGF5ZXJD bGlwCiAgICAgfQogCiAgICAgLy8gQ29weSBvZmYgdGhlIGltYWdlIGFzIHxpbWFnZUJ1ZmZlcnwg bWF5IGJlIGRlbGV0ZWQgYmVmb3JlIHJlc3RvcmUgaXMgaW52b2tlZC4KLSAgICBpZiAoIWJpdG1h cC0+cGl4ZWxSZWYoKSkgewotICAgICAgICAvLyBUaGUgYml0bWFwIG93bnMgaXQncyBwaXhlbHMu IFRoaXMgaGFwcGVucyB3aGVuIHdlJ3ZlIGFsbG9jYXRlZCB0aGUKLSAgICAgICAgLy8gcGl4ZWxz IGluIHNvbWUgd2F5IGFuZCBhc3NpZ25lZCB0aGVtIGRpcmVjdGx5IHRvIHRoZSBiaXRtYXAgKGFz Ci0gICAgICAgIC8vIGhhcHBlbnMgd2hlbiB3ZSBhbGxvY2F0ZSBhIERJQikuIEluIHRoaXMgY2Fz ZSB0aGUgYXNzaWdubWVudCBvcGVyYXRvcgotICAgICAgICAvLyBkb2VzIG5vdCBjb3B5IHRoZSBw aXhlbHMsIHJhdGhlciB0aGUgY29waWVkIGJpdG1hcCBlbmRzIHVwCi0gICAgICAgIC8vIHJlZmVy ZW5jaW5nIHRoZSBzYW1lIHBpeGVscy4gQXMgdGhlIHBpeGVscyBtYXkgbm90IGxpdmUgYXMgbG9u ZyBhcyB3ZQotICAgICAgICAvLyBuZWVkIGl0IHRvLCB3ZSBjb3B5IHRoZSBpbWFnZS4KLSAgICAg ICAgYml0bWFwLT5jb3B5VG8oJm1fc3RhdGUtPm1faW1hZ2VCdWZmZXJDbGlwLCBTa0JpdG1hcDo6 a0FSR0JfODg4OF9Db25maWcpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIElmIHRoZXJlIGlz IGEgcGl4ZWwgcmVmLCB3ZSBjYW4gc2FmZWx5IHVzZSB0aGUgYXNzaWdubWVudCBvcGVyYXRvci4K KyAgICBpZiAoYml0bWFwLT5pc0ltbXV0YWJsZSgpKQogICAgICAgICBtX3N0YXRlLT5tX2ltYWdl QnVmZmVyQ2xpcCA9ICpiaXRtYXA7CisgICAgZWxzZSB7CisgICAgICAgIC8vIFdlIG5lZWQgdG8g bWFrZSBhIGRlZXAtY29weSBvZiB0aGUgcGl4ZWxzIHRoZW1zZWx2ZXMsIHNvIHRoZXkgZG9uJ3QK KyAgICAgICAgLy8gY2hhbmdlIG9uIHVzIGJldHdlZW4gbm93IGFuZCB3aGVuIHdlIHdhbnQgdG8g YXBwbHkgdGhlbSBpbiByZXN0b3JlKCkKKyAgICAgICAgYml0bWFwLT5jb3B5VG8oJm1fc3RhdGUt Pm1faW1hZ2VCdWZmZXJDbGlwLCBTa0JpdG1hcDo6a0FSR0JfODg4OF9Db25maWcpOwogICAgIH0K IH0KIAo=