79172 2012-02-21 17:57:13 -0800 Having a drop handler prevents navigation on drop even if event is not cancelled 2012-04-04 09:17:05 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 79171 1 dcheng dcheng apavlov ap dglazkov enrica jbadics rniwa simon.fraser tony webkit.review.bot oldest_to_newest 561432 0 dcheng 2012-02-21 17:57:13 -0800 Download the attached test case, and open it. Attempt to navigate to another page by dragging and dropping a link or another HTML file. Nothing will happen, even though we didn't prevent the default drop event. 562516 1 128321 dcheng 2012-02-22 16:18:30 -0800 Created attachment 128321 Patch 562522 2 128321 rniwa 2012-02-22 16:23:42 -0800 Comment on attachment 128321 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=128321&action=review > Source/WebCore/page/DragController.cpp:-215 > - if (m_isHandlingDrag || preventedDefault) { r- because this is not a Chromium specific change. If this bug exists on non-Chromium ports as well, then please rename the bug. 562527 3 128327 dcheng 2012-02-22 16:27:08 -0800 Created attachment 128327 Patch 562535 4 128327 rniwa 2012-02-22 16:31:42 -0800 Comment on attachment 128327 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=128327&action=review > LayoutTests/fast/events/drop-handler-should-not-stop-navigate.html:18 > + log('SUCCESS'); Please use 'PASS' instead to be consistent with other tests. > LayoutTests/fast/events/drop-handler-should-not-stop-navigate.html:40 > +eventSender.mouseUp(); We should probably add log('FAIL') and a call to notifyDone() here so that the test will print 'FAIL' instead of timing out when the beforeunload is never fired. 562549 5 ap 2012-02-22 16:40:09 -0800 What is the rationale for this change? Is there a spec that agrees with both IE and Firefox? 562568 6 dcheng 2012-02-22 16:54:25 -0800 (In reply to comment #5) > What is the rationale for this change? Is there a spec that agrees with both IE and Firefox? I believe it was an unintentional regression introduced from http://trac.webkit.org/changeset/105396. It also matches the behavior of Firefox and Opera, and all the other event handlers: merely setting an event handler should not be enough to suppress the default action unless you call preventDefault(). 562656 7 128327 webkit.review.bot 2012-02-22 18:07:52 -0800 Comment on attachment 128327 Patch Attachment 128327 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11610012 New failing tests: http/tests/security/clipboard/clipboard-file-access.html 593105 8 rniwa 2012-04-01 17:25:53 -0700 Has this patch been landed yet? 593928 9 dcheng 2012-04-02 15:33:52 -0700 Committed r112954: <http://trac.webkit.org/changeset/112954> 594292 10 jbadics 2012-04-03 01:44:01 -0700 Unfortunately this test fails on Qt. --- /ramdisk/qt-linux-64-release/build/layout-test-results/fast/events/drop-handler-should-not-stop-navigate-expected.txt +++ /ramdisk/qt-linux-64-release/build/layout-test-results/fast/events/drop-handler-should-not-stop-navigate-actual.txt @@ -1,7 +1,5 @@ +CONSOLE MESSAGE: line 40: TypeError: 'undefined' is not a function (evaluating 'eventSender.beginDragWithFiles(['DRTFakeFile'])') +FAIL: Timed out waiting for notifyDone to be called This tests that a drop handler's default action must be prevented in order to stop navigation. Otherwise, if event.preventDefault() is not called, navigation should occur. To test manually, simply drag and drop another link or HTML file on this page. If navigation occurs, then the test passed. Starting test -Cancelling dragenter -Cancelling dragover -Not preventing default event on drop. -PASS Could you guys take a look at it please? 594295 11 rniwa 2012-04-03 01:54:43 -0700 (In reply to comment #10) > Unfortunately this test fails on Qt. Qt's DRT doesn't support drag & drop: http://trac.webkit.org/browser/trunk/LayoutTests/platform/qt/Skipped#L398 594300 12 jbadics 2012-04-03 02:02:22 -0700 > Qt's DRT doesn't support drag & drop: > http://trac.webkit.org/browser/trunk/LayoutTests/platform/qt/Skipped#L398 Thank you for your quick reply. Then I am going to skip it. 594328 13 apavlov 2012-04-03 02:59:42 -0700 This change was reverted in http://trac.webkit.org/changeset/113004 as it had resulted in hitting an assert on debug bots (also noticed by the cr-linux EWS bot.) 594694 14 135379 dcheng 2012-04-03 11:49:20 -0700 Created attachment 135379 Fix layout test and remove old assert 594698 15 135379 rniwa 2012-04-03 11:52:20 -0700 Comment on attachment 135379 Fix layout test and remove old assert View in context: https://bugs.webkit.org/attachment.cgi?id=135379&action=review > Source/WebCore/page/DragController.cpp:-425 > - ASSERT(!m_isHandlingDrag); Why is it okay to remove this assertion? What does it mean for m_isHandlingDrag to be true here? 594700 16 135379 dcheng 2012-04-03 11:54:42 -0700 Comment on attachment 135379 Fix layout test and remove old assert View in context: https://bugs.webkit.org/attachment.cgi?id=135379&action=review >> Source/WebCore/page/DragController.cpp:-425 >> - ASSERT(!m_isHandlingDrag); > > Why is it okay to remove this assertion? What does it mean for m_isHandlingDrag to be true here? Before, it just meant that the presence of a drop handler prevented all default actions, like dragging a file to a file input control or default text editing operations. Now, we let these default actions run if the drop wasn't canceled, so we don't want this assert anymore. 594702 17 135379 tony 2012-04-03 11:55:13 -0700 Comment on attachment 135379 Fix layout test and remove old assert View in context: https://bugs.webkit.org/attachment.cgi?id=135379&action=review > Source/WebCore/ChangeLog:8 > + Only early return if the drop handler prevents the default action. You might want to mention that this is a regression and the change in which it regressed. 594726 18 rniwa 2012-04-03 12:12:08 -0700 (In reply to comment #16) > (From update of attachment 135379 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=135379&action=review > > >> Source/WebCore/page/DragController.cpp:-425 > >> - ASSERT(!m_isHandlingDrag); > > > > Why is it okay to remove this assertion? What does it mean for m_isHandlingDrag to be true here? > > Before, it just meant that the presence of a drop handler prevented all default actions, like dragging a file to a file input control or default text editing operations. Now, we let these default actions run if the drop wasn't canceled, so we don't want this assert anymore. Please add that to the change log. 594885 19 dcheng 2012-04-03 14:21:58 -0700 Committed r113088: <http://trac.webkit.org/changeset/113088> 595600 20 simon.fraser 2012-04-04 09:17:05 -0700 This is causing a test failure on WK2 bots: <http://build.webkit.org/results/Lion%20Release%20(WebKit2%20Tests)/r113190%20(6143)/fast/events/drop-handler-should-not-stop-navigate-pretty-diff.html> 1CONSOLE MESSAGE: line 38: TypeError: 'undefined' is not a function (evaluating 'eventSender.beginDragWithFiles(['DRTFakeFile'])') 2FAIL: Timed out waiting for notifyDone to be called I presume that WebKitTestRunner's eventSender doesn't support eventSender.beginDragWithFiles 128321 2012-02-22 16:18:30 -0800 2012-02-22 16:27:05 -0800 Patch bug-79172-20120222161829.patch text/plain 4934 dcheng U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4MzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzBkNzc3YTI1ZTFhNTll NWJjNTc0ZmFjODliOTczOWE4MmRjMmQ1Ny4uYjVjYjE3YmIyZjc3YzdjZTMyYmFmZjk1MGNhZDU1 NmMyZGM2OWYyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAyLTIyICBEYW5p ZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gSGF2 aW5nIGEgZHJvcCBoYW5kbGVyIHByZXZlbnRzIG5hdmlnYXRpb24gb24gZHJvcCBldmVuIGlmIGV2 ZW50IGlzIG5vdCBjYW5jZWxsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc5MTcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgT25seSBlYXJseSByZXR1cm4gaWYgdGhlIGRyb3AgaGFuZGxlciBwcmV2ZW50 cyB0aGUgZGVmYXVsdCBhY3Rpb24uCisKKyAgICAgICAgVGVzdDogZmFzdC9ldmVudHMvZHJvcC1o YW5kbGVyLXNob3VsZC1ub3Qtc3RvcC1uYXZpZ2F0ZS5odG1sCisKKyAgICAgICAgKiBwYWdlL0Ry YWdDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYWdDb250cm9sbGVyOjpwZXJm b3JtRHJhZyk6CisKIDIwMTItMDItMjEgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9t aXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbU3VnZ2VzdEJveF0gdGV4dFByb21w dC5jc3MgZGlzYWJsZW1lbnQgZGlzcGxheXMgZ2FyYmxlZCBzdWdnZXN0IGJveApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcAppbmRleCA3OTE5ZDc2MWU1MTliODUwNmY3NTY4YmZh NmQzYmQ2OGQzMWNkNDdiLi5lNWE4YzhiN2QyNzJjMmZlZWVlMDNiZWZmMTdmYWJlMzI1YzllZjky IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcApAQCAtMjEyLDcgKzIxMiw3 IEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OnBlcmZvcm1EcmFnKERyYWdEYXRhKiBkcmFnRGF0YSkK ICAgICAgICAgICAgIHByZXZlbnRlZERlZmF1bHQgPSBtYWluRnJhbWUtPmV2ZW50SGFuZGxlcigp LT5wZXJmb3JtRHJhZ0FuZERyb3AoY3JlYXRlTW91c2VFdmVudChkcmFnRGF0YSksIGNsaXBib2Fy ZC5nZXQoKSk7CiAgICAgICAgICAgICBjbGlwYm9hcmQtPnNldEFjY2Vzc1BvbGljeShDbGlwYm9h cmROdW1iKTsgLy8gSW52YWxpZGF0ZSBjbGlwYm9hcmQgaGVyZSBmb3Igc2VjdXJpdHkKICAgICAg ICAgfQotICAgICAgICBpZiAobV9pc0hhbmRsaW5nRHJhZyB8fCBwcmV2ZW50ZWREZWZhdWx0KSB7 CisgICAgICAgIGlmIChwcmV2ZW50ZWREZWZhdWx0KSB7CiAgICAgICAgICAgICBtX2RvY3VtZW50 VW5kZXJNb3VzZSA9IDA7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IDZjMTQ4NDQ5N2M0YzkyM2IwNmU2YjliNTk3MzBjNzgxMjYxM2JmMDYuLjYyMWRkZTY5MGYy NmVjOWNmZDU3MzlkNzNlNWM4YTU3ZDdhNjI3ZjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0No YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAx Mi0wMi0yMiAgRGFuaWVsIENoZW5nICA8ZGNoZW5nQGNocm9taXVtLm9yZz4KKworICAgICAgICBb Y2hyb21pdW1dIEhhdmluZyBhIGRyb3AgaGFuZGxlciBwcmV2ZW50cyBuYXZpZ2F0aW9uIG9uIGRy b3AgZXZlbiBpZiBldmVudCBpcyBub3QgY2FuY2VsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTE3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9ldmVudHMvZHJvcC1oYW5kbGVyLXNob3Vs ZC1ub3Qtc3RvcC1uYXZpZ2F0ZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv ZXZlbnRzL2Ryb3AtaGFuZGxlci1zaG91bGQtbm90LXN0b3AtbmF2aWdhdGUuaHRtbDogQWRkZWQu CisKIDIwMTItMDItMjEgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAog ICAgICAgICBbUXRdUkVHUkVTU0lPTihyOTIyNTQpOiBJdCBtYWRlIDIgdGVzdHMgdGltZW91dApk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvZHJvcC1oYW5kbGVyLXNob3VsZC1u b3Qtc3RvcC1uYXZpZ2F0ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9k cm9wLWhhbmRsZXItc2hvdWxkLW5vdC1zdG9wLW5hdmlnYXRlLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4wNDhmNWFkY2YzZDllNTE0ZWI3ZjRlMDc1NDRiODQ0YzNmNjY1NTYxCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvZHJvcC1oYW5kbGVyLXNob3VsZC1ub3Qt c3RvcC1uYXZpZ2F0ZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw3IEBACitUaGlzIHRlc3RzIHRo YXQgYSBkcm9wIGhhbmRsZXIncyBkZWZhdWx0IGFjdGlvbiBtdXN0IGJlIHByZXZlbnRlZCBpbiBv cmRlciB0byBzdG9wIG5hdmlnYXRpb24uIE90aGVyd2lzZSwgaWYgZXZlbnQucHJldmVudERlZmF1 bHQoKSBpcyBub3QgY2FsbGVkLCBuYXZpZ2F0aW9uIHNob3VsZCBvY2N1ci4gVG8gdGVzdCBtYW51 YWxseSwgc2ltcGx5IGRyYWcgYW5kIGRyb3AgYW5vdGhlciBsaW5rIG9yIEhUTUwgZmlsZSBvbiB0 aGlzIHBhZ2UuIElmIG5hdmlnYXRpb24gb2NjdXJzLCB0aGVuIHRoZSB0ZXN0IHBhc3NlZC4KKwor U3RhcnRpbmcgdGVzdCAKK0NhbmNlbGxpbmcgZHJhZ2VudGVyCitDYW5jZWxsaW5nIGRyYWdvdmVy CitOb3QgcHJldmVudGluZyBkZWZhdWx0IGV2ZW50IG9uIGRyb3AuCitTVUNDRVNTCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9kcm9wLWhhbmRsZXItc2hvdWxkLW5vdC1zdG9w LW5hdmlnYXRlLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9kcm9wLWhhbmRsZXItc2hv dWxkLW5vdC1zdG9wLW5hdmlnYXRlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYThlMmNkNjVlNzdjYzRmMjA1 YTk3NzcwZTZlYjQ0ZWE0NGI4MjBkMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvZXZlbnRzL2Ryb3AtaGFuZGxlci1zaG91bGQtbm90LXN0b3AtbmF2aWdhdGUuaHRtbApAQCAt MCwwICsxLDQzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+Cis8ZGl2PlRoaXMg dGVzdHMgdGhhdCBhIGRyb3AgaGFuZGxlcidzIGRlZmF1bHQgYWN0aW9uIG11c3QgYmUgcHJldmVu dGVkIGluIG9yZGVyIHRvIHN0b3AgbmF2aWdhdGlvbi4KK090aGVyd2lzZSwgaWYgZXZlbnQucHJl dmVudERlZmF1bHQoKSBpcyBub3QgY2FsbGVkLCBuYXZpZ2F0aW9uIHNob3VsZCBvY2N1ci4gVG8g dGVzdCBtYW51YWxseSwKK3NpbXBseSBkcmFnIGFuZCBkcm9wIGFub3RoZXIgbGluayBvciBIVE1M IGZpbGUgb24gdGhpcyBwYWdlLiBJZiBuYXZpZ2F0aW9uIG9jY3VycywgdGhlbiB0aGUgdGVzdAor cGFzc2VkLjwvZGl2PgorPHNjcmlwdD4KK2Z1bmN0aW9uIGxvZyh0ZXh0KQoreworICAgIGRvY3Vt ZW50LmJvZHkuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnYnInKSk7CisgICAg ZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKS5h cHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSh0ZXh0KSkpOworfQoraWYgKCF3aW5k b3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgcmV0dXJuOword2luZG93LmFkZEV2ZW50TGlz dGVuZXIoJ2JlZm9yZXVubG9hZCcsIGZ1bmN0aW9uICgpCit7CisgICAgbG9nKCdTVUNDRVNTJyk7 CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOworfSk7Citkb2N1bWVudC5i b2R5LmFkZEV2ZW50TGlzdGVuZXIoJ2RyYWdlbnRlcicsIGZ1bmN0aW9uIChldmVudCkKK3sKKyAg ICBsb2coJ0NhbmNlbGxpbmcgZHJhZ2VudGVyJyk7CisgICAgZXZlbnQucHJldmVudERlZmF1bHQo KTsKK30pOworZG9jdW1lbnQuYm9keS5hZGRFdmVudExpc3RlbmVyKCdkcmFnb3ZlcicsIGZ1bmN0 aW9uIChldmVudCkKK3sKKyAgICBsb2coJ0NhbmNlbGxpbmcgZHJhZ292ZXInKTsKKyAgICBldmVu dC5wcmV2ZW50RGVmYXVsdCgpOworfSk7Citkb2N1bWVudC5ib2R5LmFkZEV2ZW50TGlzdGVuZXIo J2Ryb3AnLCBmdW5jdGlvbiAoZXZlbnQpCit7CisgICAgbG9nKCdOb3QgcHJldmVudGluZyBkZWZh dWx0IGV2ZW50IG9uIGRyb3AuJyk7Cit9KTsKK2xheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1Rl eHQoKTsKK2xheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKK2xvZygnU3RhcnRp bmcgdGVzdFxuJyk7CitldmVudFNlbmRlci5iZWdpbkRyYWdXaXRoRmlsZXMoWydEUlRGYWtlRmls ZSddKTsKK2V2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKGRvY3VtZW50LmJvZHkub2Zmc2V0TGVmdCAr IDEwLCBkb2N1bWVudC5ib2R5Lm9mZnNldFRvcCArIDEwKTsKK2V2ZW50U2VuZGVyLm1vdXNlVXAo KTsKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo= 128327 2012-02-22 16:27:08 -0800 2012-04-03 11:49:16 -0700 Patch bug-79172-20120222162707.patch text/plain 4912 dcheng U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4MzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzBkNzc3YTI1ZTFhNTll NWJjNTc0ZmFjODliOTczOWE4MmRjMmQ1Ny4uZGY4OWEwYjcyMDJkMmY0NzRiNDMwOWJmNmNjZWQ2 MDU4MWRlNDljMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAyLTIyICBEYW5p ZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEhhdmluZyBhIGRyb3Ag aGFuZGxlciBwcmV2ZW50cyBuYXZpZ2F0aW9uIG9uIGRyb3AgZXZlbiBpZiBldmVudCBpcyBub3Qg Y2FuY2VsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03OTE3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE9ubHkgZWFybHkgcmV0dXJuIGlmIHRoZSBkcm9wIGhhbmRsZXIgcHJldmVudHMgdGhlIGRlZmF1 bHQgYWN0aW9uLgorCisgICAgICAgIFRlc3Q6IGZhc3QvZXZlbnRzL2Ryb3AtaGFuZGxlci1zaG91 bGQtbm90LXN0b3AtbmF2aWdhdGUuaHRtbAorCisgICAgICAgICogcGFnZS9EcmFnQ29udHJvbGxl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6cGVyZm9ybURyYWcpOgor CiAyMDEyLTAyLTIxICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogW1N1Z2dlc3RCb3hdIHRleHRQcm9tcHQuY3NzIGRpc2Fi bGVtZW50IGRpc3BsYXlzIGdhcmJsZWQgc3VnZ2VzdCBib3gKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFn Q29udHJvbGxlci5jcHAKaW5kZXggNzkxOWQ3NjFlNTE5Yjg1MDZmNzU2OGJmYTZkM2JkNjhkMzFj ZDQ3Yi4uZTVhOGM4YjdkMjcyYzJmZWVlZTAzYmVmZjE3ZmFiZTMyNWM5ZWY5MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAKQEAgLTIxMiw3ICsyMTIsNyBAQCBib29sIERy YWdDb250cm9sbGVyOjpwZXJmb3JtRHJhZyhEcmFnRGF0YSogZHJhZ0RhdGEpCiAgICAgICAgICAg ICBwcmV2ZW50ZWREZWZhdWx0ID0gbWFpbkZyYW1lLT5ldmVudEhhbmRsZXIoKS0+cGVyZm9ybURy YWdBbmREcm9wKGNyZWF0ZU1vdXNlRXZlbnQoZHJhZ0RhdGEpLCBjbGlwYm9hcmQuZ2V0KCkpOwog ICAgICAgICAgICAgY2xpcGJvYXJkLT5zZXRBY2Nlc3NQb2xpY3koQ2xpcGJvYXJkTnVtYik7IC8v IEludmFsaWRhdGUgY2xpcGJvYXJkIGhlcmUgZm9yIHNlY3VyaXR5CiAgICAgICAgIH0KLSAgICAg ICAgaWYgKG1faXNIYW5kbGluZ0RyYWcgfHwgcHJldmVudGVkRGVmYXVsdCkgeworICAgICAgICBp ZiAocHJldmVudGVkRGVmYXVsdCkgewogICAgICAgICAgICAgbV9kb2N1bWVudFVuZGVyTW91c2Ug PSAwOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2YzE0ODQ0 OTdjNGM5MjNiMDZlNmI5YjU5NzMwYzc4MTI2MTNiZjA2Li42ZGZiYWU0MTQzYTBkMTJiYjIzOGQ3 YjgxZThkMzk3YzU4MWJiZmFhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDItMjIgIERh bmllbCBDaGVuZyAgPGRjaGVuZ0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSGF2aW5nIGEgZHJv cCBoYW5kbGVyIHByZXZlbnRzIG5hdmlnYXRpb24gb24gZHJvcCBldmVuIGlmIGV2ZW50IGlzIG5v dCBjYW5jZWxsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTc5MTcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBmYXN0L2V2ZW50cy9kcm9wLWhhbmRsZXItc2hvdWxkLW5vdC1zdG9wLW5hdmlnYXRlLWV4 cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9ldmVudHMvZHJvcC1oYW5kbGVyLXNo b3VsZC1ub3Qtc3RvcC1uYXZpZ2F0ZS5odG1sOiBBZGRlZC4KKwogMjAxMi0wMi0yMSAgQ3NhYmEg T3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1SRUdSRVNTSU9O KHI5MjI1NCk6IEl0IG1hZGUgMiB0ZXN0cyB0aW1lb3V0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2V2ZW50cy9kcm9wLWhhbmRsZXItc2hvdWxkLW5vdC1zdG9wLW5hdmlnYXRlLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2Ryb3AtaGFuZGxlci1zaG91bGQtbm90 LXN0b3AtbmF2aWdhdGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA0OGY1YWRjZjNkOWU1MTRl YjdmNGUwNzU0NGI4NDRjM2Y2NjU1NjEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2V2ZW50cy9kcm9wLWhhbmRsZXItc2hvdWxkLW5vdC1zdG9wLW5hdmlnYXRlLWV4cGVjdGVk LnR4dApAQCAtMCwwICsxLDcgQEAKK1RoaXMgdGVzdHMgdGhhdCBhIGRyb3AgaGFuZGxlcidzIGRl ZmF1bHQgYWN0aW9uIG11c3QgYmUgcHJldmVudGVkIGluIG9yZGVyIHRvIHN0b3AgbmF2aWdhdGlv bi4gT3RoZXJ3aXNlLCBpZiBldmVudC5wcmV2ZW50RGVmYXVsdCgpIGlzIG5vdCBjYWxsZWQsIG5h dmlnYXRpb24gc2hvdWxkIG9jY3VyLiBUbyB0ZXN0IG1hbnVhbGx5LCBzaW1wbHkgZHJhZyBhbmQg ZHJvcCBhbm90aGVyIGxpbmsgb3IgSFRNTCBmaWxlIG9uIHRoaXMgcGFnZS4gSWYgbmF2aWdhdGlv biBvY2N1cnMsIHRoZW4gdGhlIHRlc3QgcGFzc2VkLgorCitTdGFydGluZyB0ZXN0IAorQ2FuY2Vs bGluZyBkcmFnZW50ZXIKK0NhbmNlbGxpbmcgZHJhZ292ZXIKK05vdCBwcmV2ZW50aW5nIGRlZmF1 bHQgZXZlbnQgb24gZHJvcC4KK1NVQ0NFU1MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv ZXZlbnRzL2Ryb3AtaGFuZGxlci1zaG91bGQtbm90LXN0b3AtbmF2aWdhdGUuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvZXZlbnRzL2Ryb3AtaGFuZGxlci1zaG91bGQtbm90LXN0b3AtbmF2aWdhdGUu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi5hOGUyY2Q2NWU3N2NjNGYyMDVhOTc3NzBlNmViNDRlYTQ0YjgyMGQz Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvZHJvcC1oYW5kbGVy LXNob3VsZC1ub3Qtc3RvcC1uYXZpZ2F0ZS5odG1sCkBAIC0wLDAgKzEsNDMgQEAKKzwhRE9DVFlQ RSBodG1sPgorPGh0bWw+Cis8Ym9keT4KKzxkaXY+VGhpcyB0ZXN0cyB0aGF0IGEgZHJvcCBoYW5k bGVyJ3MgZGVmYXVsdCBhY3Rpb24gbXVzdCBiZSBwcmV2ZW50ZWQgaW4gb3JkZXIgdG8gc3RvcCBu YXZpZ2F0aW9uLgorT3RoZXJ3aXNlLCBpZiBldmVudC5wcmV2ZW50RGVmYXVsdCgpIGlzIG5vdCBj YWxsZWQsIG5hdmlnYXRpb24gc2hvdWxkIG9jY3VyLiBUbyB0ZXN0IG1hbnVhbGx5LAorc2ltcGx5 IGRyYWcgYW5kIGRyb3AgYW5vdGhlciBsaW5rIG9yIEhUTUwgZmlsZSBvbiB0aGlzIHBhZ2UuIElm IG5hdmlnYXRpb24gb2NjdXJzLCB0aGVuIHRoZSB0ZXN0CitwYXNzZWQuPC9kaXY+Cis8c2NyaXB0 PgorZnVuY3Rpb24gbG9nKHRleHQpCit7CisgICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChk b2N1bWVudC5jcmVhdGVFbGVtZW50KCdicicpKTsKKyAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENo aWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2RpdicpLmFwcGVuZENoaWxkKGRvY3VtZW50LmNy ZWF0ZVRleHROb2RlKHRleHQpKSk7Cit9CitpZiAoIXdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxl cikKKyAgICByZXR1cm47Cit3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignYmVmb3JldW5sb2FkJywg ZnVuY3Rpb24gKCkKK3sKKyAgICBsb2coJ1NVQ0NFU1MnKTsKKyAgICBsYXlvdXRUZXN0Q29udHJv bGxlci5ub3RpZnlEb25lKCk7Cit9KTsKK2RvY3VtZW50LmJvZHkuYWRkRXZlbnRMaXN0ZW5lcign ZHJhZ2VudGVyJywgZnVuY3Rpb24gKGV2ZW50KQoreworICAgIGxvZygnQ2FuY2VsbGluZyBkcmFn ZW50ZXInKTsKKyAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOworfSk7Citkb2N1bWVudC5ib2R5 LmFkZEV2ZW50TGlzdGVuZXIoJ2RyYWdvdmVyJywgZnVuY3Rpb24gKGV2ZW50KQoreworICAgIGxv ZygnQ2FuY2VsbGluZyBkcmFnb3ZlcicpOworICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7Cit9 KTsKK2RvY3VtZW50LmJvZHkuYWRkRXZlbnRMaXN0ZW5lcignZHJvcCcsIGZ1bmN0aW9uIChldmVu dCkKK3sKKyAgICBsb2coJ05vdCBwcmV2ZW50aW5nIGRlZmF1bHQgZXZlbnQgb24gZHJvcC4nKTsK K30pOworbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworbGF5b3V0VGVzdENvbnRy b2xsZXIud2FpdFVudGlsRG9uZSgpOworbG9nKCdTdGFydGluZyB0ZXN0XG4nKTsKK2V2ZW50U2Vu ZGVyLmJlZ2luRHJhZ1dpdGhGaWxlcyhbJ0RSVEZha2VGaWxlJ10pOworZXZlbnRTZW5kZXIubW91 c2VNb3ZlVG8oZG9jdW1lbnQuYm9keS5vZmZzZXRMZWZ0ICsgMTAsIGRvY3VtZW50LmJvZHkub2Zm c2V0VG9wICsgMTApOworZXZlbnRTZW5kZXIubW91c2VVcCgpOworPC9zY3JpcHQ+Cis8L2JvZHk+ Cis8L2h0bWw+Cg== 135379 2012-04-03 11:49:20 -0700 2012-04-03 11:55:13 -0700 Fix layout test and remove old assert bug-79172-20120403114919.patch text/plain 7040 dcheng U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGIxZWU2MjVkOTgxZjll N2Q0NDY5YzkzYzI0MWJhYjYwOGExYjk3My4uMGJjYTM5YTNmMWEzN2NkZGNjOTMxNWZhODYyMTVk MGM5M2ViOGQwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA0LTAzICBEYW5p ZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEhhdmluZyBhIGRyb3Ag aGFuZGxlciBwcmV2ZW50cyBuYXZpZ2F0aW9uIG9uIGRyb3AgZXZlbiBpZiBldmVudCBpcyBub3Qg Y2FuY2VsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03OTE3MgorCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4KKworICAgICAgICBP bmx5IGVhcmx5IHJldHVybiBpZiB0aGUgZHJvcCBoYW5kbGVyIHByZXZlbnRzIHRoZSBkZWZhdWx0 IGFjdGlvbi4KKworICAgICAgICBUZXN0OiBmYXN0L2V2ZW50cy9kcm9wLWhhbmRsZXItc2hvdWxk LW5vdC1zdG9wLW5hdmlnYXRlLmh0bWwKKworICAgICAgICAqIHBhZ2UvRHJhZ0NvbnRyb2xsZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0NvbnRyb2xsZXI6OnBlcmZvcm1EcmFnKToKKyAg ICAgICAgKFdlYkNvcmU6OkRyYWdDb250cm9sbGVyOjpjb25jbHVkZUVkaXREcmFnKToKKwogMjAx Mi0wNC0wMyAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdS RVNTSU9OKHI4MDQzOSk6IENyYXNoIGluIFN0eWxlUHJvcGVydHlTZXQ6OmJvcmRlclNwYWNpbmdW YWx1ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcAppbmRleCBkZmViNTI5ODkw N2U3NTEyZDhhZWY5ZjI3MGJlMGVlNGI1YzcwNWM2Li5jZmRjOWM1ZDZmMTNkNmFiYzM5ZGEyZDZm NGM3YzhmMzVlMmIyNTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250 cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcApA QCAtMjEyLDcgKzIxMiw3IEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OnBlcmZvcm1EcmFnKERyYWdE YXRhKiBkcmFnRGF0YSkKICAgICAgICAgICAgIHByZXZlbnRlZERlZmF1bHQgPSBtYWluRnJhbWUt PmV2ZW50SGFuZGxlcigpLT5wZXJmb3JtRHJhZ0FuZERyb3AoY3JlYXRlTW91c2VFdmVudChkcmFn RGF0YSksIGNsaXBib2FyZC5nZXQoKSk7CiAgICAgICAgICAgICBjbGlwYm9hcmQtPnNldEFjY2Vz c1BvbGljeShDbGlwYm9hcmROdW1iKTsgLy8gSW52YWxpZGF0ZSBjbGlwYm9hcmQgaGVyZSBmb3Ig c2VjdXJpdHkKICAgICAgICAgfQotICAgICAgICBpZiAobV9pc0hhbmRsaW5nRHJhZyB8fCBwcmV2 ZW50ZWREZWZhdWx0KSB7CisgICAgICAgIGlmIChwcmV2ZW50ZWREZWZhdWx0KSB7CiAgICAgICAg ICAgICBtX2RvY3VtZW50VW5kZXJNb3VzZSA9IDA7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICAgICAgfQpAQCAtNDIyLDcgKzQyMiw2IEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OmRpc3Bh dGNoVGV4dElucHV0RXZlbnRGb3IoRnJhbWUqIGlubmVyRnJhbWUsIERyYWdEYXRhKiBkcmFnCiBi b29sIERyYWdDb250cm9sbGVyOjpjb25jbHVkZUVkaXREcmFnKERyYWdEYXRhKiBkcmFnRGF0YSkK IHsKICAgICBBU1NFUlQoZHJhZ0RhdGEpOwotICAgIEFTU0VSVCghbV9pc0hhbmRsaW5nRHJhZyk7 CiAKICAgICBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4gZmlsZUlucHV0ID0gbV9maWxlSW5wdXRF bGVtZW50VW5kZXJNb3VzZTsKICAgICBpZiAobV9maWxlSW5wdXRFbGVtZW50VW5kZXJNb3VzZSkg ewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCmluZGV4IDQ1N2FjN2JlOTU4MjFmY2NmZTBhNDgyMDcwYTU4Njg0M2ZmMDM5ZTAuLjIyZGI1 NjRmNDNlYmIyNTIzM2U4YjQ0MjQ4YTA3Y2YyMzhjY2U2ZDQgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBA QAorMjAxMi0wNC0wMyAgRGFuaWVsIENoZW5nICA8ZGNoZW5nQGNocm9taXVtLm9yZz4KKworICAg ICAgICBIYXZpbmcgYSBkcm9wIGhhbmRsZXIgcHJldmVudHMgbmF2aWdhdGlvbiBvbiBkcm9wIGV2 ZW4gaWYgZXZlbnQgaXMgbm90IGNhbmNlbGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzkxNzIKKworICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtl IE5pd2EuCisKKyAgICAgICAgKiBmYXN0L2V2ZW50cy9kcmFnLWRhdGFUcmFuc2Zlckl0ZW1MaXN0 Lmh0bWw6IEZpeCBkcm9wIGhhbmRsZXIgdG8gcHJldmVudCBkZWZhdWx0LgorICAgICAgICAqIGZh c3QvZXZlbnRzL2Ryb3AtaGFuZGxlci1zaG91bGQtbm90LXN0b3AtbmF2aWdhdGUtZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2V2ZW50cy9kcm9wLWhhbmRsZXItc2hvdWxkLW5v dC1zdG9wLW5hdmlnYXRlLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvc2VjdXJp dHkvY2xpcGJvYXJkL2NsaXBib2FyZC1maWxlLWFjY2Vzcy5odG1sOiBDaGFuZ2UgZHJhZ292ZXIg dG8gZHJvcCBoYW5kbGVyCisgICAgICAgICAgICB0byBwcmV2ZW50IGJ1YmJsZWQgZXZlbnRzIGZy b20gY2F1c2luZyBuYXZpZ2F0aW9uLgorCiAyMDEyLTA0LTAzICBUb20gWmFrcmFqc2VrICA8dG9t ekBjb2RlYXVyb3JhLm9yZz4KIAogICAgICAgICBFeHBlY3RhdGlvbnMgdXBkYXRlIGFmdGVyIDgy NzM0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9kcmFnLWRhdGFUcmFuc2Zl ckl0ZW1MaXN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9kcmFnLWRhdGFUcmFuc2Zl ckl0ZW1MaXN0Lmh0bWwKaW5kZXggYmMzMzJlOTU1NmVkOGQ3ZTljOWMxZDUyMDI3YjI2MmExOWRi YmNkYi4uMTdmMDg1NWVjNDY0OTVjYzVmNGQzNjFlODk0YWI0ODhmYmZhZmRjNCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvZHJhZy1kYXRhVHJhbnNmZXJJdGVtTGlzdC5odG1s CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2RyYWctZGF0YVRyYW5zZmVySXRlbUxpc3Qu aHRtbApAQCAtMTMxLDYgKzEzMSw3IEBAIGZ1bmN0aW9uIGRyb3AoZXZlbnQpCiAgICAgICAgIGxl Z2FjeURyb3AoZXZlbnQuZGF0YVRyYW5zZmVyKTsKICAgICBlbHNlIGlmIChkcm9wTWV0aG9kLnNl bGVjdGVkSW5kZXggPT0gMSkKICAgICAgICAgaXRlbUxpc3REcm9wKGV2ZW50LmRhdGFUcmFuc2Zl cik7CisgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKIH0KIAogZnVuY3Rpb24gcnVuVGVzdChk cmFnTWV0aG9kSW5kZXgsIGRyb3BNZXRob2RJbmRleCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvZXZlbnRzL2Ryb3AtaGFuZGxlci1zaG91bGQtbm90LXN0b3AtbmF2aWdhdGUtZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvZHJvcC1oYW5kbGVyLXNob3VsZC1ub3Qt c3RvcC1uYXZpZ2F0ZS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZThhNWViYzc4NGNkMDYyNGIw MTVjZTYxMjdkNTZiM2ZhZGU2MGU3MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvZXZlbnRzL2Ryb3AtaGFuZGxlci1zaG91bGQtbm90LXN0b3AtbmF2aWdhdGUtZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsNSBAQAorVGhpcyB0ZXN0cyB0aGF0IGEgZHJvcCBoYW5kbGVyJ3MgZGVm YXVsdCBhY3Rpb24gbXVzdCBiZSBwcmV2ZW50ZWQgaW4gb3JkZXIgdG8gc3RvcCBuYXZpZ2F0aW9u LiBPdGhlcndpc2UsIGlmIGV2ZW50LnByZXZlbnREZWZhdWx0KCkgaXMgbm90IGNhbGxlZCwgbmF2 aWdhdGlvbiBzaG91bGQgb2NjdXIuIFRvIHRlc3QgbWFudWFsbHksIHNpbXBseSBkcmFnIGFuZCBk cm9wIGFub3RoZXIgbGluayBvciBIVE1MIGZpbGUgb24gdGhpcyBwYWdlLiBJZiBuYXZpZ2F0aW9u IG9jY3VycywgdGhlbiB0aGUgdGVzdCBwYXNzZWQuCisKK1N0YXJ0aW5nIHRlc3QKK05vdCBwcmV2 ZW50aW5nIGRlZmF1bHQgZXZlbnQgb24gZHJvcC4KK1BBU1MKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvZXZlbnRzL2Ryb3AtaGFuZGxlci1zaG91bGQtbm90LXN0b3AtbmF2aWdhdGUuaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2Ryb3AtaGFuZGxlci1zaG91bGQtbm90LXN0b3At bmF2aWdhdGUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45N2Q1YWNlZjYyOGQxZDg0NmEwMzEyMzM5NjgwNmUz YjIwZTljZDA0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvZHJv cC1oYW5kbGVyLXNob3VsZC1ub3Qtc3RvcC1uYXZpZ2F0ZS5odG1sCkBAIC0wLDAgKzEsNTAgQEAK KzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8Ym9keT4KKzxkaXY+VGhpcyB0ZXN0cyB0aGF0IGEg ZHJvcCBoYW5kbGVyJ3MgZGVmYXVsdCBhY3Rpb24gbXVzdCBiZSBwcmV2ZW50ZWQgaW4gb3JkZXIg dG8gc3RvcCBuYXZpZ2F0aW9uLgorT3RoZXJ3aXNlLCBpZiBldmVudC5wcmV2ZW50RGVmYXVsdCgp IGlzIG5vdCBjYWxsZWQsIG5hdmlnYXRpb24gc2hvdWxkIG9jY3VyLiBUbyB0ZXN0IG1hbnVhbGx5 LAorc2ltcGx5IGRyYWcgYW5kIGRyb3AgYW5vdGhlciBsaW5rIG9yIEhUTUwgZmlsZSBvbiB0aGlz IHBhZ2UuIElmIG5hdmlnYXRpb24gb2NjdXJzLCB0aGVuIHRoZSB0ZXN0CitwYXNzZWQuPC9kaXY+ Cis8c2NyaXB0PgorZnVuY3Rpb24gbG9nKHRleHQpCit7CisgICAgZG9jdW1lbnQuYm9keS5hcHBl bmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdicicpKTsKKyAgICBkb2N1bWVudC5ib2R5 LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2RpdicpLmFwcGVuZENoaWxkKGRv Y3VtZW50LmNyZWF0ZVRleHROb2RlKHRleHQpKSk7Cit9Cit3aW5kb3cuYWRkRXZlbnRMaXN0ZW5l cignYmVmb3JldW5sb2FkJywgZnVuY3Rpb24gKCkKK3sKKyAgICBsb2coJ1BBU1MnKTsKKyAgICBs YXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7Cit9KTsKK2RvY3VtZW50LmJvZHkuYWRk RXZlbnRMaXN0ZW5lcignZHJhZ2VudGVyJywgZnVuY3Rpb24gKGV2ZW50KQoreworICAgIGV2ZW50 LnByZXZlbnREZWZhdWx0KCk7Cit9KTsKK2RvY3VtZW50LmJvZHkuYWRkRXZlbnRMaXN0ZW5lcign ZHJhZ292ZXInLCBmdW5jdGlvbiAoZXZlbnQpCit7CisgICAgZXZlbnQucHJldmVudERlZmF1bHQo KTsKK30pOworZG9jdW1lbnQuYm9keS5hZGRFdmVudExpc3RlbmVyKCdkcm9wJywgZnVuY3Rpb24g KGV2ZW50KQoreworICAgIGxvZygnTm90IHByZXZlbnRpbmcgZGVmYXVsdCBldmVudCBvbiBkcm9w LicpOworfSk7CisoZnVuY3Rpb24gKCkKK3sKKyAgICBpZiAoIXdpbmRvdy5sYXlvdXRUZXN0Q29u dHJvbGxlcikKKyAgICAgICAgcmV0dXJuOworICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBB c1RleHQoKTsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7CisgICAg bG9nKCdTdGFydGluZyB0ZXN0Jyk7CisgICAgZXZlbnRTZW5kZXIuYmVnaW5EcmFnV2l0aEZpbGVz KFsnRFJURmFrZUZpbGUnXSk7CisgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oZG9jdW1lbnQu Ym9keS5vZmZzZXRMZWZ0ICsgMTAsIGRvY3VtZW50LmJvZHkub2Zmc2V0VG9wICsgMTApOworICAg IGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsKKyAgICB3aW5kb3cuc2V0VGltZW91dChmdW5jdGlvbiAo KQorICAgIHsKKyAgICAgICAgLy8gRGVhZG1hbidzIHN3aXRjaCBzbyB3ZSBkb24ndCBuZWVkIHRv IHdhaXQgZm9yIHRoZSB0ZXN0IHRvIHRpbWVvdXQgdG8gZmFpbC4KKyAgICAgICAgbG9nKCdGQUlM Jyk7CisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKKyAgICB9LCAw KTsKK30pKCk7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY2xpcGJvYXJkL2NsaXBib2FyZC1maWxlLWFjY2Vz cy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jbGlwYm9hcmQvY2xpcGJv YXJkLWZpbGUtYWNjZXNzLmh0bWwKaW5kZXggOTgwMTIyM2Q5MzdhNTRmNmRlZTMxNTE4ZjJmNjIx MTA4Njc3YTkzMi4uMWQyM2Q1OTc2Y2NiZjc4YWZlYjc4ZGUwN2Q4ZGJmZjYxZTk2N2I0MyAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jbGlwYm9hcmQvY2xpcGJv YXJkLWZpbGUtYWNjZXNzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0 eS9jbGlwYm9hcmQvY2xpcGJvYXJkLWZpbGUtYWNjZXNzLmh0bWwKQEAgLTU1LDcgKzU1LDcgQEAg ZHJhZ1RhcmdldC5hZGRFdmVudExpc3RlbmVyKCJkcm9wIiwgZnVuY3Rpb24oKSB7CiAvLyBTb21l IHRlc3RzIGRvbid0IGVuZCB1cCBkcm9wcGluZyB0aGUgZHJhZ2dlZSBvdmVyIHRoZSBkcmFnIHRh cmdldC4gQ2F0Y2ggYW55CiAvLyBsZWZ0b3ZlciBkcm9wIGV2ZW50cyBidWJibGluZyB1cCB0aHJv dWdoIHRoZSB0cmVlIHNvIHRoZXkgZG9uJ3QgY2F1c2UgcGFnZQogLy8gbmF2aWdhdGlvbi4KLWRv Y3VtZW50LmJvZHkuYWRkRXZlbnRMaXN0ZW5lcigiZHJhZ292ZXIiLCBmdW5jdGlvbigpIHsKK2Rv Y3VtZW50LmJvZHkuYWRkRXZlbnRMaXN0ZW5lcigiZHJvcCIsIGZ1bmN0aW9uKCkgewogICAgIGV2 ZW50LnByZXZlbnREZWZhdWx0KCk7CiB9KTsKIAo=