101423 2012-11-06 20:00:00 -0800 [Chromium] Flash cannot receive scroll events when threaded compositing is in use 2012-11-19 11:21:02 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 1 yusukes yusukes abarth dglazkov enne fishd jamesr tkent+wkapi tony webkit.review.bot oldest_to_newest 760330 0 yusukes 2012-11-06 20:00:00 -0800 https://code.google.com/p/chromium/issues/detail?id=158506 Chrome Version : 23.0.1271.55 OS Version: 2913.140.0 URLs (if applicable) : http://harboursixty.com/ Other browsers tested: Add OK or FAIL after other browsers where you have tested this issue: IE 10: OK with trackpad (touch scrolling scrolls page) Chrome 23 on Linux: OK Chrome 23 on Windows: OK What steps will reproduce the problem? 1. Load a flash app that has a scrollable element - eg. the menu at http://harboursixty.com/ 2. Try to scroll the menu using the trackpad What is the expected result? Expect two-finger trackpad scrolling to scroll the element. What happens instead of that? Instead it scrolls the page. The only way to scroll the element is to click and drag on the scrollbar. Please provide any additional information below. Attach a screenshot if possible. UserAgentString: Mozilla/5.0 (X11; CrOS x86_64 2913.140.0) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.55 Safari/537.11 760399 1 172721 yusukes 2012-11-06 22:24:17 -0800 Created attachment 172721 Patch 762297 2 tony 2012-11-08 16:18:03 -0800 I don't know anything about the compositor. Adding people who do. 762543 3 172721 jamesr 2012-11-08 21:45:36 -0800 Comment on attachment 172721 Patch Hmm - I would expect plugins to get added to the nonFastScrollableRegion for the given layer. See ScrollingCoordinator::computeNonFastScrollableRegion() Need tests as well. 764926 4 173753 yusukes 2012-11-12 16:11:37 -0800 Created attachment 173753 Patch 764930 5 webkit.review.bot 2012-11-12 16:13:14 -0800 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. 764934 6 yusukes 2012-11-12 16:15:22 -0800 Thanks James. I took a look at the function as well as your recent changes against WebPluginContainerImpl. I think the problem is that a plugin is added to nonFastScrollableRegion only when it uses a scroll bar, while some plugins including Flapper that don't use a scroll bar need to handle wheel events. The second patch I just uploaded puts a plugin into the nonFastScrollableRegion (even if the plugin does not use a scroll bar) when the plugin explicitly requests wheel events. Chrome counterpart of the fix is http://codereview.chromium.org/11312195/ . Re testing, I found that wheel events were already tested in LayoutTests/platform/chromium/plugins/. I'm new to WebKit but I guess the reason why chromium bots are currently green is that the bots are not using ACCELERATED_COMPOTITING yet. With my patch against Tools/DumpRenderTree/chromium/TestWebPlugin.cpp, I think the bots can be kept green even if ACCELERATED_COMPOTITING is turned on at some point in the future. (Please correct me if I'm wrong..) Please take another look at patch #2. 764942 7 jamesr 2012-11-12 16:26:15 -0800 Chromium always sets USE(ACCELERATED_COMPOSITING) to true. The chromium port most likely wouldn't even compile if that was not set. I suspect that there is something else going on. 765106 8 173789 yusukes 2012-11-12 18:35:21 -0800 Created attachment 173789 Patch 765110 9 yusukes 2012-11-12 18:38:33 -0800 Thanks again, James. I found that I confused ACCELERATED_COMPOSITING with Chrome's threaded compositing. So what really happening here is as follows: * On Chrome OS (M23-25, at least), the issue reproduces since Chrome's threaded compositing feature is enabled by default. * On Chrome OS (M23-25, at least), the issue does not reproduce if threaded compositing is disabled via chrome://flags. * On Mac (Chrome M24), the issue does not reproduce by default since threaded compositing is disabled by default. * On Mac (Chrome M24), the issue reproduces if threaded compositing is enabled via chrome://flags. When it reproduces, according to chrome://tracing results, Chrome's LayerImpl::tryScroll() takes this path: if (!scrollable()) { TRACE_EVENT0("cc", "LayerImpl::tryScroll: Ignored not scrollable"); return InputHandlerClient::ScrollIgnored; } and the event is discarded. My patch asks the compositor not to do so and to take the following path instead. if (type == InputHandlerClient::Wheel && haveWheelEventHandlers()) { TRACE_EVENT0("cc", "LayerImpl::tryScroll: Failed wheelEventHandlers"); return InputHandlerClient::ScrollOnMainThread; } I've updated the ChangeLog comments and removed #if USE(ACCELERATED_COMPOSITING) in WebPluginContainerImpl::setWantsWheelEvents(). I'm hoping the patch makes sense this time... 770305 10 173789 jamesr 2012-11-18 20:34:56 -0800 Comment on attachment 173789 Patch Thanks for the thorough investigation. Your explanation makes sense - if we the plugin doesn't have scrollbars, without this patch we assume it doesn't want wheel events at all which is definitely wrong. R=me - set cq? if you would like a committer to land this for you. 770861 11 yusukes 2012-11-19 10:53:48 -0800 Thanks, since I'm not a WebKit committer, I've set cq?. 770878 12 173789 webkit.review.bot 2012-11-19 11:20:58 -0800 Comment on attachment 173789 Patch Clearing flags on attachment: 173789 Committed r135178: <http://trac.webkit.org/changeset/135178> 770879 13 webkit.review.bot 2012-11-19 11:21:02 -0800 All reviewed patches have been landed. Closing bug. 172721 2012-11-06 22:24:17 -0800 2012-11-12 16:11:35 -0800 Patch bug-101423-20121106222228.patch text/plain 2422 yusukes U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDJjYmU2NjU4OTA0M2MyYmM3NTdmNzAwNWRlNTQ3N2JhNDc3OGZiYzguLmYxMTI5Nzc3MTFiNzQx YTBmYTRmNDcyMGYzMmEyM2MyNzZhYmQ2ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTItMTEtMDYgIFl1c3VrZSBTYXRvICA8eXVzdWtlc0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBGbGFzaCBjYW5ub3QgcmVjZWl2ZSBzY3JvbGwg ZXZlbnRzIHdoZW4gQUNDRUxFUkFURURfQ09NUE9TSVRJTkcgaXMgaW4gdXNlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE0MjMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYWxsIHNldEhhdmVXaGVlbEV2 ZW50SGFuZGxlcnModHJ1ZSkgd2hlbiBhIGxheWVyIGlzIGNyZWF0ZWQgc28gdGhhdCB0aGUgbmV3 IGxheWVyIGNhbiByZWNlaXZlIHNjcm9sbCBldmVudHMgY29ycmVjdGx5LgorICAgICAgICBPdGhl cndpc2UsIENocm9tZSBDb21wb3NpdG9yIChMYXllckltcGw6OnRyeVNjcm9sbCgpIGluIGNocm9t ZS9zcmMvY2MvbGF5ZXJfaW1wbC5jYykgcmV0dXJucworICAgICAgICBJbnB1dEhhbmRsZXJDbGll bnQ6OlNjcm9sbElnbm9yZWQgZm9yIGEgc2Nyb2xsIGV2ZW50LCBhbmQgQ0Mgc2lsZW50bHkgY29u c3VtZXMgdGhlIGV2ZW50IHdpdGhvdXQgZm9yd2FyZGluZyBpdCB0byBXZWJLaXQuCisKKyAgICAg ICAgKiBzcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlBsdWdpbkNvbnRhaW5lckltcGw6OnNldEJhY2tpbmdUZXh0dXJlSWQpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQbHVnaW5Db250YWluZXJJbXBsOjpzZXRCYWNraW5nSU9TdXJmYWNlSWQpOgorCiAy MDEyLTExLTA2ICBQZXRlciBCZXZlcmxvbyAgPHBldGVyQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbQ2hyb21pdW1dIEVuYWJsZSB0aGUgSmF2YVNjcmlwdCBpMThuIEFQSSBmb3IgQW5kcm9pZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVy SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJ bXBsLmNwcAppbmRleCA4N2E2NjAxNTY5YmE1OWUxZjRmMmI0OTdmNmY5MjA2ODJiMTcxMzE4Li43 NGFhNjM1YWNlNzUzMTk2MmUxZmJjMWYzNjUwZjk1MWM5M2ZjNjc3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcApAQCAt MzgxLDYgKzM4MSw3IEBAIHZvaWQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6c2V0QmFja2luZ1Rl eHR1cmVJZCh1bnNpZ25lZCB0ZXh0dXJlSWQpCiAgICAgaWYgKCFtX3RleHR1cmVMYXllcikgewog ICAgICAgICBtX3RleHR1cmVMYXllciA9IGFkb3B0UHRyKFBsYXRmb3JtOjpjdXJyZW50KCktPmNv bXBvc2l0b3JTdXBwb3J0KCktPmNyZWF0ZUV4dGVybmFsVGV4dHVyZUxheWVyKCkpOwogICAgICAg ICBHcmFwaGljc0xheWVyQ2hyb21pdW06OnJlZ2lzdGVyQ29udGVudHNMYXllcihtX3RleHR1cmVM YXllci0+bGF5ZXIoKSk7CisgICAgICAgIG1fdGV4dHVyZUxheWVyLT5sYXllcigpLT5zZXRIYXZl V2hlZWxFdmVudEhhbmRsZXJzKHRydWUpOwogICAgIH0KICAgICBtX3RleHR1cmVMYXllci0+c2V0 VGV4dHVyZUlkKHRleHR1cmVJZCk7CiAKQEAgLTQwNyw2ICs0MDgsNyBAQCB2b2lkIFdlYlBsdWdp bkNvbnRhaW5lckltcGw6OnNldEJhY2tpbmdJT1N1cmZhY2VJZChpbnQgd2lkdGgsCiAgICAgaWYg KCFtX2lvU3VyZmFjZUxheWVyKSB7CiAgICAgICAgIG1faW9TdXJmYWNlTGF5ZXIgPSBhZG9wdFB0 cihQbGF0Zm9ybTo6Y3VycmVudCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpLT5jcmVhdGVJT1N1cmZh Y2VMYXllcigpKTsKICAgICAgICAgR3JhcGhpY3NMYXllckNocm9taXVtOjpyZWdpc3RlckNvbnRl bnRzTGF5ZXIobV9pb1N1cmZhY2VMYXllci0+bGF5ZXIoKSk7CisgICAgICAgIG1faW9TdXJmYWNl TGF5ZXItPmxheWVyKCktPnNldEhhdmVXaGVlbEV2ZW50SGFuZGxlcnModHJ1ZSk7CiAgICAgfQog ICAgIG1faW9TdXJmYWNlTGF5ZXItPnNldElPU3VyZmFjZVByb3BlcnRpZXMoaW9TdXJmYWNlSWQs IFdlYlNpemUod2lkdGgsIGhlaWdodCkpOwogCg== 173753 2012-11-12 16:11:37 -0800 2012-11-12 18:35:18 -0800 Patch bug-101423-20121112160939.patch text/plain 6997 yusukes U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDJjYmU2NjU4OTA0M2MyYmM3NTdmNzAwNWRlNTQ3N2JhNDc3OGZiYzguLjcyOGJkYjEzMzc1MjU5 MDhiNGI4Yjg3ZDYwNjkwMmQzOTU4MWYzYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTItMTEtMTIgIFl1c3VrZSBTYXRvICA8eXVzdWtlc0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBGbGFzaCBjYW5ub3QgcmVjZWl2ZSBzY3JvbGwg ZXZlbnRzIHdoZW4gQUNDRUxFUkFURURfQ09NUE9TSVRJTkcgaXMgaW4gdXNlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE0MjMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc2V0V2FudHNXaGVlbEV2 ZW50cygpIHRvIENocm9taXVtJ3MgV2ViUGx1Z2luQ29udGFpbmVyIGludGVyZmFjZSBzbyB0aGF0 IGEgcGx1Z2luIGNhbiB0ZWxsIHRoZQorICAgICAgICBjb250YWluZXIgdGhhdCB0aGUgcGx1Z2lu IGFsd2F5cyB3YW50cyB0byBoYW5kbGUgd2hlZWwgZXZlbnRzIGV2ZW4gd2hlbiBhIHNjcm9sbCBi YXIgaXMgbm90IHNob3duLgorCisgICAgICAgICogcHVibGljL1dlYlBsdWdpbkNvbnRhaW5lci5o OgorICAgICAgICAoV2ViUGx1Z2luQ29udGFpbmVyKToKKyAgICAgICAgKiBzcmMvV2ViUGx1Z2lu Q29udGFpbmVySW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpbkNvbnRhaW5lcklt cGw6OnNldFdhbnRzV2hlZWxFdmVudHMpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdl YktpdDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbDo6d2FudHNXaGVlbEV2ZW50cyk6CisgICAgICAg IChXZWJLaXQ6OldlYlBsdWdpbkNvbnRhaW5lckltcGw6OldlYlBsdWdpbkNvbnRhaW5lckltcGwp OgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmg6CisgICAgICAgIChXZWJQ bHVnaW5Db250YWluZXJJbXBsKToKKwogMjAxMi0xMS0wNiAgUGV0ZXIgQmV2ZXJsb28gIDxwZXRl ckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBFbmFibGUgdGhlIEphdmFTY3Jp cHQgaTE4biBBUEkgZm9yIEFuZHJvaWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYlBsdWdpbkNvbnRhaW5lci5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViUGx1Z2luQ29udGFpbmVyLmgKaW5kZXggZGViZTI2MDM4MDFiOGZjMThjNzIxM2Q0 OGUyMTAzMDhiYWNlZWMzMC4uYmM3ZjYzOWM1NWY3MzAwNjJhYjAzNmY1ZGJmNjNjNzc3MDBlMTg3 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luQ29u dGFpbmVyLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luQ29u dGFpbmVyLmgKQEAgLTExMSw2ICsxMTEsMTIgQEAgcHVibGljOgogICAgIC8vIE5vdGlmaWVzIHdo ZW4gdGhlIHBsdWdpbiBzdGFydHMvc3RvcHMgYWNjZXB0aW5nIHRvdWNoIGV2ZW50cy4KICAgICB2 aXJ0dWFsIHZvaWQgc2V0SXNBY2NlcHRpbmdUb3VjaEV2ZW50cyhib29sKSA9IDA7CiAKKyAgICAv LyBOb3RpZmllcyB3aGVuIHRoZSBwbHVnaW4gc3RhcnRzL3N0b3BzIGFjY2VwdGluZyB3aGVlbCBl dmVudHMuIFdpdGhvdXQKKyAgICAvLyBjYWxsaW5nIHRoZSBmdW5jdGlvbiB3aXRoIHRydWUsIHRo ZSBjb250YWluZXIgbWlnaHQgbm90IGFsd2F5cyBhYmxlIHRvCisgICAgLy8gcmVjZWl2ZSB3aGVl bCBldmVudHMgaW4gc29tZSBjYXNlcyAoc3VjaCBhcyB3aGVuIGFjY2VsZXJhdGVkIGNvbXBvc2l0 aW5nCisgICAgLy8gaXMgaW4gdXNlIGJ1dCBhIHNjcm9sbCBiYXIgaXMgbm90IGluIHVzZSkuCisg ICAgdmlydHVhbCB2b2lkIHNldFdhbnRzV2hlZWxFdmVudHMoYm9vbCkgPSAwOworCiAgICAgdmly dHVhbCBXZWJQbHVnaW4qIHBsdWdpbigpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0UGx1Z2lu KFdlYlBsdWdpbiopID0gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAppbmRleCA4N2E2NjAxNTY5YmE1OWUxZjRmMmI0 OTdmNmY5MjA2ODJiMTcxMzE4Li5mMzlkZDlhNDgzNzU3ODVlNGM0YjVjYWI1MzYxM2Y5ZTAwMzU4 NDA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250 YWluZXJJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5D b250YWluZXJJbXBsLmNwcApAQCAtNjcsNiArNjcsNyBAQAogI2luY2x1ZGUgIlNjcm9sbEFuaW1h dG9yLmgiCiAjaW5jbHVkZSAiU2Nyb2xsVmlldy5oIgogI2luY2x1ZGUgIlNjcm9sbGJhclRoZW1l LmgiCisjaW5jbHVkZSAiU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCIKICNpbmNsdWRlICJUb3VjaEV2 ZW50LmgiCiAjaW5jbHVkZSAiVXNlckdlc3R1cmVJbmRpY2F0b3IuaCIKICNpbmNsdWRlICJXZWJQ cmludFBhcmFtcy5oIgpAQCAtNTMyLDYgKzUzMywyMyBAQCB2b2lkIFdlYlBsdWdpbkNvbnRhaW5l ckltcGw6OnNldElzQWNjZXB0aW5nVG91Y2hFdmVudHMoYm9vbCBhY2NlcHRpbmdUb3VjaEV2ZW50 cwogICAgICAgICBtX2VsZW1lbnQtPmRvY3VtZW50KCktPmRpZFJlbW92ZVRvdWNoRXZlbnRIYW5k bGVyKCk7CiB9CiAKK3ZvaWQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6c2V0V2FudHNXaGVlbEV2 ZW50cyhib29sIHdhbnRzV2hlZWxFdmVudHMpCit7CisgICAgaWYgKG1fd2FudHNXaGVlbEV2ZW50 cyA9PSB3YW50c1doZWVsRXZlbnRzKQorICAgICAgICByZXR1cm47CisgICAgbV93YW50c1doZWVs RXZlbnRzID0gd2FudHNXaGVlbEV2ZW50czsKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpCisgICAgaWYgKFBhZ2UqIHBhZ2UgPSBtX2VsZW1lbnQtPmRvY3VtZW50KCktPnBhZ2UoKSkg eworICAgICAgICBpZiAoU2Nyb2xsaW5nQ29vcmRpbmF0b3IqIHNjcm9sbGluZ0Nvb3JkaW5hdG9y ID0gcGFnZS0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSkgeworICAgICAgICAgICAgaWYgKHBhcmVu dCgpICYmIHBhcmVudCgpLT5pc0ZyYW1lVmlldygpKQorICAgICAgICAgICAgICAgIHNjcm9sbGlu Z0Nvb3JkaW5hdG9yLT5mcmFtZVZpZXdMYXlvdXRVcGRhdGVkKHN0YXRpY19jYXN0PEZyYW1lVmll dyo+KHBhcmVudCgpKSk7CisgICAgICAgIH0KKyAgICB9CisjZW5kaWYKKyAgICAvLyBXaGVuIEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HIGlzIG5vdCBpbiB1c2UsIHdlIGRvbid0IGhhdmUgdG8gdXBk YXRlIHRoZSBzY3JvbGxpbmcgY29vcmRpbmF0b3IgaGVyZS4KKyAgICAvLyBJbiB0aGlzIGNhc2Us IHdoZWVsIGV2ZW50cyBhcmUgc2VudCB0byB0aGUgY29udGFpbmVyIGFueXdheXMuCit9CisKIHZv aWQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6ZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFJlc291 cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewogICAgIC8vIE1ha2Ugc3VyZSB0aGF0IHRoZSBwbHVn aW4gcmVjZWl2ZXMgd2luZG93IGdlb21ldHJ5IGJlZm9yZSBkYXRhLCBvciBlbHNlCkBAIC01ODIs NiArNjAwLDExIEBAIGJvb2wgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6Y2FuUHJvY2Vzc0RyYWco KSBjb25zdAogICAgIHJldHVybiBtX3dlYlBsdWdpbi0+Y2FuUHJvY2Vzc0RyYWcoKTsKIH0KIAor Ym9vbCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjp3YW50c1doZWVsRXZlbnRzKCkKK3sKKyAgICBy ZXR1cm4gbV93YW50c1doZWVsRXZlbnRzOworfQorCiB2b2lkIFdlYlBsdWdpbkNvbnRhaW5lcklt cGw6OndpbGxEZXN0cm95UGx1Z2luTG9hZE9ic2VydmVyKFdlYlBsdWdpbkxvYWRPYnNlcnZlciog b2JzZXJ2ZXIpCiB7CiAgICAgc2l6ZV90IHBvcyA9IG1fcGx1Z2luTG9hZE9ic2VydmVycy5maW5k KG9ic2VydmVyKTsKQEAgLTY0MSw2ICs2NjQsNyBAQCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpX ZWJQbHVnaW5Db250YWluZXJJbXBsKFdlYkNvcmU6OkhUTUxQbHVnSW5FbGVtZW50KiBlbGVtZQog ICAgICwgbV9pb1N1cmZhY2VJZCgwKQogI2VuZGlmCiAgICAgLCBtX2lzQWNjZXB0aW5nVG91Y2hF dmVudHMoZmFsc2UpCisgICAgLCBtX3dhbnRzV2hlZWxFdmVudHMoZmFsc2UpCiB7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lcklt cGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwu aAppbmRleCA4OWYyOTcxYjcyMzI5ZTBmZDY2NDc5NzY1NmZhMDNjMmQ5NDE1ZmNiLi4xNjkyZTgy NzFjYjY4NTA0NTVkNDVjMDY5NDE5Y2VkYWZkNDhmODRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCkBAIC03OSw2ICs3OSw3 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgZ2V0Rm9ybVZhbHVlKFN0cmluZyYpOwogICAg IHZpcnR1YWwgYm9vbCBzdXBwb3J0c0tleWJvYXJkRm9jdXMoKSBjb25zdDsKICAgICB2aXJ0dWFs IGJvb2wgY2FuUHJvY2Vzc0RyYWcoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgd2FudHNXaGVl bEV2ZW50cygpOwogCiAgICAgLy8gV2lkZ2V0IG1ldGhvZHMKICAgICB2aXJ0dWFsIHZvaWQgc2V0 RnJhbWVSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKQEAgLTExMyw2ICsxMTQsNyBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldE9wYXF1ZShib29sKTsKICAgICB2aXJ0dWFsIGJv b2wgaXNSZWN0VG9wbW9zdChjb25zdCBXZWJSZWN0Jik7CiAgICAgdmlydHVhbCB2b2lkIHNldElz QWNjZXB0aW5nVG91Y2hFdmVudHMoYm9vbCk7CisgICAgdmlydHVhbCB2b2lkIHNldFdhbnRzV2hl ZWxFdmVudHMoYm9vbCk7CiAKICAgICAvLyBUaGlzIGNhbm5vdCBiZSBudWxsLgogICAgIFdlYlBs dWdpbiogcGx1Z2luKCkgeyByZXR1cm4gbV93ZWJQbHVnaW47IH0KQEAgLTE5OSw2ICsyMDEsNyBA QCBwcml2YXRlOgogICAgIE93blB0cjxTY3JvbGxiYXJHcm91cD4gbV9zY3JvbGxiYXJHcm91cDsK IAogICAgIGJvb2wgbV9pc0FjY2VwdGluZ1RvdWNoRXZlbnRzOworICAgIGJvb2wgbV93YW50c1do ZWVsRXZlbnRzOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzZjOTViOTZkYWM4NmNjMzM0OTE4 Mjc5MzdhMjNlODVhM2MyNTNkZC4uNDcyZmViYWIxNTZlOWVjNGU2YzllM2NmYTUwZDhiOGJhZTVj OTAwMiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE2IEBACisyMDEyLTExLTEyICBZdXN1a2UgU2F0byAgPHl1c3VrZXNAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gRmxhc2ggY2Fubm90IHJlY2VpdmUgc2Nyb2xs IGV2ZW50cyB3aGVuIEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HIGlzIGluIHVzZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNDIzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2FsbCBzZXRXYW50c1doZWVs RXZlbnRzKHRydWUpIGluIGluaXRpYWxpemUoKSBzbyB0aGF0IGdlc3R1cmUtZXZlbnRzIGFuZCB0 cmFuc2Zvcm1lZC1ldmVudHMgdGVzdHMgaW4KKyAgICAgICAgTGF5b3V0VGVzdHMvcGxhdGZvcm0v Y2hyb21pdW0vcGx1Z2lucy8gd2lsbCBub3QgZmFpbCB3aGVuIGEgYnVpbGRib3Qgd2l0aCBBQ0NF TEVSQVRFRF9DT01QT1NJVElORyBpcyBjcmVhdGVkLgorCisgICAgICAgICogRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vVGVzdFdlYlBsdWdpbi5jcHA6CisgICAgICAgIChUZXN0V2ViUGx1Z2luOjpp bml0aWFsaXplKToKKwogMjAxMi0xMS0wNiAgVG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29v Z2xlLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIE1lZGlhU3RyZWFtIEFQSTogUmVtb3ZlIHRo ZSB2YWxncmluZCBpc3N1ZSB3aXRoIE1vY2tXZWJSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXIKZGlm ZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RXZWJQbHVnaW4uY3Bw IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFdlYlBsdWdpbi5jcHAKaW5kZXgg NDE0ZGIyYzFjNWY5Y2E2NmFjMmIzMTIwNzFlMjU5MGZhMzJjOTMzOS4uYjBkMTk5NDJhZjU5Y2Zi ZDljODEzOTZkMTg0MTc2YzViOTc1ZTI2NyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vVGVzdFdlYlBsdWdpbi5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vVGVzdFdlYlBsdWdpbi5jcHAKQEAgLTE4NCw2ICsxODQsNyBAQCBib29sIFRlc3RX ZWJQbHVnaW46OmluaXRpYWxpemUoV2ViUGx1Z2luQ29udGFpbmVyKiBjb250YWluZXIpCiAgICAg bV9jb250YWluZXIgPSBjb250YWluZXI7CiAgICAgbV9jb250YWluZXItPnNldEJhY2tpbmdUZXh0 dXJlSWQobV9jb2xvclRleHR1cmUpOwogICAgIG1fY29udGFpbmVyLT5zZXRJc0FjY2VwdGluZ1Rv dWNoRXZlbnRzKG1fYWNjZXB0c1RvdWNoRXZlbnQpOworICAgIG1fY29udGFpbmVyLT5zZXRXYW50 c1doZWVsRXZlbnRzKHRydWUpOwogICAgIHJldHVybiB0cnVlOwogfQogCg== 173789 2012-11-12 18:35:21 -0800 2012-11-19 11:20:58 -0800 Patch bug-101423-20121112183323.patch text/plain 6786 yusukes U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDJjYmU2NjU4OTA0M2MyYmM3NTdmNzAwNWRlNTQ3N2JhNDc3OGZiYzguLmM2YzZhY2VjYTI5NzE0 OTM1MDAwODQwZWUxYzA2YWRiMDIyMzIxOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTItMTEtMTIgIFl1c3VrZSBTYXRvICA8eXVzdWtlc0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBGbGFzaCBjYW5ub3QgcmVjZWl2ZSBzY3JvbGwg ZXZlbnRzIHdoZW4gdGhyZWFkZWQgY29tcG9zaXRpbmcgaXMgaW4gdXNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE0MjMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc2V0V2FudHNXaGVlbEV2ZW50 cygpIHRvIENocm9taXVtJ3MgV2ViUGx1Z2luQ29udGFpbmVyIGludGVyZmFjZSBzbyB0aGF0IGEg cGx1Z2luIGNhbiB0ZWxsIHRoZQorICAgICAgICBjb250YWluZXIgdGhhdCB0aGUgcGx1Z2luIGFs d2F5cyB3YW50cyB0byBoYW5kbGUgd2hlZWwgZXZlbnRzIGV2ZW4gd2hlbiBhIHNjcm9sbCBiYXIg aXMgbm90IHNob3duLgorCisgICAgICAgICogcHVibGljL1dlYlBsdWdpbkNvbnRhaW5lci5oOgor ICAgICAgICAoV2ViUGx1Z2luQ29udGFpbmVyKToKKyAgICAgICAgKiBzcmMvV2ViUGx1Z2luQ29u dGFpbmVySW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpbkNvbnRhaW5lckltcGw6 OnNldFdhbnRzV2hlZWxFdmVudHMpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktp dDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbDo6d2FudHNXaGVlbEV2ZW50cyk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBsdWdpbkNvbnRhaW5lckltcGw6OldlYlBsdWdpbkNvbnRhaW5lckltcGwpOgor ICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmg6CisgICAgICAgIChXZWJQbHVn aW5Db250YWluZXJJbXBsKToKKwogMjAxMi0xMS0wNiAgUGV0ZXIgQmV2ZXJsb28gIDxwZXRlckBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBFbmFibGUgdGhlIEphdmFTY3JpcHQg aTE4biBBUEkgZm9yIEFuZHJvaWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYlBsdWdpbkNvbnRhaW5lci5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViUGx1Z2luQ29udGFpbmVyLmgKaW5kZXggZGViZTI2MDM4MDFiOGZjMThjNzIxM2Q0OGUy MTAzMDhiYWNlZWMzMC4uZDNkNjBmZDNhOWZiNWVhNTJiZDI0NWVmZDBlYTkwZDZmZjM2NmRmMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luQ29udGFp bmVyLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luQ29udGFp bmVyLmgKQEAgLTExMSw2ICsxMTEsMTIgQEAgcHVibGljOgogICAgIC8vIE5vdGlmaWVzIHdoZW4g dGhlIHBsdWdpbiBzdGFydHMvc3RvcHMgYWNjZXB0aW5nIHRvdWNoIGV2ZW50cy4KICAgICB2aXJ0 dWFsIHZvaWQgc2V0SXNBY2NlcHRpbmdUb3VjaEV2ZW50cyhib29sKSA9IDA7CiAKKyAgICAvLyBO b3RpZmllcyB3aGVuIHRoZSBwbHVnaW4gc3RhcnRzL3N0b3BzIGFjY2VwdGluZyB3aGVlbCBldmVu dHMuIFdpdGhvdXQKKyAgICAvLyBjYWxsaW5nIHRoZSBmdW5jdGlvbiB3aXRoIHRydWUsIHRoZSBj b250YWluZXIgbWlnaHQgbm90IGFsd2F5cyBhYmxlIHRvCisgICAgLy8gcmVjZWl2ZSB3aGVlbCBl dmVudHMgaW4gc29tZSBjYXNlcyAoc3VjaCBhcyB3aGVuIHRocmVhZGVkIGNvbXBvc2l0aW5nCisg ICAgLy8gaXMgaW4gdXNlIGJ1dCBhIHNjcm9sbCBiYXIgaXMgbm90IGluIHVzZSkuCisgICAgdmly dHVhbCB2b2lkIHNldFdhbnRzV2hlZWxFdmVudHMoYm9vbCkgPSAwOworCiAgICAgdmlydHVhbCBX ZWJQbHVnaW4qIHBsdWdpbigpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0UGx1Z2luKFdlYlBs dWdpbiopID0gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi UGx1Z2luQ29udGFpbmVySW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQ bHVnaW5Db250YWluZXJJbXBsLmNwcAppbmRleCA4N2E2NjAxNTY5YmE1OWUxZjRmMmI0OTdmNmY5 MjA2ODJiMTcxMzE4Li45OGFiNGViZTI1NjkyOTIxMDdiZDVkZDA0OTc3YTg2ZDVmNDc5MDllIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJ bXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWlu ZXJJbXBsLmNwcApAQCAtNjcsNiArNjcsNyBAQAogI2luY2x1ZGUgIlNjcm9sbEFuaW1hdG9yLmgi CiAjaW5jbHVkZSAiU2Nyb2xsVmlldy5oIgogI2luY2x1ZGUgIlNjcm9sbGJhclRoZW1lLmgiCisj aW5jbHVkZSAiU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCIKICNpbmNsdWRlICJUb3VjaEV2ZW50Lmgi CiAjaW5jbHVkZSAiVXNlckdlc3R1cmVJbmRpY2F0b3IuaCIKICNpbmNsdWRlICJXZWJQcmludFBh cmFtcy5oIgpAQCAtNTMyLDYgKzUzMywxOSBAQCB2b2lkIFdlYlBsdWdpbkNvbnRhaW5lckltcGw6 OnNldElzQWNjZXB0aW5nVG91Y2hFdmVudHMoYm9vbCBhY2NlcHRpbmdUb3VjaEV2ZW50cwogICAg ICAgICBtX2VsZW1lbnQtPmRvY3VtZW50KCktPmRpZFJlbW92ZVRvdWNoRXZlbnRIYW5kbGVyKCk7 CiB9CiAKK3ZvaWQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6c2V0V2FudHNXaGVlbEV2ZW50cyhi b29sIHdhbnRzV2hlZWxFdmVudHMpCit7CisgICAgaWYgKG1fd2FudHNXaGVlbEV2ZW50cyA9PSB3 YW50c1doZWVsRXZlbnRzKQorICAgICAgICByZXR1cm47CisgICAgbV93YW50c1doZWVsRXZlbnRz ID0gd2FudHNXaGVlbEV2ZW50czsKKyAgICBpZiAoUGFnZSogcGFnZSA9IG1fZWxlbWVudC0+ZG9j dW1lbnQoKS0+cGFnZSgpKSB7CisgICAgICAgIGlmIChTY3JvbGxpbmdDb29yZGluYXRvciogc2Ny b2xsaW5nQ29vcmRpbmF0b3IgPSBwYWdlLT5zY3JvbGxpbmdDb29yZGluYXRvcigpKSB7CisgICAg ICAgICAgICBpZiAocGFyZW50KCkgJiYgcGFyZW50KCktPmlzRnJhbWVWaWV3KCkpCisgICAgICAg ICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmZyYW1lVmlld0xheW91dFVwZGF0ZWQoc3Rh dGljX2Nhc3Q8RnJhbWVWaWV3Kj4ocGFyZW50KCkpKTsKKyAgICAgICAgfQorICAgIH0KK30KKwog dm9pZCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpkaWRSZWNlaXZlUmVzcG9uc2UoY29uc3QgUmVz b3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7CiAgICAgLy8gTWFrZSBzdXJlIHRoYXQgdGhlIHBs dWdpbiByZWNlaXZlcyB3aW5kb3cgZ2VvbWV0cnkgYmVmb3JlIGRhdGEsIG9yIGVsc2UKQEAgLTU4 Miw2ICs1OTYsMTEgQEAgYm9vbCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpjYW5Qcm9jZXNzRHJh ZygpIGNvbnN0CiAgICAgcmV0dXJuIG1fd2ViUGx1Z2luLT5jYW5Qcm9jZXNzRHJhZygpOwogfQog Citib29sIFdlYlBsdWdpbkNvbnRhaW5lckltcGw6OndhbnRzV2hlZWxFdmVudHMoKQoreworICAg IHJldHVybiBtX3dhbnRzV2hlZWxFdmVudHM7Cit9CisKIHZvaWQgV2ViUGx1Z2luQ29udGFpbmVy SW1wbDo6d2lsbERlc3Ryb3lQbHVnaW5Mb2FkT2JzZXJ2ZXIoV2ViUGx1Z2luTG9hZE9ic2VydmVy KiBvYnNlcnZlcikKIHsKICAgICBzaXplX3QgcG9zID0gbV9wbHVnaW5Mb2FkT2JzZXJ2ZXJzLmZp bmQob2JzZXJ2ZXIpOwpAQCAtNjQxLDYgKzY2MCw3IEBAIFdlYlBsdWdpbkNvbnRhaW5lckltcGw6 OldlYlBsdWdpbkNvbnRhaW5lckltcGwoV2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1lbnQqIGVsZW1l CiAgICAgLCBtX2lvU3VyZmFjZUlkKDApCiAjZW5kaWYKICAgICAsIG1faXNBY2NlcHRpbmdUb3Vj aEV2ZW50cyhmYWxzZSkKKyAgICAsIG1fd2FudHNXaGVlbEV2ZW50cyhmYWxzZSkKIHsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVy SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1w bC5oCmluZGV4IDg5ZjI5NzFiNzIzMjllMGZkNjY0Nzk3NjU2ZmEwM2MyZDk0MTVmY2IuLjE2OTJl ODI3MWNiNjg1MDQ1NWQ0NWMwNjk0MTljZWRhZmQ0OGY4NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgKQEAgLTc5LDYgKzc5 LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBnZXRGb3JtVmFsdWUoU3RyaW5nJik7CiAg ICAgdmlydHVhbCBib29sIHN1cHBvcnRzS2V5Ym9hcmRGb2N1cygpIGNvbnN0OwogICAgIHZpcnR1 YWwgYm9vbCBjYW5Qcm9jZXNzRHJhZygpIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCB3YW50c1do ZWVsRXZlbnRzKCk7CiAKICAgICAvLyBXaWRnZXQgbWV0aG9kcwogICAgIHZpcnR1YWwgdm9pZCBz ZXRGcmFtZVJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpOwpAQCAtMTEzLDYgKzExNCw3IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2V0T3BhcXVlKGJvb2wpOwogICAgIHZpcnR1YWwg Ym9vbCBpc1JlY3RUb3Btb3N0KGNvbnN0IFdlYlJlY3QmKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0 SXNBY2NlcHRpbmdUb3VjaEV2ZW50cyhib29sKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0V2FudHNX aGVlbEV2ZW50cyhib29sKTsKIAogICAgIC8vIFRoaXMgY2Fubm90IGJlIG51bGwuCiAgICAgV2Vi UGx1Z2luKiBwbHVnaW4oKSB7IHJldHVybiBtX3dlYlBsdWdpbjsgfQpAQCAtMTk5LDYgKzIwMSw3 IEBAIHByaXZhdGU6CiAgICAgT3duUHRyPFNjcm9sbGJhckdyb3VwPiBtX3Njcm9sbGJhckdyb3Vw OwogCiAgICAgYm9vbCBtX2lzQWNjZXB0aW5nVG91Y2hFdmVudHM7CisgICAgYm9vbCBtX3dhbnRz V2hlZWxFdmVudHM7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1Rv b2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNmM5NWI5NmRhYzg2Y2MzMzQ5 MTgyNzkzN2EyM2U4NWEzYzI1M2RkLi4wNmRlMmNkNmQzOWQ0ZGU3OTIxOWI1ODA4ZTQyYWE1NTQ0 N2JhZTJmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMTEtMTIgIFl1c3VrZSBTYXRvICA8eXVzdWtlc0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBGbGFzaCBjYW5ub3QgcmVjZWl2ZSBzY3Jv bGwgZXZlbnRzIHdoZW4gdGhyZWFkZWQgY29tcG9zaXRpbmcgaXMgaW4gdXNlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE0MjMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYWxsIHNldFdhbnRzV2hlZWxF dmVudHModHJ1ZSkgaW4gaW5pdGlhbGl6ZSgpIHNvIHRoYXQgZ2VzdHVyZS1ldmVudHMgYW5kIHRy YW5zZm9ybWVkLWV2ZW50cyB0ZXN0cyBpbgorICAgICAgICBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9j aHJvbWl1bS9wbHVnaW5zLyB3aWxsIG5vdCBmYWlsIGV2ZW4gaWYgYSBidWlsZGJvdCBpbnRyb2R1 Y2VzIHRocmVhZGVkIGNvbXBvc2l0aW5nCisgICAgICAgIGluIHRoZSBmdXR1cmUuCisKKyAgICAg ICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0V2ViUGx1Z2luLmNwcDoKKyAgICAgICAg KFRlc3RXZWJQbHVnaW46OmluaXRpYWxpemUpOgorCiAyMDEyLTExLTA2ICBUb21teSBXaWRlbmZs eWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgogCiAgICAgICAgIFtjaHJvbWl1bV0gTWVkaWFTdHJl YW0gQVBJOiBSZW1vdmUgdGhlIHZhbGdyaW5kIGlzc3VlIHdpdGggTW9ja1dlYlJUQ1BlZXJDb25u ZWN0aW9uSGFuZGxlcgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v VGVzdFdlYlBsdWdpbi5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0V2Vi UGx1Z2luLmNwcAppbmRleCA0MTRkYjJjMWM1ZjljYTY2YWMyYjMxMjA3MWUyNTkwZmEzMmM5MzM5 Li5iMGQxOTk0MmFmNTljZmJkOWM4MTM5NmQxODQxNzZjNWI5NzVlMjY3IDEwMDY0NAotLS0gYS9U b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0V2ViUGx1Z2luLmNwcAorKysgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0V2ViUGx1Z2luLmNwcApAQCAtMTg0LDYgKzE4 NCw3IEBAIGJvb2wgVGVzdFdlYlBsdWdpbjo6aW5pdGlhbGl6ZShXZWJQbHVnaW5Db250YWluZXIq IGNvbnRhaW5lcikKICAgICBtX2NvbnRhaW5lciA9IGNvbnRhaW5lcjsKICAgICBtX2NvbnRhaW5l ci0+c2V0QmFja2luZ1RleHR1cmVJZChtX2NvbG9yVGV4dHVyZSk7CiAgICAgbV9jb250YWluZXIt PnNldElzQWNjZXB0aW5nVG91Y2hFdmVudHMobV9hY2NlcHRzVG91Y2hFdmVudCk7CisgICAgbV9j b250YWluZXItPnNldFdhbnRzV2hlZWxFdmVudHModHJ1ZSk7CiAgICAgcmV0dXJuIHRydWU7CiB9 CiAK