131869 2014-04-18 17:27:20 -0700 Latched scrolling may interact badly with custom programmatic scrolling 2020-08-30 11:13:07 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 128225 1 bfulgham bfulgham bfulgham cmarcelo commit-queue dino esprehn+autocc kangil.han simon.fraser oldest_to_newest 1002086 0 bfulgham 2014-04-18 17:27:20 -0700 Some sites manually scroll widgets by attaching 'mousewheel'/'wheel'/'scroll' handlers that scroll the element using the DOM 'setScrollTop' method, and block further propagation of the wheel event to the rest of the DOM. Latched scrolling (added in <https://trac.webkit.org/changeset/163975> bypasses this scrolling logic, but interacts badly with the blocking of the event propagation, resulting in "unscrollable" widgets. This patch identifies cases where the scrollable area is being set via "setScrollTop", and does not perform latched scrolling in these cases. It is assumed that the web developer controlling their scrolling manually will deal with any desired latching behavior. 1002092 1 229692 bfulgham 2014-04-18 17:34:42 -0700 Created attachment 229692 Patch 1002093 2 bfulgham 2014-04-18 17:35:22 -0700 <rdar://problem/16249557> 1002094 3 bfulgham 2014-04-18 17:36:02 -0700 smfr: Do we need logic to somehow clear the programmatic scroll state? If so, when would we decide to do so? Maybe at the beginning of a swipe event? 1002107 4 229696 bfulgham 2014-04-18 18:21:04 -0700 Created attachment 229696 Patch 1002140 5 229710 bfulgham 2014-04-18 20:50:11 -0700 Created attachment 229710 Patch 1002148 6 229714 bfulgham 2014-04-18 21:10:03 -0700 Created attachment 229714 Patch 1002285 7 229714 darin 2014-04-19 14:53:57 -0700 Comment on attachment 229714 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229714&action=review > Source/WebCore/dom/Element.cpp:802 > + if (RenderBox* rend = renderBox()) { rend is such an unpleasant local variable name; I suggest renderer instead > Source/WebCore/dom/Element.cpp:804 > + if (ScrollableArea* scrollableArea = static_cast<ScrollableArea*>(rend->layer())) This typecast is a bad idea. A RenderLayer is a ScrollableArea, so there is no reason to cast, but further, no reason to narrow the type like this. It should just say: if (auto* layer = renderer->layer()) layer->setScrolledProgrammatically(true); > Source/WebCore/dom/Element.cpp:805 > + scrollableArea->setScrolledProgrammatically(true); This won’t ever get reset to false? It’s a permanent state of affairs? > Source/WebCore/page/EventHandler.h:301 > +protected: > + void clearLatchedState(); should be private not protected; no classes derive from EventHandler, so there’s no difference between protected and private Also, should always prefer private to protected unless there is some reason a member needs to be exposed to derived classes. 1002323 8 bfulgham 2014-04-19 19:33:38 -0700 Committed r167560: <http://trac.webkit.org/changeset/167560> 1684018 9 407569 simon.fraser 2020-08-30 10:51:19 -0700 Created attachment 407569 Testcase 229692 2014-04-18 17:34:42 -0700 2014-04-18 18:21:00 -0700 Patch bug-131869-20140418173421.patch text/plain 5382 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzUyMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA0LTE4ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIExhdGNoZWQgc2Nyb2xsaW5n IG1heSBpbnRlcmFjdCBiYWRseSB3aXRoIGN1c3RvbSBwcm9ncmFtbWF0aWMgc2Nyb2xsaW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE4NjkKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2MjQ5NTU3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RWxlbWVudDo6c2V0U2Nyb2xsVG9wKTogTWFyayBzY3JvbGxhYmxlIGFyZWEgYXMgaGF2 aW5nCisgICAgICAgIGJlZW4gc2Nyb2xsZWQgcHJvZ3JhbW1hdGljYWxseS4KKyAgICAgICAgKiBw YWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRs ZXI6OnBsYXRmb3JtUHJlcGFyZUZvcldoZWVsRXZlbnRzKTogQ2hlY2sKKyAgICAgICAgaWYgc2Ny b2xsYWJsZSBhcmVhIHdhcyBzY3JvbGxlZCBwcm9ncmFtbWF0aWNhbGx5LiBJZiBpdCB3YXMsIGRv CisgICAgICAgIG5vdCBob25vciBsYXRjaGluZyBiZWhhdmlvci4KKyAgICAgICAgKiBwbGF0Zm9y bS9TY3JvbGxhYmxlQXJlYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6 U2Nyb2xsYWJsZUFyZWEpOiBJbml0aWFsaXplIG5ldyB2YWx1ZS4KKyAgICAgICAgKiBwbGF0Zm9y bS9TY3JvbGxhYmxlQXJlYS5oOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6Omlz U2Nyb2xsZWRQcm9ncmFtbWF0aWNhbGx5KTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpTY3Jv bGxhYmxlQXJlYTo6c2V0U2Nyb2xsZWRQcm9ncmFtbWF0aWNhbGx5KTogQWRkZWQuCisKIDIwMTQt MDQtMTggIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJHTF0g TGltaXQgbWF4aW11bSB0ZXh0dXJlIHNpemVzIG9uIG9sZGVyIEludGVsIGhhcmR3YXJlCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvZG9tL0VsZW1lbnQuY3BwCShyZXZpc2lvbiAxNjc1MDMpCisrKyBTb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDcgQEAKICNpbmNs dWRlICJOb2RlUmVuZGVyU3R5bGUuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIK ICNpbmNsdWRlICJQb2ludGVyTG9ja0NvbnRyb2xsZXIuaCIKKyNpbmNsdWRlICJSZW5kZXJMYXll ci5oIgogI2luY2x1ZGUgIlJlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmgiCiAjaW5jbHVkZSAiUmVu ZGVyUmVnaW9uLmgiCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWUuaCIKQEAgLTgwNiw4ICs4MDcsMTEg QEAgdm9pZCBFbGVtZW50OjpzZXRTY3JvbGxUb3AoaW50IG5ld1RvcCkKIHsKICAgICBkb2N1bWVu dCgpLnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwogCi0gICAgaWYgKFJl bmRlckJveCogcmVuZCA9IHJlbmRlckJveCgpKQorICAgIGlmIChSZW5kZXJCb3gqIHJlbmQgPSBy ZW5kZXJCb3goKSkgewogICAgICAgICByZW5kLT5zZXRTY3JvbGxUb3Aoc3RhdGljX2Nhc3Q8aW50 PihuZXdUb3AgKiByZW5kLT5zdHlsZSgpLmVmZmVjdGl2ZVpvb20oKSkpOworICAgICAgICBpZiAo U2Nyb2xsYWJsZUFyZWEqIHNjcm9sbGFibGVBcmVhID0gc3RhdGljX2Nhc3Q8U2Nyb2xsYWJsZUFy ZWEqPihyZW5kLT5sYXllcigpKSkKKyAgICAgICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRTY3Jv bGxlZFByb2dyYW1tYXRpY2FsbHkodHJ1ZSk7CisgICAgfQogfQogCiBpbnQgRWxlbWVudDo6c2Ny b2xsV2lkdGgoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFj Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxlck1h Yy5tbQkocmV2aXNpb24gMTY3NTAzKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRXZlbnRI YW5kbGVyTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC03ODcsOCArNzg3LDEwIEBAIHZvaWQgRXZl bnRIYW5kbGVyOjpwbGF0Zm9ybVByZXBhcmVGb3JXaGUKICAgICAgICAgICAgIH0KICAgICAgICAg fQogICAgIH0KLSAgICAKLSAgICBpZiAod2hlZWxFdmVudC5zaG91bGRDb25zaWRlckxhdGNoaW5n KCkpIHsKKworICAgIGJvb2wgaWdub3JlTGF0Y2hpbmdEdWVUb1Byb2dyYW1tYXRpY1Njcm9sbGlu ZyA9IHNjcm9sbGFibGVBcmVhICYmIHNjcm9sbGFibGVBcmVhLT5pc1Njcm9sbGVkUHJvZ3JhbW1h dGljYWxseSgpOworCisgICAgaWYgKHdoZWVsRXZlbnQuc2hvdWxkQ29uc2lkZXJMYXRjaGluZygp ICYmICFpZ25vcmVMYXRjaGluZ0R1ZVRvUHJvZ3JhbW1hdGljU2Nyb2xsaW5nKSB7CiAgICAgICAg IGlmIChzY3JvbGxhYmxlQXJlYSkKICAgICAgICAgICAgIG1fc3RhcnRlZEdlc3R1cmVBdFNjcm9s bExpbWl0ID0gc2Nyb2xsZWRUb0VkZ2VJbkRvbWluYW50RGlyZWN0aW9uKCpzY3JvbGxhYmxlQXJl YSwgbV9yZWNlbnRXaGVlbEV2ZW50RGVsdGFUcmFja2VyLT5kb21pbmFudFNjcm9sbEdlc3R1cmVE aXJlY3Rpb24oKSwgd2hlZWxFdmVudC5kZWx0YVgoKSwgd2hlZWxFdmVudC5kZWx0YVkoKSk7CiAg ICAgICAgIGVsc2UKQEAgLTc5OCw3ICs4MDAsNyBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6cGxhdGZv cm1QcmVwYXJlRm9yV2hlCiAgICAgICAgIG1fd2lkZ2V0SXNMYXRjaGVkID0gcmVzdWx0LmlzT3Zl cldpZGdldCgpOwogICAgICAgICBpc092ZXJXaWRnZXQgPSBtX3dpZGdldElzTGF0Y2hlZDsKICAg ICAgICAgbV9yZWNlbnRXaGVlbEV2ZW50RGVsdGFUcmFja2VyLT5iZWdpblRyYWNraW5nRGVsdGFz KCk7Ci0gICAgfSBlbHNlIGlmICh3aGVlbEV2ZW50LnNob3VsZFJlc2V0TGF0Y2hpbmcoKSkgewor ICAgIH0gZWxzZSBpZiAod2hlZWxFdmVudC5zaG91bGRSZXNldExhdGNoaW5nKCkgfHwgaWdub3Jl TGF0Y2hpbmdEdWVUb1Byb2dyYW1tYXRpY1Njcm9sbGluZykgewogICAgICAgICBtX2xhdGNoZWRX aGVlbEV2ZW50RWxlbWVudCA9IG51bGxwdHI7CiAgICAgICAgIG1fbGF0Y2hlZFNjcm9sbGFibGVD b250YWluZXIgPSBudWxscHRyOwogICAgICAgICBtX3dpZGdldElzTGF0Y2hlZCA9IGZhbHNlOwpA QCAtODA2LDcgKzgwOCw3IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpwbGF0Zm9ybVByZXBhcmVGb3JX aGUKICAgICAgICAgbV9yZWNlbnRXaGVlbEV2ZW50RGVsdGFUcmFja2VyLT5lbmRUcmFja2luZ0Rl bHRhcygpOwogICAgIH0KICAgICAKLSAgICBpZiAoIXdoZWVsRXZlbnQuc2hvdWxkUmVzZXRMYXRj aGluZygpICYmIG1fbGF0Y2hlZFdoZWVsRXZlbnRFbGVtZW50KSB7CisgICAgaWYgKCF3aGVlbEV2 ZW50LnNob3VsZFJlc2V0TGF0Y2hpbmcoKSAmJiBtX2xhdGNoZWRXaGVlbEV2ZW50RWxlbWVudCAm JiAhaWdub3JlTGF0Y2hpbmdEdWVUb1Byb2dyYW1tYXRpY1Njcm9sbGluZykgewogICAgICAgICB3 aGVlbEV2ZW50VGFyZ2V0ID0gbV9sYXRjaGVkV2hlZWxFdmVudEVsZW1lbnQuZ2V0KCk7CiAgICAg ICAgIGlzT3ZlcldpZGdldCA9IG1fd2lkZ2V0SXNMYXRjaGVkOwogICAgIH0KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAJKHJldmlzaW9uIDE2NzUwMykK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNTksNiArNTksNyBAQCBTY3JvbGxhYmxlQXJlYTo6U2Nyb2xsYWJsZUFyZWEoKQog ICAgICwgbV9ob3Jpem9udGFsU2Nyb2xsRWxhc3RpY2l0eShTY3JvbGxFbGFzdGljaXR5Tm9uZSkK ICAgICAsIG1fc2Nyb2xsYmFyT3ZlcmxheVN0eWxlKFNjcm9sbGJhck92ZXJsYXlTdHlsZURlZmF1 bHQpCiAgICAgLCBtX3Njcm9sbE9yaWdpbkNoYW5nZWQoZmFsc2UpCisgICAgLCBtX3Njcm9sbGVk UHJvZ3JhbW1hdGljYWxseShmYWxzZSkKIHsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCShyZXZpc2lvbiAxNjc1MDMpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTYsNiArMTU2 LDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBzY3JvbGxlZFRvTGVmdCgpIGNvbnN0Owog ICAgIHZpcnR1YWwgYm9vbCBzY3JvbGxlZFRvUmlnaHQoKSBjb25zdDsKIAorICAgIGJvb2wgaXNT Y3JvbGxlZFByb2dyYW1tYXRpY2FsbHkoKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbGVkUHJvZ3Jh bW1hdGljYWxseTsgfQorICAgIHZvaWQgc2V0U2Nyb2xsZWRQcm9ncmFtbWF0aWNhbGx5KGJvb2wg c3RhdGUpIHsgbV9zY3JvbGxlZFByb2dyYW1tYXRpY2FsbHkgPSBzdGF0ZTsgfQorCiAgICAgZW51 bSBWaXNpYmxlQ29udGVudFJlY3RJbmNsdWRlc1Njcm9sbGJhcnMgeyBFeGNsdWRlU2Nyb2xsYmFy cywgSW5jbHVkZVNjcm9sbGJhcnMgfTsKICAgICBlbnVtIFZpc2libGVDb250ZW50UmVjdEJlaGF2 aW9yIHsKICAgICAgICAgQ29udGVudHNWaXNpYmxlUmVjdCwKQEAgLTI5Miw2ICsyOTUsNyBAQCBw cml2YXRlOgogICAgIHVuc2lnbmVkIG1fc2Nyb2xsYmFyT3ZlcmxheVN0eWxlIDogMjsgLy8gU2Ny b2xsYmFyT3ZlcmxheVN0eWxlCiAKICAgICB1bnNpZ25lZCBtX3Njcm9sbE9yaWdpbkNoYW5nZWQg OiAxOworICAgIHVuc2lnbmVkIG1fc2Nyb2xsZWRQcm9ncmFtbWF0aWNhbGx5IDogMTsKIH07CiAK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 229696 2014-04-18 18:21:04 -0700 2014-04-18 20:50:07 -0700 Patch bug-131869-20140418182043.patch text/plain 6542 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzUyMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA0LTE4ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIExhdGNoZWQgc2Nyb2xsaW5n IG1heSBpbnRlcmFjdCBiYWRseSB3aXRoIGN1c3RvbSBwcm9ncmFtbWF0aWMgc2Nyb2xsaW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE4NjkKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2MjQ5NTU3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RWxlbWVudDo6c2V0U2Nyb2xsTGVmdCk6IE1hcmsgc2Nyb2xsYWJsZSBhcmVhIGFzIGhh dmluZworICAgICAgICBiZWVuIHNjcm9sbGVkIHByb2dyYW1tYXRpY2FsbHkuCisgICAgICAgIChX ZWJDb3JlOjpFbGVtZW50OjpzZXRTY3JvbGxUb3ApOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6 OkV2ZW50SGFuZGxlcjo6cGxhdGZvcm1QcmVwYXJlRm9yV2hlZWxFdmVudHMpOiBDaGVjaworICAg ICAgICBpZiBzY3JvbGxhYmxlIGFyZWEgd2FzIHNjcm9sbGVkIHByb2dyYW1tYXRpY2FsbHkuIElm IGl0IHdhcywgZG8KKyAgICAgICAgbm90IGhvbm9yIGxhdGNoaW5nIGJlaGF2aW9yLgorICAgICAg ICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpwbGF0Zm9ybUNvbXBsZXRlV2hlZWxFdmVudHMpOiBJ ZiB0aGUKKyAgICAgICAgc2Nyb2xsIGdlc3R1cmUgaXMgZW5kaW5nLCBjbGVhciB0aGUgJ3Njcm9s bGVkIHByb2dyYW1tYXRpY2FsbHknCisgICAgICAgIGZsYWcuCisgICAgICAgICogcGxhdGZvcm0v U2Nyb2xsYWJsZUFyZWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6OlNj cm9sbGFibGVBcmVhKTogSW5pdGlhbGl6ZSBuZXcgdmFsdWUuCisgICAgICAgICogcGxhdGZvcm0v U2Nyb2xsYWJsZUFyZWEuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjppc1Nj cm9sbGVkUHJvZ3JhbW1hdGljYWxseSk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs YWJsZUFyZWE6OnNldFNjcm9sbGVkUHJvZ3JhbW1hdGljYWxseSk6IEFkZGVkLgorCiAyMDE0LTA0 LTE4ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViR0xdIExp bWl0IG1heGltdW0gdGV4dHVyZSBzaXplcyBvbiBvbGRlciBJbnRlbCBoYXJkd2FyZQpJbmRleDog U291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2RvbS9FbGVtZW50LmNwcAkocmV2aXNpb24gMTY3NTAzKQorKysgU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MSw2ICs2MSw3IEBACiAjaW5jbHVk ZSAiTm9kZVJlbmRlclN0eWxlLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1XaGVlbEV2ZW50LmgiCiAj aW5jbHVkZSAiUG9pbnRlckxvY2tDb250cm9sbGVyLmgiCisjaW5jbHVkZSAiUmVuZGVyTGF5ZXIu aCIKICNpbmNsdWRlICJSZW5kZXJOYW1lZEZsb3dGcmFnbWVudC5oIgogI2luY2x1ZGUgIlJlbmRl clJlZ2lvbi5oIgogI2luY2x1ZGUgIlJlbmRlclRoZW1lLmgiCkBAIC03OTgsMTYgKzc5OSwyMiBA QCB2b2lkIEVsZW1lbnQ6OnNldFNjcm9sbExlZnQoaW50IG5ld0xlZnQpCiB7CiAgICAgZG9jdW1l bnQoKS51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKIAotICAgIGlmIChS ZW5kZXJCb3gqIHJlbmQgPSByZW5kZXJCb3goKSkKKyAgICBpZiAoUmVuZGVyQm94KiByZW5kID0g cmVuZGVyQm94KCkpIHsKICAgICAgICAgcmVuZC0+c2V0U2Nyb2xsTGVmdChzdGF0aWNfY2FzdDxp bnQ+KG5ld0xlZnQgKiByZW5kLT5zdHlsZSgpLmVmZmVjdGl2ZVpvb20oKSkpOworICAgICAgICBp ZiAoU2Nyb2xsYWJsZUFyZWEqIHNjcm9sbGFibGVBcmVhID0gc3RhdGljX2Nhc3Q8U2Nyb2xsYWJs ZUFyZWEqPihyZW5kLT5sYXllcigpKSkKKyAgICAgICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRT Y3JvbGxlZFByb2dyYW1tYXRpY2FsbHkodHJ1ZSk7CisgICAgfQogfQogCiB2b2lkIEVsZW1lbnQ6 OnNldFNjcm9sbFRvcChpbnQgbmV3VG9wKQogewogICAgIGRvY3VtZW50KCkudXBkYXRlTGF5b3V0 SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7CiAKLSAgICBpZiAoUmVuZGVyQm94KiByZW5kID0g cmVuZGVyQm94KCkpCisgICAgaWYgKFJlbmRlckJveCogcmVuZCA9IHJlbmRlckJveCgpKSB7CiAg ICAgICAgIHJlbmQtPnNldFNjcm9sbFRvcChzdGF0aWNfY2FzdDxpbnQ+KG5ld1RvcCAqIHJlbmQt PnN0eWxlKCkuZWZmZWN0aXZlWm9vbSgpKSk7CisgICAgICAgIGlmIChTY3JvbGxhYmxlQXJlYSog c2Nyb2xsYWJsZUFyZWEgPSBzdGF0aWNfY2FzdDxTY3JvbGxhYmxlQXJlYSo+KHJlbmQtPmxheWVy KCkpKQorICAgICAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNldFNjcm9sbGVkUHJvZ3JhbW1hdGlj YWxseSh0cnVlKTsKKyAgICB9CiB9CiAKIGludCBFbGVtZW50OjpzY3JvbGxXaWR0aCgpCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tCShyZXZpc2lvbiAx Njc1MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0JKHdv cmtpbmcgY29weSkKQEAgLTc4Nyw4ICs3ODcsMTAgQEAgdm9pZCBFdmVudEhhbmRsZXI6OnBsYXRm b3JtUHJlcGFyZUZvcldoZQogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQotICAgIAot ICAgIGlmICh3aGVlbEV2ZW50LnNob3VsZENvbnNpZGVyTGF0Y2hpbmcoKSkgeworCisgICAgYm9v bCBpZ25vcmVMYXRjaGluZ0R1ZVRvUHJvZ3JhbW1hdGljU2Nyb2xsaW5nID0gc2Nyb2xsYWJsZUFy ZWEgJiYgc2Nyb2xsYWJsZUFyZWEtPmlzU2Nyb2xsZWRQcm9ncmFtbWF0aWNhbGx5KCk7CisKKyAg ICBpZiAod2hlZWxFdmVudC5zaG91bGRDb25zaWRlckxhdGNoaW5nKCkgJiYgIWlnbm9yZUxhdGNo aW5nRHVlVG9Qcm9ncmFtbWF0aWNTY3JvbGxpbmcpIHsKICAgICAgICAgaWYgKHNjcm9sbGFibGVB cmVhKQogICAgICAgICAgICAgbV9zdGFydGVkR2VzdHVyZUF0U2Nyb2xsTGltaXQgPSBzY3JvbGxl ZFRvRWRnZUluRG9taW5hbnREaXJlY3Rpb24oKnNjcm9sbGFibGVBcmVhLCBtX3JlY2VudFdoZWVs RXZlbnREZWx0YVRyYWNrZXItPmRvbWluYW50U2Nyb2xsR2VzdHVyZURpcmVjdGlvbigpLCB3aGVl bEV2ZW50LmRlbHRhWCgpLCB3aGVlbEV2ZW50LmRlbHRhWSgpKTsKICAgICAgICAgZWxzZQpAQCAt Nzk4LDcgKzgwMCw3IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpwbGF0Zm9ybVByZXBhcmVGb3JXaGUK ICAgICAgICAgbV93aWRnZXRJc0xhdGNoZWQgPSByZXN1bHQuaXNPdmVyV2lkZ2V0KCk7CiAgICAg ICAgIGlzT3ZlcldpZGdldCA9IG1fd2lkZ2V0SXNMYXRjaGVkOwogICAgICAgICBtX3JlY2VudFdo ZWVsRXZlbnREZWx0YVRyYWNrZXItPmJlZ2luVHJhY2tpbmdEZWx0YXMoKTsKLSAgICB9IGVsc2Ug aWYgKHdoZWVsRXZlbnQuc2hvdWxkUmVzZXRMYXRjaGluZygpKSB7CisgICAgfSBlbHNlIGlmICh3 aGVlbEV2ZW50LnNob3VsZFJlc2V0TGF0Y2hpbmcoKSB8fCBpZ25vcmVMYXRjaGluZ0R1ZVRvUHJv Z3JhbW1hdGljU2Nyb2xsaW5nKSB7CiAgICAgICAgIG1fbGF0Y2hlZFdoZWVsRXZlbnRFbGVtZW50 ID0gbnVsbHB0cjsKICAgICAgICAgbV9sYXRjaGVkU2Nyb2xsYWJsZUNvbnRhaW5lciA9IG51bGxw dHI7CiAgICAgICAgIG1fd2lkZ2V0SXNMYXRjaGVkID0gZmFsc2U7CkBAIC04MDYsNyArODA4LDcg QEAgdm9pZCBFdmVudEhhbmRsZXI6OnBsYXRmb3JtUHJlcGFyZUZvcldoZQogICAgICAgICBtX3Jl Y2VudFdoZWVsRXZlbnREZWx0YVRyYWNrZXItPmVuZFRyYWNraW5nRGVsdGFzKCk7CiAgICAgfQog ICAgIAotICAgIGlmICghd2hlZWxFdmVudC5zaG91bGRSZXNldExhdGNoaW5nKCkgJiYgbV9sYXRj aGVkV2hlZWxFdmVudEVsZW1lbnQpIHsKKyAgICBpZiAoIXdoZWVsRXZlbnQuc2hvdWxkUmVzZXRM YXRjaGluZygpICYmIG1fbGF0Y2hlZFdoZWVsRXZlbnRFbGVtZW50ICYmICFpZ25vcmVMYXRjaGlu Z0R1ZVRvUHJvZ3JhbW1hdGljU2Nyb2xsaW5nKSB7CiAgICAgICAgIHdoZWVsRXZlbnRUYXJnZXQg PSBtX2xhdGNoZWRXaGVlbEV2ZW50RWxlbWVudC5nZXQoKTsKICAgICAgICAgaXNPdmVyV2lkZ2V0 ID0gbV93aWRnZXRJc0xhdGNoZWQ7CiAgICAgfQpAQCAtODMwLDYgKzgzMiw5IEBAIHZvaWQgRXZl bnRIYW5kbGVyOjpwbGF0Zm9ybVJlY29yZFdoZWVsRXYKIAogYm9vbCBFdmVudEhhbmRsZXI6OnBs YXRmb3JtQ29tcGxldGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxF dmVudCwgQ29udGFpbmVyTm9kZSogc2Nyb2xsYWJsZUNvbnRhaW5lciwgU2Nyb2xsYWJsZUFyZWEq IHNjcm9sbGFibGVBcmVhKQogeworICAgIGlmICh3aGVlbEV2ZW50LnNob3VsZFJlc2V0TGF0Y2hp bmcoKSB8fCB3aGVlbEV2ZW50LnBoYXNlKCkgPT0gUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2VFbmRl ZCkKKyAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNldFNjcm9sbGVkUHJvZ3JhbW1hdGljYWxseShm YWxzZSk7CisKICAgICAvLyBXZSBkbyBhbm90aGVyIGNoZWNrIG9uIHRoZSBmcmFtZSB2aWV3IGJl Y2F1c2UgdGhlIGV2ZW50IGhhbmRsZXIgY2FuIHJ1biBKUyB3aGljaCByZXN1bHRzIGluIHRoZSBm cmFtZSBnZXR0aW5nIGRlc3Ryb3llZC4KICAgICBGcmFtZVZpZXcqIHZpZXcgPSBtX2ZyYW1lLnZp ZXcoKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNw cAkocmV2aXNpb24gMTY3NTAzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJs ZUFyZWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OSw2ICs1OSw3IEBAIFNjcm9sbGFibGVBcmVh OjpTY3JvbGxhYmxlQXJlYSgpCiAgICAgLCBtX2hvcml6b250YWxTY3JvbGxFbGFzdGljaXR5KFNj cm9sbEVsYXN0aWNpdHlOb25lKQogICAgICwgbV9zY3JvbGxiYXJPdmVybGF5U3R5bGUoU2Nyb2xs YmFyT3ZlcmxheVN0eWxlRGVmYXVsdCkKICAgICAsIG1fc2Nyb2xsT3JpZ2luQ2hhbmdlZChmYWxz ZSkKKyAgICAsIG1fc2Nyb2xsZWRQcm9ncmFtbWF0aWNhbGx5KGZhbHNlKQogewogfQogCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgJKHJldmlzaW9uIDE2NzUw MykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgJKHdvcmtpbmcg Y29weSkKQEAgLTE1Niw2ICsxNTYsOSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIHNjcm9s bGVkVG9MZWZ0KCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIHNjcm9sbGVkVG9SaWdodCgpIGNv bnN0OwogCisgICAgYm9vbCBpc1Njcm9sbGVkUHJvZ3JhbW1hdGljYWxseSgpIGNvbnN0IHsgcmV0 dXJuIG1fc2Nyb2xsZWRQcm9ncmFtbWF0aWNhbGx5OyB9CisgICAgdm9pZCBzZXRTY3JvbGxlZFBy b2dyYW1tYXRpY2FsbHkoYm9vbCBzdGF0ZSkgeyBtX3Njcm9sbGVkUHJvZ3JhbW1hdGljYWxseSA9 IHN0YXRlOyB9CisKICAgICBlbnVtIFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFy cyB7IEV4Y2x1ZGVTY3JvbGxiYXJzLCBJbmNsdWRlU2Nyb2xsYmFycyB9OwogICAgIGVudW0gVmlz aWJsZUNvbnRlbnRSZWN0QmVoYXZpb3IgewogICAgICAgICBDb250ZW50c1Zpc2libGVSZWN0LApA QCAtMjkyLDYgKzI5NSw3IEBAIHByaXZhdGU6CiAgICAgdW5zaWduZWQgbV9zY3JvbGxiYXJPdmVy bGF5U3R5bGUgOiAyOyAvLyBTY3JvbGxiYXJPdmVybGF5U3R5bGUKIAogICAgIHVuc2lnbmVkIG1f c2Nyb2xsT3JpZ2luQ2hhbmdlZCA6IDE7CisgICAgdW5zaWduZWQgbV9zY3JvbGxlZFByb2dyYW1t YXRpY2FsbHkgOiAxOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 229710 2014-04-18 20:50:11 -0700 2014-04-18 21:09:57 -0700 Patch bug-131869-20140418204950.patch text/plain 6852 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzUyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE0LTA0LTE4ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIExhdGNoZWQgc2Nyb2xsaW5n IG1heSBpbnRlcmFjdCBiYWRseSB3aXRoIGN1c3RvbSBwcm9ncmFtbWF0aWMgc2Nyb2xsaW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE4NjkKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2MjQ5NTU3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RWxlbWVudDo6c2V0U2Nyb2xsTGVmdCk6IE1hcmsgc2Nyb2xsYWJsZSBhcmVhIGFzIGhh dmluZworICAgICAgICBiZWVuIHNjcm9sbGVkIHByb2dyYW1tYXRpY2FsbHkuCisgICAgICAgIChX ZWJDb3JlOjpFbGVtZW50OjpzZXRTY3JvbGxUb3ApOiBEaXR0by4KKyAgICAgICAgKiBwYWdlL0V2 ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmhhbmRsZVdo ZWVsRXZlbnQpOiBDaGVjayBmb3IgcHJvZ3JhbW1hdGljIHNjcm9sbCwgYW5kCisgICAgICAgIGNs ZWFyIGxhdGNoZWQgc3RhdGUgaWYgdGhlIGhhbmRsZXIgbWFudWFsbHkgc2Nyb2xsZWQuIENsZWFy IHByb2dyYW1tYXRpYworICAgICAgICBzY3JvbGwgc3RhdGUgYXQgdGhlIGVuZCBvZiBldmVudCBo YW5kbGluZy4KKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6Y2xlYXJMYXRjaGVkU3Rh dGUpOiBSZWZhY3RvcmVkIGNvZGUuCisgICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuaDoKKyAg ICAgICAgKiBwYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpF dmVudEhhbmRsZXI6OnBsYXRmb3JtUHJlcGFyZUZvcldoZWVsRXZlbnRzKTogQ2hlY2sKKyAgICAg ICAgaWYgc2Nyb2xsYWJsZSBhcmVhIHdhcyBzY3JvbGxlZCBwcm9ncmFtbWF0aWNhbGx5LiBJZiBp dCB3YXMsIGRvCisgICAgICAgIG5vdCBob25vciBsYXRjaGluZyBiZWhhdmlvci4KKyAgICAgICAg KiBwbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxh YmxlQXJlYTo6U2Nyb2xsYWJsZUFyZWEpOiBJbml0aWFsaXplIG5ldyBtZW1iZXIuCisgICAgICAg ICogcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGFi bGVBcmVhOjppc1Njcm9sbGVkUHJvZ3JhbW1hdGljYWxseSk6IEFkZGVkLgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsYWJsZUFyZWE6OnNldFNjcm9sbGVkUHJvZ3JhbW1hdGljYWxseSk6IEFkZGVk LgorCiAyMDE0LTA0LTE4ICBKb24gSG9uZXljdXR0ICA8amhvbmV5Y3V0dEBhcHBsZS5jb20+CiAK ICAgICAgICAgSGFyZGVuIFJlbmRlcklubGluZTo6aW5saW5lRWxlbWVudENvbnRpbnVhdGlvbigp CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCShyZXZpc2lvbiAxNjc1MDMpCisrKyBTb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDcgQEAK ICNpbmNsdWRlICJOb2RlUmVuZGVyU3R5bGUuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZl bnQuaCIKICNpbmNsdWRlICJQb2ludGVyTG9ja0NvbnRyb2xsZXIuaCIKKyNpbmNsdWRlICJSZW5k ZXJMYXllci5oIgogI2luY2x1ZGUgIlJlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmgiCiAjaW5jbHVk ZSAiUmVuZGVyUmVnaW9uLmgiCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWUuaCIKQEAgLTc5OCwxNiAr Nzk5LDIyIEBAIHZvaWQgRWxlbWVudDo6c2V0U2Nyb2xsTGVmdChpbnQgbmV3TGVmdCkKIHsKICAg ICBkb2N1bWVudCgpLnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwogCi0g ICAgaWYgKFJlbmRlckJveCogcmVuZCA9IHJlbmRlckJveCgpKQorICAgIGlmIChSZW5kZXJCb3gq IHJlbmQgPSByZW5kZXJCb3goKSkgewogICAgICAgICByZW5kLT5zZXRTY3JvbGxMZWZ0KHN0YXRp Y19jYXN0PGludD4obmV3TGVmdCAqIHJlbmQtPnN0eWxlKCkuZWZmZWN0aXZlWm9vbSgpKSk7Cisg ICAgICAgIGlmIChTY3JvbGxhYmxlQXJlYSogc2Nyb2xsYWJsZUFyZWEgPSBzdGF0aWNfY2FzdDxT Y3JvbGxhYmxlQXJlYSo+KHJlbmQtPmxheWVyKCkpKQorICAgICAgICAgICAgc2Nyb2xsYWJsZUFy ZWEtPnNldFNjcm9sbGVkUHJvZ3JhbW1hdGljYWxseSh0cnVlKTsKKyAgICB9CiB9CiAKIHZvaWQg RWxlbWVudDo6c2V0U2Nyb2xsVG9wKGludCBuZXdUb3ApCiB7CiAgICAgZG9jdW1lbnQoKS51cGRh dGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKIAotICAgIGlmIChSZW5kZXJCb3gq IHJlbmQgPSByZW5kZXJCb3goKSkKKyAgICBpZiAoUmVuZGVyQm94KiByZW5kID0gcmVuZGVyQm94 KCkpIHsKICAgICAgICAgcmVuZC0+c2V0U2Nyb2xsVG9wKHN0YXRpY19jYXN0PGludD4obmV3VG9w ICogcmVuZC0+c3R5bGUoKS5lZmZlY3RpdmVab29tKCkpKTsKKyAgICAgICAgaWYgKFNjcm9sbGFi bGVBcmVhKiBzY3JvbGxhYmxlQXJlYSA9IHN0YXRpY19jYXN0PFNjcm9sbGFibGVBcmVhKj4ocmVu ZC0+bGF5ZXIoKSkpCisgICAgICAgICAgICBzY3JvbGxhYmxlQXJlYS0+c2V0U2Nyb2xsZWRQcm9n cmFtbWF0aWNhbGx5KHRydWUpOworICAgIH0KIH0KIAogaW50IEVsZW1lbnQ6OnNjcm9sbFdpZHRo KCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAJKHJldmlzaW9uIDE2NzUw MykKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjU5OSw2ICsyNTk5LDEzIEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVXaGVlbEV2 ZW50KGNvbnMKIAogICAgICAgICBpZiAoIWVsZW1lbnQtPmRpc3BhdGNoV2hlZWxFdmVudChldmVu dCkpIHsKICAgICAgICAgICAgIG1faXNIYW5kbGluZ1doZWVsRXZlbnQgPSBmYWxzZTsKKworICAg ICAgICAgICAgaWYgKHNjcm9sbGFibGVBcmVhICYmIHNjcm9sbGFibGVBcmVhLT5pc1Njcm9sbGVk UHJvZ3JhbW1hdGljYWxseSgpKSB7CisgICAgICAgICAgICAgICAgLy8gV2ViIGRldmVsb3BlciBp cyBjb250cm9sbGluZyBzY3JvbGxpbmcuIERvbid0IGF0dGVtcHQgdG8gbGF0Y2ggb3Vyc2VsdmVz OgorICAgICAgICAgICAgICAgIGNsZWFyTGF0Y2hlZFN0YXRlKCk7CisgICAgICAgICAgICAgICAg c2Nyb2xsYWJsZUFyZWEtPnNldFNjcm9sbGVkUHJvZ3JhbW1hdGljYWxseShmYWxzZSk7CisgICAg ICAgICAgICB9CisKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgfQpA QCAtMjYwNiw2ICsyNjEzLDE0IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVXaGVlbEV2ZW50 KGNvbnMKICAgICByZXR1cm4gcGxhdGZvcm1Db21wbGV0ZVdoZWVsRXZlbnQoZSwgc2Nyb2xsYWJs ZUNvbnRhaW5lciwgc2Nyb2xsYWJsZUFyZWEpOwogfQogCit2b2lkIEV2ZW50SGFuZGxlcjo6Y2xl YXJMYXRjaGVkU3RhdGUoKQoreworICAgIG1fbGF0Y2hlZFdoZWVsRXZlbnRFbGVtZW50ID0gbnVs bHB0cjsKKyAgICBtX2xhdGNoZWRTY3JvbGxhYmxlQ29udGFpbmVyID0gbnVsbHB0cjsKKyAgICBt X3dpZGdldElzTGF0Y2hlZCA9IGZhbHNlOworICAgIG1fcHJldmlvdXNXaGVlbFNjcm9sbGVkRWxl bWVudCA9IG51bGxwdHI7Cit9CisKIHZvaWQgRXZlbnRIYW5kbGVyOjpkZWZhdWx0V2hlZWxFdmVu dEhhbmRsZXIoTm9kZSogc3RhcnROb2RlLCBXaGVlbEV2ZW50KiB3aGVlbEV2ZW50KQogewogICAg IGlmICghc3RhcnROb2RlIHx8ICF3aGVlbEV2ZW50KQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFn ZS9FdmVudEhhbmRsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50 SGFuZGxlci5oCShyZXZpc2lvbiAxNjc1MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50 SGFuZGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOTcsNiArMjk3LDkgQEAgcHVibGljOgogCiAg ICAgYm9vbCBpc0hhbmRsaW5nV2hlZWxFdmVudCgpIGNvbnN0IHsgcmV0dXJuIG1faXNIYW5kbGlu Z1doZWVsRXZlbnQ7IH0KIAorcHJvdGVjdGVkOgorICAgIHZvaWQgY2xlYXJMYXRjaGVkU3RhdGUo KTsKKwogcHJpdmF0ZToKICNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAgIHN0YXRpYyBEcmFn U3RhdGUmIGRyYWdTdGF0ZSgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRXZlbnRI YW5kbGVyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50 SGFuZGxlck1hYy5tbQkocmV2aXNpb24gMTY3NTAzKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9t YWMvRXZlbnRIYW5kbGVyTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC03OTksMTAgKzc5OSw3IEBA IHZvaWQgRXZlbnRIYW5kbGVyOjpwbGF0Zm9ybVByZXBhcmVGb3JXaGUKICAgICAgICAgaXNPdmVy V2lkZ2V0ID0gbV93aWRnZXRJc0xhdGNoZWQ7CiAgICAgICAgIG1fcmVjZW50V2hlZWxFdmVudERl bHRhVHJhY2tlci0+YmVnaW5UcmFja2luZ0RlbHRhcygpOwogICAgIH0gZWxzZSBpZiAod2hlZWxF dmVudC5zaG91bGRSZXNldExhdGNoaW5nKCkpIHsKLSAgICAgICAgbV9sYXRjaGVkV2hlZWxFdmVu dEVsZW1lbnQgPSBudWxscHRyOwotICAgICAgICBtX2xhdGNoZWRTY3JvbGxhYmxlQ29udGFpbmVy ID0gbnVsbHB0cjsKLSAgICAgICAgbV93aWRnZXRJc0xhdGNoZWQgPSBmYWxzZTsKLSAgICAgICAg bV9wcmV2aW91c1doZWVsU2Nyb2xsZWRFbGVtZW50ID0gbnVsbHB0cjsKKyAgICAgICAgY2xlYXJM YXRjaGVkU3RhdGUoKTsKICAgICAgICAgbV9yZWNlbnRXaGVlbEV2ZW50RGVsdGFUcmFja2VyLT5l bmRUcmFja2luZ0RlbHRhcygpOwogICAgIH0KICAgICAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAJKHJldmlzaW9uIDE2NzUwMykKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTks NiArNTksNyBAQCBTY3JvbGxhYmxlQXJlYTo6U2Nyb2xsYWJsZUFyZWEoKQogICAgICwgbV9ob3Jp em9udGFsU2Nyb2xsRWxhc3RpY2l0eShTY3JvbGxFbGFzdGljaXR5Tm9uZSkKICAgICAsIG1fc2Ny b2xsYmFyT3ZlcmxheVN0eWxlKFNjcm9sbGJhck92ZXJsYXlTdHlsZURlZmF1bHQpCiAgICAgLCBt X3Njcm9sbE9yaWdpbkNoYW5nZWQoZmFsc2UpCisgICAgLCBtX3Njcm9sbGVkUHJvZ3JhbW1hdGlj YWxseShmYWxzZSkKIHsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs YWJsZUFyZWEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxh YmxlQXJlYS5oCShyZXZpc2lvbiAxNjc1MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9T Y3JvbGxhYmxlQXJlYS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTYsNiArMTU2LDkgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgYm9vbCBzY3JvbGxlZFRvTGVmdCgpIGNvbnN0OwogICAgIHZpcnR1YWwg Ym9vbCBzY3JvbGxlZFRvUmlnaHQoKSBjb25zdDsKIAorICAgIGJvb2wgaXNTY3JvbGxlZFByb2dy YW1tYXRpY2FsbHkoKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbGVkUHJvZ3JhbW1hdGljYWxseTsg fQorICAgIHZvaWQgc2V0U2Nyb2xsZWRQcm9ncmFtbWF0aWNhbGx5KGJvb2wgc3RhdGUpIHsgbV9z Y3JvbGxlZFByb2dyYW1tYXRpY2FsbHkgPSBzdGF0ZTsgfQorCiAgICAgZW51bSBWaXNpYmxlQ29u dGVudFJlY3RJbmNsdWRlc1Njcm9sbGJhcnMgeyBFeGNsdWRlU2Nyb2xsYmFycywgSW5jbHVkZVNj cm9sbGJhcnMgfTsKICAgICBlbnVtIFZpc2libGVDb250ZW50UmVjdEJlaGF2aW9yIHsKICAgICAg ICAgQ29udGVudHNWaXNpYmxlUmVjdCwKQEAgLTI5Miw2ICsyOTUsNyBAQCBwcml2YXRlOgogICAg IHVuc2lnbmVkIG1fc2Nyb2xsYmFyT3ZlcmxheVN0eWxlIDogMjsgLy8gU2Nyb2xsYmFyT3Zlcmxh eVN0eWxlCiAKICAgICB1bnNpZ25lZCBtX3Njcm9sbE9yaWdpbkNoYW5nZWQgOiAxOworICAgIHVu c2lnbmVkIG1fc2Nyb2xsZWRQcm9ncmFtbWF0aWNhbGx5IDogMTsKIH07CiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUK 229714 2014-04-18 21:10:03 -0700 2014-04-19 14:53:57 -0700 Patch bug-131869-20140418210942.patch text/plain 6881 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzUyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE0LTA0LTE4ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIExhdGNoZWQgc2Nyb2xsaW5n IG1heSBpbnRlcmFjdCBiYWRseSB3aXRoIGN1c3RvbSBwcm9ncmFtbWF0aWMgc2Nyb2xsaW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE4NjkKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2MjQ5NTU3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RWxlbWVudDo6c2V0U2Nyb2xsTGVmdCk6IE1hcmsgc2Nyb2xsYWJsZSBhcmVhIGFzIGhh dmluZworICAgICAgICBiZWVuIHNjcm9sbGVkIHByb2dyYW1tYXRpY2FsbHkuCisgICAgICAgIChX ZWJDb3JlOjpFbGVtZW50OjpzZXRTY3JvbGxUb3ApOiBEaXR0by4KKyAgICAgICAgKiBwYWdlL0V2 ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmhhbmRsZVdo ZWVsRXZlbnQpOiBDaGVjayBmb3IgcHJvZ3JhbW1hdGljIHNjcm9sbCwgYW5kCisgICAgICAgIGNs ZWFyIGxhdGNoZWQgc3RhdGUgaWYgdGhlIGhhbmRsZXIgbWFudWFsbHkgc2Nyb2xsZWQuIENsZWFy IHByb2dyYW1tYXRpYworICAgICAgICBzY3JvbGwgc3RhdGUgYXQgdGhlIGVuZCBvZiBldmVudCBo YW5kbGluZy4KKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6Y2xlYXJMYXRjaGVkU3Rh dGUpOiBSZWZhY3RvcmVkIGNvZGUuCisgICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuaDoKKyAg ICAgICAgKiBwYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpF dmVudEhhbmRsZXI6OnBsYXRmb3JtUHJlcGFyZUZvcldoZWVsRXZlbnRzKTogQ2hlY2sKKyAgICAg ICAgaWYgc2Nyb2xsYWJsZSBhcmVhIHdhcyBzY3JvbGxlZCBwcm9ncmFtbWF0aWNhbGx5LiBJZiBp dCB3YXMsIGRvCisgICAgICAgIG5vdCBob25vciBsYXRjaGluZyBiZWhhdmlvci4KKyAgICAgICAg KiBwbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxh YmxlQXJlYTo6U2Nyb2xsYWJsZUFyZWEpOiBJbml0aWFsaXplIG5ldyBtZW1iZXIuCisgICAgICAg ICogcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGFi bGVBcmVhOjppc1Njcm9sbGVkUHJvZ3JhbW1hdGljYWxseSk6IEFkZGVkLgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsYWJsZUFyZWE6OnNldFNjcm9sbGVkUHJvZ3JhbW1hdGljYWxseSk6IEFkZGVk LgorCiAyMDE0LTA0LTE4ICBKb24gSG9uZXljdXR0ICA8amhvbmV5Y3V0dEBhcHBsZS5jb20+CiAK ICAgICAgICAgSGFyZGVuIFJlbmRlcklubGluZTo6aW5saW5lRWxlbWVudENvbnRpbnVhdGlvbigp CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCShyZXZpc2lvbiAxNjc1MDMpCisrKyBTb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDcgQEAK ICNpbmNsdWRlICJOb2RlUmVuZGVyU3R5bGUuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZl bnQuaCIKICNpbmNsdWRlICJQb2ludGVyTG9ja0NvbnRyb2xsZXIuaCIKKyNpbmNsdWRlICJSZW5k ZXJMYXllci5oIgogI2luY2x1ZGUgIlJlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmgiCiAjaW5jbHVk ZSAiUmVuZGVyUmVnaW9uLmgiCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWUuaCIKQEAgLTc5OCwxNiAr Nzk5LDIyIEBAIHZvaWQgRWxlbWVudDo6c2V0U2Nyb2xsTGVmdChpbnQgbmV3TGVmdCkKIHsKICAg ICBkb2N1bWVudCgpLnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwogCi0g ICAgaWYgKFJlbmRlckJveCogcmVuZCA9IHJlbmRlckJveCgpKQorICAgIGlmIChSZW5kZXJCb3gq IHJlbmQgPSByZW5kZXJCb3goKSkgewogICAgICAgICByZW5kLT5zZXRTY3JvbGxMZWZ0KHN0YXRp Y19jYXN0PGludD4obmV3TGVmdCAqIHJlbmQtPnN0eWxlKCkuZWZmZWN0aXZlWm9vbSgpKSk7Cisg ICAgICAgIGlmIChTY3JvbGxhYmxlQXJlYSogc2Nyb2xsYWJsZUFyZWEgPSBzdGF0aWNfY2FzdDxT Y3JvbGxhYmxlQXJlYSo+KHJlbmQtPmxheWVyKCkpKQorICAgICAgICAgICAgc2Nyb2xsYWJsZUFy ZWEtPnNldFNjcm9sbGVkUHJvZ3JhbW1hdGljYWxseSh0cnVlKTsKKyAgICB9CiB9CiAKIHZvaWQg RWxlbWVudDo6c2V0U2Nyb2xsVG9wKGludCBuZXdUb3ApCiB7CiAgICAgZG9jdW1lbnQoKS51cGRh dGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKIAotICAgIGlmIChSZW5kZXJCb3gq IHJlbmQgPSByZW5kZXJCb3goKSkKKyAgICBpZiAoUmVuZGVyQm94KiByZW5kID0gcmVuZGVyQm94 KCkpIHsKICAgICAgICAgcmVuZC0+c2V0U2Nyb2xsVG9wKHN0YXRpY19jYXN0PGludD4obmV3VG9w ICogcmVuZC0+c3R5bGUoKS5lZmZlY3RpdmVab29tKCkpKTsKKyAgICAgICAgaWYgKFNjcm9sbGFi bGVBcmVhKiBzY3JvbGxhYmxlQXJlYSA9IHN0YXRpY19jYXN0PFNjcm9sbGFibGVBcmVhKj4ocmVu ZC0+bGF5ZXIoKSkpCisgICAgICAgICAgICBzY3JvbGxhYmxlQXJlYS0+c2V0U2Nyb2xsZWRQcm9n cmFtbWF0aWNhbGx5KHRydWUpOworICAgIH0KIH0KIAogaW50IEVsZW1lbnQ6OnNjcm9sbFdpZHRo KCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAJKHJldmlzaW9uIDE2NzUw MykKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjU5OSw2ICsyNTk5LDEzIEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVXaGVlbEV2 ZW50KGNvbnMKIAogICAgICAgICBpZiAoIWVsZW1lbnQtPmRpc3BhdGNoV2hlZWxFdmVudChldmVu dCkpIHsKICAgICAgICAgICAgIG1faXNIYW5kbGluZ1doZWVsRXZlbnQgPSBmYWxzZTsKKworICAg ICAgICAgICAgaWYgKHNjcm9sbGFibGVBcmVhICYmIHNjcm9sbGFibGVBcmVhLT5pc1Njcm9sbGVk UHJvZ3JhbW1hdGljYWxseSgpKSB7CisgICAgICAgICAgICAgICAgLy8gV2ViIGRldmVsb3BlciBp cyBjb250cm9sbGluZyBzY3JvbGxpbmcuIERvbid0IGF0dGVtcHQgdG8gbGF0Y2ggb3Vyc2VsdmVz OgorICAgICAgICAgICAgICAgIGNsZWFyTGF0Y2hlZFN0YXRlKCk7CisgICAgICAgICAgICAgICAg c2Nyb2xsYWJsZUFyZWEtPnNldFNjcm9sbGVkUHJvZ3JhbW1hdGljYWxseShmYWxzZSk7CisgICAg ICAgICAgICB9CisKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgfQpA QCAtMjYwNiw2ICsyNjEzLDE2IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVXaGVlbEV2ZW50 KGNvbnMKICAgICByZXR1cm4gcGxhdGZvcm1Db21wbGV0ZVdoZWVsRXZlbnQoZSwgc2Nyb2xsYWJs ZUNvbnRhaW5lciwgc2Nyb2xsYWJsZUFyZWEpOwogfQogCit2b2lkIEV2ZW50SGFuZGxlcjo6Y2xl YXJMYXRjaGVkU3RhdGUoKQoreworICAgIG1fbGF0Y2hlZFdoZWVsRXZlbnRFbGVtZW50ID0gbnVs bHB0cjsKKyNpZiBQTEFURk9STShDT0NPQSkKKyAgICBtX2xhdGNoZWRTY3JvbGxhYmxlQ29udGFp bmVyID0gbnVsbHB0cjsKKyNlbmRpZgorICAgIG1fd2lkZ2V0SXNMYXRjaGVkID0gZmFsc2U7Cisg ICAgbV9wcmV2aW91c1doZWVsU2Nyb2xsZWRFbGVtZW50ID0gbnVsbHB0cjsKK30KKwogdm9pZCBF dmVudEhhbmRsZXI6OmRlZmF1bHRXaGVlbEV2ZW50SGFuZGxlcihOb2RlKiBzdGFydE5vZGUsIFdo ZWVsRXZlbnQqIHdoZWVsRXZlbnQpCiB7CiAgICAgaWYgKCFzdGFydE5vZGUgfHwgIXdoZWVsRXZl bnQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmgJKHJldmlzaW9uIDE2NzUwMykK KysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmgJKHdvcmtpbmcgY29weSkKQEAg LTI5Nyw2ICsyOTcsOSBAQCBwdWJsaWM6CiAKICAgICBib29sIGlzSGFuZGxpbmdXaGVlbEV2ZW50 KCkgY29uc3QgeyByZXR1cm4gbV9pc0hhbmRsaW5nV2hlZWxFdmVudDsgfQogCitwcm90ZWN0ZWQ6 CisgICAgdm9pZCBjbGVhckxhdGNoZWRTdGF0ZSgpOworCiBwcml2YXRlOgogI2lmIEVOQUJMRShE UkFHX1NVUFBPUlQpCiAgICAgc3RhdGljIERyYWdTdGF0ZSYgZHJhZ1N0YXRlKCk7CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tCShyZXZpc2lvbiAxNjc1 MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0JKHdvcmtp bmcgY29weSkKQEAgLTc5OSwxMCArNzk5LDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OnBsYXRmb3Jt UHJlcGFyZUZvcldoZQogICAgICAgICBpc092ZXJXaWRnZXQgPSBtX3dpZGdldElzTGF0Y2hlZDsK ICAgICAgICAgbV9yZWNlbnRXaGVlbEV2ZW50RGVsdGFUcmFja2VyLT5iZWdpblRyYWNraW5nRGVs dGFzKCk7CiAgICAgfSBlbHNlIGlmICh3aGVlbEV2ZW50LnNob3VsZFJlc2V0TGF0Y2hpbmcoKSkg ewotICAgICAgICBtX2xhdGNoZWRXaGVlbEV2ZW50RWxlbWVudCA9IG51bGxwdHI7Ci0gICAgICAg IG1fbGF0Y2hlZFNjcm9sbGFibGVDb250YWluZXIgPSBudWxscHRyOwotICAgICAgICBtX3dpZGdl dElzTGF0Y2hlZCA9IGZhbHNlOwotICAgICAgICBtX3ByZXZpb3VzV2hlZWxTY3JvbGxlZEVsZW1l bnQgPSBudWxscHRyOworICAgICAgICBjbGVhckxhdGNoZWRTdGF0ZSgpOwogICAgICAgICBtX3Jl Y2VudFdoZWVsRXZlbnREZWx0YVRyYWNrZXItPmVuZFRyYWNraW5nRGVsdGFzKCk7CiAgICAgfQog ICAgIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcAko cmV2aXNpb24gMTY3NTAzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFy ZWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OSw2ICs1OSw3IEBAIFNjcm9sbGFibGVBcmVhOjpT Y3JvbGxhYmxlQXJlYSgpCiAgICAgLCBtX2hvcml6b250YWxTY3JvbGxFbGFzdGljaXR5KFNjcm9s bEVsYXN0aWNpdHlOb25lKQogICAgICwgbV9zY3JvbGxiYXJPdmVybGF5U3R5bGUoU2Nyb2xsYmFy T3ZlcmxheVN0eWxlRGVmYXVsdCkKICAgICAsIG1fc2Nyb2xsT3JpZ2luQ2hhbmdlZChmYWxzZSkK KyAgICAsIG1fc2Nyb2xsZWRQcm9ncmFtbWF0aWNhbGx5KGZhbHNlKQogewogfQogCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgJKHJldmlzaW9uIDE2NzUwMykK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE1Niw2ICsxNTYsOSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIHNjcm9sbGVk VG9MZWZ0KCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIHNjcm9sbGVkVG9SaWdodCgpIGNvbnN0 OwogCisgICAgYm9vbCBpc1Njcm9sbGVkUHJvZ3JhbW1hdGljYWxseSgpIGNvbnN0IHsgcmV0dXJu IG1fc2Nyb2xsZWRQcm9ncmFtbWF0aWNhbGx5OyB9CisgICAgdm9pZCBzZXRTY3JvbGxlZFByb2dy YW1tYXRpY2FsbHkoYm9vbCBzdGF0ZSkgeyBtX3Njcm9sbGVkUHJvZ3JhbW1hdGljYWxseSA9IHN0 YXRlOyB9CisKICAgICBlbnVtIFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFycyB7 IEV4Y2x1ZGVTY3JvbGxiYXJzLCBJbmNsdWRlU2Nyb2xsYmFycyB9OwogICAgIGVudW0gVmlzaWJs ZUNvbnRlbnRSZWN0QmVoYXZpb3IgewogICAgICAgICBDb250ZW50c1Zpc2libGVSZWN0LApAQCAt MjkyLDYgKzI5NSw3IEBAIHByaXZhdGU6CiAgICAgdW5zaWduZWQgbV9zY3JvbGxiYXJPdmVybGF5 U3R5bGUgOiAyOyAvLyBTY3JvbGxiYXJPdmVybGF5U3R5bGUKIAogICAgIHVuc2lnbmVkIG1fc2Ny b2xsT3JpZ2luQ2hhbmdlZCA6IDE7CisgICAgdW5zaWduZWQgbV9zY3JvbGxlZFByb2dyYW1tYXRp Y2FsbHkgOiAxOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 407569 2020-08-30 10:51:19 -0700 2020-08-30 11:13:07 -0700 Testcase latch_scrolling_test_with_handlers.html text/html 4854 simon.fraser PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPHN0eWxlPgouc2Nyb2xsYWJsZV9yZWdpb24g ewogICAgYm9yZGVyOiAxcHggc29saWQgI2ViZWJlYjsKICAgIHBhZGRpbmc6IDVweDsKICAgIG1h cmdpbjogYXV0bzsKICAgIG1hcmdpbi1ib3R0b206IDVweDsKICAgIGJvcmRlci1yYWRpdXM6IDNw eDsKICAgIHdpZHRoOiA2ODBweDsKICAgIGZsb2F0OiBsZWZ0Owp9CgoudGFibGUgdGQsIC50YWJs ZSB0aCB7CiAgICBwYWRkaW5nOiAycHg7Cn0KCi50YWJsZSB0aCB7CiAgICBoZWlnaHQ6IDIwcHg7 CiAgICB0ZXh0LWFsaWduOiBsZWZ0OwogICAgZm9udC13ZWlnaHQ6IHN0cm9uZzsKfQoKLnRhYmxl IHRyOm50aC1jaGlsZChvZGQpIHsKICAgIGJhY2tncm91bmQ6ICNmM2YzZjM7Cn0KCi5zY3JvbGxh YmxlX3NlbGVjdCBvcHRpb246bnRoLWNoaWxkKG9kZCkgewogICAgYmFja2dyb3VuZDogI2YzZjNm MzsKfQoKPC9zdHlsZT4KPHNjcmlwdD4KZnVuY3Rpb24gb25TY3JvbGxXaGVlbChldnQpIHsKICAg IGNvbnNvbGUubG9nKCJTY3JvbGxXaGVlbCIpOwogICAgZXZ0LnByZXZlbnREZWZhdWx0KCk7Cn0K CmZ1bmN0aW9uIG9uTG9hZCgpIHsKICAgIC8vZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91 c2V3aGVlbCIsIG9uU2Nyb2xsV2hlZWwpOwogICAgdmFyIG9iaiA9IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJzY3JvbGxhYmxlUmVnaW9uIik7CiAgICBpZiAob2JqKSB7CiAgICAgICAgb2JqLmFk ZEV2ZW50TGlzdGVuZXIoIm1vdXNld2hlZWwiLCBvblNjcm9sbFdoZWVsKTsKICAgIH0KfQo8L3Nj cmlwdD4KPC9oZWFkPgo8Ym9keSBvbmxvYWQ9Im9uTG9hZCgpOyI+CiAgICA8ZGl2IHN0eWxlPSJo ZWlnaHQ6IDIwMDBweDsgd2lkdGg6IDIwMDBweDsiPgogICAgICAgIDxkaXYgc3R5bGU9ImhlaWdo dDogMTAwcHg7IHdpZHRoOiA1MDBweDsiPgogICAgICAgIFB1dCBtb3VzZSBoZXJlIGFuZCBmbGlj ayBkb3dud2FyZHMKICAgICAgICA8L2Rpdj4KICAgICAgICA8YnIvPjxici8+CiAgICAgICAgPGRp diBjbGFzcz0ic2Nyb2xsYWJsZV9yZWdpb24iPgogICAgICAgICAgICA8aDM+U2Nyb2xsYWJsZSBS ZWdpb248L2gzPgogICAgICAgICAgICA8ZGl2IGlkPSJzY3JvbGxhYmxlUmVnaW9uIiBzdHlsZT0n b3ZlcmZsb3cteTogYXV0bzsgb3ZlcmZsb3cteDogaGlkZGVuOyBtYXgtaGVpZ2h0OiA0ODVweDsg ei1pbmRleDogMjsgcG9zaXRpb246IGFic29sdXRlICFpbXBvcnRhbnQ7Jz4KICAgICAgICAgICAg ICAgIDxkaXYgaWQ9ImdyaWREaXYiIHN0eWxlPSJoZWlnaHQ6IDEzMzU2MHB4OyI+CiAgICAgICAg ICAgICAgICAgICAgPHRhYmxlIGNsYXNzPSJ0YWJsZSIgc3R5bGU9J3dpZHRoOiA5OSUnPgogICAg ICAgICAgICAgICAgICAgICAgICA8dGJvZHk+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICA8 dHI+PHRoPkNvdW50PC90aD48dGg+REFUQTwvdGg+PHRoPlJldiBDb3VudDwvdGg+PC90cj4KICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDx0cj48dGQ+VE9QIFRPUCBUT1AgVE9QIFRPUDwvdGQ+ PHRkPlRPUCBUT1AgVE9QIFRPUCBUT1A8L3RkPjx0ZD5UT1AgVE9QIFRPUCBUT1AgVE9QPC90ZD48 L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD4xPC90ZD48dGQ+MC4xMTAw PC90ZD48dGQ+NDA8L3RkPjwvdHI+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICA8dHI+PHRk PjI8L3RkPjx0ZD4wLjExNTU8L3RkPjx0ZD4zOTwvdGQ+PC90cj4KICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDx0cj48dGQ+MzwvdGQ+PHRkPjAuMjIwMDwvdGQ+PHRkPjM4PC90ZD48L3RyPgog ICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD40PC90ZD48dGQ+MC4yMjU1PC90ZD48 dGQ+Mzc8L3RkPjwvdHI+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICA8dHI+PHRkPjU8L3Rk Pjx0ZD4wLjMzMDA8L3RkPjx0ZD4zNjwvdGQ+PC90cj4KICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDx0cj48dGQ+NjwvdGQ+PHRkPjAuMzM1NTwvdGQ+PHRkPjM1PC90ZD48L3RyPgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD43PC90ZD48dGQ+MC40NDAwPC90ZD48dGQ+MzQ8 L3RkPjwvdHI+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICA8dHI+PHRkPjg8L3RkPjx0ZD4w LjQ0NTU8L3RkPjx0ZD4zMzwvdGQ+PC90cj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgIDx0 cj48dGQ+OTwvdGQ+PHRkPjAuNTUwMDwvdGQ+PHRkPjMyPC90ZD48L3RyPgogICAgICAgICAgICAg ICAgICAgICAgICAgICAgPHRyPjx0ZD4xMDwvdGQ+PHRkPjAuNTU1NTwvdGQ+PHRkPjMxPC90ZD48 L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD4xMTwvdGQ+PHRkPjAuNjYw MDwvdGQ+PHRkPjMwPC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0 ZD4xMjwvdGQ+PHRkPjAuNjY1NTwvdGQ+PHRkPjI5PC90ZD48L3RyPgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgPHRyPjx0ZD4xMzwvdGQ+PHRkPjAuNzcwMDwvdGQ+PHRkPjI4PC90ZD48L3Ry PgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD4xNDwvdGQ+PHRkPjAuNzc1NTwv dGQ+PHRkPjI3PC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD4x NTwvdGQ+PHRkPjAuODgwMDwvdGQ+PHRkPjI2PC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAg ICAgICAgICAgPHRyPjx0ZD4xNjwvdGQ+PHRkPjAuODg1NTwvdGQ+PHRkPjI1PC90ZD48L3RyPgog ICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD4xNzwvdGQ+PHRkPjAuOTkwMDwvdGQ+ PHRkPjI0PC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD4xODwv dGQ+PHRkPjAuOTk1NTwvdGQ+PHRkPjIzPC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgPHRyPjx0ZD4xOTwvdGQ+PHRkPjAuOTk5OTwvdGQ+PHRkPjIyPC90ZD48L3RyPgogICAg ICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD4yMDwvdGQ+PHRkPjEuMDAwMDwvdGQ+PHRk PjIxPC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD4yMTwvdGQ+ PHRkPjEuMDAwMDwvdGQ+PHRkPjIwPC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAg ICAgPHRyPjx0ZD4yMjwvdGQ+PHRkPjAuOTk5OTwvdGQ+PHRkPjE5PC90ZD48L3RyPgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD4yMzwvdGQ+PHRkPjAuOTk1NTwvdGQ+PHRkPjE4 PC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD4yNDwvdGQ+PHRk PjAuOTkwMDwvdGQ+PHRkPjE3PC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAg PHRyPjx0ZD4yNTwvdGQ+PHRkPjAuODg1NTwvdGQ+PHRkPjE2PC90ZD48L3RyPgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgPHRyPjx0ZD4yNjwvdGQ+PHRkPjAuODgwMDwvdGQ+PHRkPjE1PC90 ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD4yNzwvdGQ+PHRkPjAu Nzc1NTwvdGQ+PHRkPjE0PC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRy Pjx0ZD4yODwvdGQ+PHRkPjAuNzcwMDwvdGQ+PHRkPjEzPC90ZD48L3RyPgogICAgICAgICAgICAg ICAgICAgICAgICAgICAgPHRyPjx0ZD4yOTwvdGQ+PHRkPjAuNjY1NTwvdGQ+PHRkPjEyPC90ZD48 L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0ZD4zMDwvdGQ+PHRkPjAuNjYw MDwvdGQ+PHRkPjExPC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0 ZD4zMTwvdGQ+PHRkPjAuNTU1NTwvdGQ+PHRkPjEwPC90ZD48L3RyPgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgPHRyPjx0ZD4zMjwvdGQ+PHRkPjAuNTUwMDwvdGQ+PHRkPjk8L3RkPjwvdHI+ CiAgICAgICAgICAgICAgICAgICAgICAgICAgICA8dHI+PHRkPjMzPC90ZD48dGQ+MC40NDU1PC90 ZD48dGQ+ODwvdGQ+PC90cj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgIDx0cj48dGQ+MzQ8 L3RkPjx0ZD4wLjQ0MDA8L3RkPjx0ZD43PC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgPHRyPjx0ZD4zNTwvdGQ+PHRkPjAuMzM1NTwvdGQ+PHRkPjY8L3RkPjwvdHI+CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICA8dHI+PHRkPjM2PC90ZD48dGQ+MC4zMzAwPC90ZD48dGQ+ NTwvdGQ+PC90cj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgIDx0cj48dGQ+Mzc8L3RkPjx0 ZD4wLjIyNTU8L3RkPjx0ZD40PC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAg PHRyPjx0ZD4zODwvdGQ+PHRkPjAuMjIwMDwvdGQ+PHRkPjM8L3RkPjwvdHI+CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICA8dHI+PHRkPjM5PC90ZD48dGQ+MC4xMTU1PC90ZD48dGQ+MjwvdGQ+ PC90cj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgIDx0cj48dGQ+NDA8L3RkPjx0ZD4wLjEx MDA8L3RkPjx0ZD4xPC90ZD48L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRyPjx0 ZD5CT1RUT00gQk9UVE9NIEJPVFRPTTwvdGQ+PHRkPkJPVFRPTSBCT1RUT00gQk9UVE9NPC90ZD48 dGQ+Qk9UVE9NIEJPVFRPTSBCT1RUT008L3RkPjwvdHI+CiAgICAgICAgICAgICAgICAgICAgICAg IDwvdGJvZHk+CiAgICAgICAgICAgICAgICAgICAgPC90YWJsZT4KICAgICAgICAgICAgICAgIDwv ZGl2PgogICAgICAgICAgICA8L2Rpdj4KICAgICAgICA8L2Rpdj4KICAgIDwvZGl2Pgo8L2JvZHk+ CjwvaHRtbD4K