94234 2012-08-16 11:38:01 -0700 [Chromium] Changing Canvas2DLayerBridge to use SkDeferredCanvas's notification client API 2012-08-16 18:34:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 junov junov cc-bugs jamesr kbr reed senorblanco webkit.review.bot oldest_to_newest 697311 0 junov 2012-08-16 11:38:01 -0700 [Chromium] Changing Canvas2DLayerBridge to use SkDeferredCanvas's notification client API 697330 1 158868 junov 2012-08-16 11:53:09 -0700 Created attachment 158868 Patch 697353 2 158868 jamesr 2012-08-16 12:22:42 -0700 Comment on attachment 158868 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=158868&action=review R=me. When did this roll into skia - have you checked that it shows up in the chr->skia rev in Source/WebKit/chromium/DEPS ? > Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.cpp:80 > + SkDeferredCanvas* deferred = deferredCanvas(); > + if (deferred) FYI, you could fold the assignment into the if() if you want, since "deferred" isn't used outside the scope of the if 697368 3 junov 2012-08-16 12:35:59 -0700 Yep, the dependency has rolled in earlier today, as evidenced by the green cr-linux. Will re-upload with suggested change. (In reply to comment #2) > (From update of attachment 158868 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=158868&action=review > > R=me. When did this roll into skia - have you checked that it shows up in the chr->skia rev in Source/WebKit/chromium/DEPS ? > > > Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.cpp:80 > > + SkDeferredCanvas* deferred = deferredCanvas(); > > + if (deferred) > > FYI, you could fold the assignment into the if() if you want, since "deferred" isn't used outside the scope of the if 697371 4 158877 junov 2012-08-16 12:40:13 -0700 Created attachment 158877 Patch 697378 5 158877 jamesr 2012-08-16 12:44:31 -0700 Comment on attachment 158877 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=158877&action=review > Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.h:46 > +class Canvas2DLayerBridge : public WebKit::WebExternalTextureLayerClient, public SkDeferredCanvas::NotificationClient { Wait a second - SkDeferredCanvas::NotificationClient derives from SkRefCnt. This class is held in an OwnPtr<> by ImageBufferData. That's a problem, isn't it? I believe this is the reason for the extra class indirection before. 697396 6 junov 2012-08-16 12:57:47 -0700 (In reply to comment #5) > (From update of attachment 158877 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=158877&action=review > > > Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.h:46 > > +class Canvas2DLayerBridge : public WebKit::WebExternalTextureLayerClient, public SkDeferredCanvas::NotificationClient { > > Wait a second - SkDeferredCanvas::NotificationClient derives from SkRefCnt. This class is held in an OwnPtr<> by ImageBufferData. That's a problem, isn't it? I believe this is the reason for the extra class indirection before. Ahah, you've an eagle eye! This is intentional and temporary because I have a chicken/egg problem. The layer bridge gets destroyed before the canvas and the layer bridge destructor unregisters itself as notification client, so the SkRefCnt will never kick-in to destroy the object. Therefore, this change won't crash. My plan is to remove the SkRefCnt, but I can't do that safely until this webkit change rolls into chromium. 697400 7 158877 jamesr 2012-08-16 12:59:23 -0700 Comment on attachment 158877 Patch OK, that makes sense. Sounds good then - please don't leave it ref counted for long :) 697414 8 158877 webkit.review.bot 2012-08-16 13:12:04 -0700 Comment on attachment 158877 Patch Clearing flags on attachment: 158877 Committed r125804: <http://trac.webkit.org/changeset/125804> 697415 9 webkit.review.bot 2012-08-16 13:12:08 -0700 All reviewed patches have been landed. Closing bug. 697736 10 kbr 2012-08-16 17:47:38 -0700 Reverted r125804 for reason: Made threaded tests in performance_browser_tests start timing out on Chromium GPU bots Committed r125833: <http://trac.webkit.org/changeset/125833> 697785 11 kbr 2012-08-16 18:34:35 -0700 Reverted r125833 for reason: Was not the cause of the test failures. Per http://crbug.com/143311 , it is probably WebKit r125800. Committed r125841: <http://trac.webkit.org/changeset/125841> 697786 12 kbr 2012-08-16 18:34:58 -0700 Closing as fixed again after rollout of the rollout. 158868 2012-08-16 11:53:09 -0700 2012-08-16 12:40:10 -0700 Patch bug-94234-20120816145234.patch text/plain 7128 junov SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTc5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA4LTE2ICBKdXN0aW4g Tm92b3NhZCAgPGp1bm92QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIENoYW5n aW5nIENhbnZhczJETGF5ZXJCcmlkZ2UgdG8gdXNlIFNrRGVmZXJyZWRDYW52YXMncyBub3RpZmlj YXRpb24gY2xpZW50IEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTQyMzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGUgZXhpc3RpbmcgRGV2aWNlQ29udGV4dCBBUEkgaW4gc2tpYSdzIFNrRGVmZXJy ZWRDYW52YXMgaXMgYmVpbmcKKyAgICAgICAgZGVwcmVjYXRlZCBpbiBmYXZvciBvZiB0aGUgbmV3 IE5vdGlmaWNhdGlvbkNsaWVudCBpbnRlcmZhY2UsIHdoaWNoIGlzCisgICAgICAgIGRlc2lnbmVk IHRvIGFsbG93IFdlYktpdCB0byBjb250cm9sIGRlZmVycmVkIGNhbnZhcyBnbG9iYWwgbWVtb3J5 CisgICAgICAgIGNvbnN1bXB0aW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0czogdGhpcyBwYXRj aCBkb2VzIG5vdCBmaXggYW55IGJ1ZyBhbmQgZG9lcyBub3QgYWRkIG5ldworICAgICAgICBmdW5j dGlvbmFsaXR5LiBJdCBpcyBqdXN0IGEgdHJhbnNpdGlvbiB0byBhIG5ldyBza2lhIGludGVyZmFj ZS4KKyAgICAgICAgQ292ZXJhZ2UgaXMgYXNzdXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJCcmlkZ2UuY3Bw OgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIFJlbW92ZWQgdGhlIEFjY2VsZXJhdGVkRGV2 aWNlQ29udGV4dCBjbGFzcyBjb21wbGV0ZWx5IGFuZCBtaXhlZCBpdAorICAgICAgICBpbnRvIENh bnZhczJETGF5ZXJCcmlkZ2UgYnkgaW5oZXJpdGluZworICAgICAgICBTa0RlZmVycmVkQ2FudmFz OjpOb3RpZmljYXRpb25DbGllbnQKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhczJETGF5ZXJCcmlk Z2U6On5DYW52YXMyRExheWVyQnJpZGdlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhczJETGF5 ZXJCcmlkZ2U6OmRlZmVycmVkQ2FudmFzKToKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhczJETGF5 ZXJCcmlkZ2U6OnByZXBhcmVGb3JEcmF3KToKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhczJETGF5 ZXJCcmlkZ2U6OnNrQ2FudmFzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9DYW52YXMyRExheWVyQnJpZGdlLmg6CisgICAgICAgIChDYW52YXMyRExheWVyQnJpZGdlKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHA6Cisg ICAgICAgIENsZWFuaW5nIHVwIHVubmVjZXNzYXJ5IGluY2x1ZGUgb2YgU2tEZWZlcnJlZENhbnZh cy5oCisKIDIwMTItMDgtMTUgIExldmkgV2VpbnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIEFjY3VtdWxhdGUgc3ViLXBpeGVsIG9mZnNldHMgdGhyb3VnaCBsYXllcnMgYW5k IHRyYW5zZm9ybXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0NhbnZhczJETGF5ZXJCcmlkZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJCcmlkZ2UuY3BwCShyZXZp c2lvbiAxMjU3OTMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9DYW52YXMyRExheWVyQnJpZGdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEsOCArMzEsNiBA QAogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250 ZXh0M0RQcml2YXRlLmgiCiAjaW5jbHVkZSAiTGF5ZXJSZW5kZXJlckNocm9taXVtLmgiIC8vIEZv ciBHTEMoKSBtYWNyby4KLSNpbmNsdWRlICJTa0NhbnZhcy5oIgotI2luY2x1ZGUgIlNrRGVmZXJy ZWRDYW52YXMuaCIKICNpbmNsdWRlICJUcmFjZUV2ZW50LmgiCiAjaW5jbHVkZSA8cHVibGljL1dl YkNvbXBvc2l0b3IuaD4KICNpbmNsdWRlIDxwdWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaD4K QEAgLTQzLDMxICs0MSw2IEBAIHVzaW5nIFdlYktpdDo6V2ViVGV4dHVyZVVwZGF0ZXI7CiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgQWNjZWxlcmF0ZWREZXZpY2VDb250ZXh0IDogcHVi bGljIFNrRGVmZXJyZWRDYW52YXM6OkRldmljZUNvbnRleHQgewotcHVibGljOgotICAgIEFjY2Vs ZXJhdGVkRGV2aWNlQ29udGV4dChXZWJHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCwgV2ViRXh0 ZXJuYWxUZXh0dXJlTGF5ZXIgbGF5ZXIsIGJvb2wgdXNlRG91YmxlQnVmZmVyaW5nKQotICAgICAg ICA6IG1fbGF5ZXIobGF5ZXIpCi0gICAgICAgICwgbV9jb250ZXh0KCkKLSAgICAgICAgLCBtX3Vz ZURvdWJsZUJ1ZmZlcmluZyh1c2VEb3VibGVCdWZmZXJpbmcpCi0gICAgewotICAgICAgICBBU1NF UlQoY29udGV4dCk7Ci0gICAgICAgIEFTU0VSVCghbGF5ZXIuaXNOdWxsKCkpOwotICAgICAgICBt X2NvbnRleHQgPSBjb250ZXh0OwotICAgIH0KLQotICAgIHZpcnR1YWwgdm9pZCBwcmVwYXJlRm9y RHJhdygpCi0gICAgewotICAgICAgICBpZiAoIW1fdXNlRG91YmxlQnVmZmVyaW5nKQotICAgICAg ICAgICAgbV9sYXllci53aWxsTW9kaWZ5VGV4dHVyZSgpOwotICAgICAgICBtX2NvbnRleHQtPm1h a2VDb250ZXh0Q3VycmVudCgpOwotICAgIH0KLQotcHJpdmF0ZToKLSAgICBXZWJFeHRlcm5hbFRl eHR1cmVMYXllciBtX2xheWVyOwotICAgIFdlYkdyYXBoaWNzQ29udGV4dDNEKiBtX2NvbnRleHQ7 Ci0gICAgYm9vbCBtX3VzZURvdWJsZUJ1ZmZlcmluZzsKLX07Ci0KIENhbnZhczJETGF5ZXJCcmlk Z2U6OkNhbnZhczJETGF5ZXJCcmlkZ2UoUGFzc1JlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4gY29u dGV4dCwgY29uc3QgSW50U2l6ZSYgc2l6ZSwgRGVmZXJyYWxNb2RlIGRlZmVycmFsTW9kZSwgdW5z aWduZWQgdGV4dHVyZUlkKQogICAgIDogbV9kZWZlcnJhbE1vZGUoZGVmZXJyYWxNb2RlKQogICAg IC8vIEZJWE1FOiBXZSBjdXJyZW50bHkgdHVybiBvZmYgZG91YmxlIGJ1ZmZlcmluZyB3aGVuIGNh bnZhcyByZW5kZXJpbmcgaXMKQEAgLTEwMSw5ICs3NCwxMSBAQCBDYW52YXMyRExheWVyQnJpZGdl OjpDYW52YXMyRExheWVyQnJpZGdlCiAgICAgbV9sYXllci5zZXRSYXRlTGltaXRDb250ZXh0KCFX ZWJLaXQ6OldlYkNvbXBvc2l0b3I6OnRocmVhZGluZ0VuYWJsZWQoKSB8fCBtX3VzZURvdWJsZUJ1 ZmZlcmluZyk7CiB9CiAKLQogQ2FudmFzMkRMYXllckJyaWRnZTo6fkNhbnZhczJETGF5ZXJCcmlk Z2UoKQogeworICAgIFNrRGVmZXJyZWRDYW52YXMqIGRlZmVycmVkID0gZGVmZXJyZWRDYW52YXMo KTsKKyAgICBpZiAoZGVmZXJyZWQpCisgICAgICAgIGRlZmVycmVkLT5zZXROb3RpZmljYXRpb25D bGllbnQoMCk7CiAgICAgbV9sYXllci5zZXRUZXh0dXJlSWQoMCk7CiAgICAgaWYgKG1fdXNlRG91 YmxlQnVmZmVyaW5nKSB7CiAgICAgICAgIG1fY29udGV4dC0+bWFrZUNvbnRleHRDdXJyZW50KCk7 CkBAIC0xMTMsMTEgKzg4LDI4IEBAIENhbnZhczJETGF5ZXJCcmlkZ2U6On5DYW52YXMyRExheWVy QnJpZGcKICAgICBtX2xheWVyLmNsZWFyQ2xpZW50KCk7CiB9CiAKK1NrRGVmZXJyZWRDYW52YXMq IENhbnZhczJETGF5ZXJCcmlkZ2U6OmRlZmVycmVkQ2FudmFzKCkKK3sKKyAgICBpZiAobV9kZWZl cnJhbE1vZGUgPT0gRGVmZXJyZWQpCisgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxTa0RlZmVy cmVkQ2FudmFzKj4obV9jYW52YXMpOworICAgIHJldHVybiAwOworfQorCit2b2lkIENhbnZhczJE TGF5ZXJCcmlkZ2U6OnByZXBhcmVGb3JEcmF3KCkKK3sKKyAgICBBU1NFUlQoZGVmZXJyZWRDYW52 YXMoKSk7CisgICAgaWYgKCFtX3VzZURvdWJsZUJ1ZmZlcmluZykKKyAgICAgICAgbV9sYXllci53 aWxsTW9kaWZ5VGV4dHVyZSgpOworICAgIG1fY29udGV4dC0+bWFrZUNvbnRleHRDdXJyZW50KCk7 Cit9CisKIFNrQ2FudmFzKiBDYW52YXMyRExheWVyQnJpZGdlOjpza0NhbnZhcyhTa0RldmljZSog ZGV2aWNlKQogeworICAgIEFTU0VSVCghbV9jYW52YXMpOwogICAgIGlmIChtX2RlZmVycmFsTW9k ZSA9PSBEZWZlcnJlZCkgewotICAgICAgICBTa0F1dG9UVW5yZWY8QWNjZWxlcmF0ZWREZXZpY2VD b250ZXh0PiBkZXZpY2VDb250ZXh0KG5ldyBBY2NlbGVyYXRlZERldmljZUNvbnRleHQoY29udGV4 dCgpLCBtX2xheWVyLCBtX3VzZURvdWJsZUJ1ZmZlcmluZykpOwotICAgICAgICBtX2NhbnZhcyA9 IG5ldyBTa0RlZmVycmVkQ2FudmFzKGRldmljZSwgZGV2aWNlQ29udGV4dC5nZXQoKSk7CisgICAg ICAgIFNrRGVmZXJyZWRDYW52YXMqIGRlZmVycmVkID0gbmV3IFNrRGVmZXJyZWRDYW52YXMoZGV2 aWNlKTsKKyAgICAgICAgZGVmZXJyZWQtPnNldE5vdGlmaWNhdGlvbkNsaWVudCh0aGlzKTsKKyAg ICAgICAgbV9jYW52YXMgPSBkZWZlcnJlZDsKICAgICB9IGVsc2UKICAgICAgICAgbV9jYW52YXMg PSBuZXcgU2tDYW52YXMoZGV2aWNlKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRMYXllckJyaWRnZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJCcmlk Z2UuaAkocmV2aXNpb24gMTI1NzkzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vQ2FudmFzMkRMYXllckJyaWRnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSwx NCArMjksMTIgQEAKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQzRC5oIgogI2luY2x1ZGUgIklt YWdlQnVmZmVyLmgiIC8vIEZvciBEZWZlcnJhbE1vZGUgZW51bS4KICNpbmNsdWRlICJJbnRTaXpl LmgiCisjaW5jbHVkZSAiU2tEZWZlcnJlZENhbnZhcy5oIgogI2luY2x1ZGUgPHB1YmxpYy9XZWJF eHRlcm5hbFRleHR1cmVMYXllci5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJFeHRlcm5hbFRleHR1 cmVMYXllckNsaWVudC5oPgogI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAjaW5jbHVkZSA8 d3RmL1JlZlB0ci5oPgogCi1jbGFzcyBTa0NhbnZhczsKLWNsYXNzIFNrRGV2aWNlOwotCiBuYW1l c3BhY2UgV2ViS2l0IHsKIGNsYXNzIFdlYkdyYXBoaWNzQ29udGV4dDNEOwogfQpAQCAtNDUsNyAr NDMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIExheWVyQ2hyb21pdW07CiAKLWNs YXNzIENhbnZhczJETGF5ZXJCcmlkZ2UgOiBwdWJsaWMgV2ViS2l0OjpXZWJFeHRlcm5hbFRleHR1 cmVMYXllckNsaWVudCB7CitjbGFzcyBDYW52YXMyRExheWVyQnJpZGdlIDogcHVibGljIFdlYktp dDo6V2ViRXh0ZXJuYWxUZXh0dXJlTGF5ZXJDbGllbnQsIHB1YmxpYyBTa0RlZmVycmVkQ2FudmFz OjpOb3RpZmljYXRpb25DbGllbnQgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKENhbnZhczJE TGF5ZXJCcmlkZ2UpOwogcHVibGljOgogICAgIHN0YXRpYyBQYXNzT3duUHRyPENhbnZhczJETGF5 ZXJCcmlkZ2U+IGNyZWF0ZShQYXNzUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiBjb250ZXh0LCBj b25zdCBJbnRTaXplJiBzaXplLCBEZWZlcnJhbE1vZGUgZGVmZXJyYWxNb2RlLCB1bnNpZ25lZCB0 ZXh0dXJlSWQpCkBAIC01OSw2ICs1Nyw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHVuc2lnbmVk IHByZXBhcmVUZXh0dXJlKFdlYktpdDo6V2ViVGV4dHVyZVVwZGF0ZXImKSBPVkVSUklERTsKICAg ICB2aXJ0dWFsIFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQoKSBPVkVSUklE RTsKIAorICAgIC8vIFNrRGVmZXJyZWRDYW52YXM6Ok5vdGlmaWNhdGlvbkNsaWVudCBpbXBsZW1l bnRhdGlvbgorICAgIHZpcnR1YWwgdm9pZCBwcmVwYXJlRm9yRHJhdygpOworCiAgICAgU2tDYW52 YXMqIHNrQ2FudmFzKFNrRGV2aWNlKik7CiAgICAgV2ViS2l0OjpXZWJMYXllciogbGF5ZXIoKTsK ICAgICB2b2lkIGNvbnRleHRBY3F1aXJlZCgpOwpAQCAtNjcsNiArNjgsNyBAQCBwdWJsaWM6CiAK IHByaXZhdGU6CiAgICAgQ2FudmFzMkRMYXllckJyaWRnZShQYXNzUmVmUHRyPEdyYXBoaWNzQ29u dGV4dDNEPiwgY29uc3QgSW50U2l6ZSYsIERlZmVycmFsTW9kZSwgdW5zaWduZWQgdGV4dHVyZUlk KTsKKyAgICBTa0RlZmVycmVkQ2FudmFzKiBkZWZlcnJlZENhbnZhcygpOwogCiAgICAgRGVmZXJy YWxNb2RlIG1fZGVmZXJyYWxNb2RlOwogICAgIGJvb2wgbV91c2VEb3VibGVCdWZmZXJpbmc7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tp YS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tp YS9JbWFnZUJ1ZmZlclNraWEuY3BwCShyZXZpc2lvbiAxMjU3OTMpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTQ2LDcgKzQ2LDYgQEAKICNpbmNsdWRlICJQbGF0Zm9ybUNvbnRleHRTa2lhLmgiCiAj aW5jbHVkZSAiU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QuaCIKICNpbmNsdWRlICJTa0NvbG9yUHJp di5oIgotI2luY2x1ZGUgIlNrRGVmZXJyZWRDYW52YXMuaCIKICNpbmNsdWRlICJTa0dwdURldmlj ZS5oIgogI2luY2x1ZGUgIlNraWFVdGlscy5oIgogI2luY2x1ZGUgIldFQlBJbWFnZUVuY29kZXIu aCIK 158877 2012-08-16 12:40:13 -0700 2012-08-16 13:12:04 -0700 Patch bug-94234-20120816153938.patch text/plain 7113 junov SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTc5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA4LTE2ICBKdXN0aW4g Tm92b3NhZCAgPGp1bm92QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIENoYW5n aW5nIENhbnZhczJETGF5ZXJCcmlkZ2UgdG8gdXNlIFNrRGVmZXJyZWRDYW52YXMncyBub3RpZmlj YXRpb24gY2xpZW50IEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTQyMzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGUgZXhpc3RpbmcgRGV2aWNlQ29udGV4dCBBUEkgaW4gc2tpYSdzIFNrRGVmZXJy ZWRDYW52YXMgaXMgYmVpbmcKKyAgICAgICAgZGVwcmVjYXRlZCBpbiBmYXZvciBvZiB0aGUgbmV3 IE5vdGlmaWNhdGlvbkNsaWVudCBpbnRlcmZhY2UsIHdoaWNoIGlzCisgICAgICAgIGRlc2lnbmVk IHRvIGFsbG93IFdlYktpdCB0byBjb250cm9sIGRlZmVycmVkIGNhbnZhcyBnbG9iYWwgbWVtb3J5 CisgICAgICAgIGNvbnN1bXB0aW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0czogdGhpcyBwYXRj aCBkb2VzIG5vdCBmaXggYW55IGJ1ZyBhbmQgZG9lcyBub3QgYWRkIG5ldworICAgICAgICBmdW5j dGlvbmFsaXR5LiBJdCBpcyBqdXN0IGEgdHJhbnNpdGlvbiB0byBhIG5ldyBza2lhIGludGVyZmFj ZS4KKyAgICAgICAgQ292ZXJhZ2UgaXMgYXNzdXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJCcmlkZ2UuY3Bw OgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIFJlbW92ZWQgdGhlIEFjY2VsZXJhdGVkRGV2 aWNlQ29udGV4dCBjbGFzcyBjb21wbGV0ZWx5IGFuZCBtaXhlZCBpdAorICAgICAgICBpbnRvIENh bnZhczJETGF5ZXJCcmlkZ2UgYnkgaW5oZXJpdGluZworICAgICAgICBTa0RlZmVycmVkQ2FudmFz OjpOb3RpZmljYXRpb25DbGllbnQKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhczJETGF5ZXJCcmlk Z2U6On5DYW52YXMyRExheWVyQnJpZGdlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhczJETGF5 ZXJCcmlkZ2U6OmRlZmVycmVkQ2FudmFzKToKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhczJETGF5 ZXJCcmlkZ2U6OnByZXBhcmVGb3JEcmF3KToKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhczJETGF5 ZXJCcmlkZ2U6OnNrQ2FudmFzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9DYW52YXMyRExheWVyQnJpZGdlLmg6CisgICAgICAgIChDYW52YXMyRExheWVyQnJpZGdlKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHA6Cisg ICAgICAgIENsZWFuaW5nIHVwIHVubmVjZXNzYXJ5IGluY2x1ZGUgb2YgU2tEZWZlcnJlZENhbnZh cy5oCisKIDIwMTItMDgtMTUgIExldmkgV2VpbnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIEFjY3VtdWxhdGUgc3ViLXBpeGVsIG9mZnNldHMgdGhyb3VnaCBsYXllcnMgYW5k IHRyYW5zZm9ybXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0NhbnZhczJETGF5ZXJCcmlkZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJCcmlkZ2UuY3BwCShyZXZp c2lvbiAxMjU3OTMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9DYW52YXMyRExheWVyQnJpZGdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEsOCArMzEsNiBA QAogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250 ZXh0M0RQcml2YXRlLmgiCiAjaW5jbHVkZSAiTGF5ZXJSZW5kZXJlckNocm9taXVtLmgiIC8vIEZv ciBHTEMoKSBtYWNyby4KLSNpbmNsdWRlICJTa0NhbnZhcy5oIgotI2luY2x1ZGUgIlNrRGVmZXJy ZWRDYW52YXMuaCIKICNpbmNsdWRlICJUcmFjZUV2ZW50LmgiCiAjaW5jbHVkZSA8cHVibGljL1dl YkNvbXBvc2l0b3IuaD4KICNpbmNsdWRlIDxwdWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaD4K QEAgLTQzLDMxICs0MSw2IEBAIHVzaW5nIFdlYktpdDo6V2ViVGV4dHVyZVVwZGF0ZXI7CiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgQWNjZWxlcmF0ZWREZXZpY2VDb250ZXh0IDogcHVi bGljIFNrRGVmZXJyZWRDYW52YXM6OkRldmljZUNvbnRleHQgewotcHVibGljOgotICAgIEFjY2Vs ZXJhdGVkRGV2aWNlQ29udGV4dChXZWJHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCwgV2ViRXh0 ZXJuYWxUZXh0dXJlTGF5ZXIgbGF5ZXIsIGJvb2wgdXNlRG91YmxlQnVmZmVyaW5nKQotICAgICAg ICA6IG1fbGF5ZXIobGF5ZXIpCi0gICAgICAgICwgbV9jb250ZXh0KCkKLSAgICAgICAgLCBtX3Vz ZURvdWJsZUJ1ZmZlcmluZyh1c2VEb3VibGVCdWZmZXJpbmcpCi0gICAgewotICAgICAgICBBU1NF UlQoY29udGV4dCk7Ci0gICAgICAgIEFTU0VSVCghbGF5ZXIuaXNOdWxsKCkpOwotICAgICAgICBt X2NvbnRleHQgPSBjb250ZXh0OwotICAgIH0KLQotICAgIHZpcnR1YWwgdm9pZCBwcmVwYXJlRm9y RHJhdygpCi0gICAgewotICAgICAgICBpZiAoIW1fdXNlRG91YmxlQnVmZmVyaW5nKQotICAgICAg ICAgICAgbV9sYXllci53aWxsTW9kaWZ5VGV4dHVyZSgpOwotICAgICAgICBtX2NvbnRleHQtPm1h a2VDb250ZXh0Q3VycmVudCgpOwotICAgIH0KLQotcHJpdmF0ZToKLSAgICBXZWJFeHRlcm5hbFRl eHR1cmVMYXllciBtX2xheWVyOwotICAgIFdlYkdyYXBoaWNzQ29udGV4dDNEKiBtX2NvbnRleHQ7 Ci0gICAgYm9vbCBtX3VzZURvdWJsZUJ1ZmZlcmluZzsKLX07Ci0KIENhbnZhczJETGF5ZXJCcmlk Z2U6OkNhbnZhczJETGF5ZXJCcmlkZ2UoUGFzc1JlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4gY29u dGV4dCwgY29uc3QgSW50U2l6ZSYgc2l6ZSwgRGVmZXJyYWxNb2RlIGRlZmVycmFsTW9kZSwgdW5z aWduZWQgdGV4dHVyZUlkKQogICAgIDogbV9kZWZlcnJhbE1vZGUoZGVmZXJyYWxNb2RlKQogICAg IC8vIEZJWE1FOiBXZSBjdXJyZW50bHkgdHVybiBvZmYgZG91YmxlIGJ1ZmZlcmluZyB3aGVuIGNh bnZhcyByZW5kZXJpbmcgaXMKQEAgLTEwMSw5ICs3NCwxMCBAQCBDYW52YXMyRExheWVyQnJpZGdl OjpDYW52YXMyRExheWVyQnJpZGdlCiAgICAgbV9sYXllci5zZXRSYXRlTGltaXRDb250ZXh0KCFX ZWJLaXQ6OldlYkNvbXBvc2l0b3I6OnRocmVhZGluZ0VuYWJsZWQoKSB8fCBtX3VzZURvdWJsZUJ1 ZmZlcmluZyk7CiB9CiAKLQogQ2FudmFzMkRMYXllckJyaWRnZTo6fkNhbnZhczJETGF5ZXJCcmlk Z2UoKQogeworICAgIGlmIChTa0RlZmVycmVkQ2FudmFzKiBkZWZlcnJlZCA9IGRlZmVycmVkQ2Fu dmFzKCkpCisgICAgICAgIGRlZmVycmVkLT5zZXROb3RpZmljYXRpb25DbGllbnQoMCk7CiAgICAg bV9sYXllci5zZXRUZXh0dXJlSWQoMCk7CiAgICAgaWYgKG1fdXNlRG91YmxlQnVmZmVyaW5nKSB7 CiAgICAgICAgIG1fY29udGV4dC0+bWFrZUNvbnRleHRDdXJyZW50KCk7CkBAIC0xMTMsMTEgKzg3 LDI4IEBAIENhbnZhczJETGF5ZXJCcmlkZ2U6On5DYW52YXMyRExheWVyQnJpZGcKICAgICBtX2xh eWVyLmNsZWFyQ2xpZW50KCk7CiB9CiAKK1NrRGVmZXJyZWRDYW52YXMqIENhbnZhczJETGF5ZXJC cmlkZ2U6OmRlZmVycmVkQ2FudmFzKCkKK3sKKyAgICBpZiAobV9kZWZlcnJhbE1vZGUgPT0gRGVm ZXJyZWQpCisgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxTa0RlZmVycmVkQ2FudmFzKj4obV9j YW52YXMpOworICAgIHJldHVybiAwOworfQorCit2b2lkIENhbnZhczJETGF5ZXJCcmlkZ2U6OnBy ZXBhcmVGb3JEcmF3KCkKK3sKKyAgICBBU1NFUlQoZGVmZXJyZWRDYW52YXMoKSk7CisgICAgaWYg KCFtX3VzZURvdWJsZUJ1ZmZlcmluZykKKyAgICAgICAgbV9sYXllci53aWxsTW9kaWZ5VGV4dHVy ZSgpOworICAgIG1fY29udGV4dC0+bWFrZUNvbnRleHRDdXJyZW50KCk7Cit9CisKIFNrQ2FudmFz KiBDYW52YXMyRExheWVyQnJpZGdlOjpza0NhbnZhcyhTa0RldmljZSogZGV2aWNlKQogeworICAg IEFTU0VSVCghbV9jYW52YXMpOwogICAgIGlmIChtX2RlZmVycmFsTW9kZSA9PSBEZWZlcnJlZCkg ewotICAgICAgICBTa0F1dG9UVW5yZWY8QWNjZWxlcmF0ZWREZXZpY2VDb250ZXh0PiBkZXZpY2VD b250ZXh0KG5ldyBBY2NlbGVyYXRlZERldmljZUNvbnRleHQoY29udGV4dCgpLCBtX2xheWVyLCBt X3VzZURvdWJsZUJ1ZmZlcmluZykpOwotICAgICAgICBtX2NhbnZhcyA9IG5ldyBTa0RlZmVycmVk Q2FudmFzKGRldmljZSwgZGV2aWNlQ29udGV4dC5nZXQoKSk7CisgICAgICAgIFNrRGVmZXJyZWRD YW52YXMqIGRlZmVycmVkID0gbmV3IFNrRGVmZXJyZWRDYW52YXMoZGV2aWNlKTsKKyAgICAgICAg ZGVmZXJyZWQtPnNldE5vdGlmaWNhdGlvbkNsaWVudCh0aGlzKTsKKyAgICAgICAgbV9jYW52YXMg PSBkZWZlcnJlZDsKICAgICB9IGVsc2UKICAgICAgICAgbV9jYW52YXMgPSBuZXcgU2tDYW52YXMo ZGV2aWNlKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vQ2FudmFzMkRMYXllckJyaWRnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJCcmlkZ2UuaAkocmV2aXNpb24g MTI1NzkzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2Fu dmFzMkRMYXllckJyaWRnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSwxNCArMjksMTIgQEAKICNp bmNsdWRlICJHcmFwaGljc0NvbnRleHQzRC5oIgogI2luY2x1ZGUgIkltYWdlQnVmZmVyLmgiIC8v IEZvciBEZWZlcnJhbE1vZGUgZW51bS4KICNpbmNsdWRlICJJbnRTaXplLmgiCisjaW5jbHVkZSAi U2tEZWZlcnJlZENhbnZhcy5oIgogI2luY2x1ZGUgPHB1YmxpYy9XZWJFeHRlcm5hbFRleHR1cmVM YXllci5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJFeHRlcm5hbFRleHR1cmVMYXllckNsaWVudC5o PgogI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgog Ci1jbGFzcyBTa0NhbnZhczsKLWNsYXNzIFNrRGV2aWNlOwotCiBuYW1lc3BhY2UgV2ViS2l0IHsK IGNsYXNzIFdlYkdyYXBoaWNzQ29udGV4dDNEOwogfQpAQCAtNDUsNyArNDMsNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIGNsYXNzIExheWVyQ2hyb21pdW07CiAKLWNsYXNzIENhbnZhczJETGF5 ZXJCcmlkZ2UgOiBwdWJsaWMgV2ViS2l0OjpXZWJFeHRlcm5hbFRleHR1cmVMYXllckNsaWVudCB7 CitjbGFzcyBDYW52YXMyRExheWVyQnJpZGdlIDogcHVibGljIFdlYktpdDo6V2ViRXh0ZXJuYWxU ZXh0dXJlTGF5ZXJDbGllbnQsIHB1YmxpYyBTa0RlZmVycmVkQ2FudmFzOjpOb3RpZmljYXRpb25D bGllbnQgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKENhbnZhczJETGF5ZXJCcmlkZ2UpOwog cHVibGljOgogICAgIHN0YXRpYyBQYXNzT3duUHRyPENhbnZhczJETGF5ZXJCcmlkZ2U+IGNyZWF0 ZShQYXNzUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiBjb250ZXh0LCBjb25zdCBJbnRTaXplJiBz aXplLCBEZWZlcnJhbE1vZGUgZGVmZXJyYWxNb2RlLCB1bnNpZ25lZCB0ZXh0dXJlSWQpCkBAIC01 OSw2ICs1Nyw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHVuc2lnbmVkIHByZXBhcmVUZXh0dXJl KFdlYktpdDo6V2ViVGV4dHVyZVVwZGF0ZXImKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIFdlYktp dDo6V2ViR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQoKSBPVkVSUklERTsKIAorICAgIC8vIFNr RGVmZXJyZWRDYW52YXM6Ok5vdGlmaWNhdGlvbkNsaWVudCBpbXBsZW1lbnRhdGlvbgorICAgIHZp cnR1YWwgdm9pZCBwcmVwYXJlRm9yRHJhdygpOworCiAgICAgU2tDYW52YXMqIHNrQ2FudmFzKFNr RGV2aWNlKik7CiAgICAgV2ViS2l0OjpXZWJMYXllciogbGF5ZXIoKTsKICAgICB2b2lkIGNvbnRl eHRBY3F1aXJlZCgpOwpAQCAtNjcsNiArNjgsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAg Q2FudmFzMkRMYXllckJyaWRnZShQYXNzUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiwgY29uc3Qg SW50U2l6ZSYsIERlZmVycmFsTW9kZSwgdW5zaWduZWQgdGV4dHVyZUlkKTsKKyAgICBTa0RlZmVy cmVkQ2FudmFzKiBkZWZlcnJlZENhbnZhcygpOwogCiAgICAgRGVmZXJyYWxNb2RlIG1fZGVmZXJy YWxNb2RlOwogICAgIGJvb2wgbV91c2VEb3VibGVCdWZmZXJpbmc7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNr aWEuY3BwCShyZXZpc2lvbiAxMjU3OTMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDcgKzQ2 LDYgQEAKICNpbmNsdWRlICJQbGF0Zm9ybUNvbnRleHRTa2lhLmgiCiAjaW5jbHVkZSAiU2hhcmVk R3JhcGhpY3NDb250ZXh0M0QuaCIKICNpbmNsdWRlICJTa0NvbG9yUHJpdi5oIgotI2luY2x1ZGUg IlNrRGVmZXJyZWRDYW52YXMuaCIKICNpbmNsdWRlICJTa0dwdURldmljZS5oIgogI2luY2x1ZGUg IlNraWFVdGlscy5oIgogI2luY2x1ZGUgIldFQlBJbWFnZUVuY29kZXIuaCIK