89769 2012-06-22 10:38:25 -0700 [chromium] Notify the document if a plugin accepts touch input events 2012-06-22 16:25:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sadrul sadrul abarth dglazkov fishd jamesr tkent+wkapi webkit.review.bot oldest_to_newest 655567 0 sadrul 2012-06-22 10:38:25 -0700 [chromium] Notify the document if a plugin accepts touch input events 655580 1 149057 sadrul 2012-06-22 10:43:36 -0700 Created attachment 149057 Patch 655587 2 sadrul 2012-06-22 10:50:34 -0700 The corresponding chromium CL is http://codereview.chromium.org/10628020/ 655601 3 149057 abarth 2012-06-22 10:59:11 -0700 Comment on attachment 149057 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=149057&action=review > Source/WebKit/chromium/public/WebPluginContainer.h:111 > + // Notifies when the plugin starts/stops accepting touch events. > + virtual void setAcceptingTouchEvents(bool) = 0; setAcceptingTouchEvents -> setIsAcceptingTouchEvents or setAcceptsTouchEvents ? > Source/WebKit/chromium/src/WebPluginContainerImpl.cpp:601 > + if (m_acceptingTouchEvents && m_element->document()) > + m_element->document()->didRemoveTouchEventHandler(); How can m_element->document() be null? In the case where it becomes null, do we need to call didRemoveTouchEventHandler? 655602 4 abarth 2012-06-22 10:59:25 -0700 Is there a way to test this change? 655734 5 149093 sadrul 2012-06-22 13:43:18 -0700 Created attachment 149093 Patch 655736 6 149057 sadrul 2012-06-22 13:44:48 -0700 Comment on attachment 149057 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=149057&action=review >> Source/WebKit/chromium/public/WebPluginContainer.h:111 >> + virtual void setAcceptingTouchEvents(bool) = 0; > > setAcceptingTouchEvents -> setIsAcceptingTouchEvents or setAcceptsTouchEvents ? Done. >> Source/WebKit/chromium/src/WebPluginContainerImpl.cpp:601 >> + m_element->document()->didRemoveTouchEventHandler(); > > How can m_element->document() be null? In the case where it becomes null, do we need to call didRemoveTouchEventHandler? I wasn't sure if it could be NULL so I added the check. I looked at the relevant code and did some testing, and it looks like it cannot be null. So I have removed the null-check here. 655738 7 sadrul 2012-06-22 13:45:10 -0700 (In reply to comment #4) > Is there a way to test this change? I am working on writing a browser-test for this in the chrome side. 655744 8 webkit.review.bot 2012-06-22 13:48:55 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 655785 9 149093 abarth 2012-06-22 14:42:35 -0700 Comment on attachment 149093 Patch Ok. A browser_test isn't ideal since we won't see it fail until after we roll WebKit into Chromium, but I can understand it's hard to make a LayoutTest for this case. Thanks for the patch. 655792 10 149093 sadrul 2012-06-22 14:45:15 -0700 Comment on attachment 149093 Patch Indeed. Thanks for the quick review! 655815 11 149093 abarth 2012-06-22 15:06:53 -0700 Comment on attachment 149093 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=149093&action=review > Source/WebKit/chromium/src/WebPluginContainerImpl.cpp:594 > + , m_acceptingTouchEvents(false) nit: This should be named m_isAcceptingTouchEvents also. The idea is that you should be able to read these boolean flags as a sentence "If this object isAcceptingTouchEvents ..." 655824 12 149117 sadrul 2012-06-22 15:13:54 -0700 Created attachment 149117 Patch 655825 13 149093 sadrul 2012-06-22 15:14:44 -0700 Comment on attachment 149093 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=149093&action=review >> Source/WebKit/chromium/src/WebPluginContainerImpl.cpp:594 >> + , m_acceptingTouchEvents(false) > > nit: This should be named m_isAcceptingTouchEvents also. The idea is that you should be able to read these boolean flags as a sentence "If this object isAcceptingTouchEvents ..." Ah, good catch. Done. Thanks 655905 14 149117 webkit.review.bot 2012-06-22 16:25:14 -0700 Comment on attachment 149117 Patch Clearing flags on attachment: 149117 Committed r121070: <http://trac.webkit.org/changeset/121070> 655906 15 webkit.review.bot 2012-06-22 16:25:33 -0700 All reviewed patches have been landed. Closing bug. 149057 2012-06-22 10:43:36 -0700 2012-06-22 13:44:48 -0700 Patch bug-89769-20120622134335.patch text/plain 4519 sadrul U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDI1MTY5NGMyMzRkMjNjZTY4Mzg0ZGUyMzQ3MzgyZjYyMTJjZTY2YjcuLjg5ZWYyNzVmYzBiYWNl MTAwYTMxYTRmOGVkYzVlYjljN2RiYWVmM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTItMDYtMjIgIFNhZHJ1bCBIYWJpYiBDaG93ZGh1cnkgIDxzYWRy dWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gTm90aWZ5IHRoZSBkb2N1bWVu dCBpZiBhIHBsdWdpbiBhY2NlcHRzIHRvdWNoIGlucHV0IGV2ZW50cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk3NjkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYnJvd3NlciBzZW5kcyB0b3VjaCBl dmVudHMgdG8gd2Via2l0IG9ubHkgaWYgd2Via2l0IGhhcyBhbnkgdG91Y2gtZXZlbnQgaGFuZGxl cnMuIFNvIGl0IGlzCisgICAgICAgIG5lY2Vzc2FyeSB0byBub3RpZnkgdGhlIGRvY3VtZW50IHdo ZW4gYSBwbHVnaW4gc3RhcnRzIGFjY2VwdGluZyB0b3VjaC1ldmVudHMgc28gdGhhdCBpdCBjYW4g aW4KKyAgICAgICAgdHVybiB0ZWxsIHRoZSBicm93c2VyIHRvIHNlbmQgaXQgdG91Y2ggZXZlbnRz LgorCisgICAgICAgICogcHVibGljL1dlYlBsdWdpbkNvbnRhaW5lci5oOgorICAgICAgICAoV2Vi UGx1Z2luQ29udGFpbmVyKToKKyAgICAgICAgKiBzcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpbkNvbnRhaW5lckltcGw6OnNldEFjY2VwdGlu Z1RvdWNoRXZlbnRzKToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBs dWdpbkNvbnRhaW5lckltcGw6OldlYlBsdWdpbkNvbnRhaW5lckltcGwpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQbHVnaW5Db250YWluZXJJbXBsOjp+V2ViUGx1Z2luQ29udGFpbmVySW1wbCk6Cisg ICAgICAgICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuaDoKKyAgICAgICAgKFdlYlBsdWdp bkNvbnRhaW5lckltcGwpOgorCiAyMDEyLTA2LTIyICBBbXkgT3VzdGVyaG91dCAgPGFvdXN0ZXJo QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW5hbWVkIERldmljZU9yaWVudGF0aW9uIHRvIERl dmljZU9yaWVudGF0aW9uRGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViUGx1Z2luQ29udGFpbmVyLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJQbHVnaW5Db250YWluZXIuaAppbmRleCA3Nzc0MzFmYjA0NTFiOWIwNmM4NzBjM2IwOWIy MjgxMzk4NjBiNzAwLi5lNTc3MmVkNWRiMDBkYjM5YTFiYWZhZmU0ZGFhZWY5NWE0OTVlZmIyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQbHVnaW5Db250YWlu ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQbHVnaW5Db250YWlu ZXIuaApAQCAtMTA3LDYgKzEwNyw5IEBAIHB1YmxpYzoKICAgICAvLyBjb250ZW50LiBUaGUgcmVj dGFuZ2xlIGlzIGluIHRoZSBwbHVnaW4ncyBjb29yZGluYXRlIHN5c3RlbS4KICAgICB2aXJ0dWFs IGJvb2wgaXNSZWN0VG9wbW9zdChjb25zdCBXZWJSZWN0JikgPSAwOwogCisgICAgLy8gTm90aWZp ZXMgd2hlbiB0aGUgcGx1Z2luIHN0YXJ0cy9zdG9wcyBhY2NlcHRpbmcgdG91Y2ggZXZlbnRzLgor ICAgIHZpcnR1YWwgdm9pZCBzZXRBY2NlcHRpbmdUb3VjaEV2ZW50cyhib29sKSA9IDA7CisKICAg ICB2aXJ0dWFsIFdlYlBsdWdpbiogcGx1Z2luKCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRQ bHVnaW4oV2ViUGx1Z2luKikgPSAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCmluZGV4IGY0YzQzYmNkMjk1MzJhZTQ4 NDQ4YmY3MjUyZGJkYWIwMGVkZTIzMjkuLjJiNzIwOGYzMzQ3ODFkOWIyOWQ1ZTMyMTE2NDMwYjNh ZTdhZWJmZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdp bkNvbnRhaW5lckltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBs dWdpbkNvbnRhaW5lckltcGwuY3BwCkBAIC00ODEsNiArNDgxLDE4IEBAIGJvb2wgV2ViUGx1Z2lu Q29udGFpbmVySW1wbDo6aXNSZWN0VG9wbW9zdChjb25zdCBXZWJSZWN0JiByZWN0KQogICAgIHJl dHVybiAobm9kZXMuZmlyc3QoKS5nZXQoKSA9PSBtX2VsZW1lbnQpOwogfQogCit2b2lkIFdlYlBs dWdpbkNvbnRhaW5lckltcGw6OnNldEFjY2VwdGluZ1RvdWNoRXZlbnRzKGJvb2wgYWNjZXB0aW5n VG91Y2hFdmVudHMpCit7CisgICAgaWYgKG1fYWNjZXB0aW5nVG91Y2hFdmVudHMgPT0gYWNjZXB0 aW5nVG91Y2hFdmVudHMpCisgICAgICAgIHJldHVybjsKKyAgICBtX2FjY2VwdGluZ1RvdWNoRXZl bnRzID0gYWNjZXB0aW5nVG91Y2hFdmVudHM7CisgICAgaWYgKG1fYWNjZXB0aW5nVG91Y2hFdmVu dHMpIHsKKyAgICAgICAgbV9lbGVtZW50LT5kb2N1bWVudCgpLT5kaWRBZGRUb3VjaEV2ZW50SGFu ZGxlcigpOworICAgICAgICBtX2VsZW1lbnQtPmRvY3VtZW50KCktPmFkZExpc3RlbmVyVHlwZShE b2N1bWVudDo6VE9VQ0hfTElTVEVORVIpOworICAgIH0gZWxzZQorICAgICAgICBtX2VsZW1lbnQt PmRvY3VtZW50KCktPmRpZFJlbW92ZVRvdWNoRXZlbnRIYW5kbGVyKCk7Cit9CisKIHZvaWQgV2Vi UGx1Z2luQ29udGFpbmVySW1wbDo6ZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVz cG9uc2UmIHJlc3BvbnNlKQogewogICAgIC8vIE1ha2Ugc3VyZSB0aGF0IHRoZSBwbHVnaW4gcmVj ZWl2ZXMgd2luZG93IGdlb21ldHJ5IGJlZm9yZSBkYXRhLCBvciBlbHNlCkBAIC01NzksMTEgKzU5 MSwxNSBAQCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpXZWJQbHVnaW5Db250YWluZXJJbXBsKFdl YkNvcmU6OkhUTUxQbHVnSW5FbGVtZW50KiBlbGVtZQogICAgICwgbV90ZXh0dXJlSWQoMCkKICAg ICAsIG1faW9TdXJmYWNlSWQoMCkKICNlbmRpZgorICAgICwgbV9hY2NlcHRpbmdUb3VjaEV2ZW50 cyhmYWxzZSkKIHsKIH0KIAogV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6fldlYlBsdWdpbkNvbnRh aW5lckltcGwoKQogeworICAgIGlmIChtX2FjY2VwdGluZ1RvdWNoRXZlbnRzICYmIG1fZWxlbWVu dC0+ZG9jdW1lbnQoKSkKKyAgICAgICAgbV9lbGVtZW50LT5kb2N1bWVudCgpLT5kaWRSZW1vdmVU b3VjaEV2ZW50SGFuZGxlcigpOworCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3BsdWdp bkxvYWRPYnNlcnZlcnMuc2l6ZSgpOyArK2kpCiAgICAgICAgIG1fcGx1Z2luTG9hZE9ic2VydmVy c1tpXS0+Y2xlYXJQbHVnaW5Db250YWluZXIoKTsKICAgICBtX3dlYlBsdWdpbi0+ZGVzdHJveSgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFp bmVySW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVy SW1wbC5oCmluZGV4IDc3MmIyMjM4YzdiMGY1M2QwOWUwNTJlYzA5Zjc1OWZkNWEyODc4ZGQuLjVk MTVhODRlNTYyODMwZjgzMjJiY2EyMmFlNTBiYzM5NjJkZmRiOTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgKQEAgLTExMCw2 ICsxMTAsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHpvb21MZXZlbENoYW5nZWQoZG91 YmxlIHpvb21MZXZlbCk7ICAgIAogICAgIHZpcnR1YWwgdm9pZCBzZXRPcGFxdWUoYm9vbCk7CiAg ICAgdmlydHVhbCBib29sIGlzUmVjdFRvcG1vc3QoY29uc3QgV2ViUmVjdCYpOworICAgIHZpcnR1 YWwgdm9pZCBzZXRBY2NlcHRpbmdUb3VjaEV2ZW50cyhib29sKTsKIAogICAgIC8vIFRoaXMgY2Fu bm90IGJlIG51bGwuCiAgICAgV2ViUGx1Z2luKiBwbHVnaW4oKSB7IHJldHVybiBtX3dlYlBsdWdp bjsgfQpAQCAtMTg4LDYgKzE4OSw4IEBAIHByaXZhdGU6CiAgICAgLy8gVGhlIGFzc29jaWF0ZWQg c2Nyb2xsYmFyIGdyb3VwIG9iamVjdCwgY3JlYXRlZCBsYXppbHkuIFVzZWQgZm9yIFBlcHBlcgog ICAgIC8vIHNjcm9sbGJhcnMuCiAgICAgT3duUHRyPFNjcm9sbGJhckdyb3VwPiBtX3Njcm9sbGJh ckdyb3VwOworCisgICAgYm9vbCBtX2FjY2VwdGluZ1RvdWNoRXZlbnRzOwogfTsKIAogfSAvLyBu YW1lc3BhY2UgV2ViS2l0Cg== 149093 2012-06-22 13:43:18 -0700 2012-06-22 15:14:44 -0700 Patch bug-89769-20120622164317.patch text/plain 4502 sadrul U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDI1MTY5NGMyMzRkMjNjZTY4Mzg0ZGUyMzQ3MzgyZjYyMTJjZTY2YjcuLjNhYjgxZTQ5MTMyOGMz YjViNzA2ZjlmZTMxOWI0OTQ1Yzk5MzdkYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTItMDYtMjIgIFNhZHJ1bCBIYWJpYiBDaG93ZGh1cnkgIDxzYWRy dWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gTm90aWZ5IHRoZSBkb2N1bWVu dCBpZiBhIHBsdWdpbiBhY2NlcHRzIHRvdWNoIGlucHV0IGV2ZW50cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk3NjkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYnJvd3NlciBzZW5kcyB0b3VjaCBl dmVudHMgdG8gd2Via2l0IG9ubHkgaWYgd2Via2l0IGhhcyBhbnkgdG91Y2gtZXZlbnQgaGFuZGxl cnMuIFNvIGl0IGlzCisgICAgICAgIG5lY2Vzc2FyeSB0byBub3RpZnkgdGhlIGRvY3VtZW50IHdo ZW4gYSBwbHVnaW4gc3RhcnRzIGFjY2VwdGluZyB0b3VjaC1ldmVudHMgc28gdGhhdCBpdCBjYW4g aW4KKyAgICAgICAgdHVybiB0ZWxsIHRoZSBicm93c2VyIHRvIHNlbmQgaXQgdG91Y2ggZXZlbnRz LgorCisgICAgICAgICogcHVibGljL1dlYlBsdWdpbkNvbnRhaW5lci5oOgorICAgICAgICAoV2Vi UGx1Z2luQ29udGFpbmVyKToKKyAgICAgICAgKiBzcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpbkNvbnRhaW5lckltcGw6OnNldElzQWNjZXB0 aW5nVG91Y2hFdmVudHMpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGx1Z2luQ29udGFpbmVySW1wbDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBsdWdpbkNvbnRhaW5lckltcGw6On5XZWJQbHVnaW5Db250YWluZXJJbXBsKToK KyAgICAgICAgKiBzcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oOgorICAgICAgICAoV2ViUGx1 Z2luQ29udGFpbmVySW1wbCk6CisKIDIwMTItMDYtMjIgIEFteSBPdXN0ZXJob3V0ICA8YW91c3Rl cmhAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlbmFtZWQgRGV2aWNlT3JpZW50YXRpb24gdG8g RGV2aWNlT3JpZW50YXRpb25EYXRhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJQbHVnaW5Db250YWluZXIuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYlBsdWdpbkNvbnRhaW5lci5oCmluZGV4IDc3NzQzMWZiMDQ1MWI5YjA2Yzg3MGMzYjA5 YjIyODEzOTg2MGI3MDAuLjk5ZjA3OGZkNjBiMDcyZWEyOGJjMWVkYmM3MDhmZWU3Y2NiMjkyNWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbkNvbnRh aW5lci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbkNvbnRh aW5lci5oCkBAIC0xMDcsNiArMTA3LDkgQEAgcHVibGljOgogICAgIC8vIGNvbnRlbnQuIFRoZSBy ZWN0YW5nbGUgaXMgaW4gdGhlIHBsdWdpbidzIGNvb3JkaW5hdGUgc3lzdGVtLgogICAgIHZpcnR1 YWwgYm9vbCBpc1JlY3RUb3Btb3N0KGNvbnN0IFdlYlJlY3QmKSA9IDA7CiAKKyAgICAvLyBOb3Rp ZmllcyB3aGVuIHRoZSBwbHVnaW4gc3RhcnRzL3N0b3BzIGFjY2VwdGluZyB0b3VjaCBldmVudHMu CisgICAgdmlydHVhbCB2b2lkIHNldElzQWNjZXB0aW5nVG91Y2hFdmVudHMoYm9vbCkgPSAwOwor CiAgICAgdmlydHVhbCBXZWJQbHVnaW4qIHBsdWdpbigpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQg c2V0UGx1Z2luKFdlYlBsdWdpbiopID0gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAppbmRleCBmNGM0M2JjZDI5NTMy YWU0ODQ0OGJmNzI1MmRiZGFiMDBlZGUyMzI5Li41MzY0MGZlZDBkM2EyNDM0ODY4ZjYwOWY1OWQ2 NmYzYTM3ZTMwOWMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQ bHVnaW5Db250YWluZXJJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcApAQCAtNDgxLDYgKzQ4MSwxOCBAQCBib29sIFdlYlBs dWdpbkNvbnRhaW5lckltcGw6OmlzUmVjdFRvcG1vc3QoY29uc3QgV2ViUmVjdCYgcmVjdCkKICAg ICByZXR1cm4gKG5vZGVzLmZpcnN0KCkuZ2V0KCkgPT0gbV9lbGVtZW50KTsKIH0KIAordm9pZCBX ZWJQbHVnaW5Db250YWluZXJJbXBsOjpzZXRJc0FjY2VwdGluZ1RvdWNoRXZlbnRzKGJvb2wgYWNj ZXB0aW5nVG91Y2hFdmVudHMpCit7CisgICAgaWYgKG1fYWNjZXB0aW5nVG91Y2hFdmVudHMgPT0g YWNjZXB0aW5nVG91Y2hFdmVudHMpCisgICAgICAgIHJldHVybjsKKyAgICBtX2FjY2VwdGluZ1Rv dWNoRXZlbnRzID0gYWNjZXB0aW5nVG91Y2hFdmVudHM7CisgICAgaWYgKG1fYWNjZXB0aW5nVG91 Y2hFdmVudHMpIHsKKyAgICAgICAgbV9lbGVtZW50LT5kb2N1bWVudCgpLT5kaWRBZGRUb3VjaEV2 ZW50SGFuZGxlcigpOworICAgICAgICBtX2VsZW1lbnQtPmRvY3VtZW50KCktPmFkZExpc3RlbmVy VHlwZShEb2N1bWVudDo6VE9VQ0hfTElTVEVORVIpOworICAgIH0gZWxzZQorICAgICAgICBtX2Vs ZW1lbnQtPmRvY3VtZW50KCktPmRpZFJlbW92ZVRvdWNoRXZlbnRIYW5kbGVyKCk7Cit9CisKIHZv aWQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6ZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFJlc291 cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewogICAgIC8vIE1ha2Ugc3VyZSB0aGF0IHRoZSBwbHVn aW4gcmVjZWl2ZXMgd2luZG93IGdlb21ldHJ5IGJlZm9yZSBkYXRhLCBvciBlbHNlCkBAIC01Nzks MTEgKzU5MSwxNSBAQCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpXZWJQbHVnaW5Db250YWluZXJJ bXBsKFdlYkNvcmU6OkhUTUxQbHVnSW5FbGVtZW50KiBlbGVtZQogICAgICwgbV90ZXh0dXJlSWQo MCkKICAgICAsIG1faW9TdXJmYWNlSWQoMCkKICNlbmRpZgorICAgICwgbV9hY2NlcHRpbmdUb3Vj aEV2ZW50cyhmYWxzZSkKIHsKIH0KIAogV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6fldlYlBsdWdp bkNvbnRhaW5lckltcGwoKQogeworICAgIGlmIChtX2FjY2VwdGluZ1RvdWNoRXZlbnRzKQorICAg ICAgICBtX2VsZW1lbnQtPmRvY3VtZW50KCktPmRpZFJlbW92ZVRvdWNoRXZlbnRIYW5kbGVyKCk7 CisKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fcGx1Z2luTG9hZE9ic2VydmVycy5zaXpl KCk7ICsraSkKICAgICAgICAgbV9wbHVnaW5Mb2FkT2JzZXJ2ZXJzW2ldLT5jbGVhclBsdWdpbkNv bnRhaW5lcigpOwogICAgIG1fd2ViUGx1Z2luLT5kZXN0cm95KCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmggYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgKaW5kZXggNzcyYjIy MzhjN2IwZjUzZDA5ZTA1MmVjMDlmNzU5ZmQ1YTI4NzhkZC4uODQ5OGJkZmMwNWE5MTlkZGNhY2Yw OGUwOGY3MmJiMmY3YWZkOTYyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuaApAQCAtMTEwLDYgKzExMCw3IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIHZvaWQgem9vbUxldmVsQ2hhbmdlZChkb3VibGUgem9vbUxldmVsKTsgICAg CiAgICAgdmlydHVhbCB2b2lkIHNldE9wYXF1ZShib29sKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNS ZWN0VG9wbW9zdChjb25zdCBXZWJSZWN0Jik7CisgICAgdmlydHVhbCB2b2lkIHNldElzQWNjZXB0 aW5nVG91Y2hFdmVudHMoYm9vbCk7CiAKICAgICAvLyBUaGlzIGNhbm5vdCBiZSBudWxsLgogICAg IFdlYlBsdWdpbiogcGx1Z2luKCkgeyByZXR1cm4gbV93ZWJQbHVnaW47IH0KQEAgLTE4OCw2ICsx ODksOCBAQCBwcml2YXRlOgogICAgIC8vIFRoZSBhc3NvY2lhdGVkIHNjcm9sbGJhciBncm91cCBv YmplY3QsIGNyZWF0ZWQgbGF6aWx5LiBVc2VkIGZvciBQZXBwZXIKICAgICAvLyBzY3JvbGxiYXJz LgogICAgIE93blB0cjxTY3JvbGxiYXJHcm91cD4gbV9zY3JvbGxiYXJHcm91cDsKKworICAgIGJv b2wgbV9hY2NlcHRpbmdUb3VjaEV2ZW50czsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo= 149117 2012-06-22 15:13:54 -0700 2012-06-22 16:25:13 -0700 Patch bug-89769-20120622181353.patch text/plain 4514 sadrul U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDI1MTY5NGMyMzRkMjNjZTY4Mzg0ZGUyMzQ3MzgyZjYyMTJjZTY2YjcuLjNhYjgxZTQ5MTMyOGMz YjViNzA2ZjlmZTMxOWI0OTQ1Yzk5MzdkYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTItMDYtMjIgIFNhZHJ1bCBIYWJpYiBDaG93ZGh1cnkgIDxzYWRy dWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gTm90aWZ5IHRoZSBkb2N1bWVu dCBpZiBhIHBsdWdpbiBhY2NlcHRzIHRvdWNoIGlucHV0IGV2ZW50cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk3NjkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYnJvd3NlciBzZW5kcyB0b3VjaCBl dmVudHMgdG8gd2Via2l0IG9ubHkgaWYgd2Via2l0IGhhcyBhbnkgdG91Y2gtZXZlbnQgaGFuZGxl cnMuIFNvIGl0IGlzCisgICAgICAgIG5lY2Vzc2FyeSB0byBub3RpZnkgdGhlIGRvY3VtZW50IHdo ZW4gYSBwbHVnaW4gc3RhcnRzIGFjY2VwdGluZyB0b3VjaC1ldmVudHMgc28gdGhhdCBpdCBjYW4g aW4KKyAgICAgICAgdHVybiB0ZWxsIHRoZSBicm93c2VyIHRvIHNlbmQgaXQgdG91Y2ggZXZlbnRz LgorCisgICAgICAgICogcHVibGljL1dlYlBsdWdpbkNvbnRhaW5lci5oOgorICAgICAgICAoV2Vi UGx1Z2luQ29udGFpbmVyKToKKyAgICAgICAgKiBzcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpbkNvbnRhaW5lckltcGw6OnNldElzQWNjZXB0 aW5nVG91Y2hFdmVudHMpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGx1Z2luQ29udGFpbmVySW1wbDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBsdWdpbkNvbnRhaW5lckltcGw6On5XZWJQbHVnaW5Db250YWluZXJJbXBsKToK KyAgICAgICAgKiBzcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oOgorICAgICAgICAoV2ViUGx1 Z2luQ29udGFpbmVySW1wbCk6CisKIDIwMTItMDYtMjIgIEFteSBPdXN0ZXJob3V0ICA8YW91c3Rl cmhAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlbmFtZWQgRGV2aWNlT3JpZW50YXRpb24gdG8g RGV2aWNlT3JpZW50YXRpb25EYXRhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJQbHVnaW5Db250YWluZXIuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYlBsdWdpbkNvbnRhaW5lci5oCmluZGV4IDc3NzQzMWZiMDQ1MWI5YjA2Yzg3MGMzYjA5 YjIyODEzOTg2MGI3MDAuLjk5ZjA3OGZkNjBiMDcyZWEyOGJjMWVkYmM3MDhmZWU3Y2NiMjkyNWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbkNvbnRh aW5lci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbkNvbnRh aW5lci5oCkBAIC0xMDcsNiArMTA3LDkgQEAgcHVibGljOgogICAgIC8vIGNvbnRlbnQuIFRoZSBy ZWN0YW5nbGUgaXMgaW4gdGhlIHBsdWdpbidzIGNvb3JkaW5hdGUgc3lzdGVtLgogICAgIHZpcnR1 YWwgYm9vbCBpc1JlY3RUb3Btb3N0KGNvbnN0IFdlYlJlY3QmKSA9IDA7CiAKKyAgICAvLyBOb3Rp ZmllcyB3aGVuIHRoZSBwbHVnaW4gc3RhcnRzL3N0b3BzIGFjY2VwdGluZyB0b3VjaCBldmVudHMu CisgICAgdmlydHVhbCB2b2lkIHNldElzQWNjZXB0aW5nVG91Y2hFdmVudHMoYm9vbCkgPSAwOwor CiAgICAgdmlydHVhbCBXZWJQbHVnaW4qIHBsdWdpbigpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQg c2V0UGx1Z2luKFdlYlBsdWdpbiopID0gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAppbmRleCBmNGM0M2JjZDI5NTMy YWU0ODQ0OGJmNzI1MmRiZGFiMDBlZGUyMzI5Li4wNDBlYjYzODQ1MTc4NjM1MzhlMjgzNTA3MDEw MDc1MWVhODgzODc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQ bHVnaW5Db250YWluZXJJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcApAQCAtNDgxLDYgKzQ4MSwxOCBAQCBib29sIFdlYlBs dWdpbkNvbnRhaW5lckltcGw6OmlzUmVjdFRvcG1vc3QoY29uc3QgV2ViUmVjdCYgcmVjdCkKICAg ICByZXR1cm4gKG5vZGVzLmZpcnN0KCkuZ2V0KCkgPT0gbV9lbGVtZW50KTsKIH0KIAordm9pZCBX ZWJQbHVnaW5Db250YWluZXJJbXBsOjpzZXRJc0FjY2VwdGluZ1RvdWNoRXZlbnRzKGJvb2wgYWNj ZXB0aW5nVG91Y2hFdmVudHMpCit7CisgICAgaWYgKG1faXNBY2NlcHRpbmdUb3VjaEV2ZW50cyA9 PSBhY2NlcHRpbmdUb3VjaEV2ZW50cykKKyAgICAgICAgcmV0dXJuOworICAgIG1faXNBY2NlcHRp bmdUb3VjaEV2ZW50cyA9IGFjY2VwdGluZ1RvdWNoRXZlbnRzOworICAgIGlmIChtX2lzQWNjZXB0 aW5nVG91Y2hFdmVudHMpIHsKKyAgICAgICAgbV9lbGVtZW50LT5kb2N1bWVudCgpLT5kaWRBZGRU b3VjaEV2ZW50SGFuZGxlcigpOworICAgICAgICBtX2VsZW1lbnQtPmRvY3VtZW50KCktPmFkZExp c3RlbmVyVHlwZShEb2N1bWVudDo6VE9VQ0hfTElTVEVORVIpOworICAgIH0gZWxzZQorICAgICAg ICBtX2VsZW1lbnQtPmRvY3VtZW50KCktPmRpZFJlbW92ZVRvdWNoRXZlbnRIYW5kbGVyKCk7Cit9 CisKIHZvaWQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6ZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0 IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewogICAgIC8vIE1ha2Ugc3VyZSB0aGF0IHRo ZSBwbHVnaW4gcmVjZWl2ZXMgd2luZG93IGdlb21ldHJ5IGJlZm9yZSBkYXRhLCBvciBlbHNlCkBA IC01NzksMTEgKzU5MSwxNSBAQCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpXZWJQbHVnaW5Db250 YWluZXJJbXBsKFdlYkNvcmU6OkhUTUxQbHVnSW5FbGVtZW50KiBlbGVtZQogICAgICwgbV90ZXh0 dXJlSWQoMCkKICAgICAsIG1faW9TdXJmYWNlSWQoMCkKICNlbmRpZgorICAgICwgbV9pc0FjY2Vw dGluZ1RvdWNoRXZlbnRzKGZhbHNlKQogewogfQogCiBXZWJQbHVnaW5Db250YWluZXJJbXBsOjp+ V2ViUGx1Z2luQ29udGFpbmVySW1wbCgpCiB7CisgICAgaWYgKG1faXNBY2NlcHRpbmdUb3VjaEV2 ZW50cykKKyAgICAgICAgbV9lbGVtZW50LT5kb2N1bWVudCgpLT5kaWRSZW1vdmVUb3VjaEV2ZW50 SGFuZGxlcigpOworCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3BsdWdpbkxvYWRPYnNl cnZlcnMuc2l6ZSgpOyArK2kpCiAgICAgICAgIG1fcGx1Z2luTG9hZE9ic2VydmVyc1tpXS0+Y2xl YXJQbHVnaW5Db250YWluZXIoKTsKICAgICBtX3dlYlBsdWdpbi0+ZGVzdHJveSgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5o IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCmlu ZGV4IDc3MmIyMjM4YzdiMGY1M2QwOWUwNTJlYzA5Zjc1OWZkNWEyODc4ZGQuLmExNTFmNzA5MDE0 NTUwNjE0M2FjMzQ3ZDRkMGE4YzdkYWE2ZGQ4MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgKQEAgLTExMCw2ICsxMTAsNyBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHpvb21MZXZlbENoYW5nZWQoZG91YmxlIHpvb21M ZXZlbCk7ICAgIAogICAgIHZpcnR1YWwgdm9pZCBzZXRPcGFxdWUoYm9vbCk7CiAgICAgdmlydHVh bCBib29sIGlzUmVjdFRvcG1vc3QoY29uc3QgV2ViUmVjdCYpOworICAgIHZpcnR1YWwgdm9pZCBz ZXRJc0FjY2VwdGluZ1RvdWNoRXZlbnRzKGJvb2wpOwogCiAgICAgLy8gVGhpcyBjYW5ub3QgYmUg bnVsbC4KICAgICBXZWJQbHVnaW4qIHBsdWdpbigpIHsgcmV0dXJuIG1fd2ViUGx1Z2luOyB9CkBA IC0xODgsNiArMTg5LDggQEAgcHJpdmF0ZToKICAgICAvLyBUaGUgYXNzb2NpYXRlZCBzY3JvbGxi YXIgZ3JvdXAgb2JqZWN0LCBjcmVhdGVkIGxhemlseS4gVXNlZCBmb3IgUGVwcGVyCiAgICAgLy8g c2Nyb2xsYmFycy4KICAgICBPd25QdHI8U2Nyb2xsYmFyR3JvdXA+IG1fc2Nyb2xsYmFyR3JvdXA7 CisKKyAgICBib29sIG1faXNBY2NlcHRpbmdUb3VjaEV2ZW50czsKIH07CiAKIH0gLy8gbmFtZXNw YWNlIFdlYktpdAo=