89376 2012-06-18 13:35:10 -0700 [chromium] ContentLayerPainter should clear rect to be painted 2012-06-18 16:16:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr cc-bugs enne senorblanco webkit.review.bot oldest_to_newest 651666 0 jamesr 2012-06-18 13:35:10 -0700 [chromium] ContentLayerPainter should clear rect to be painted 651675 1 148164 jamesr 2012-06-18 13:40:11 -0700 Created attachment 148164 Patch 651678 2 148165 jamesr 2012-06-18 13:41:07 -0700 Created attachment 148165 remove more redundant clears 651702 3 148165 senorblanco 2012-06-18 13:59:28 -0700 Comment on attachment 148165 remove more redundant clears The skia stuff looks ok, but I'll defer to enne or someone else more compositor-savvy for the rest. 651706 4 senorblanco 2012-06-18 14:01:01 -0700 Oh, and could we get some test coverage for this? 651709 5 148165 danakj 2012-06-18 14:06:07 -0700 Comment on attachment 148165 remove more redundant clears View in context: https://bugs.webkit.org/attachment.cgi?id=148165&action=review > Source/WebCore/platform/graphics/chromium/ScrollbarLayerChromium.cpp:-120 > - context.clearRect(contentRect); > - context.clip(contentRect); Is the implication that the canvas will now be cleared by the added code in ContentLayerPainter? Cuz I don't see how that can be, or is this being removed for a different reason? 651756 6 148165 enne 2012-06-18 14:49:45 -0700 Comment on attachment 148165 remove more redundant clears View in context: https://bugs.webkit.org/attachment.cgi?id=148165&action=review > Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp:69 > + SkPaint paint; > + paint.setAntiAlias(false); > + paint.setXfermodeMode(SkXfermode::kClear_Mode); > + canvas->drawRect(contentRect, paint); > + canvas->clipRect(contentRect); I think this should maybe go in CanvasLayerTextureUpdater so that the root and scrollbars get cleared properly, since both of those use different painters other than ContentLayerPainter. 651821 7 jamesr 2012-06-18 15:47:41 -0700 D'oh, will move it up. 651835 8 148193 jamesr 2012-06-18 15:55:20 -0700 Created attachment 148193 clear in CanvasLayerTextureUpdater 651838 9 148193 enne 2012-06-18 15:59:33 -0700 Comment on attachment 148193 clear in CanvasLayerTextureUpdater R=me. 651853 10 jamesr 2012-06-18 16:16:24 -0700 Committed r120640: <http://trac.webkit.org/changeset/120640> 148164 2012-06-18 13:40:11 -0700 2012-06-18 13:41:03 -0700 Patch bug-89376-20120618134011.patch text/plain 3591 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODJhYzhmOTBhOWNhNTdk NDE3N2Q0MWY2ODhjM2NkYzFlYjhmZDhhMy4uZGFjNjZhZDVmN2U1Y2M4ZjUxYjkxYzlhNTY2ZmNl NzdmMjQ0MDgzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA2LTE4ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBS RUdSRVNTSU9OKHIxMjAzNDYpIENvbnRlbnRMYXllclBhaW50ZXIgc2hvdWxkIGNsZWFyIHJlY3Qg dG8gYmUgcGFpbnRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODkzNzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJbiByMTIwMzQ2LCBhIHJlZmFjdG9yIG1vdmVkIGEgY2xlYXJSZWN0KCkvY2xpcCgpIGNh bGwgZnJvbSBDb250ZW50TGF5ZXJQYWludGVyIC0gd2hpY2ggYWxsCisgICAgICAgIENvbnRlbnRM YXllckNocm9taXVtcyB1c2UgLSBvdXQgdG8gT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVy RGVsZWdhdGUgLSB3aGljaCBhbGwgR3JhcGhpY3NMYXllckNocm9taXVtCisgICAgICAgIGJhY2tl ZCBsYXllcnMgdXNlLCBidXQgd2hpY2ggY2FsbGVycyB1c2luZyBXZWJDb250ZW50TGF5ZXIgZGly ZWN0bHkgZG8gbm90IHVzZS4gVGhpcyBtZWFudCB0aGF0IHRoZSBjYW52YXMKKyAgICAgICAgd2Fz bid0IGNsZWFyZWQvY2xpcHBlZCBhcyBXZWJDb250ZW50TGF5ZXJDbGllbnQuaCBjbGFpbWVkIGl0 IHdvdWxkIGJlLiAgVGhpcyBtb3ZlcyB0aGUgY2xlYXIgYW5kIHRoZSBjbGlwIGJhY2sKKyAgICAg ICAgaW50byBDb250ZW50TGF5ZXJQYWludGVyIHdoZXJlIHRoZXkgb3JpZ2luYWxseSB3ZXJlLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21p dW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudExheWVyUGFpbnRlcjo6cGFpbnQpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL09wYXF1ZVJlY3RUcmFja2luZ0Nv bnRlbnRMYXllckRlbGVnYXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok9wYXF1ZVJlY3RUcmFj a2luZ0NvbnRlbnRMYXllckRlbGVnYXRlOjpwYWludENvbnRlbnRzKToKKwogMjAxMi0wNi0xOCAg TWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1RleHR1 cmVNYXBwZXJdIFJlcGxhY2UgdGhlIHNvdXJjZSB0cmFuc2Zvcm0gd2l0aCBhIGZsaXAgdW5pZm9y bQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Q29udGVudExheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCmluZGV4IDdjMDBiYWJjZDJiMmZl OTJlMWM4MDgxMzI1MzUzN2FjZmVkNjNmYjIuLmJmOTFmNDliODM2NDQzNGI4ZTdhNzBmYTI2ZTU5 NTdiZDg2ZDBhYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTQw LDYgKzQwLDkgQEAKICNpbmNsdWRlICJMYXllclBhaW50ZXJDaHJvbWl1bS5oIgogI2luY2x1ZGUg IkxheWVyUmVuZGVyZXJDaHJvbWl1bS5oIgogI2luY2x1ZGUgIlBsYXRmb3JtU3VwcG9ydC5oIgor I2luY2x1ZGUgIlNrQ2FudmFzLmgiCisjaW5jbHVkZSAiU2tQYWludC5oIgorI2luY2x1ZGUgIlNr UmVjdC5oIgogI2luY2x1ZGUgImNjL0NDTGF5ZXJUcmVlSG9zdC5oIgogI2luY2x1ZGUgImNjL0ND U2V0dGluZ3MuaCIKICNpbmNsdWRlIDxwdWJsaWMvUGxhdGZvcm0uaD4KQEAgLTU4LDYgKzYxLDEz IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnQoU2tDYW52YXMqIGNhbnZhcywgY29u c3QgSW50UmVjdCYgY29udGVudFJlY3QsIEludFJlY3QmIG9wYXF1ZSkKICAgICB7CiAgICAgICAg IGRvdWJsZSBwYWludFN0YXJ0ID0gY3VycmVudFRpbWUoKTsKKworICAgICAgICBTa1BhaW50IHBh aW50OworICAgICAgICBwYWludC5zZXRBbnRpQWxpYXMoZmFsc2UpOworICAgICAgICBwYWludC5z ZXRYZmVybW9kZU1vZGUoU2tYZmVybW9kZTo6a0NsZWFyX01vZGUpOworICAgICAgICBjYW52YXMt PmRyYXdSZWN0KGNvbnRlbnRSZWN0LCBwYWludCk7CisgICAgICAgIGNhbnZhcy0+Y2xpcFJlY3Qo Y29udGVudFJlY3QpOworCiAgICAgICAgIG1fZGVsZWdhdGUtPnBhaW50Q29udGVudHMoY2FudmFz LCBjb250ZW50UmVjdCwgb3BhcXVlKTsKICAgICAgICAgZG91YmxlIHBhaW50RW5kID0gY3VycmVu dFRpbWUoKTsKICAgICAgICAgZG91YmxlIHBpeGVsc1BlclNlYyA9IChjb250ZW50UmVjdC53aWR0 aCgpICogY29udGVudFJlY3QuaGVpZ2h0KCkpIC8gKHBhaW50RW5kIC0gcGFpbnRTdGFydCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9PcGFx dWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJE ZWxlZ2F0ZS5jcHAKaW5kZXggMWI2MTk2NmI5NWRkOTEwM2JlMzMyYWNjNTYxOWU5M2U2OWNhYjQz YS4uNTZkMjYyOTY1YTg4MzE5YTNjNzJiZjM2ZmEwOTBkYjcyNGM3ZjZmMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vT3BhcXVlUmVjdFRyYWNr aW5nQ29udGVudExheWVyRGVsZWdhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL09wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRl LmNwcApAQCAtNTAsOSArNTAsNiBAQCB2b2lkIE9wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXll ckRlbGVnYXRlOjpwYWludENvbnRlbnRzKFNrQ2FudmFzKiBjYW52YXMsIGNvbgogICAgIHBsYXRm b3JtQ29udGV4dC5zZXRUcmFja09wYXF1ZVJlZ2lvbighbV9vcGFxdWUpOwogICAgIEdyYXBoaWNz Q29udGV4dCBjb250ZXh0KCZwbGF0Zm9ybUNvbnRleHQpOwogCi0gICAgY29udGV4dC5jbGVhclJl Y3QoY2xpcCk7Ci0gICAgY29udGV4dC5jbGlwKGNsaXApOwotCiAgICAgLy8gUmVjb3JkIHRyYW5z Zm9ybSBwcmlvciB0byBwYWludGluZywgYXMgYWxsIG9wYXF1ZSB0cmFja2luZyB3aWxsIGJlCiAg ICAgLy8gcmVsYXRpdmUgdG8gdGhpcyBjdXJyZW50IHZhbHVlLgogICAgIEFmZmluZVRyYW5zZm9y bSBjYW52YXNUb0NvbnRlbnRUcmFuc2Zvcm0gPSBjb250ZXh0LmdldENUTSgpLmludmVyc2UoKTsK 148165 2012-06-18 13:41:07 -0700 2012-06-18 15:55:09 -0700 remove more redundant clears bug-89376-20120618134106.patch text/plain 4808 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODJhYzhmOTBhOWNhNTdk NDE3N2Q0MWY2ODhjM2NkYzFlYjhmZDhhMy4uZGFjNjZhZDVmN2U1Y2M4ZjUxYjkxYzlhNTY2ZmNl NzdmMjQ0MDgzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA2LTE4ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBS RUdSRVNTSU9OKHIxMjAzNDYpIENvbnRlbnRMYXllclBhaW50ZXIgc2hvdWxkIGNsZWFyIHJlY3Qg dG8gYmUgcGFpbnRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODkzNzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJbiByMTIwMzQ2LCBhIHJlZmFjdG9yIG1vdmVkIGEgY2xlYXJSZWN0KCkvY2xpcCgpIGNh bGwgZnJvbSBDb250ZW50TGF5ZXJQYWludGVyIC0gd2hpY2ggYWxsCisgICAgICAgIENvbnRlbnRM YXllckNocm9taXVtcyB1c2UgLSBvdXQgdG8gT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVy RGVsZWdhdGUgLSB3aGljaCBhbGwgR3JhcGhpY3NMYXllckNocm9taXVtCisgICAgICAgIGJhY2tl ZCBsYXllcnMgdXNlLCBidXQgd2hpY2ggY2FsbGVycyB1c2luZyBXZWJDb250ZW50TGF5ZXIgZGly ZWN0bHkgZG8gbm90IHVzZS4gVGhpcyBtZWFudCB0aGF0IHRoZSBjYW52YXMKKyAgICAgICAgd2Fz bid0IGNsZWFyZWQvY2xpcHBlZCBhcyBXZWJDb250ZW50TGF5ZXJDbGllbnQuaCBjbGFpbWVkIGl0 IHdvdWxkIGJlLiAgVGhpcyBtb3ZlcyB0aGUgY2xlYXIgYW5kIHRoZSBjbGlwIGJhY2sKKyAgICAg ICAgaW50byBDb250ZW50TGF5ZXJQYWludGVyIHdoZXJlIHRoZXkgb3JpZ2luYWxseSB3ZXJlLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21p dW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudExheWVyUGFpbnRlcjo6cGFpbnQpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL09wYXF1ZVJlY3RUcmFja2luZ0Nv bnRlbnRMYXllckRlbGVnYXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok9wYXF1ZVJlY3RUcmFj a2luZ0NvbnRlbnRMYXllckRlbGVnYXRlOjpwYWludENvbnRlbnRzKToKKwogMjAxMi0wNi0xOCAg TWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1RleHR1 cmVNYXBwZXJdIFJlcGxhY2UgdGhlIHNvdXJjZSB0cmFuc2Zvcm0gd2l0aCBhIGZsaXAgdW5pZm9y bQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Q29udGVudExheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCmluZGV4IDdjMDBiYWJjZDJiMmZl OTJlMWM4MDgxMzI1MzUzN2FjZmVkNjNmYjIuLmJmOTFmNDliODM2NDQzNGI4ZTdhNzBmYTI2ZTU5 NTdiZDg2ZDBhYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTQw LDYgKzQwLDkgQEAKICNpbmNsdWRlICJMYXllclBhaW50ZXJDaHJvbWl1bS5oIgogI2luY2x1ZGUg IkxheWVyUmVuZGVyZXJDaHJvbWl1bS5oIgogI2luY2x1ZGUgIlBsYXRmb3JtU3VwcG9ydC5oIgor I2luY2x1ZGUgIlNrQ2FudmFzLmgiCisjaW5jbHVkZSAiU2tQYWludC5oIgorI2luY2x1ZGUgIlNr UmVjdC5oIgogI2luY2x1ZGUgImNjL0NDTGF5ZXJUcmVlSG9zdC5oIgogI2luY2x1ZGUgImNjL0ND U2V0dGluZ3MuaCIKICNpbmNsdWRlIDxwdWJsaWMvUGxhdGZvcm0uaD4KQEAgLTU4LDYgKzYxLDEz IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnQoU2tDYW52YXMqIGNhbnZhcywgY29u c3QgSW50UmVjdCYgY29udGVudFJlY3QsIEludFJlY3QmIG9wYXF1ZSkKICAgICB7CiAgICAgICAg IGRvdWJsZSBwYWludFN0YXJ0ID0gY3VycmVudFRpbWUoKTsKKworICAgICAgICBTa1BhaW50IHBh aW50OworICAgICAgICBwYWludC5zZXRBbnRpQWxpYXMoZmFsc2UpOworICAgICAgICBwYWludC5z ZXRYZmVybW9kZU1vZGUoU2tYZmVybW9kZTo6a0NsZWFyX01vZGUpOworICAgICAgICBjYW52YXMt PmRyYXdSZWN0KGNvbnRlbnRSZWN0LCBwYWludCk7CisgICAgICAgIGNhbnZhcy0+Y2xpcFJlY3Qo Y29udGVudFJlY3QpOworCiAgICAgICAgIG1fZGVsZWdhdGUtPnBhaW50Q29udGVudHMoY2FudmFz LCBjb250ZW50UmVjdCwgb3BhcXVlKTsKICAgICAgICAgZG91YmxlIHBhaW50RW5kID0gY3VycmVu dFRpbWUoKTsKICAgICAgICAgZG91YmxlIHBpeGVsc1BlclNlYyA9IChjb250ZW50UmVjdC53aWR0 aCgpICogY29udGVudFJlY3QuaGVpZ2h0KCkpIC8gKHBhaW50RW5kIC0gcGFpbnRTdGFydCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9PcGFx dWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJE ZWxlZ2F0ZS5jcHAKaW5kZXggMWI2MTk2NmI5NWRkOTEwM2JlMzMyYWNjNTYxOWU5M2U2OWNhYjQz YS4uNTZkMjYyOTY1YTg4MzE5YTNjNzJiZjM2ZmEwOTBkYjcyNGM3ZjZmMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vT3BhcXVlUmVjdFRyYWNr aW5nQ29udGVudExheWVyRGVsZWdhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL09wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRl LmNwcApAQCAtNTAsOSArNTAsNiBAQCB2b2lkIE9wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXll ckRlbGVnYXRlOjpwYWludENvbnRlbnRzKFNrQ2FudmFzKiBjYW52YXMsIGNvbgogICAgIHBsYXRm b3JtQ29udGV4dC5zZXRUcmFja09wYXF1ZVJlZ2lvbighbV9vcGFxdWUpOwogICAgIEdyYXBoaWNz Q29udGV4dCBjb250ZXh0KCZwbGF0Zm9ybUNvbnRleHQpOwogCi0gICAgY29udGV4dC5jbGVhclJl Y3QoY2xpcCk7Ci0gICAgY29udGV4dC5jbGlwKGNsaXApOwotCiAgICAgLy8gUmVjb3JkIHRyYW5z Zm9ybSBwcmlvciB0byBwYWludGluZywgYXMgYWxsIG9wYXF1ZSB0cmFja2luZyB3aWxsIGJlCiAg ICAgLy8gcmVsYXRpdmUgdG8gdGhpcyBjdXJyZW50IHZhbHVlLgogICAgIEFmZmluZVRyYW5zZm9y bSBjYW52YXNUb0NvbnRlbnRUcmFuc2Zvcm0gPSBjb250ZXh0LmdldENUTSgpLmludmVyc2UoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1Nj cm9sbGJhckxheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vU2Nyb2xsYmFyTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggMDA2YzkyZjIwOWJk YTFjOGYzYTg1MDQ0Y2U1NzQ2NmQxZWFlN2MyYi4uNWUyM2U5MzQ1MmRiZmMwMjQ2YzIyMmU2MWZk YmYwMGY2OWRkNWQ3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vU2Nyb2xsYmFyTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vU2Nyb2xsYmFyTGF5ZXJDaHJvbWl1bS5jcHAK QEAgLTExNiw4ICsxMTYsNiBAQCBwdWJsaWM6CiAgICAgICAgIFBsYXRmb3JtQ29udGV4dFNraWEg cGxhdGZvcm1Db250ZXh0KGNhbnZhcyk7CiAgICAgICAgIHBsYXRmb3JtQ29udGV4dC5zZXREcmF3 aW5nVG9JbWFnZUJ1ZmZlcih0cnVlKTsKICAgICAgICAgR3JhcGhpY3NDb250ZXh0IGNvbnRleHQo JnBsYXRmb3JtQ29udGV4dCk7Ci0gICAgICAgIGNvbnRleHQuY2xlYXJSZWN0KGNvbnRlbnRSZWN0 KTsKLSAgICAgICAgY29udGV4dC5jbGlwKGNvbnRlbnRSZWN0KTsKIAogICAgICAgICAvLyBUaGUg Zm9sbG93aW5nIGlzIGEgc2ltcGxpZmljYXRpb24gb2YgU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6 OnBhaW50LgogICAgICAgICBtX3RoZW1lLT5wYWludFNjcm9sbGJhckJhY2tncm91bmQoJmNvbnRl eHQsIG1fc2Nyb2xsYmFyKTsKQEAgLTE3Niw4ICsxNzQsNiBAQCBwdWJsaWM6CiAgICAgICAgIHBs YXRmb3JtQ29udGV4dC5zZXREcmF3aW5nVG9JbWFnZUJ1ZmZlcih0cnVlKTsKICAgICAgICAgR3Jh cGhpY3NDb250ZXh0IGNvbnRleHQoJnBsYXRmb3JtQ29udGV4dCk7CiAKLSAgICAgICAgY29udGV4 dC5jbGVhclJlY3QoY29udGVudFJlY3QpOwotCiAgICAgICAgIC8vIENvbnNpZGVyIHRoZSB0aHVt YiB0byBiZSBhdCB0aGUgb3JpZ2luIHdoZW4gcGFpbnRpbmcuCiAgICAgICAgIEludFJlY3QgdGh1 bWJSZWN0ID0gSW50UmVjdChJbnRQb2ludCgpLCBtX3RoZW1lLT50aHVtYlJlY3QobV9zY3JvbGxi YXIpLnNpemUoKSk7CiAgICAgICAgIG1fdGhlbWUtPnBhaW50VGh1bWIoJmNvbnRleHQsIG1fc2Ny b2xsYmFyLCB0aHVtYlJlY3QpOwo= 148193 2012-06-18 15:55:20 -0700 2012-06-18 15:59:32 -0700 clear in CanvasLayerTextureUpdater bug-89376-20120618155520.patch text/plain 4710 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODJhYzhmOTBhOWNhNTdk NDE3N2Q0MWY2ODhjM2NkYzFlYjhmZDhhMy4uMmE4MTFkMDg4YTIwMzE2MmE1ZTJmYjU2M2UxNWRj Y2JkYmQyNjJhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA2LTE4ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBS RUdSRVNTSU9OKHIxMjAzNDYpIENvbnRlbnRMYXllclBhaW50ZXIgc2hvdWxkIGNsZWFyIHJlY3Qg dG8gYmUgcGFpbnRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODkzNzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJbiByMTIwMzQ2LCBhIHJlZmFjdG9yIG1vdmVkIGEgY2xlYXJSZWN0KCkvY2xpcCgpIGNh bGwgZnJvbSBDb250ZW50TGF5ZXJQYWludGVyIC0gd2hpY2ggYWxsCisgICAgICAgIENvbnRlbnRM YXllckNocm9taXVtcyB1c2UgLSBvdXQgdG8gT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVy RGVsZWdhdGUgLSB3aGljaCBhbGwgR3JhcGhpY3NMYXllckNocm9taXVtCisgICAgICAgIGJhY2tl ZCBsYXllcnMgdXNlLCBidXQgd2hpY2ggY2FsbGVycyB1c2luZyBXZWJDb250ZW50TGF5ZXIgZGly ZWN0bHkgZG8gbm90IHVzZS4gVGhpcyBtZWFudCB0aGF0IHRoZSBjYW52YXMKKyAgICAgICAgd2Fz bid0IGNsZWFyZWQvY2xpcHBlZCBhcyBXZWJDb250ZW50TGF5ZXJDbGllbnQuaCBjbGFpbWVkIGl0 IHdvdWxkIGJlLiBUaGlzIG1vdmVzIHRoZSBjbGVhciBhbmQgdGhlIGNsaXAKKyAgICAgICAgaW50 byBDYW52YXNMYXllclRleHR1cmVVcGRhdGVyIHdoaWNoIGFsbCBwYXRocyB1c2UsIGluY2x1ZGlu ZyBsYXllcnMgdGhhdCBkb24ndCB1c2UgdGhlIENvbnRlbnRMYXllclBhaW50ZXIuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50TGF5ZXJQYWludGVyOjpwYWludCk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExh eWVyRGVsZWdhdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6T3BhcXVlUmVjdFRyYWNraW5nQ29u dGVudExheWVyRGVsZWdhdGU6OnBhaW50Q29udGVudHMpOgorCiAyMDEyLTA2LTE4ICBNYXJ0aW4g Um9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBbVGV4dHVyZU1hcHBl cl0gUmVwbGFjZSB0aGUgc291cmNlIHRyYW5zZm9ybSB3aXRoIGEgZmxpcCB1bmlmb3JtCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNM YXllclRleHR1cmVVcGRhdGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0NhbnZhc0xheWVyVGV4dHVyZVVwZGF0ZXIuY3BwCmluZGV4IGI0NjRhM2Q0OGVj ZGU2MDIzYjY5N2M4ODQzNGNjZjFhNjYyODM3ZjUuLjUzMGJiMmY3MWM0MWRjNDlhNmRmODRmODFj MzUzMjMwMGU5MzQ4ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0NhbnZhc0xheWVyVGV4dHVyZVVwZGF0ZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhc0xheWVyVGV4dHVyZVVwZGF0 ZXIuY3BwCkBAIC0zMyw2ICszMyw5IEBACiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0LmgiCiAj aW5jbHVkZSAiTGF5ZXJQYWludGVyQ2hyb21pdW0uaCIKICNpbmNsdWRlICJQbGF0Zm9ybUNvbnRl eHRTa2lhLmgiCisjaW5jbHVkZSAiU2tDYW52YXMuaCIKKyNpbmNsdWRlICJTa1BhaW50LmgiCisj aW5jbHVkZSAiU2tSZWN0LmgiCiAjaW5jbHVkZSAiU2tpYVV0aWxzLmgiCiAjaW5jbHVkZSAiVHJh Y2VFdmVudC5oIgogCkBAIC02Myw2ICs2NiwxMiBAQCB2b2lkIENhbnZhc0xheWVyVGV4dHVyZVVw ZGF0ZXI6OnBhaW50Q29udGVudHMoU2tDYW52YXMqIGNhbnZhcywgY29uc3QgSW50UmVjdCYgYwog ICAgICAgICBzY2FsZWRDb250ZW50UmVjdCA9IGVuY2xvc2luZ0ludFJlY3QocmVjdCk7CiAgICAg fQogCisgICAgU2tQYWludCBwYWludDsKKyAgICBwYWludC5zZXRBbnRpQWxpYXMoZmFsc2UpOwor ICAgIHBhaW50LnNldFhmZXJtb2RlTW9kZShTa1hmZXJtb2RlOjprQ2xlYXJfTW9kZSk7CisgICAg Y2FudmFzLT5kcmF3UmVjdChzY2FsZWRDb250ZW50UmVjdCwgcGFpbnQpOworICAgIGNhbnZhcy0+ Y2xpcFJlY3Qoc2NhbGVkQ29udGVudFJlY3QpOworCiAgICAgbV9wYWludGVyLT5wYWludChjYW52 YXMsIHNjYWxlZENvbnRlbnRSZWN0LCByZXN1bHRpbmdPcGFxdWVSZWN0KTsKICAgICBjYW52YXMt PnJlc3RvcmUoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGUuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vT3BhcXVlUmVjdFRyYWNr aW5nQ29udGVudExheWVyRGVsZWdhdGUuY3BwCmluZGV4IDFiNjE5NjZiOTVkZDkxMDNiZTMzMmFj YzU2MTllOTNlNjljYWI0M2EuLjU2ZDI2Mjk2NWE4ODMxOWEzYzcyYmYzNmZhMDkwZGI3MjRjN2Y2 ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L09wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9PcGFxdWVSZWN0VHJhY2tpbmdDb250 ZW50TGF5ZXJEZWxlZ2F0ZS5jcHAKQEAgLTUwLDkgKzUwLDYgQEAgdm9pZCBPcGFxdWVSZWN0VHJh Y2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZTo6cGFpbnRDb250ZW50cyhTa0NhbnZhcyogY2FudmFz LCBjb24KICAgICBwbGF0Zm9ybUNvbnRleHQuc2V0VHJhY2tPcGFxdWVSZWdpb24oIW1fb3BhcXVl KTsKICAgICBHcmFwaGljc0NvbnRleHQgY29udGV4dCgmcGxhdGZvcm1Db250ZXh0KTsKIAotICAg IGNvbnRleHQuY2xlYXJSZWN0KGNsaXApOwotICAgIGNvbnRleHQuY2xpcChjbGlwKTsKLQogICAg IC8vIFJlY29yZCB0cmFuc2Zvcm0gcHJpb3IgdG8gcGFpbnRpbmcsIGFzIGFsbCBvcGFxdWUgdHJh Y2tpbmcgd2lsbCBiZQogICAgIC8vIHJlbGF0aXZlIHRvIHRoaXMgY3VycmVudCB2YWx1ZS4KICAg ICBBZmZpbmVUcmFuc2Zvcm0gY2FudmFzVG9Db250ZW50VHJhbnNmb3JtID0gY29udGV4dC5nZXRD VE0oKS5pbnZlcnNlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9TY3JvbGxiYXJMYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1Njcm9sbGJhckxheWVyQ2hyb21pdW0uY3BwCmlu ZGV4IDAwNmM5MmYyMDliZGExYzhmM2E4NTA0NGNlNTc0NjZkMWVhZTdjMmIuLjVlMjNlOTM0NTJk YmZjMDI0NmMyMjJlNjFmZGJmMDBmNjlkZDVkNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1Njcm9sbGJhckxheWVyQ2hyb21pdW0uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1Njcm9sbGJhckxh eWVyQ2hyb21pdW0uY3BwCkBAIC0xMTYsOCArMTE2LDYgQEAgcHVibGljOgogICAgICAgICBQbGF0 Zm9ybUNvbnRleHRTa2lhIHBsYXRmb3JtQ29udGV4dChjYW52YXMpOwogICAgICAgICBwbGF0Zm9y bUNvbnRleHQuc2V0RHJhd2luZ1RvSW1hZ2VCdWZmZXIodHJ1ZSk7CiAgICAgICAgIEdyYXBoaWNz Q29udGV4dCBjb250ZXh0KCZwbGF0Zm9ybUNvbnRleHQpOwotICAgICAgICBjb250ZXh0LmNsZWFy UmVjdChjb250ZW50UmVjdCk7Ci0gICAgICAgIGNvbnRleHQuY2xpcChjb250ZW50UmVjdCk7CiAK ICAgICAgICAgLy8gVGhlIGZvbGxvd2luZyBpcyBhIHNpbXBsaWZpY2F0aW9uIG9mIFNjcm9sbGJh clRoZW1lQ29tcG9zaXRlOjpwYWludC4KICAgICAgICAgbV90aGVtZS0+cGFpbnRTY3JvbGxiYXJC YWNrZ3JvdW5kKCZjb250ZXh0LCBtX3Njcm9sbGJhcik7CkBAIC0xNzYsOCArMTc0LDYgQEAgcHVi bGljOgogICAgICAgICBwbGF0Zm9ybUNvbnRleHQuc2V0RHJhd2luZ1RvSW1hZ2VCdWZmZXIodHJ1 ZSk7CiAgICAgICAgIEdyYXBoaWNzQ29udGV4dCBjb250ZXh0KCZwbGF0Zm9ybUNvbnRleHQpOwog Ci0gICAgICAgIGNvbnRleHQuY2xlYXJSZWN0KGNvbnRlbnRSZWN0KTsKLQogICAgICAgICAvLyBD b25zaWRlciB0aGUgdGh1bWIgdG8gYmUgYXQgdGhlIG9yaWdpbiB3aGVuIHBhaW50aW5nLgogICAg ICAgICBJbnRSZWN0IHRodW1iUmVjdCA9IEludFJlY3QoSW50UG9pbnQoKSwgbV90aGVtZS0+dGh1 bWJSZWN0KG1fc2Nyb2xsYmFyKS5zaXplKCkpOwogICAgICAgICBtX3RoZW1lLT5wYWludFRodW1i KCZjb250ZXh0LCBtX3Njcm9sbGJhciwgdGh1bWJSZWN0KTsK