36944 2010-04-01 01:13:39 -0700 Web inspector: Docking should not rely on synchronous canAttachWindow() call 2010-04-06 06:45:28 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) PC Linux RESOLVED FIXED P3 Minor --- 0 mnissler webkit-unassigned pfeldman webkit.review.bot oldest_to_newest 207046 0 mnissler 2010-04-01 01:13:39 -0700 The InspectorFrontendHost implementation for chromium (in WebKit/chromium/src/WebDevToolsFrontendImpl.cpp) implements canAttachWindow() returning always true. This poses a problem when trying to dock a devtools window that cannot be docked. This is the case i.e. for the devtools windows that correspond to extension views in chromium. The inspector switches to attached mode (different toolbar layout), but still has its own window. 207050 1 52275 mnissler 2010-04-01 01:20:40 -0700 Created attachment 52275 patch 207051 2 webkit.review.bot 2010-04-01 01:22:49 -0700 Attachment 52275 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit/chromium/public/WebDevToolsFrontendClient.h:51: More than one command on the same line [whitespace/newline] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 207055 3 52277 mnissler 2010-04-01 01:32:32 -0700 Created attachment 52277 Patch 207071 4 52277 pfeldman 2010-04-01 02:25:27 -0700 Comment on attachment 52277 Patch Overall looks good. Could of nits that need to be fixed prior to landing. > diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog > index 551c957..aefd631 100644 > --- a/WebKit/chromium/ChangeLog > +++ b/WebKit/chromium/ChangeLog > @@ -1,3 +1,16 @@ > +2010-04-01 Mattias Nissler <mnissler@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Implement canAttachWindow() for the WebDevToolsFrontendImpl implementation of > + InspectorFrontendHost and forward the call to WebDevToolsFrontendClient. This > + allows us to implement canAttachWindow() properly in the chromium code. > + ChangeLog entry should reference bug url here. > + WebDevToolsFrontendImpl* frontend = static_cast<WebDevToolsFrontendImpl*>(v8::External::Cast(*args.Data())->Value()); > + frontend->m_client->sendDebuggerPauseScript(); No need to pause debugger for this one. 207072 5 52278 mnissler 2010-04-01 02:33:35 -0700 Created attachment 52278 patch 207073 6 52278 pfeldman 2010-04-01 02:43:44 -0700 Comment on attachment 52278 patch This looks good, although please look at my comments for the Chromium part. It might be that we should go the other way in WebKit and remove canAttachWindow as a whole. Clearing r? flag for now. 207257 7 52314 mnissler 2010-04-01 11:13:44 -0700 Created attachment 52314 patch 207320 8 52314 pfeldman 2010-04-01 12:39:20 -0700 Comment on attachment 52314 patch > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > index 23f2bf3..9888bc8 100644 > --- a/WebCore/ChangeLog > +++ b/WebCore/ChangeLog > @@ -1,3 +1,24 @@ > +2010-04-01 Mattias Nissler <mnissler@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + It'd be nice if this started with "Web Inspector:". Note that using webkit.org/new-inspector-bug has a nice template for this. > + virtual void requestAttachWindow() = 0; > virtual void attachWindow() = 0; InspectorFrontendClient should only have requestAttachWindow. attachWindow should be declared in InspectorFrontendClientLocal.h insead. > +++ b/WebCore/inspector/InspectorFrontendHost.h > @@ -64,7 +64,7 @@ public: > void bringToFront(); > void inspectedURLChanged(const String&); > > - bool canAttachWindow() const; > + void requestAttachWindow() const; This guy should lose attach() as well, right? Probably attach and detach should now be requestAttach and requestDetach for symmetry. > WebInspector.toggleAttach = function() > { > - if (!this.attached && !InspectorFrontendHost.canAttachWindow()) > - return; > + if (!this.attached) { > + InspectorFrontendHost.requestAttachWindow(); > + return; > + } > > this.attached = !this.attached; Actual request for attachment is done in "attached" setter (line ~239). You probably want to remove the line above from here and introduce a case for requestDetach. "attached" setter is going to be called as a part of callback and should only take care of the front-end javascript state (update toolbar style and titles). Otherwise you are calling attach twice and re-entering it in the setter. > + virtual void requestDockWindow() {}; > virtual void dockWindow() {}; Just use existing dockWindow. Otherwise - what is it for... 208986 9 mnissler 2010-04-06 04:47:30 -0700 Updating summary to reflect discussion in previous comments. 208996 10 52622 mnissler 2010-04-06 05:22:55 -0700 Created attachment 52622 patch 209001 11 52622 pfeldman 2010-04-06 05:48:15 -0700 Comment on attachment 52622 patch This looks good. Please coordinate landing with me. 209020 12 pfeldman 2010-04-06 06:45:28 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/WebCore.Inspector.exp M WebCore/inspector/InspectorFrontendClient.h M WebCore/inspector/InspectorFrontendClientLocal.cpp M WebCore/inspector/InspectorFrontendClientLocal.h M WebCore/inspector/InspectorFrontendHost.cpp M WebCore/inspector/InspectorFrontendHost.h M WebCore/inspector/InspectorFrontendHost.idl M WebCore/inspector/front-end/inspector.js M WebKit/chromium/ChangeLog M WebKit/chromium/public/WebDevToolsFrontendClient.h M WebKit/chromium/src/InspectorFrontendClientImpl.cpp M WebKit/chromium/src/InspectorFrontendClientImpl.h Committed r57146 52275 2010-04-01 01:20:40 -0700 2010-04-01 01:32:27 -0700 patch bug-36944-20100401102038.patch text/plain 1246 mnissler ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNGcm9udGVuZENs aWVudC5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEZXZUb29sc0Zyb250ZW5kQ2xpZW50 LmgKaW5kZXggNjIwMDcwOS4uMWY3NDk3ZCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJEZXZUb29sc0Zyb250ZW5kQ2xpZW50LmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJEZXZUb29sc0Zyb250ZW5kQ2xpZW50LmgKQEAgLTQ4LDYgKzQ4LDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBjbG9zZVdpbmRvdygpIHt9OwogICAgIHZpcnR1YWwgdm9pZCBk b2NrV2luZG93KCkge307CiAgICAgdmlydHVhbCB2b2lkIHVuZG9ja1dpbmRvdygpIHt9OworICAg IHZpcnR1YWwgYm9vbCBjYW5Eb2NrV2luZG93KCkgeyByZXR1cm4gdHJ1ZTsgfTsKIAogcHJvdGVj dGVkOgogICAgIHZpcnR1YWwgfldlYkRldlRvb2xzRnJvbnRlbmRDbGllbnQoKSB7fQpkaWZmIC0t Z2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0Zyb250ZW5kSW1wbC5jcHAgYi9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzRnJvbnRlbmRJbXBsLmNwcAppbmRleCAzMDBl Y2Q4Li5mMzJjMzIwIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xz RnJvbnRlbmRJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzRnJv bnRlbmRJbXBsLmNwcApAQCAtNDA1LDcgKzQwNSw5IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBX ZWJEZXZUb29sc0Zyb250ZW5kSW1wbDo6anNTaG93Q29udGV4dE1lbnUoY29uc3Qgdjg6OkFyZ3Vt CiAKIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBXZWJEZXZUb29sc0Zyb250ZW5kSW1wbDo6anNDYW5B dHRhY2hXaW5kb3coY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKIHsKLSAgICByZXR1cm4gdjhC b29sZWFuKHRydWUpOworICAgIFdlYkRldlRvb2xzRnJvbnRlbmRJbXBsKiBmcm9udGVuZCA9IHN0 YXRpY19jYXN0PFdlYkRldlRvb2xzRnJvbnRlbmRJbXBsKj4odjg6OkV4dGVybmFsOjpDYXN0KCph cmdzLkRhdGEoKSktPlZhbHVlKCkpOworICAgIGZyb250ZW5kLT5tX2NsaWVudC0+c2VuZERlYnVn Z2VyUGF1c2VTY3JpcHQoKTsKKyAgICByZXR1cm4gdjhCb29sZWFuKGZyb250ZW5kLT5tX2NsaWVu dC0+Y2FuRG9ja1dpbmRvdygpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg== 52277 2010-04-01 01:32:32 -0700 2010-04-01 02:33:29 -0700 Patch bug-36944-20100401103230.patch text/plain 2081 mnissler ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDU1MWM5NTcuLmFlZmQ2MzEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDEwLTA0LTAxICBNYXR0aWFzIE5pc3NsZXIgIDxtbmlzc2xlckBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1w bGVtZW50IGNhbkF0dGFjaFdpbmRvdygpIGZvciB0aGUgV2ViRGV2VG9vbHNGcm9udGVuZEltcGwg aW1wbGVtZW50YXRpb24gb2YKKyAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0IGFuZCBmb3J3 YXJkIHRoZSBjYWxsIHRvIFdlYkRldlRvb2xzRnJvbnRlbmRDbGllbnQuIFRoaXMKKyAgICAgICAg YWxsb3dzIHVzIHRvIGltcGxlbWVudCBjYW5BdHRhY2hXaW5kb3coKSBwcm9wZXJseSBpbiB0aGUg Y2hyb21pdW0gY29kZS4KKworICAgICAgICAqIHB1YmxpYy9XZWJEZXZUb29sc0Zyb250ZW5kQ2xp ZW50Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYkRldlRvb2xzRnJvbnRlbmRDbGllbnQ6OmNhbkRv Y2tXaW5kb3cpOgorICAgICAgICAqIHNyYy9XZWJEZXZUb29sc0Zyb250ZW5kSW1wbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYkRldlRvb2xzRnJvbnRlbmRJbXBsOjpqc0NhbkF0dGFjaFdpbmRv dyk6CisKIDIwMTAtMDMtMjkgIFJhZmFlbCBXZWluc3RlaW4gIDxyYWZhZWx3QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJEZXZUb29sc0Zyb250ZW5kQ2xpZW50LmggYi9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYkRldlRvb2xzRnJvbnRlbmRDbGllbnQuaAppbmRleCA2MjAwNzA5Li4y MTczN2Q4IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzRnJv bnRlbmRDbGllbnQuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzRnJv bnRlbmRDbGllbnQuaApAQCAtNDgsNiArNDgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lk IGNsb3NlV2luZG93KCkge307CiAgICAgdmlydHVhbCB2b2lkIGRvY2tXaW5kb3coKSB7fTsKICAg ICB2aXJ0dWFsIHZvaWQgdW5kb2NrV2luZG93KCkge307CisgICAgdmlydHVhbCBib29sIGNhbkRv Y2tXaW5kb3coKSB7IHJldHVybiB0cnVlOyB9CiAKIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIH5X ZWJEZXZUb29sc0Zyb250ZW5kQ2xpZW50KCkge30KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViRGV2VG9vbHNGcm9udGVuZEltcGwuY3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJEZXZUb29sc0Zyb250ZW5kSW1wbC5jcHAKaW5kZXggMzAwZWNkOC4uZjMyYzMyMCAxMDA2NDQK LS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0Zyb250ZW5kSW1wbC5jcHAKKysr IGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0Zyb250ZW5kSW1wbC5jcHAKQEAgLTQw NSw3ICs0MDUsOSBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gV2ViRGV2VG9vbHNGcm9udGVuZElt cGw6OmpzU2hvd0NvbnRleHRNZW51KGNvbnN0IHY4OjpBcmd1bQogCiB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gV2ViRGV2VG9vbHNGcm9udGVuZEltcGw6OmpzQ2FuQXR0YWNoV2luZG93KGNvbnN0IHY4 OjpBcmd1bWVudHMmIGFyZ3MpCiB7Ci0gICAgcmV0dXJuIHY4Qm9vbGVhbih0cnVlKTsKKyAgICBX ZWJEZXZUb29sc0Zyb250ZW5kSW1wbCogZnJvbnRlbmQgPSBzdGF0aWNfY2FzdDxXZWJEZXZUb29s c0Zyb250ZW5kSW1wbCo+KHY4OjpFeHRlcm5hbDo6Q2FzdCgqYXJncy5EYXRhKCkpLT5WYWx1ZSgp KTsKKyAgICBmcm9udGVuZC0+bV9jbGllbnQtPnNlbmREZWJ1Z2dlclBhdXNlU2NyaXB0KCk7Cisg ICAgcmV0dXJuIHY4Qm9vbGVhbihmcm9udGVuZC0+bV9jbGllbnQtPmNhbkRvY2tXaW5kb3coKSk7 CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo= 52278 2010-04-01 02:33:35 -0700 2010-04-01 11:13:39 -0700 patch bug-36944-20100401113333.patch text/plain 2190 mnissler ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDZlNmIwNWEuLjE2ZWEwMDAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE3IEBACisyMDEwLTA0LTAxICBNYXR0aWFzIE5pc3NsZXIgIDxtbmlzc2xlckBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1w bGVtZW50IGNhbkF0dGFjaFdpbmRvdygpIGZvciB0aGUgV2ViRGV2VG9vbHNGcm9udGVuZEltcGwg aW1wbGVtZW50YXRpb24gb2YKKyAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0IGFuZCBmb3J3 YXJkIHRoZSBjYWxsIHRvIFdlYkRldlRvb2xzRnJvbnRlbmRDbGllbnQuIFRoaXMKKyAgICAgICAg YWxsb3dzIHVzIHRvIGltcGxlbWVudCBjYW5BdHRhY2hXaW5kb3coKSBwcm9wZXJseSBpbiB0aGUg Y2hyb21pdW0gY29kZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM2OTQ0CisKKyAgICAgICAgKiBwdWJsaWMvV2ViRGV2VG9vbHNGcm9udGVuZENsaWVu dC5oOgorICAgICAgICAoV2ViS2l0OjpXZWJEZXZUb29sc0Zyb250ZW5kQ2xpZW50OjpjYW5Eb2Nr V2luZG93KToKKyAgICAgICAgKiBzcmMvV2ViRGV2VG9vbHNGcm9udGVuZEltcGwuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJEZXZUb29sc0Zyb250ZW5kSW1wbDo6anNDYW5BdHRhY2hXaW5kb3cp OgorCiAyMDEwLTAzLTMxICBEYXJpbiBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYkRldlRvb2xzRnJvbnRlbmRDbGllbnQuaCBiL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRGV2VG9vbHNGcm9udGVuZENsaWVudC5oCmluZGV4IDYyMDA3MDkuLjIxNzM3ZDgg MTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNGcm9udGVuZENs aWVudC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNGcm9udGVuZENs aWVudC5oCkBAIC00OCw2ICs0OCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY2xvc2VX aW5kb3coKSB7fTsKICAgICB2aXJ0dWFsIHZvaWQgZG9ja1dpbmRvdygpIHt9OwogICAgIHZpcnR1 YWwgdm9pZCB1bmRvY2tXaW5kb3coKSB7fTsKKyAgICB2aXJ0dWFsIGJvb2wgY2FuRG9ja1dpbmRv dygpIHsgcmV0dXJuIHRydWU7IH0KIAogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgfldlYkRldlRv b2xzRnJvbnRlbmRDbGllbnQoKSB7fQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJEZXZUb29sc0Zyb250ZW5kSW1wbC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRv b2xzRnJvbnRlbmRJbXBsLmNwcAppbmRleCBmNzQxYjIyLi40NmIwYjllIDEwMDY0NAotLS0gYS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzRnJvbnRlbmRJbXBsLmNwcAorKysgYi9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzRnJvbnRlbmRJbXBsLmNwcApAQCAtNDExLDggKzQx MSwxMCBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gV2ViRGV2VG9vbHNGcm9udGVuZEltcGw6Ompz U2hvd0NvbnRleHRNZW51KGNvbnN0IHY4OjpBcmd1bQogCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g V2ViRGV2VG9vbHNGcm9udGVuZEltcGw6OmpzQ2FuQXR0YWNoV2luZG93KGNvbnN0IHY4OjpBcmd1 bWVudHMmIGFyZ3MpCiB7Ci0gICAgcmV0dXJuIHY4Qm9vbGVhbih0cnVlKTsKKyAgICBXZWJEZXZU b29sc0Zyb250ZW5kSW1wbCogZnJvbnRlbmQgPSBzdGF0aWNfY2FzdDxXZWJEZXZUb29sc0Zyb250 ZW5kSW1wbCo+KHY4OjpFeHRlcm5hbDo6Q2FzdCgqYXJncy5EYXRhKCkpLT5WYWx1ZSgpKTsKKyAg ICByZXR1cm4gdjhCb29sZWFuKGZyb250ZW5kLT5tX2NsaWVudC0+Y2FuRG9ja1dpbmRvdygpKTsK IH0KKwogdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFdlYkRldlRvb2xzRnJvbnRlbmRJbXBsOjpqc1Nl dEF0dGFjaGVkV2luZG93SGVpZ2h0KGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCiB7CiAgICAg cmV0dXJuIHY4OjpVbmRlZmluZWQoKTsK 52314 2010-04-01 11:13:44 -0700 2010-04-06 05:22:50 -0700 patch bug-36944-20100401201342.patch text/plain 9553 mnissler ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjNmMmJmMy4uOTg4OGJjOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0wNC0wMSAgTWF0dGlhcyBOaXNz bGVyICA8bW5pc3NsZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJld29yayBpbnNwZWN0b3IgZG9ja2luZyB0byBpc3N1ZSBh IHJlcXVlc3QgY2FsbCBmcm9tIHRoZSBmcm9udGVuZAorICAgICAgICB3aGVuZXZlciB0aGUgdXNl ciB0cmlnZ2VycyB0byBkb2NrIHRoZSBpbnNwZWN0b3Igd2luZG93LiBEb2luZyBzbworICAgICAg ICBlbmFibGVzIEluc3BlY3RvckZyb250ZW5kSG9zdCBpbXBsZW1lbnRhdGlvbnMgdG8gYXN5bmNo cm9ub3VzbHkgZGVjaWRlCisgICAgICAgIHdoZXRoZXIgdGhlIHdpbmRvdyBpcyBkb2NrZWQgb3Ig bm90LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY5 NDQKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudC5oOgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWw6OnJlcXVlc3RBdHRhY2hX aW5kb3cpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2Fs Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OnJlcXVlc3RBdHRhY2hXaW5kb3cp OgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaDoKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbDoKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci50b2dnbGVB dHRhY2gpOgorCiAyMDEwLTAzLTMxICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAog ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtV2luLmg6IEZpeCBpbmNvbnNp c3RlbnQgbGluZSBlbmRpbmdzLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRnJvbnRlbmRDbGllbnQuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5k Q2xpZW50LmgKaW5kZXggMDU4MzQ2Yi4uNjM2YTgwOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JGcm9udGVuZENsaWVudC5oCkBAIC01NCw3ICs1NCw3IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgYnJpbmdUb0Zyb250KCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBjbG9zZVdp bmRvdygpID0gMDsKIAotICAgIHZpcnR1YWwgYm9vbCBjYW5BdHRhY2hXaW5kb3coKSA9IDA7Cisg ICAgdmlydHVhbCB2b2lkIHJlcXVlc3RBdHRhY2hXaW5kb3coKSA9IDA7CiAgICAgdmlydHVhbCB2 b2lkIGF0dGFjaFdpbmRvdygpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGV0YWNoV2luZG93KCkg PSAwOwogICAgIHZpcnR1YWwgdm9pZCBjaGFuZ2VBdHRhY2hlZFdpbmRvd0hlaWdodCh1bnNpZ25l ZCkgPSAwOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRD bGllbnRMb2NhbC5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVu dExvY2FsLmNwcAppbmRleCAxODg4ZmJkLi4wODE5ZDU2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmNwcAorKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmNwcApAQCAtMTYwLDYgKzE2MCwx NCBAQCB2b2lkIEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWw6OmZyb250ZW5kTG9hZGVkKCkK ICAgICBtX2luc3BlY3RvckNvbnRyb2xsZXItPnNldEZyb250ZW5kKG5ldyBJbnNwZWN0b3JGcm9u dGVuZCh3ZWJJbnNwZWN0b3JPYmopKTsKIH0KIAordm9pZCBJbnNwZWN0b3JGcm9udGVuZENsaWVu dExvY2FsOjpyZXF1ZXN0QXR0YWNoV2luZG93KCkKK3sKKyAgICBpZiAoIWNhbkF0dGFjaFdpbmRv dygpKQorICAgICAgICByZXR1cm47CisgICAgYXR0YWNoV2luZG93KCk7CisgICAgc2V0QXR0YWNo ZWRXaW5kb3codHJ1ZSk7Cit9CisKIGJvb2wgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6 Y2FuQXR0YWNoV2luZG93KCkKIHsKICAgICB1bnNpZ25lZCBpbnNwZWN0ZWRQYWdlSGVpZ2h0ID0g bV9pbnNwZWN0b3JDb250cm9sbGVyLT5pbnNwZWN0ZWRQYWdlKCktPm1haW5GcmFtZSgpLT52aWV3 KCktPnZpc2libGVIZWlnaHQoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckZyb250ZW5kQ2xpZW50TG9jYWwuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZy b250ZW5kQ2xpZW50TG9jYWwuaAppbmRleCA5MThjNDc5Li45OTVkOWE1IDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmgKKysrIGIvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5oCkBAIC01Miw2ICs1 Miw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBtb3ZlV2luZG93QnkoZmxvYXQgeCwg ZmxvYXQgeSk7CiAKKyAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdEF0dGFjaFdpbmRvdygpOwogICAg IHZpcnR1YWwgYm9vbCBjYW5BdHRhY2hXaW5kb3coKTsKICAgICB2aXJ0dWFsIHZvaWQgY2hhbmdl QXR0YWNoZWRXaW5kb3dIZWlnaHQodW5zaWduZWQpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRnJvbnRlbmRIb3N0LmNwcAppbmRleCAyM2JlNDRjLi5iMTNhMThkIDEwMDY0NAotLS0g YS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwCisrKyBiL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAKQEAgLTEwNiw5ICsxMDYsMTAg QEAgdm9pZCBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6Omluc3BlY3RlZFVSTENoYW5nZWQoY29uc3Qg U3RyaW5nJiBuZXdVUkwpCiAgICAgICAgIG1fY2xpZW50LT5pbnNwZWN0ZWRVUkxDaGFuZ2VkKG5l d1VSTCk7CiB9CiAKLWJvb2wgSW5zcGVjdG9yRnJvbnRlbmRIb3N0OjpjYW5BdHRhY2hXaW5kb3co KSBjb25zdAordm9pZCBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OnJlcXVlc3RBdHRhY2hXaW5kb3co KSBjb25zdAogewotICAgIHJldHVybiBtX2NsaWVudCAmJiBtX2NsaWVudC0+Y2FuQXR0YWNoV2lu ZG93KCk7CisgICAgaWYgKG1fY2xpZW50KQorICAgICAgICBtX2NsaWVudC0+cmVxdWVzdEF0dGFj aFdpbmRvdygpOwogfQogCiB2b2lkIEluc3BlY3RvckZyb250ZW5kSG9zdDo6c2V0QXR0YWNoZWRX aW5kb3dIZWlnaHQodW5zaWduZWQgaGVpZ2h0KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JG cm9udGVuZEhvc3QuaAppbmRleCBmNWJhOWQ3Li5iYzQxZTBiIDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaApAQCAtNjQsNyArNjQsNyBAQCBwdWJsaWM6CiAgICAg dm9pZCBicmluZ1RvRnJvbnQoKTsKICAgICB2b2lkIGluc3BlY3RlZFVSTENoYW5nZWQoY29uc3Qg U3RyaW5nJik7CiAKLSAgICBib29sIGNhbkF0dGFjaFdpbmRvdygpIGNvbnN0OworICAgIHZvaWQg cmVxdWVzdEF0dGFjaFdpbmRvdygpIGNvbnN0OwogICAgIHZvaWQgc2V0QXR0YWNoZWRXaW5kb3dI ZWlnaHQodW5zaWduZWQgaGVpZ2h0KTsKICAgICB2b2lkIG1vdmVXaW5kb3dCeShmbG9hdCB4LCBm bG9hdCB5KSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RnJvbnRlbmRIb3N0LmlkbCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9z dC5pZGwKaW5kZXggMGFlZjVjNC4uMDBkNDI3ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JGcm9udGVuZEhvc3QuaWRsCkBAIC0zOSw3ICszOSw3IEBAIG1vZHVsZSBjb3JlIHsKICAg ICAgICAgdm9pZCBicmluZ1RvRnJvbnQoKTsKICAgICAgICAgdm9pZCBpbnNwZWN0ZWRVUkxDaGFu Z2VkKGluIERPTVN0cmluZyBuZXdVUkwpOwogCi0gICAgICAgIGJvb2xlYW4gY2FuQXR0YWNoV2lu ZG93KCk7CisgICAgICAgIHZvaWQgcmVxdWVzdEF0dGFjaFdpbmRvdygpOwogICAgICAgICB2b2lk IHNldEF0dGFjaGVkV2luZG93SGVpZ2h0KGluIHVuc2lnbmVkIGxvbmcgaGVpZ2h0KTsKICAgICAg ICAgdm9pZCBtb3ZlV2luZG93QnkoaW4gZmxvYXQgeCwgaW4gZmxvYXQgeSk7CiAKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDM1OWRhM2UuLjJiMzY2M2MgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtOTEyLDggKzkxMiwx MCBAQCBXZWJJbnNwZWN0b3IuZm9jdXNTZWFyY2hGaWVsZCA9IGZ1bmN0aW9uKCkKIAogV2ViSW5z cGVjdG9yLnRvZ2dsZUF0dGFjaCA9IGZ1bmN0aW9uKCkKIHsKLSAgICBpZiAoIXRoaXMuYXR0YWNo ZWQgJiYgIUluc3BlY3RvckZyb250ZW5kSG9zdC5jYW5BdHRhY2hXaW5kb3coKSkKLSAgICAgICAg cmV0dXJuOworICAgIGlmICghdGhpcy5hdHRhY2hlZCkgeworICAgICAgSW5zcGVjdG9yRnJvbnRl bmRIb3N0LnJlcXVlc3RBdHRhY2hXaW5kb3coKTsKKyAgICAgIHJldHVybjsKKyAgICB9CiAKICAg ICB0aGlzLmF0dGFjaGVkID0gIXRoaXMuYXR0YWNoZWQ7CiAgICAgdGhpcy5kcmF3ZXIucmVzaXpl KCk7CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwppbmRleCA2ZTZiMDVhLi44Y2NjMDMyIDEwMDY0NAotLS0gYS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMiBAQAorMjAxMC0wNC0wMSAgTWF0dGlhcyBOaXNzbGVyICA8bW5pc3NsZXJAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEhhbmRsZSBkb2NraW5nIHJlcXVlc3RzIGZyb20gdGhlIGRldmVsb3BlciB0b29scyBhbmQgZm9y d2FyZCB0aGVtIHRvCisgICAgICAgIFdlYkRldlRvb2xzRnJvbnRlbmRDbGllbnQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjk0NAorCisgICAgICAg ICogcHVibGljL1dlYkRldlRvb2xzRnJvbnRlbmRDbGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6 V2ViRGV2VG9vbHNGcm9udGVuZENsaWVudDo6cmVxdWVzdERvY2tXaW5kb3cpOgorICAgICAgICAq IHNyYy9XZWJEZXZUb29sc0Zyb250ZW5kSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkRl dlRvb2xzRnJvbnRlbmRJbXBsOjpXZWJEZXZUb29sc0Zyb250ZW5kSW1wbCk6CisgICAgICAgIChX ZWJLaXQ6OldlYkRldlRvb2xzRnJvbnRlbmRJbXBsOjpqc1JlcXVlc3RBdHRhY2hXaW5kb3cpOgor ICAgICAgICAqIHNyYy9XZWJEZXZUb29sc0Zyb250ZW5kSW1wbC5oOgorCisyMDEwLTA0LTAxICBN YXR0aWFzIE5pc3NsZXIgIDxtbmlzc2xlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IGNhbkF0dGFjaFdpbmRv dygpIGZvciB0aGUgV2ViRGV2VG9vbHNGcm9udGVuZEltcGwgaW1wbGVtZW50YXRpb24gb2YKKyAg ICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0IGFuZCBmb3J3YXJkIHRoZSBjYWxsIHRvIFdlYkRl dlRvb2xzRnJvbnRlbmRDbGllbnQuIFRoaXMKKyAgICAgICAgYWxsb3dzIHVzIHRvIGltcGxlbWVu dCBjYW5BdHRhY2hXaW5kb3coKSBwcm9wZXJseSBpbiB0aGUgY2hyb21pdW0gY29kZS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2OTQ0CisKKyAgICAg ICAgKiBwdWJsaWMvV2ViRGV2VG9vbHNGcm9udGVuZENsaWVudC5oOgorICAgICAgICAoV2ViS2l0 OjpXZWJEZXZUb29sc0Zyb250ZW5kQ2xpZW50OjpjYW5Eb2NrV2luZG93KToKKyAgICAgICAgKiBz cmMvV2ViRGV2VG9vbHNGcm9udGVuZEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJEZXZU b29sc0Zyb250ZW5kSW1wbDo6anNDYW5BdHRhY2hXaW5kb3cpOgorCiAyMDEwLTAzLTMxICBEYXJp biBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2 aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xz RnJvbnRlbmRDbGllbnQuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNGcm9u dGVuZENsaWVudC5oCmluZGV4IDYyMDA3MDkuLjE5ZWQ2MjUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNGcm9udGVuZENsaWVudC5oCisrKyBiL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNGcm9udGVuZENsaWVudC5oCkBAIC00Niw2ICs0Niw3 IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBhY3RpdmF0ZVdpbmRvdygpIHt9OwogICAg IHZpcnR1YWwgdm9pZCBjbG9zZVdpbmRvdygpIHt9OworICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0 RG9ja1dpbmRvdygpIHt9OwogICAgIHZpcnR1YWwgdm9pZCBkb2NrV2luZG93KCkge307CiAgICAg dmlydHVhbCB2b2lkIHVuZG9ja1dpbmRvdygpIHt9OwogCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYkRldlRvb2xzRnJvbnRlbmRJbXBsLmNwcCBiL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViRGV2VG9vbHNGcm9udGVuZEltcGwuY3BwCmluZGV4IGY3NDFiMjIuLmJmMjM4ODUgMTAw NjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNGcm9udGVuZEltcGwuY3Bw CisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNGcm9udGVuZEltcGwuY3BwCkBA IC0xNjYsOCArMTY2LDggQEAgV2ViRGV2VG9vbHNGcm9udGVuZEltcGw6OldlYkRldlRvb2xzRnJv bnRlbmRJbXBsKAogICAgICAgICAic2hvd0NvbnRleHRNZW51IiwKICAgICAgICAgV2ViRGV2VG9v bHNGcm9udGVuZEltcGw6OmpzU2hvd0NvbnRleHRNZW51KTsKICAgICBkZXZUb29sc0hvc3QuYWRk UHJvdG9GdW5jdGlvbigKLSAgICAgICAgImNhbkF0dGFjaFdpbmRvdyIsCi0gICAgICAgIFdlYkRl dlRvb2xzRnJvbnRlbmRJbXBsOjpqc0NhbkF0dGFjaFdpbmRvdyk7CisgICAgICAgICJyZXF1ZXN0 QXR0YWNoV2luZG93IiwKKyAgICAgICAgV2ViRGV2VG9vbHNGcm9udGVuZEltcGw6OmpzUmVxdWVz dEF0dGFjaFdpbmRvdyk7CiAgICAgZGV2VG9vbHNIb3N0LmFkZFByb3RvRnVuY3Rpb24oCiAgICAg ICAgICJzZXRBdHRhY2hlZFdpbmRvd0hlaWdodCIsCiAgICAgICAgIFdlYkRldlRvb2xzRnJvbnRl bmRJbXBsOjpqc1NldEF0dGFjaGVkV2luZG93SGVpZ2h0KTsKQEAgLTQwOSwxMCArNDA5LDEzIEBA IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBXZWJEZXZUb29sc0Zyb250ZW5kSW1wbDo6anNTaG93Q29u dGV4dE1lbnUoY29uc3Qgdjg6OkFyZ3VtCiAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKIH0K IAotdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFdlYkRldlRvb2xzRnJvbnRlbmRJbXBsOjpqc0NhbkF0 dGFjaFdpbmRvdyhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQordjg6OkhhbmRsZTx2ODo6VmFs dWU+IFdlYkRldlRvb2xzRnJvbnRlbmRJbXBsOjpqc1JlcXVlc3RBdHRhY2hXaW5kb3coY29uc3Qg djg6OkFyZ3VtZW50cyYgYXJncykKIHsKLSAgICByZXR1cm4gdjhCb29sZWFuKHRydWUpOworICAg IFdlYkRldlRvb2xzRnJvbnRlbmRJbXBsKiBmcm9udGVuZCA9IHN0YXRpY19jYXN0PFdlYkRldlRv b2xzRnJvbnRlbmRJbXBsKj4odjg6OkV4dGVybmFsOjpDYXN0KCphcmdzLkRhdGEoKSktPlZhbHVl KCkpOworICAgIGZyb250ZW5kLT5tX2NsaWVudC0+cmVxdWVzdERvY2tXaW5kb3coKTsKKyAgICBy ZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwogfQorCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gV2ViRGV2 VG9vbHNGcm9udGVuZEltcGw6OmpzU2V0QXR0YWNoZWRXaW5kb3dIZWlnaHQoY29uc3Qgdjg6OkFy Z3VtZW50cyYgYXJncykKIHsKICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0Zyb250ZW5kSW1wbC5oIGIvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0Zyb250ZW5kSW1wbC5oCmluZGV4IGEzOGU1MWQuLjg4 OTI0NmYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNGcm9udGVu ZEltcGwuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzRnJvbnRlbmRJbXBs LmgKQEAgLTE0NSw3ICsxNDUsNyBAQCBwcml2YXRlOgogICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4ganNCcmluZ1RvRnJvbnQoY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncyk7CiAgICAg c3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBqc0luc3BlY3RlZFVSTENoYW5nZWQoY29uc3Qg djg6OkFyZ3VtZW50cyYgYXJncyk7CiAgICAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBq c1Nob3dDb250ZXh0TWVudShjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKTsKLSAgICBzdGF0aWMg djg6OkhhbmRsZTx2ODo6VmFsdWU+IGpzQ2FuQXR0YWNoV2luZG93KGNvbnN0IHY4OjpBcmd1bWVu dHMmIGFyZ3MpOworICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4ganNSZXF1ZXN0QXR0 YWNoV2luZG93KGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpOwogICAgIHN0YXRpYyB2ODo6SGFu ZGxlPHY4OjpWYWx1ZT4ganNTZXRBdHRhY2hlZFdpbmRvd0hlaWdodChjb25zdCB2ODo6QXJndW1l bnRzJiBhcmdzKTsKICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGpzTW92ZVdpbmRv d0J5KGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpOwogCg== 52622 2010-04-06 05:22:55 -0700 2010-04-06 05:48:15 -0700 patch bug-36944-20100406142253.patch text/plain 10422 mnissler ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzYwMzg2MC4uMjk5OGU0ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNC0wMSAgTWF0dGlhcyBOaXNz bGVyICA8bW5pc3NsZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJld29yayBpbnNwZWN0b3IgZG9ja2luZyB0byBpc3N1ZSBh IHJlcXVlc3QgY2FsbCBmcm9tIHRoZSBmcm9udGVuZAorICAgICAgICB3aGVuZXZlciB0aGUgdXNl ciB0cmlnZ2VycyB0byAodW4pZG9jayB0aGUgaW5zcGVjdG9yIHdpbmRvdy4gRG9pbmcgc28KKyAg ICAgICAgZW5hYmxlcyBJbnNwZWN0b3JGcm9udGVuZEhvc3QgaW1wbGVtZW50YXRpb25zIHRvIGFz eW5jaHJvbm91c2x5IGRlY2lkZQorICAgICAgICB3aGV0aGVyIHRoZSB3aW5kb3cgaXMgZG9ja2Vk IG9yIG5vdC4gVGhlIG9sZCBjYW5BdHRhY2hXaW5kb3coKSBpcyBub3QKKyAgICAgICAgcmVxdWly ZWQgYW55bW9yZSwgcmVtb3ZlIGl0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzY5NDQKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9u dGVuZENsaWVudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVu dExvY2FsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9j YWw6OnJlcXVlc3RBdHRhY2hXaW5kb3cpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JG cm9udGVuZENsaWVudExvY2FsLmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250 ZW5kSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OnJl cXVlc3RBdHRhY2hXaW5kb3cpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVu ZEhvc3QuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbDoK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci50b2dnbGVBdHRhY2gpOgorCiAyMDEwLTA0LTA0ICBQYXZlbCBGZWxkbWFuICA8 cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE5vdCByZXZpZXdlZC4gUm9sbGluZyBv dXQgY2hyb21pdW0gY2hhbmdlcyByNTcwMjggYW5kIHI1NzAzMgpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQuaCBiL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckZyb250ZW5kQ2xpZW50LmgKaW5kZXggMGNlNjAyYy4uNTE1Mzg4YyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQuaAorKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudC5oCkBAIC01NCwxMSArNTQs MTAgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBicmluZ1RvRnJvbnQoKSA9IDA7CiAgICAg dmlydHVhbCB2b2lkIGNsb3NlV2luZG93KCkgPSAwOwogCi0gICAgdmlydHVhbCBib29sIGNhbkF0 dGFjaFdpbmRvdygpID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgYXR0YWNoV2luZG93KCkgPSAwOwot ICAgIHZpcnR1YWwgdm9pZCBkZXRhY2hXaW5kb3coKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHJl cXVlc3RBdHRhY2hXaW5kb3coKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHJlcXVlc3REZXRhY2hX aW5kb3coKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGNoYW5nZUF0dGFjaGVkV2luZG93SGVpZ2h0 KHVuc2lnbmVkKSA9IDA7Ci0gICAgCisKICAgICB2aXJ0dWFsIHZvaWQgaW5zcGVjdGVkVVJMQ2hh bmdlZChjb25zdCBTdHJpbmcmKSA9IDA7CiB9OwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwuY3BwCmluZGV4IDA3N2ZjNjYuLjE4YzUyZGEg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9j YWwuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9j YWwuY3BwCkBAIC05Miw2ICs5MiwyMCBAQCB2b2lkIEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9j YWw6OmZyb250ZW5kTG9hZGVkKCkKICAgICBtX2luc3BlY3RvckNvbnRyb2xsZXItPnNldEZyb250 ZW5kKG5ldyBJbnNwZWN0b3JGcm9udGVuZCh3ZWJJbnNwZWN0b3JPYmopKTsKIH0KIAordm9pZCBJ bnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjpyZXF1ZXN0QXR0YWNoV2luZG93KCkKK3sKKyAg ICBpZiAoIWNhbkF0dGFjaFdpbmRvdygpKQorICAgICAgICByZXR1cm47CisgICAgYXR0YWNoV2lu ZG93KCk7CisgICAgc2V0QXR0YWNoZWRXaW5kb3codHJ1ZSk7Cit9CisKK3ZvaWQgSW5zcGVjdG9y RnJvbnRlbmRDbGllbnRMb2NhbDo6cmVxdWVzdERldGFjaFdpbmRvdygpCit7CisgICAgZGV0YWNo V2luZG93KCk7CisgICAgc2V0QXR0YWNoZWRXaW5kb3coZmFsc2UpOworfQorCiBib29sIEluc3Bl Y3RvckZyb250ZW5kQ2xpZW50TG9jYWw6OmNhbkF0dGFjaFdpbmRvdygpCiB7CiAgICAgdW5zaWdu ZWQgaW5zcGVjdGVkUGFnZUhlaWdodCA9IG1faW5zcGVjdG9yQ29udHJvbGxlci0+aW5zcGVjdGVk UGFnZSgpLT5tYWluRnJhbWUoKS0+dmlldygpLT52aXNpYmxlSGVpZ2h0KCk7CmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmggYi9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmgKaW5kZXggMDY3ZDI5 OS4uNzQ3OGExYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRl bmRDbGllbnRMb2NhbC5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5k Q2xpZW50TG9jYWwuaApAQCAtNTEsMTIgKzUxLDE2IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwg dm9pZCBtb3ZlV2luZG93QnkoZmxvYXQgeCwgZmxvYXQgeSk7CiAKLSAgICB2aXJ0dWFsIGJvb2wg Y2FuQXR0YWNoV2luZG93KCk7CisgICAgdmlydHVhbCB2b2lkIHJlcXVlc3RBdHRhY2hXaW5kb3co KTsKKyAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdERldGFjaFdpbmRvdygpOwogICAgIHZpcnR1YWwg dm9pZCBjaGFuZ2VBdHRhY2hlZFdpbmRvd0hlaWdodCh1bnNpZ25lZCk7CiAKIHByb3RlY3RlZDoK ICAgICB2aXJ0dWFsIHZvaWQgc2V0QXR0YWNoZWRXaW5kb3dIZWlnaHQodW5zaWduZWQpID0gMDsK IAorICAgIHZpcnR1YWwgdm9pZCBhdHRhY2hXaW5kb3coKSA9IDA7CisgICAgdmlydHVhbCB2b2lk IGRldGFjaFdpbmRvdygpID0gMDsKKyAgICB2aXJ0dWFsIGJvb2wgY2FuQXR0YWNoV2luZG93KCk7 CiAgICAgdm9pZCBzZXRBdHRhY2hlZFdpbmRvdyhib29sKTsKICAgICB2b2lkIHJlc3RvcmVBdHRh Y2hlZFdpbmRvd0hlaWdodCgpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JGcm9udGVuZEhvc3QuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRl bmRIb3N0LmNwcAppbmRleCAxYTBiNDgzLi5kMWJmMzJkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAKQEAgLTE0MiwxNiArMTQyLDE2IEBAIHZvaWQgSW5z cGVjdG9yRnJvbnRlbmRIb3N0Ojpsb2FkZWQoKQogICAgICAgICBtX2NsaWVudC0+ZnJvbnRlbmRM b2FkZWQoKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OmF0dGFjaCgpCit2b2lk IEluc3BlY3RvckZyb250ZW5kSG9zdDo6cmVxdWVzdEF0dGFjaFdpbmRvdygpCiB7CiAgICAgaWYg KG1fY2xpZW50KQotICAgICAgICBtX2NsaWVudC0+YXR0YWNoV2luZG93KCk7CisgICAgICAgIG1f Y2xpZW50LT5yZXF1ZXN0QXR0YWNoV2luZG93KCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRnJvbnRl bmRIb3N0OjpkZXRhY2goKQordm9pZCBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OnJlcXVlc3REZXRh Y2hXaW5kb3coKQogewogICAgIGlmIChtX2NsaWVudCkKLSAgICAgICAgbV9jbGllbnQtPmRldGFj aFdpbmRvdygpOworICAgICAgICBtX2NsaWVudC0+cmVxdWVzdERldGFjaFdpbmRvdygpOwogfQog CiB2b2lkIEluc3BlY3RvckZyb250ZW5kSG9zdDo6Y2xvc2VXaW5kb3coKQpAQCAtMTc0LDExICsx NzQsNiBAQCB2b2lkIEluc3BlY3RvckZyb250ZW5kSG9zdDo6aW5zcGVjdGVkVVJMQ2hhbmdlZChj b25zdCBTdHJpbmcmIG5ld1VSTCkKICAgICAgICAgbV9jbGllbnQtPmluc3BlY3RlZFVSTENoYW5n ZWQobmV3VVJMKTsKIH0KIAotYm9vbCBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OmNhbkF0dGFjaFdp bmRvdygpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fY2xpZW50ICYmIG1fY2xpZW50LT5jYW5BdHRh Y2hXaW5kb3coKTsKLX0KLQogdm9pZCBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OnNldEF0dGFjaGVk V2luZG93SGVpZ2h0KHVuc2lnbmVkIGhlaWdodCkKIHsKICAgICBpZiAobV9jbGllbnQpCmRpZmYg LS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaCBiL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5oCmluZGV4IDZjMzRhY2QuLmUzYjMx YzIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5o CisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5oCkBAIC01OSwx MyArNTksMTIgQEAgcHVibGljOgogICAgIHZvaWQgZGlzY29ubmVjdENsaWVudCgpOwogCiAgICAg dm9pZCBsb2FkZWQoKTsKLSAgICB2b2lkIGF0dGFjaCgpOwotICAgIHZvaWQgZGV0YWNoKCk7Cisg ICAgdm9pZCByZXF1ZXN0QXR0YWNoV2luZG93KCk7CisgICAgdm9pZCByZXF1ZXN0RGV0YWNoV2lu ZG93KCk7CiAgICAgdm9pZCBjbG9zZVdpbmRvdygpOwogICAgIHZvaWQgYnJpbmdUb0Zyb250KCk7 CiAgICAgdm9pZCBpbnNwZWN0ZWRVUkxDaGFuZ2VkKGNvbnN0IFN0cmluZyYpOwogCi0gICAgYm9v bCBjYW5BdHRhY2hXaW5kb3coKSBjb25zdDsKICAgICB2b2lkIHNldEF0dGFjaGVkV2luZG93SGVp Z2h0KHVuc2lnbmVkIGhlaWdodCk7CiAgICAgdm9pZCBtb3ZlV2luZG93QnkoZmxvYXQgeCwgZmxv YXQgeSkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZy b250ZW5kSG9zdC5pZGwgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3Qu aWRsCmluZGV4IDBhZWY1YzQuLjhkNzAwNDMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGwKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRnJvbnRlbmRIb3N0LmlkbApAQCAtMzMsMTMgKzMzLDEyIEBACiBtb2R1bGUgY29yZSB7CiAg ICAgaW50ZXJmYWNlIFtDb25kaXRpb25hbD1JTlNQRUNUT1JdIEluc3BlY3RvckZyb250ZW5kSG9z dCB7CiAgICAgICAgIHZvaWQgbG9hZGVkKCk7Ci0gICAgICAgIHZvaWQgYXR0YWNoKCk7Ci0gICAg ICAgIHZvaWQgZGV0YWNoKCk7CiAgICAgICAgIHZvaWQgY2xvc2VXaW5kb3coKTsKICAgICAgICAg dm9pZCBicmluZ1RvRnJvbnQoKTsKICAgICAgICAgdm9pZCBpbnNwZWN0ZWRVUkxDaGFuZ2VkKGlu IERPTVN0cmluZyBuZXdVUkwpOwogCi0gICAgICAgIGJvb2xlYW4gY2FuQXR0YWNoV2luZG93KCk7 CisgICAgICAgIHZvaWQgcmVxdWVzdEF0dGFjaFdpbmRvdygpOworICAgICAgICB2b2lkIHJlcXVl c3REZXRhY2hXaW5kb3coKTsKICAgICAgICAgdm9pZCBzZXRBdHRhY2hlZFdpbmRvd0hlaWdodChp biB1bnNpZ25lZCBsb25nIGhlaWdodCk7CiAgICAgICAgIHZvaWQgbW92ZVdpbmRvd0J5KGluIGZs b2F0IHgsIGluIGZsb2F0IHkpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5qcwppbmRleCA5YjA5NzU0Li4yYTEzYTM0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuanMKQEAgLTIzNiwxMiArMjM2LDEwIEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7 CiAgICAgICAgIHZhciBib2R5ID0gZG9jdW1lbnQuYm9keTsKIAogICAgICAgICBpZiAoeCkgewot ICAgICAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmF0dGFjaCgpOwogICAgICAgICAgICAg Ym9keS5yZW1vdmVTdHlsZUNsYXNzKCJkZXRhY2hlZCIpOwogICAgICAgICAgICAgYm9keS5hZGRT dHlsZUNsYXNzKCJhdHRhY2hlZCIpOwogICAgICAgICAgICAgZG9ja1RvZ2dsZUJ1dHRvbi50aXRs ZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVW5kb2NrIGludG8gc2VwYXJhdGUgd2luZG93LiIp OwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmRl dGFjaCgpOwogICAgICAgICAgICAgYm9keS5yZW1vdmVTdHlsZUNsYXNzKCJhdHRhY2hlZCIpOwog ICAgICAgICAgICAgYm9keS5hZGRTdHlsZUNsYXNzKCJkZXRhY2hlZCIpOwogICAgICAgICAgICAg ZG9ja1RvZ2dsZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRG9jayB0byBt YWluIHdpbmRvdy4iKTsKQEAgLTkxMiwxMSArOTEwLDEwIEBAIFdlYkluc3BlY3Rvci5mb2N1c1Nl YXJjaEZpZWxkID0gZnVuY3Rpb24oKQogCiBXZWJJbnNwZWN0b3IudG9nZ2xlQXR0YWNoID0gZnVu Y3Rpb24oKQogewotICAgIGlmICghdGhpcy5hdHRhY2hlZCAmJiAhSW5zcGVjdG9yRnJvbnRlbmRI b3N0LmNhbkF0dGFjaFdpbmRvdygpKQotICAgICAgICByZXR1cm47Ci0KLSAgICB0aGlzLmF0dGFj aGVkID0gIXRoaXMuYXR0YWNoZWQ7Ci0gICAgdGhpcy5kcmF3ZXIucmVzaXplKCk7CisgICAgaWYg KCF0aGlzLmF0dGFjaGVkKQorICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QucmVxdWVzdEF0 dGFjaFdpbmRvdygpOworICAgIGVsc2UKKyAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnJl cXVlc3REZXRhY2hXaW5kb3coKTsKIH0KIAogV2ViSW5zcGVjdG9yLnRvb2xiYXJEcmFnU3RhcnQg PSBmdW5jdGlvbihldmVudCkKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cg Yi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGI2YjJkYzMuLjVlZGM2YTkgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEwLTA0LTAxICBNYXR0aWFzIE5pc3NsZXIgIDxt bmlzc2xlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSGFuZGxlIGRvY2tpbmcgcmVxdWVzdHMgZnJvbSB0aGUgZGV2ZWxvcGVy IHRvb2xzIGFuZCBmb3J3YXJkIHRoZW0gdG8KKyAgICAgICAgV2ViRGV2VG9vbHNGcm9udGVuZENs aWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2 OTQ0CisKKyAgICAgICAgKiBwdWJsaWMvV2ViRGV2VG9vbHNGcm9udGVuZENsaWVudC5oOgorICAg ICAgICAoV2ViS2l0OjpXZWJEZXZUb29sc0Zyb250ZW5kQ2xpZW50OjpyZXF1ZXN0RG9ja1dpbmRv dyk6CisgICAgICAgICogc3JjL1dlYkRldlRvb2xzRnJvbnRlbmRJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViRGV2VG9vbHNGcm9udGVuZEltcGw6OldlYkRldlRvb2xzRnJvbnRlbmRJbXBs KToKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9vbHNGcm9udGVuZEltcGw6OmpzUmVxdWVzdEF0 dGFjaFdpbmRvdyk6CisgICAgICAgICogc3JjL1dlYkRldlRvb2xzRnJvbnRlbmRJbXBsLmg6CisK IDIwMTAtMDQtMDQgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgTm90IHJldmlld2VkLiBSb2xsaW5nIG91dCBjaHJvbWl1bSBjaGFuZ2VzIHI1NzAyOCBh bmQgcjU3MDMyIApkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEZXZUb29s c0Zyb250ZW5kQ2xpZW50LmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzRnJv bnRlbmRDbGllbnQuaAppbmRleCA2MjAwNzA5Li43NTRlY2Y5IDEwMDY0NAotLS0gYS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzRnJvbnRlbmRDbGllbnQuaAorKysgYi9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzRnJvbnRlbmRDbGllbnQuaApAQCAtNDYsOCArNDYs OCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgYWN0aXZhdGVXaW5kb3coKSB7fTsKICAg ICB2aXJ0dWFsIHZvaWQgY2xvc2VXaW5kb3coKSB7fTsKLSAgICB2aXJ0dWFsIHZvaWQgZG9ja1dp bmRvdygpIHt9OwotICAgIHZpcnR1YWwgdm9pZCB1bmRvY2tXaW5kb3coKSB7fTsKKyAgICB2aXJ0 dWFsIHZvaWQgcmVxdWVzdERvY2tXaW5kb3coKSB7fTsKKyAgICB2aXJ0dWFsIHZvaWQgcmVxdWVz dFVuZG9ja1dpbmRvdygpIHt9OwogCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB+V2ViRGV2VG9v bHNGcm9udGVuZENsaWVudCgpIHt9CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL0lu c3BlY3RvckZyb250ZW5kQ2xpZW50SW1wbC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL0luc3Bl Y3RvckZyb250ZW5kQ2xpZW50SW1wbC5jcHAKaW5kZXggYTAzMjA0Zi4uN2RhMDU3MSAxMDA2NDQK LS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9JbnNwZWN0b3JGcm9udGVuZENsaWVudEltcGwuY3Bw CisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRJbXBsLmNw cApAQCAtMTAwLDE5ICsxMDAsMTQgQEAgdm9pZCBJbnNwZWN0b3JGcm9udGVuZENsaWVudEltcGw6 OmNsb3NlV2luZG93KCkKICAgICBtX2NsaWVudC0+Y2xvc2VXaW5kb3coKTsKIH0KIAotYm9vbCBJ bnNwZWN0b3JGcm9udGVuZENsaWVudEltcGw6OmNhbkF0dGFjaFdpbmRvdygpCit2b2lkIEluc3Bl Y3RvckZyb250ZW5kQ2xpZW50SW1wbDo6cmVxdWVzdEF0dGFjaFdpbmRvdygpCiB7Ci0gICAgcmV0 dXJuIHRydWU7CisgICAgbV9jbGllbnQtPnJlcXVlc3REb2NrV2luZG93KCk7CiB9CiAKLXZvaWQg SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRJbXBsOjphdHRhY2hXaW5kb3coKQordm9pZCBJbnNwZWN0 b3JGcm9udGVuZENsaWVudEltcGw6OnJlcXVlc3REZXRhY2hXaW5kb3coKQogewotICAgIG1fY2xp ZW50LT5kb2NrV2luZG93KCk7Ci19Ci0KLXZvaWQgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRJbXBs OjpkZXRhY2hXaW5kb3coKQotewotICAgIG1fY2xpZW50LT51bmRvY2tXaW5kb3coKTsKKyAgICBt X2NsaWVudC0+cmVxdWVzdFVuZG9ja1dpbmRvdygpOwogfQogCiB2b2lkIEluc3BlY3RvckZyb250 ZW5kQ2xpZW50SW1wbDo6Y2hhbmdlQXR0YWNoZWRXaW5kb3dIZWlnaHQodW5zaWduZWQpCmRpZmYg LS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL0luc3BlY3RvckZyb250ZW5kQ2xpZW50SW1wbC5o IGIvV2ViS2l0L2Nocm9taXVtL3NyYy9JbnNwZWN0b3JGcm9udGVuZENsaWVudEltcGwuaAppbmRl eCBmYzI3MDg1Li5mODY5YWMzIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL0luc3Bl Y3RvckZyb250ZW5kQ2xpZW50SW1wbC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvSW5zcGVj dG9yRnJvbnRlbmRDbGllbnRJbXBsLmgKQEAgLTYyLDExICs2MiwxMCBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIGJyaW5nVG9Gcm9udCgpOwogICAgIHZpcnR1YWwgdm9pZCBjbG9zZVdpbmRv dygpOwogCi0gICAgdmlydHVhbCBib29sIGNhbkF0dGFjaFdpbmRvdygpOwotICAgIHZpcnR1YWwg dm9pZCBhdHRhY2hXaW5kb3coKTsKLSAgICB2aXJ0dWFsIHZvaWQgZGV0YWNoV2luZG93KCk7Cisg ICAgdmlydHVhbCB2b2lkIHJlcXVlc3RBdHRhY2hXaW5kb3coKTsKKyAgICB2aXJ0dWFsIHZvaWQg cmVxdWVzdERldGFjaFdpbmRvdygpOwogICAgIHZpcnR1YWwgdm9pZCBjaGFuZ2VBdHRhY2hlZFdp bmRvd0hlaWdodCh1bnNpZ25lZCk7Ci0gICAgCisKICAgICB2aXJ0dWFsIHZvaWQgaW5zcGVjdGVk VVJMQ2hhbmdlZChjb25zdCBXZWJDb3JlOjpTdHJpbmcmKTsKIAogcHJpdmF0ZToK