136837 2014-09-15 14:24:17 -0700 Videos with controls enabled never receive 'dragstart' events. 2015-01-26 08:43:50 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified REOPENED InRadar P2 Normal --- 136946 1 jer.noble jer.noble commit-queue ossy webkit-bug-importer oldest_to_newest 1035310 0 jer.noble 2014-09-15 14:24:17 -0700 Videos with controls enabled never receieve 'dragstart' events. 1035313 1 238143 jer.noble 2014-09-15 14:30:01 -0700 Created attachment 238143 Patch 1035314 2 commit-queue 2014-09-15 14:32:16 -0700 Attachment 238143 did not pass style-queue: ERROR: Source/WebCore/page/DragController.cpp:724: Multi line control clauses should use braces. [whitespace/braces] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1035315 3 238143 simon.fraser 2014-09-15 14:36:34 -0700 Comment on attachment 238143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238143&action=review > Source/WebCore/page/DragController.cpp:732 > + if (!state.source->isMediaElement() && !state.source->contains(hitTestResult.innerNode())) > // The original node being dragged isn't under the drag origin anymore... maybe it was > // hidden or moved out from under the cursor. Regardless, we don't want to start a drag on > // something that's not actually under the drag origin. > + // FIXME(136836): Investigate whether all elements should use the containsIncludingShadowDOM() path here. > return false; > + > + if (state.source->isMediaElement() && !state.source->containsIncludingShadowDOM(hitTestResult.innerNode())) > + return false; I think this would be cleaner as: if (!state.source->isMediaElement()) { if (!state.source->contains(hitTestResult.innerNode())) ... } else { if (!state.source->containsIncludingShadowDOM(hitTestResult.innerNode())) } Or better: bool includeShadowDOM = state.source->isMediaElement(); bool sourceContainsHitNode = false; if (!includeShadowDOM) sourceContainsHitNode = state.source->contains(hitTestResult.innerNode()); else sourceContainsHitNode = state.source->containsIncludingShadowDOM(hitTestResult.innerNode()); if (! sourceContainsHitNode) return false 1035316 4 jer.noble 2014-09-15 14:44:16 -0700 <rdar://problem/18187713> 1035317 5 jer.noble 2014-09-15 14:47:33 -0700 Committed r173631: <http://trac.webkit.org/changeset/173631> 1035318 6 jer.noble 2014-09-15 14:52:49 -0700 Follow up fix committed r173632: <http://trac.webkit.org/changeset/173632> 1035421 7 ossy 2014-09-16 02:19:35 -0700 (In reply to comment #5) > Committed r173631: <http://trac.webkit.org/changeset/173631> It broke fast/events/mousedown-inside-dragstart-should-not-cause-crash.html on all Apple Mac bots, as the EWS noticed it before landing: http://build.webkit.org/results/Apple%20Mavericks%20Release%20WK1%20%28Tests%29/r173655%20%288592%29/fast/events/mousedown-inside-dragstart-should-not-cause-crash-crash-log.txt 1035473 8 jer.noble 2014-09-16 08:52:18 -0700 Wow, Node::contains() will return FALSE if `this` is NULL. So previously, `state.source->contains(hitTestResult.innerNode())` would return FALSE if `state.source` NULL. Now that we're calling a virtual method, a null-dereference crash occurs. The fact that this ever passed is entirely accidental. I'll fix this in a follow-up patch. 1035476 9 jer.noble 2014-09-16 08:59:29 -0700 Reopening to attach new patch. 1035477 10 238182 jer.noble 2014-09-16 08:59:32 -0700 Created attachment 238182 Follow up patch 1035507 11 jer.noble 2014-09-16 11:09:41 -0700 Committed r173664: <http://trac.webkit.org/changeset/173664> 1036137 12 jer.noble 2014-09-19 09:16:37 -0700 Reopening to attach new patch. 1036138 13 238376 jer.noble 2014-09-19 09:16:39 -0700 Created attachment 238376 Follow up patch 1036165 14 238376 commit-queue 2014-09-19 11:15:18 -0700 Comment on attachment 238376 Follow up patch Clearing flags on attachment: 238376 Committed r173764: <http://trac.webkit.org/changeset/173764> 238143 2014-09-15 14:30:01 -0700 2015-01-26 08:43:50 -0800 Patch bug-136837-20140915142958.patch text/plain 5231 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjBkMDk3ZDgyZTEwYzdj MDVkYTMxMDQzNzVlOWVlZWZmOGU0ZmRlZi4uNjA5MzcwNTgzOTY4OTM2NmE1MjEyMjI3ZjM4N2Ji MjMwNmRmNDZmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTA5LTE1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFZpZGVvcyB3aXRoIGNvbnRy b2xzIGVuYWJsZWQgbmV2ZXIgcmVjZWlldmUgJ2RyYWdzdGFydCcgZXZlbnRzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2ODM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBpbml0aWF0aW5nIGEg ZHJhZywgdGhlIERyYWdDb250cm9sbGVyIGNoZWNrcyB3aGV0aGVyIHRoZSBoaXQtdGVzdGVkIGVs ZW1lbnQgYXQgYQorICAgICAgICBkcmFnIGxvY2F0aW9uIGlzIGEgY2hpbGQgb2YgdGhlIGRyYWcg c291cmNlLCBhbmQgYmFpbHMgaWYgZWFybHkgaWYgdGhhdCBpcyBub3QgdGhlIGNhc2UuCisgICAg ICAgIEZvciBhIDx2aWRlbz4gZWxlbWVudCB3aXRoIGNvbnRyb2xzLCB0aGUgaGl0LXRlc3RlZCBl bGVtZW50IGlzIGFuIGVsZW1lbnQgd2l0aGluIHRoZQorICAgICAgICA8dmlkZW8+IGVsZW1lbnQn cyBTaGFkb3cgRE9NLiBCZWNhdXNlIHRoZSBEcmFnQ29udHJvbGxlciB1c2VzIGEgbWV0aG9kIHdo aWNoIGRvZXMgbm90CisgICAgICAgIHRha2UgU2hhZG93IERPTSBpbnRvIGFjY291bnQgd2hlbiBk ZXRlcm1pbmluZyBhIGNoaWxkLXBhcmVudCByZWxhdGlvbnNoaXAsIHRoaXMgdGVzdCBmYWlscwor ICAgICAgICBhbmQgYWxsIGRyYWcgb3BlcmF0aW9ucyBmYWlsIGFzIHdlbGwuCisKKyAgICAgICAg Rm9yIDx2aWRlbz4gZWxlbWVudHMgb25seSwgd2hlbiB0ZXN0aW5nIHdoZXRoZXIgdGhlIGRyYWcg c291cmNlIGlzIGFuIGFuY2VzdG9yIG9mIHRoZQorICAgICAgICBoaXQtdGVzdGVkIGVsZW1lbnQs IHVzZSBjb250YWluc0luY2x1ZGluZ1NoYWRvd0RPTSgpIGluc3RlYWQgb2YgY29udGFpbnMoKS4g VG8gZW5zdXJlIHRoYXQKKyAgICAgICAgdGhlIGNvbnRyb2xzIGFyZSBzdGlsbCB1c2FibGUgd2hl biBhIGRyYWcgbGlzdGVuZXIgaXMgYWN0aXZlIG9uIGEgPHZpZGVvPiBlbGVtZW50LCBtYXJrCisg ICAgICAgIHRoZSBjb250cm9scyBhcyBhIGRyYWdnYWJsZSBlbGVtZW50LCBidXQgc2ltcGx5IGNh bGwgcHJldmVudERlZmF1bHQoKSBpbiB0aGUgY29udHJvbHMnCisgICAgICAgICdkcmFnc3RhcnQn IGhhbmRsZXIsIGVuc3VyaW5nIHRoZSB0aW1lbGluZSBhbmQgdm9sdW1lIGNvbnRyb2xzIGFyZSB0 aGVtc2VsdmVzIHN0aWxsIGRyYWdnYWJsZS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250 cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuY3NzOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVk aWEtY29udHJvbHMtcGFuZWwpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9tZWRp YUNvbnRyb2xzQXBwbGUuanM6CisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS5jcmVhdGVD b250cm9scyk6CisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS5oYW5kbGVQYW5lbERyYWdT dGFydCk6CisgICAgICAgICogcGFnZS9EcmFnQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpEcmFnQ29udHJvbGxlcjo6c3RhcnREcmFnKToKKwogMjAxNC0wOS0xMiAgSmVyIE5vYmxl ICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbRnVsbHNjcmVlbl0gVGFraW5nIGVt YmVkZGVkIHlvdXR1YmUgdmlkZW8gZnVsbCBzY3JlZW4gdGFrZXMgdGhlIHdob2xlIHBhZ2UgZnVs bCBzY3JlZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9s cy9tZWRpYUNvbnRyb2xzQXBwbGUuY3NzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNv bnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5jc3MKaW5kZXggMjYwMzAzMTNkNWVlMjVlZDE0YjQx NzFkNzhhNGQyN2U4YTBhNjY1Yi4uYmMxZGM5NGU0OTRmYWM1ZTk3YTNiZDgzZjU0MTY5MzQ5MjA3 YjM5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21l ZGlhQ29udHJvbHNBcHBsZS5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNv bnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5jc3MKQEAgLTgwLDYgKzgwLDcgQEAgYXVkaW86Oi13 ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgewogICAgIGhlaWdodDogMjVweDsKICAgICBsaW5l LWhlaWdodDogMjVweDsKICAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25lOworICAgIC13ZWJr aXQtdXNlci1kcmFnOiBlbGVtZW50OwogICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50 OwogICAgIGJhY2tncm91bmQtaW1hZ2U6IC13ZWJraXQtbGluZWFyLWdyYWRpZW50KHRvcCwKICAg ICAgICAgcmdiYSgwLCAgMCwgIDAsICAuOTIpIDAsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmpzIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5qcwppbmRleCA5 ZjZmNzE5M2Q3ODRjMDVlZmNlZGFkZTA4YzY3YThkNzkzN2Y3MGU0Li4yYTFlYTA1Njk5OWM1OGI5 MWUwNGJkMGRmNDI2NzAyNjUzNWU3NzU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanMKQEAgLTI5Niw2 ICsyOTYsNyBAQCBDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5saXN0ZW5G b3IocGFuZWwsICd0cmFuc2l0aW9uZW5kJywgdGhpcy5oYW5kbGVQYW5lbFRyYW5zaXRpb25FbmQp OwogICAgICAgICB0aGlzLmxpc3RlbkZvcihwYW5lbCwgJ2NsaWNrJywgdGhpcy5oYW5kbGVQYW5l bENsaWNrKTsKICAgICAgICAgdGhpcy5saXN0ZW5Gb3IocGFuZWwsICdkYmxjbGljaycsIHRoaXMu aGFuZGxlUGFuZWxDbGljayk7CisgICAgICAgIHRoaXMubGlzdGVuRm9yKHBhbmVsLCAnZHJhZ3N0 YXJ0JywgdGhpcy5oYW5kbGVQYW5lbERyYWdTdGFydCk7CiAKICAgICAgICAgdmFyIHJld2luZEJ1 dHRvbiA9IHRoaXMuY29udHJvbHMucmV3aW5kQnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgnYnV0dG9uJyk7CiAgICAgICAgIHJld2luZEJ1dHRvbi5zZXRBdHRyaWJ1dGUoJ3BzZXVkbycs ICctd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJld2luZC1idXR0b24nKTsKQEAgLTY5Nyw2ICs2OTgs MTIgQEAgQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIGV2ZW50LnByZXZlbnREZWZh dWx0KCk7CiAgICAgfSwKIAorICAgIGhhbmRsZVBhbmVsRHJhZ1N0YXJ0OiBmdW5jdGlvbihldmVu dCkKKyAgICB7CisgICAgICAgIC8vIFByZXZlbnQgZHJhZ3MgaW4gdGhlIHBhbmVsIGZyb20gdHJp Z2dlcmluZyBhIGRyYWcgZXZlbnQgb24gdGhlIDx2aWRlbz4gZWxlbWVudC4KKyAgICAgICAgZXZl bnQucHJldmVudERlZmF1bHQoKTsKKyAgICB9LAorCiAgICAgaGFuZGxlUmV3aW5kQnV0dG9uQ2xp Y2tlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB2YXIgbmV3VGltZSA9IE1hdGgu bWF4KApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcAppbmRleCAxNjJlZTQ5YjVh ZjNmY2ZlZGQ5NjhmM2YyOTQwODI1YjgxZmM2MzE3Li44M2M5MWI3ZjYzMzNiNjFlODExYTI1NGVl OGYyY2E1ZTI4ODgxNzA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250 cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcApA QCAtNzIxLDExICs3MjEsMTYgQEAgYm9vbCBEcmFnQ29udHJvbGxlcjo6c3RhcnREcmFnKEZyYW1l JiBzcmMsIGNvbnN0IERyYWdTdGF0ZSYgc3RhdGUsIERyYWdPcGVyYXRpb24KICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCiAgICAgSGl0VGVzdFJlc3VsdCBoaXRUZXN0UmVzdWx0ID0gc3JjLmV2ZW50 SGFuZGxlcigpLmhpdFRlc3RSZXN1bHRBdFBvaW50KGRyYWdPcmlnaW4sIEhpdFRlc3RSZXF1ZXN0 OjpSZWFkT25seSB8IEhpdFRlc3RSZXF1ZXN0OjpBY3RpdmUpOwotICAgIGlmICghc3RhdGUuc291 cmNlLT5jb250YWlucyhoaXRUZXN0UmVzdWx0LmlubmVyTm9kZSgpKSkKKyAgICBpZiAoIXN0YXRl LnNvdXJjZS0+aXNNZWRpYUVsZW1lbnQoKSAmJiAhc3RhdGUuc291cmNlLT5jb250YWlucyhoaXRU ZXN0UmVzdWx0LmlubmVyTm9kZSgpKSkKICAgICAgICAgLy8gVGhlIG9yaWdpbmFsIG5vZGUgYmVp bmcgZHJhZ2dlZCBpc24ndCB1bmRlciB0aGUgZHJhZyBvcmlnaW4gYW55bW9yZS4uLiBtYXliZSBp dCB3YXMKICAgICAgICAgLy8gaGlkZGVuIG9yIG1vdmVkIG91dCBmcm9tIHVuZGVyIHRoZSBjdXJz b3IuIFJlZ2FyZGxlc3MsIHdlIGRvbid0IHdhbnQgdG8gc3RhcnQgYSBkcmFnIG9uCiAgICAgICAg IC8vIHNvbWV0aGluZyB0aGF0J3Mgbm90IGFjdHVhbGx5IHVuZGVyIHRoZSBkcmFnIG9yaWdpbi4K KyAgICAgICAgLy8gRklYTUUoMTM2ODM2KTogSW52ZXN0aWdhdGUgd2hldGhlciBhbGwgZWxlbWVu dHMgc2hvdWxkIHVzZSB0aGUgY29udGFpbnNJbmNsdWRpbmdTaGFkb3dET00oKSBwYXRoIGhlcmUu CiAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmIChzdGF0ZS5zb3VyY2UtPmlzTWVkaWFF bGVtZW50KCkgJiYgIXN0YXRlLnNvdXJjZS0+Y29udGFpbnNJbmNsdWRpbmdTaGFkb3dET00oaGl0 VGVzdFJlc3VsdC5pbm5lck5vZGUoKSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIFVS TCBsaW5rVVJMID0gaGl0VGVzdFJlc3VsdC5hYnNvbHV0ZUxpbmtVUkwoKTsKICAgICBVUkwgaW1h Z2VVUkwgPSBoaXRUZXN0UmVzdWx0LmFic29sdXRlSW1hZ2VVUkwoKTsKIAo= 238182 2014-09-16 08:59:32 -0700 2015-01-26 08:43:28 -0800 Follow up patch bug-136837-20140916085929.patch text/plain 1723 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNjU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTgwMTA3MWIzZTZjODcx MmU5OTM2MmI2ZjgyMDk0ZDhmMzk3NTNhYS4uZjZmMWIxZTZiN2EyMDQxOWNkMjgyYzFiNWNjZWRk NjNmZjAyMDdjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA5LTE2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFZpZGVvcyB3aXRoIGNvbnRy b2xzIGVuYWJsZWQgbmV2ZXIgcmVjZWl2ZSAnZHJhZ3N0YXJ0JyBldmVudHMuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY4MzcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXhlcyBhIGNyYXNoIHJlZ3Jl c3Npb24gaW50cm9kdWNlZCBieSByMTczNjMxLiBOb2RlOjpjb250YWlucygpIGhhcyBhbiBpbnRl cmVzdGluZyBwcm9wZXJ0eSBvZiByZXR1cm5pbmcgZmFsc2UKKyAgICAgICAgaWYgYHRoaXNgIGlz IE5VTEwuIFJhdGhlciB0aGFuIGRlcGVuZGluZyBvbiB0aGlzIGJlaGF2aW9yLCBleHBsaWNpdGx5 IE5VTEwtY2hlY2sgc3RhdGUuc291cmNlIGFuZCBiYWlsIGVhcmx5LgorCisgICAgICAgICogcGFn ZS9EcmFnQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6 c3RhcnREcmFnKToKKwogMjAxNC0wOS0xNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubi5mYWJsZXRA Y3JmLmNhbm9uLmZyPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIGh0dHAvdGVzdHMvbWVkaWEvdmlk ZW8tYXV0aC5odG1sIGlzIGZhaWxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RHJhZ0NvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5j cHAKaW5kZXggMmZlMDI3MTE0MTBhNGY5MjlmNjg4ZTcxYzczNDZkYzViMzBmMWJmNC4uZGNiZjkz OGQ0OGMwOGI1NjcxOWFhMjViMTM5NTU4YzM1NmVlOGQ1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9E cmFnQ29udHJvbGxlci5jcHAKQEAgLTcxNyw3ICs3MTcsNyBAQCBzdGF0aWMgSW50UG9pbnQgZHJh Z0xvY0ZvclNlbGVjdGlvbkRyYWcoRnJhbWUmIHNyYykKIAogYm9vbCBEcmFnQ29udHJvbGxlcjo6 c3RhcnREcmFnKEZyYW1lJiBzcmMsIGNvbnN0IERyYWdTdGF0ZSYgc3RhdGUsIERyYWdPcGVyYXRp b24gc3JjT3AsIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZHJhZ0V2ZW50LCBjb25zdCBJbnRQ b2ludCYgZHJhZ09yaWdpbikKIHsKLSAgICBpZiAoIXNyYy52aWV3KCkgfHwgIXNyYy5jb250ZW50 UmVuZGVyZXIoKSkKKyAgICBpZiAoIXNyYy52aWV3KCkgfHwgIXNyYy5jb250ZW50UmVuZGVyZXIo KSB8fCAhc3RhdGUuc291cmNlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBIaXRUZXN0 UmVzdWx0IGhpdFRlc3RSZXN1bHQgPSBzcmMuZXZlbnRIYW5kbGVyKCkuaGl0VGVzdFJlc3VsdEF0 UG9pbnQoZHJhZ09yaWdpbiwgSGl0VGVzdFJlcXVlc3Q6OlJlYWRPbmx5IHwgSGl0VGVzdFJlcXVl c3Q6OkFjdGl2ZSk7Cg== 238376 2014-09-19 09:16:39 -0700 2014-09-19 11:15:17 -0700 Follow up patch bug-136837-20140919091638.patch text/plain 2414 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNjU4CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZjc0NmIyNDk1YWY4YjdmYThkNWEz YzIwYjJhMDVlMWJiY2EyMjViOS4uNDRiNzZjMTlhNWM5OTQ2M2M2YzVkZjhiNWVmZDAzOWEwZGY0 MmExMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE0LTA5LTE5ICBKZXIgTm9ibGUgIDxqZXIu bm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFZpZGVvcyB3aXRoIGNvbnRyb2xzIGVuYWJsZWQg bmV2ZXIgcmVjZWl2ZSAnZHJhZ3N0YXJ0JyBldmVudHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY4MzcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1lZGlhL3ZpZGVvLWNvbnRyb2xzLWRyYWctZXhw ZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS92aWRlby1jb250cm9scy1kcmFnLmh0 bWw6IEFkZGVkLgorCiAyMDE0LTA5LTE2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBj cmYuY2Fub24uZnI+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gaHR0cC90ZXN0cy9tZWRpYS92aWRl by1hdXRoLmh0bWwgaXMgZmFpbGluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvdmlk ZW8tY29udHJvbHMtZHJhZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1j b250cm9scy1kcmFnLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wYTc4YmM3NmIwYjI4MWZiYzBk NWNjNzFlZWI4NzM1NjQ5Yzk3NWE4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVk aWEvdmlkZW8tY29udHJvbHMtZHJhZy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBACitUaGlz IHRlc3RzIHRoYXQgdmlkZW9zIHdpdGggY29udHJvbHMgZW5hYmxlZCBhcmUgc3RpbGwgZHJhZ2dh YmxlLiBJbiBhIGJyb3dzZXIsIHN0YXJ0IHRoZSB0ZXN0IGJ5IGRyYWdnaW5nIHRoZSB2aWRlbyBv dXRzaWRlIGl0cyBjb250cm9scyBhcmVhLgorCitFVkVOVChkcmFnKQorRU5EIE9GIFRFU1QKKwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtZHJhZy5odG1sIGIv TGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtZHJhZy5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk0 ZDRmYWUyZWVjMGFmNjhhNWNjMGQ3ZDEwZWJjZGNjMTlhMGVhZjkKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy1kcmFnLmh0bWwKQEAgLTAsMCArMSwy NyBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT52aWRlby1j b250cm9scy1kcmFnc3RhcnQ8L3RpdGxlPgorICAgIDxzdHlsZT4KKyAgICAgICAgdmlkZW8geyAg Ym9yZGVyOiAxcHggc29saWQgYmxhY2s7IH0KKyAgICA8L3N0eWxlPgorICAgIDxzY3JpcHQgc3Jj PSJ2aWRlby10ZXN0LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0PgorICAgIGZ1bmN0aW9uIGdv KCkgeworICAgICAgICB2aWRlbyA9IGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCd2aWRl bycpWzBdOworICAgICAgICB3YWl0Rm9yRXZlbnRBbmRFbmQoJ2RyYWcnKTsKKworICAgICAgICBp ZiAod2luZG93LmV2ZW50U2VuZGVyKSB7CisgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1v dmVUbyh2aWRlby5vZmZzZXRMZWZ0ICsgMTAsIHZpZGVvLm9mZnNldFRvcCArIDEwKTsKKyAgICAg ICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgICAgICAgICAgZXZlbnRTZW5kZXIu bGVhcEZvcndhcmQoMjAwKTsKKyAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHZp ZGVvLm9mZnNldExlZnQgKyAxMDAsIHZpZGVvLm9mZnNldFRvcCArIDEwMCk7CisgICAgICAgICAg ICBldmVudFNlbmRlci5tb3VzZVVwKCk7CisgICAgICAgIH0KKyAgICB9CisgICAgPC9zY3JpcHQ+ Cis8Ym9keSBvbmxvYWQ9ImdvKCkiPgorICAgIDxkaXY+VGhpcyB0ZXN0cyB0aGF0IHZpZGVvcyB3 aXRoIGNvbnRyb2xzIGVuYWJsZWQgYXJlIHN0aWxsIGRyYWdnYWJsZS4gSW4gYSBicm93c2VyLCBz dGFydCB0aGUgdGVzdCBieSBkcmFnZ2luZyB0aGUgdmlkZW8gb3V0c2lkZSBpdHMgY29udHJvbHMg YXJlYS48L2Rpdj4KKyAgICA8dmlkZW8gY29udHJvbHMgZHJhZ2dhYmxlPSJ0cnVlIj48L3ZpZGVv PgorPC9ib2R5PgorPC9odG1sPgo=