101978 2012-11-12 13:43:39 -0800 Web Inspector: Fix docking behaviour on Windows. 2012-11-27 15:39:36 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 roger_fong webkit-unassigned apavlov bweinstein keishi loislo pfeldman pmuellr thorton vsevik web-inspector-bugs yurys oldest_to_newest 764767 0 roger_fong 2012-11-12 13:43:39 -0800 There are a number of problems for docking behaviour on Windows. For starters it does not ever constrain the inspectors size properly while docked. It also does not properly set the whether or not the inspector can be docked/undocked. 764770 1 173710 roger_fong 2012-11-12 13:45:21 -0800 Created attachment 173710 patch 764818 2 173710 thorton 2012-11-12 14:17:10 -0800 Comment on attachment 173710 patch View in context: https://bugs.webkit.org/attachment.cgi?id=173710&action=review > Source/WebCore/inspector/InspectorFrontendClientLocal.cpp:143 > + // Call setDockingUnavailable before bringToFront. If we display the inspector's HWND first it causes the call to canAttachWindow to return the wrong result. I wonder if you can talk about this in a more generic way. Using the word HWND in cross-platform code is weird (at the very least, note that this is Windows only). Also, what/why does it cause canAttachWindow to return the wrong result? > Source/WebKit/win/ChangeLog:8 > + There are a number of problems for docking behaviour on Windows. s/for/with/ > Source/WebKit/win/ChangeLog:9 > + For starters it does not ever constrain the inspectors size properly while docked. s/For starters/For starters,/ s/inspectors/inspector's/ > Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp:296 > + // We need to set the attached windows height before we actually attach the window. s/windows/window's/ > Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp:297 > + // Make sure that m_attached is true so that setAttachedWindowHeight succeeds. s/succeeds/doesn't return early/? 764847 3 173710 bweinstein 2012-11-12 14:44:36 -0800 Comment on attachment 173710 patch View in context: https://bugs.webkit.org/attachment.cgi?id=173710&action=review I'd like to see one more version with Tim's comments and mine addressed. Patch looks good though. > Source/WebKit/win/ChangeLog:4 > + https://bugs.webkit.org/show_bug.cgi?id=100000 100000!!! > Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp:258 > + restoreAttachedWindowHeight(); A comment explaining why we are restoring the attached window height before attaching would be nice. >> Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp:297 >> + // Make sure that m_attached is true so that setAttachedWindowHeight succeeds. > > s/succeeds/doesn't return early/? Should this say restoreAttachedWindowHeight instead of setAttachedWindowHeight? 764856 4 roger_fong 2012-11-12 14:54:28 -0800 > >> Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp:297 > >> + // Make sure that m_attached is true so that setAttachedWindowHeight succeeds. > > > > s/succeeds/doesn't return early/? > > Should this say restoreAttachedWindowHeight instead of setAttachedWindowHeight? I meant setAttachedWindowHeight because restore calls setAttachedWindowHeight which has a check: if (!m_attached) return; which prevents the final height from being et properly. I guess both are correct but I figured it'd be a little clearer using the method that actually fails. Do you think I should make it restoreAttachedWindowHeight tho? 764904 5 173746 roger_fong 2012-11-12 15:49:32 -0800 Created attachment 173746 revised patch 764918 6 173746 bweinstein 2012-11-12 16:06:46 -0800 Comment on attachment 173746 revised patch View in context: https://bugs.webkit.org/attachment.cgi?id=173746&action=review > Source/WebCore/inspector/InspectorFrontendClientLocal.cpp:143 > + // Call setDockingUnavailable before bringToFront. If we display the inspector window via bringToFront first it causes the call to canAttachWindow to return the wrong result. Another sentence on why this is the case would be helpful. > Source/WebKit/win/ChangeLog:15 > + (WebInspectorFrontendClient::frontendLoaded): > + (WebInspectorFrontendClient::attachWindow): A high level comment about the changes in these functions would nice for people reading the ChangeLog later. > Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp:299 > + // Immediately after calling showWindowWithoutNotifications(), the parent frameview's visibleHeight incorrectly returns 0 always. Is this a WebKit bug or a Windows bug? 764966 7 roger_fong 2012-11-12 16:40:19 -0800 Committed: http://trac.webkit.org/changeset/134327 And made the last few remaining changes. > Is this a WebKit bug or a Windows bug? Yeup, windows bug. I added a comment or two to clarify 777280 8 thorton 2012-11-27 15:39:36 -0800 Closing since it looks like this landed. 173710 2012-11-12 13:45:21 -0800 2012-11-12 15:49:32 -0800 patch inspector.patch text/plain 3858 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNDI4OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTExLTEyICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4 IGRvY2tpbmcgYmVoYXZpb3VyIG9uIFdpbmRvd3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDAwMDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSBhcmUgYSBudW1iZXIgb2YgcHJvYmxlbXMgZm9y IGRvY2tpbmcgYmVoYXZpb3VyIG9uIFdpbmRvd3MuCisgICAgICAgIEZvciBzdGFydGVycyBpdCBk b2VzIG5vdCBldmVyIGNvbnN0cmFpbiB0aGUgaW5zcGVjdG9ycyBzaXplIHByb3Blcmx5IHdoaWxl IGRvY2tlZC4KKyAgICAgICAgSXQgYWxzbyBkb2VzIG5vdCBwcm9wZXJseSBzZXQgdGhlIHdoZXRo ZXIgb3Igbm90IHRoZSBpbnNwZWN0b3IgY2FuIGJlIGRvY2tlZC91bmRvY2tlZC4KKyAgICAgICAg VGhpcyBwYXRjaCBmaXhlcyBib3RoIGlzc3Vlcy4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckZyb250ZW5kQ2xpZW50TG9jYWw6OmZyb250ZW5kTG9hZGVkKToKKyAgICAgICAgU3dpdGNoIG9y ZGVyIG9mIGNhbGxpbmcgYnJpbmdUb0Zyb250IGFuZCBzZXREb2NraW5nVW5hdmFpbGFibGUuCisK IDIwMTItMTEtMTIgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNv bT4KIAogICAgICAgICBGaXggbWVtb3J5IGxlYWsgaW4gY3JlYXRlU3VyZmFjZUZvckJhY2tpbmdT dG9yZSgpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRD bGllbnRMb2NhbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwuY3BwCShyZXZpc2lvbiAxMzQwOTIpCisrKyBTb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE0MCw4ICsxNDAsOSBAQCB2b2lkIEluc3BlY3RvckZyb250ZW5kQ2xp ZW50TG9jYWw6OndpbmRvCiAKIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6ZnJv bnRlbmRMb2FkZWQoKQogewotICAgIGJyaW5nVG9Gcm9udCgpOworICAgIC8vIENhbGwgc2V0RG9j a2luZ1VuYXZhaWxhYmxlIGJlZm9yZSBicmluZ1RvRnJvbnQuIElmIHdlIGRpc3BsYXkgdGhlIGlu c3BlY3RvcidzIEhXTkQgZmlyc3QgaXQgY2F1c2VzIHRoZSBjYWxsIHRvIGNhbkF0dGFjaFdpbmRv dyB0byByZXR1cm4gdGhlIHdyb25nIHJlc3VsdC4KICAgICBzZXREb2NraW5nVW5hdmFpbGFibGUo IWNhbkF0dGFjaFdpbmRvdygpKTsKKyAgICBicmluZ1RvRnJvbnQoKTsKICAgICBtX2Zyb250ZW5k TG9hZGVkID0gdHJ1ZTsKICAgICBmb3IgKFZlY3RvcjxTdHJpbmc+OjppdGVyYXRvciBpdCA9IG1f ZXZhbHVhdGVPbkxvYWQuYmVnaW4oKTsgaXQgIT0gbV9ldmFsdWF0ZU9uTG9hZC5lbmQoKTsgKytp dCkKICAgICAgICAgZXZhbHVhdGVPbkxvYWQoKml0KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2lu L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEzNDI4OCkKKysrIFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTEyICBSb2dlciBGb25nICA8cm9nZXJfZm9u Z0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IGRvY2tpbmcgYmVoYXZp b3VyIG9uIFdpbmRvd3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDAwMDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGVyZSBhcmUgYSBudW1iZXIgb2YgcHJvYmxlbXMgZm9yIGRvY2tpbmcgYmVoYXZp b3VyIG9uIFdpbmRvd3MuCisgICAgICAgIEZvciBzdGFydGVycyBpdCBkb2VzIG5vdCBldmVyIGNv bnN0cmFpbiB0aGUgaW5zcGVjdG9ycyBzaXplIHByb3Blcmx5IHdoaWxlIGRvY2tlZC4KKyAgICAg ICAgSXQgYWxzbyBkb2VzIG5vdCBwcm9wZXJseSBzZXQgdGhlIHdoZXRoZXIgb3Igbm90IHRoZSBp bnNwZWN0b3IgY2FuIGJlIGRvY2tlZC91bmRvY2tlZC4KKyAgICAgICAgVGhpcyBwYXRjaCBmaXhl cyBib3RoIGlzc3Vlcy4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNs aWVudC5jcHA6CisgICAgICAgIChXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6ZnJvbnRlbmRM b2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OmF0dGFjaFdpbmRv dyk6CisgICAgICAgIENhbGwgcmVzdG9yZUF0dGFjaGVkV2luZG93SGVpZ2h0LgorCiAyMDEyLTEx LTA1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZp eCBsYXllciBib3JkZXJzIHRvIGNsZWFuaW5nIGFwcGVhciBhbmQgZGlzYXBwZWFyIG9uIHN3aXRj aGluZwpJbmRleDogU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9y Q2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9y dC9XZWJJbnNwZWN0b3JDbGllbnQuY3BwCShyZXZpc2lvbiAxMzQwOTIpCisrKyBTb3VyY2UvV2Vi S2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yNTQsNiArMjU0LDkgQEAgdm9pZCBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6 ZnJvbnRlbgogewogICAgIEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWw6OmZyb250ZW5kTG9h ZGVkKCk7CiAKKyAgICBpZiAobV9hdHRhY2hlZCkKKyAgICAgICAgcmVzdG9yZUF0dGFjaGVkV2lu ZG93SGVpZ2h0KCk7CisKICAgICBzZXRBdHRhY2hlZFdpbmRvdyhtX2F0dGFjaGVkKTsKIH0KIApA QCAtMjkwLDYgKzI5MywxMCBAQCB2b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50OjphdHRh Y2hXCiAgICAgbV9pbnNwZWN0b3JDbGllbnQtPnNldEluc3BlY3RvclN0YXJ0c0F0dGFjaGVkKHRy dWUpOwogCiAgICAgY2xvc2VXaW5kb3dXaXRob3V0Tm90aWZpY2F0aW9ucygpOworICAgIC8vIFdl IG5lZWQgdG8gc2V0IHRoZSBhdHRhY2hlZCB3aW5kb3dzIGhlaWdodCBiZWZvcmUgd2UgYWN0dWFs bHkgYXR0YWNoIHRoZSB3aW5kb3cuCisgICAgLy8gTWFrZSBzdXJlIHRoYXQgbV9hdHRhY2hlZCBp cyB0cnVlIHNvIHRoYXQgc2V0QXR0YWNoZWRXaW5kb3dIZWlnaHQgc3VjY2VlZHMuCisgICAgbV9h dHRhY2hlZCA9IHRydWU7CisgICAgcmVzdG9yZUF0dGFjaGVkV2luZG93SGVpZ2h0KCk7CiAgICAg c2hvd1dpbmRvd1dpdGhvdXROb3RpZmljYXRpb25zKCk7CiB9CiAK 173746 2012-11-12 15:49:32 -0800 2012-11-12 16:06:45 -0800 revised patch webinspector.patch text/plain 4266 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNDMxOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTExLTEyICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4 IGRvY2tpbmcgYmVoYXZpb3VyIG9uIFdpbmRvd3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE5NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSBhcmUgYSBudW1iZXIgb2YgcHJvYmxlbXMgd2l0 aCBkb2NraW5nIGJlaGF2aW91ciBvbiBXaW5kb3dzLgorICAgICAgICBGb3Igc3RhcnRlcnMsIGl0 IGRvZXMgbm90IGV2ZXIgY29uc3RyYWluIHRoZSBpbnNwZWN0b3IncyBzaXplIHByb3Blcmx5IHdo aWxlIGRvY2tlZC4KKyAgICAgICAgSXQgYWxzbyBkb2VzIG5vdCBwcm9wZXJseSBzZXQgdGhlIHdo ZXRoZXIgb3Igbm90IHRoZSBpbnNwZWN0b3IgY2FuIGJlIGRvY2tlZC91bmRvY2tlZC4KKyAgICAg ICAgVGhpcyBwYXRjaCBmaXhlcyBib3RoIGlzc3Vlcy4KKworICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvckZyb250ZW5kQ2xpZW50TG9jYWw6OmZyb250ZW5kTG9hZGVkKToKKyAgICAgICAgU3dpdGNo IG9yZGVyIG9mIGNhbGxpbmcgYnJpbmdUb0Zyb250IGFuZCBzZXREb2NraW5nVW5hdmFpbGFibGUu CisKIDIwMTItMTEtMTIgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAg ICBbVjhdIE1hbnkgdGhpbmdzIGNyYXNoIHdoZW4gc3dpdGNoaW5nIHRvIFY4J3MgbmV3IGFsaWdu ZWQgcG9pbnRlciBBUEkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JG cm9udGVuZENsaWVudExvY2FsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5jcHAJKHJldmlzaW9uIDEzNDMxNikK KysrIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2Fs LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQwLDggKzE0MCw5IEBAIHZvaWQgSW5zcGVjdG9yRnJv bnRlbmRDbGllbnRMb2NhbDo6d2luZG8KIAogdm9pZCBJbnNwZWN0b3JGcm9udGVuZENsaWVudExv Y2FsOjpmcm9udGVuZExvYWRlZCgpCiB7Ci0gICAgYnJpbmdUb0Zyb250KCk7CisgICAgLy8gQ2Fs bCBzZXREb2NraW5nVW5hdmFpbGFibGUgYmVmb3JlIGJyaW5nVG9Gcm9udC4gSWYgd2UgZGlzcGxh eSB0aGUgaW5zcGVjdG9yIHdpbmRvdyB2aWEgYnJpbmdUb0Zyb250IGZpcnN0IGl0IGNhdXNlcyB0 aGUgY2FsbCB0byBjYW5BdHRhY2hXaW5kb3cgdG8gcmV0dXJuIHRoZSB3cm9uZyByZXN1bHQuCiAg ICAgc2V0RG9ja2luZ1VuYXZhaWxhYmxlKCFjYW5BdHRhY2hXaW5kb3coKSk7CisgICAgYnJpbmdU b0Zyb250KCk7CiAgICAgbV9mcm9udGVuZExvYWRlZCA9IHRydWU7CiAgICAgZm9yIChWZWN0b3I8 U3RyaW5nPjo6aXRlcmF0b3IgaXQgPSBtX2V2YWx1YXRlT25Mb2FkLmJlZ2luKCk7IGl0ICE9IG1f ZXZhbHVhdGVPbkxvYWQuZW5kKCk7ICsraXQpCiAgICAgICAgIGV2YWx1YXRlT25Mb2FkKCppdCk7 CkluZGV4OiBTb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC93aW4vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMzQzMTkpCisrKyBTb3VyY2UvV2ViS2l0 L3dpbi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0xMS0x MiAgUm9nZXIgRm9uZyAgPHJvZ2VyX2ZvbmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEZpeCBkb2NraW5nIGJlaGF2aW91ciBvbiBXaW5kb3dzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxOTc4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIGEgbnVtYmVyIG9mIHBy b2JsZW1zIHdpdGggZG9ja2luZyBiZWhhdmlvdXIgb24gV2luZG93cy4KKyAgICAgICAgRm9yIHN0 YXJ0ZXJzLCBpdCBkb2VzIG5vdCBldmVyIGNvbnN0cmFpbiB0aGUgaW5zcGVjdG9yJ3Mgc2l6ZSBw cm9wZXJseSB3aGlsZSBkb2NrZWQuCisgICAgICAgIEl0IGFsc28gZG9lcyBub3QgcHJvcGVybHkg c2V0IHRoZSB3aGV0aGVyIG9yIG5vdCB0aGUgaW5zcGVjdG9yIGNhbiBiZSBkb2NrZWQvdW5kb2Nr ZWQuCisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMgYm90aCBpc3N1ZXMuCisKKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3BwOgorICAgICAgICAoV2ViSW5zcGVj dG9yRnJvbnRlbmRDbGllbnQ6OmZyb250ZW5kTG9hZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ckZyb250ZW5kQ2xpZW50OjphdHRhY2hXaW5kb3cpOgorICAgICAgICBDYWxsIHJlc3RvcmVBdHRh Y2hlZFdpbmRvd0hlaWdodC4KKwogMjAxMi0xMS0wNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggbGF5ZXIgYm9yZGVycyB0byBjbGVhbmluZyBh cHBlYXIgYW5kIGRpc2FwcGVhciBvbiBzd2l0Y2hpbmcKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2lu L1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcAkocmV2 aXNpb24gMTM0MzE2KQorKysgU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViSW5z cGVjdG9yQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjU0LDYgKzI1NCw5IEBAIHZvaWQg V2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OmZyb250ZW4KIHsKICAgICBJbnNwZWN0b3JGcm9u dGVuZENsaWVudExvY2FsOjpmcm9udGVuZExvYWRlZCgpOwogCisgICAgaWYgKG1fYXR0YWNoZWQp CisgICAgICAgIHJlc3RvcmVBdHRhY2hlZFdpbmRvd0hlaWdodCgpOworCiAgICAgc2V0QXR0YWNo ZWRXaW5kb3cobV9hdHRhY2hlZCk7CiB9CiAKQEAgLTI5MCw2ICsyOTMsMTMgQEAgdm9pZCBXZWJJ bnNwZWN0b3JGcm9udGVuZENsaWVudDo6YXR0YWNoVwogICAgIG1faW5zcGVjdG9yQ2xpZW50LT5z ZXRJbnNwZWN0b3JTdGFydHNBdHRhY2hlZCh0cnVlKTsKIAogICAgIGNsb3NlV2luZG93V2l0aG91 dE5vdGlmaWNhdGlvbnMoKTsKKyAgICAvLyBXZSBuZWVkIHRvIHNldCB0aGUgYXR0YWNoZWQgd2lu ZG93J3MgaGVpZ2h0IGJlZm9yZSB3ZSBhY3R1YWxseSBhdHRhY2ggdGhlIHdpbmRvdy4KKyAgICAv LyBNYWtlIHN1cmUgdGhhdCBtX2F0dGFjaGVkIGlzIHRydWUgc28gdGhhdCBjYWxsaW5nIHNldEF0 dGFjaGVkV2luZG93SGVpZ2h0IGZyb20gcmVzdG9yZUF0dGFjaGVkV2luZG93SGVpZ2h0IGRvZXNu J3QgcmV0dXJuIGVhcmx5LiAKKyAgICBtX2F0dGFjaGVkID0gdHJ1ZTsKKyAgICAvLyBJbW1lZGlh dGVseSBhZnRlciBjYWxsaW5nIHNob3dXaW5kb3dXaXRob3V0Tm90aWZpY2F0aW9ucygpLCB0aGUg cGFyZW50IGZyYW1ldmlldydzIHZpc2libGVIZWlnaHQgaW5jb3JyZWN0bHkgcmV0dXJucyAwIGFs d2F5cy4KKyAgICAvLyBXZSBhcmUgZXhwZWN0aW5nIHRoaXMgdmFsdWUgdG8gYmUganVzdCB0aGUg aGVpZ2h0IG9mIHRoZSBwYXJlbnQgd2luZG93IHdoZW4gd2UgY2FsbCByZXN0b3JlQXR0YWNoZWRX aW5kb3dIZWlnaHQsIHdoaWNoIGl0IGlzIGJlZm9yZQorICAgIC8vIGNhbGxpbmcgc2hvd1dpbmRv d1dpdGhvdXROb3RpZmljYXRpb25zKCkuCisgICAgcmVzdG9yZUF0dGFjaGVkV2luZG93SGVpZ2h0 KCk7CiAgICAgc2hvd1dpbmRvd1dpdGhvdXROb3RpZmljYXRpb25zKCk7CiB9CiAK