50877 2010-12-11 15:47:51 -0800 Web Inspector: Make inspector on Windows show and be usable in WebKit2 2010-12-12 12:16:39 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 bweinstein bweinstein apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik sam timothy webkit.review.bot yurys oldest_to_newest 320714 0 bweinstein 2010-12-11 15:47:51 -0800 Web Inspector: Make inspector on Windows show and be usable in WebKit2 <rdar://problem/8738987> 320715 1 76309 bweinstein 2010-12-11 16:04:56 -0800 Created attachment 76309 [PATCH] Fix 320716 2 webkit.review.bot 2010-12-11 16:09:40 -0800 Attachment 76309 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--diff-files', u'WebKit2/ChangeLog', u'WebKit2/UIProcess/WebInspectorProxy.cpp', u'WebKit2/UIProcess/WebInspectorProxy.h', u'WebKit2/UIProcess/win/WebInspectorProxyWin.cpp']" exit_code: 1 WebKit2/UIProcess/win/WebInspectorProxyWin.cpp:89: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 320717 3 76309 sam 2010-12-11 16:10:19 -0800 Comment on attachment 76309 [PATCH] Fix View in context: https://bugs.webkit.org/attachment.cgi?id=76309&action=review > WebKit2/UIProcess/WebInspectorProxy.h:149 > + WKViewRef m_inspectorView; I think storing a RefPtr<WebView> here might make things a bit nicer. > WebKit2/UIProcess/win/WebInspectorProxyWin.cpp:100 > + case WM_SIZE: > + lResult = onSizeEvent(hWnd, message, wParam, lParam, handled); > + break; > + case WM_GETMINMAXINFO: > + lResult = onMinMaxInfoEvent(hWnd, message, wParam, lParam, handled); > + break; > + case WM_CLOSE: > + lResult = onCloseEvent(hWnd, message, wParam, lParam, handled); > + break; > + default: > + handled = false; > + break; This should be un-indented. > WebKit2/UIProcess/win/WebInspectorProxyWin.cpp:176 > + CFStringRef urlStringRef = ::CFURLGetString(htmlURLRef.get()); We traditionally do not use the ::prefix on CF function calls. 320722 4 76309 bweinstein 2010-12-11 17:21:23 -0800 Comment on attachment 76309 [PATCH] Fix View in context: https://bugs.webkit.org/attachment.cgi?id=76309&action=review >> WebKit2/UIProcess/WebInspectorProxy.h:149 >> + WKViewRef m_inspectorView; > > I think storing a RefPtr<WebView> here might make things a bit nicer. I was getting some strange errors when trying to make it a RefPtr<WebView> (errors from of PassRefPtr), but was able to make this a raw pointer, which did make the code a lot cleaner, and was able to remove calls to the WKView* functions and replace them with calls to functions on the WebView. >> WebKit2/UIProcess/win/WebInspectorProxyWin.cpp:100 >> + break; > > This should be un-indented. Fixed. >> WebKit2/UIProcess/win/WebInspectorProxyWin.cpp:176 >> + CFStringRef urlStringRef = ::CFURLGetString(htmlURLRef.get()); > > We traditionally do not use the ::prefix on CF function calls. Removed (and got rid of the local variable altogether. 320865 5 bweinstein 2010-12-12 12:16:39 -0800 Landed in r73877. 76309 2010-12-11 16:04:56 -0800 2010-12-11 17:21:23 -0800 [PATCH] Fix inspector_win.patch text/plain 9279 bweinstein SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3Mzg2MykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMTAtMTItMTEgIEJyaWFuIFdlaW5zdGVpbiAgPGJ3ZWluc3RlaW5A YXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IE1ha2UgaW5zcGVjdG9yIG9uIFdpbmRvd3Mgc2hvdyBhbmQgYmUg dXNhYmxlIGluIFdlYktpdDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUwODc3CisgICAgICAgIAorICAgICAgICBIb29rIHVwIHRoZSB1bmltcGxlbWVu dGVkIG1ldGhvZHMgaW4gV2ViSW5zcGVjdG9yUHJveHlXaW4gdG8gZ2V0IHRoZSB3ZWIgaW5zcGVj dG9yCisgICAgICAgIHNob3dpbmcgYW5kIHVzYWJsZSBpbiBXZWJLaXQyIG9uIFdpbmRvd3MuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6V2ViSW5zcGVjdG9yUHJveHkpOiBJbml0aWFsaXplIFdp bmRvd3Mtc3BlY2lmaWMgdmFyaWFibGVzIHRvIDAuCisgICAgICAgICogVUlQcm9jZXNzL1dlYklu c3BlY3RvclByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJJbnNwZWN0b3JQcm94 eVdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjpyZWdpc3Rlcklu c3BlY3RvclZpZXdXaW5kb3dDbGFzcyk6IFNldHMgdXAgdGhlIGluc3BlY3RvciB2aWV3IGNsYXNz LgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6SW5zcGVjdG9yVmlld1duZFBy b2MpOiBDYWxscyB0aHJvdWdoIHRvIHRoZSBXZWJJbnNwZWN0b3JQcm94eSdzIG5vbi1zdGF0aWMK KyAgICAgICAgICAgIFduZFByb2MuCisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5 Ojp3bmRQcm9jKTogSGFuZGxlcyBXTV9TSVpFLCBXTV9DTE9TRSwgYW5kIFdNX0dFVE1JTk1BWElO Rk8sIHRoZSByZXN0IGdvIHRvIAorICAgICAgICAgICAgOjpEZWZXaW5kb3dQcm9jLgorICAgICAg ICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6b25TaXplRXZlbnQpOiBSZXNpemUgdGhlIFdL VmlldyB0aGF0IGhhcyB0aGUgaW5zcGVjdG9yIHBhZ2UgdG8gbWF0Y2ggdGhlCisgICAgICAgICAg ICBvdXRlciB3aW5kb3cgdGhhdCB3YXMganVzdCByZXNpemVkLgorICAgICAgICAoV2ViS2l0OjpX ZWJJbnNwZWN0b3JQcm94eTo6b25NaW5NYXhJbmZvRXZlbnQpOiBTZXQgdGhlIG1pbmltdW0gc2l6 ZSB0aGUgd2luZG93IGNhbiBiZSByZXNpemVkIHRvLgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNw ZWN0b3JQcm94eTo6b25DbG9zZUV2ZW50KTogSGlkZSB0aGUgd2luZG93LCBhbmQgY2FsbCBXZWJJ bnNwZWN0b3JQcm94eTo6Y2xvc2UuCisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5 OjpwbGF0Zm9ybUNyZWF0ZUluc3BlY3RvclBhZ2UpOiBDcmVhdGUgYSBXS1ZpZXcgYW5kIHJldHVy biBpdHMgcGFnZS4KKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3Jt T3Blbik6IENyZWF0ZSBhbiBIV05EIGZvciB0aGUgaW5zcGVjdG9yLCBwdXQgdGhlIGluc3BlY3Rv cidzIFdLVmlldworICAgICAgICAgICAgaW5zaWRlIG9mIGl0LCBhbmQgc2hvdyB0aGUgd2luZG93 LgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1DbG9zZSk6IERl c3Ryb3kgdGhlIGluc3BlY3RvcidzIHdpbmRvdyAod2hpY2ggZGVzdHJveXMgdGhlIGNoaWxkIFdL VmlldyksIAorICAgICAgICAgICAgYW5kIDAgb3V0IGluc3RhbmNlIHZhcmlhYmxlcy4KKyAgICAg ICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3RvclBhZ2VVUkwpOiBGaW5kcyBp bnNwZWN0b3IvaW5zcGVjdG9yLmh0bWwgaW4gdGhlIFdlYktpdCBidW5kbGUuCisKIDIwMTAtMTIt MTAgIEpvbiBIb25leWN1dHQgIDxqaG9uZXljdXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBTZWxl Y3QgbWVudXMgd2l0aCBzaG9ydCBvcHRpb24gdGl0bGVzIGRvIG5vdCBwYWludCBwcm9wZXJseQpJ bmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcAkocmV2aXNpb24gNzM4 MTgpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTUzLDYgKzUzLDEwIEBAIFdlYkluc3BlY3RvclByb3h5OjpXZWJJbnNwZWN0b3JQ cm94eShXZWIKICAgICAsIG1faXNEZWJ1Z2dpbmdKYXZhU2NyaXB0KGZhbHNlKQogICAgICwgbV9p c1Byb2ZpbGluZ0phdmFTY3JpcHQoZmFsc2UpCiAgICAgLCBtX2lzUHJvZmlsaW5nUGFnZShmYWxz ZSkKKyNpZiBQTEFURk9STShXSU4pCisgICAgLCBtX2luc3BlY3RvcldpbmRvdygwKQorICAgICwg bV9pbnNwZWN0b3JWaWV3KDApCisjZW5kaWYKIHsKIH0KIApJbmRleDogV2ViS2l0Mi9VSVByb2Nl c3MvV2ViSW5zcGVjdG9yUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9X ZWJJbnNwZWN0b3JQcm94eS5oCShyZXZpc2lvbiA3MzgxOCkKKysrIFdlYktpdDIvVUlQcm9jZXNz L1dlYkluc3BlY3RvclByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDYgKzQ2LDEwIEBAIGNs YXNzIFdlYkluc3BlY3RvclByb3h5T2JqQ0FkYXB0ZXI7CiAjZW5kaWYKICNlbmRpZgogCisjaWYg UExBVEZPUk0oV0lOKQorI2luY2x1ZGUgIldLVmlldy5oIgorI2VuZGlmCisKIG5hbWVzcGFjZSBX ZWJLaXQgewogCiBjbGFzcyBXZWJQYWdlR3JvdXA7CkBAIC0xMTIsNiArMTE2LDE2IEBAIHByaXZh dGU6CiAKICAgICBzdGF0aWMgV2ViUGFnZUdyb3VwKiBpbnNwZWN0b3JQYWdlR3JvdXAoKTsKIAor I2lmIFBMQVRGT1JNKFdJTikKKyAgICBzdGF0aWMgYm9vbCByZWdpc3Rlckluc3BlY3RvclZpZXdX aW5kb3dDbGFzcygpOworICAgIHN0YXRpYyBMUkVTVUxUIENBTExCQUNLIEluc3BlY3RvclZpZXdX bmRQcm9jKEhXTkQsIFVJTlQsIFdQQVJBTSwgTFBBUkFNKTsKKyAgICBMUkVTVUxUIHduZFByb2Mo SFdORCBoV25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pOwor CisgICAgTFJFU1VMVCBvblNpemVFdmVudChIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFN LCBMUEFSQU0sIGJvb2wmIGhhbmRsZWQpOworICAgIExSRVNVTFQgb25NaW5NYXhJbmZvRXZlbnQo SFdORCBoV25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSwgTFBBUkFNLCBib29sJiBoYW5kbGVkKTsK KyAgICBMUkVTVUxUIG9uQ2xvc2VFdmVudChIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFN LCBMUEFSQU0sIGJvb2wmIGhhbmRsZWQpOworI2VuZGlmCisKICAgICBzdGF0aWMgY29uc3QgdW5z aWduZWQgbWluaW11bVdpbmRvd1dpZHRoID0gNTAwOwogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25l ZCBtaW5pbXVtV2luZG93SGVpZ2h0ID0gNDAwOwogCkBAIC0xMzAsNiArMTQ0LDkgQEAgcHJpdmF0 ZToKICAgICBSZXRhaW5QdHI8V0tWaWV3PiBtX2luc3BlY3RvclZpZXc7CiAgICAgUmV0YWluUHRy PE5TV2luZG93PiBtX2luc3BlY3RvcldpbmRvdzsKICAgICBSZXRhaW5QdHI8V2ViSW5zcGVjdG9y UHJveHlPYmpDQWRhcHRlcj4gbV9pbnNwZWN0b3JQcm94eU9iakNBZGFwdGVyOworI2VsaWYgUExB VEZPUk0oV0lOKQorICAgIEhXTkQgbV9pbnNwZWN0b3JXaW5kb3c7CisgICAgV0tWaWV3UmVmIG1f aW5zcGVjdG9yVmlldzsKICNlbmRpZgogfTsKIApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3Mvd2lu L1dlYkluc3BlY3RvclByb3h5V2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vz cy93aW4vV2ViSW5zcGVjdG9yUHJveHlXaW4uY3BwCShyZXZpc2lvbiA3MzgxOCkKKysrIFdlYktp dDIvVUlQcm9jZXNzL3dpbi9XZWJJbnNwZWN0b3JQcm94eVdpbi5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI3LDMzICsyNywxNTQgQEAKIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCiAKKyNpbmNsdWRl ICJXZWJQYWdlUHJveHkuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL1dlYkNvcmVJbnN0YW5jZUhhbmRs ZS5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCi0jZGVmaW5lIERJU0FCTEVf Tk9UX0lNUExFTUVOVEVEX1dBUk5JTkdTIDEKLSNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgor dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1XZWJQYWdl UHJveHkqIFdlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybUNyZWF0ZUluc3BlY3RvclBhZ2UoKQor c3RhdGljIGNvbnN0IExQQ1dTVFIga1dlYktpdDJJbnNwZWN0b3JXaW5kb3dDbGFzc05hbWUgPSBM IldlYktpdDJJbnNwZWN0b3JXaW5kb3dDbGFzcyI7CisKK2Jvb2wgV2ViSW5zcGVjdG9yUHJveHk6 OnJlZ2lzdGVySW5zcGVjdG9yVmlld1dpbmRvd0NsYXNzKCkKK3sKKyAgICBzdGF0aWMgYm9vbCBo YXZlUmVnaXN0ZXJlZFdpbmRvd0NsYXNzID0gZmFsc2U7CisgICAgaWYgKGhhdmVSZWdpc3RlcmVk V2luZG93Q2xhc3MpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIGhhdmVSZWdpc3RlcmVkV2lu ZG93Q2xhc3MgPSB0cnVlOworCisgICAgV05EQ0xBU1NFWCB3Y2V4OworCisgICAgd2NleC5jYlNp emUgPSBzaXplb2YoV05EQ0xBU1NFWCk7CisgICAgd2NleC5zdHlsZSAgICAgICAgICA9IENTX0RC TENMS1M7CisgICAgd2NleC5scGZuV25kUHJvYyAgICA9IFdlYkluc3BlY3RvclByb3h5OjpJbnNw ZWN0b3JWaWV3V25kUHJvYzsKKyAgICB3Y2V4LmNiQ2xzRXh0cmEgICAgID0gMDsKKyAgICB3Y2V4 LmNiV25kRXh0cmEgICAgID0gc2l6ZW9mKFdlYkluc3BlY3RvclByb3h5Kik7CisgICAgd2NleC5o SW5zdGFuY2UgICAgICA9IGluc3RhbmNlSGFuZGxlKCk7CisgICAgd2NleC5oSWNvbiAgICAgICAg ICA9IDA7CisgICAgd2NleC5oQ3Vyc29yICAgICAgICA9IDo6TG9hZEN1cnNvcigwLCBJRENfQVJS T1cpOworICAgIHdjZXguaGJyQmFja2dyb3VuZCAgPSAwOworICAgIHdjZXgubHBzek1lbnVOYW1l ICAgPSAwOworICAgIHdjZXgubHBzekNsYXNzTmFtZSAgPSBrV2ViS2l0Mkluc3BlY3RvcldpbmRv d0NsYXNzTmFtZTsKKyAgICB3Y2V4LmhJY29uU20gICAgICAgID0gMDsKKworICAgIHJldHVybiAh ITo6UmVnaXN0ZXJDbGFzc0V4KCZ3Y2V4KTsKK30KKworTFJFU1VMVCBDQUxMQkFDSyBXZWJJbnNw ZWN0b3JQcm94eTo6SW5zcGVjdG9yVmlld1duZFByb2MoSFdORCBoV25kLCBVSU5UIG1lc3NhZ2Us IFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCit7CisgICAgTE9OR19QVFIgbG9uZ1B0ciA9 IDo6R2V0V2luZG93TG9uZ1B0cihoV25kLCAwKTsKKyAgICAKKyAgICBpZiAoV2ViSW5zcGVjdG9y UHJveHkqIGluc3BlY3RvclZpZXcgPSByZWludGVycHJldF9jYXN0PFdlYkluc3BlY3RvclByb3h5 Kj4obG9uZ1B0cikpCisgICAgICAgIHJldHVybiBpbnNwZWN0b3JWaWV3LT53bmRQcm9jKGhXbmQs IG1lc3NhZ2UsIHdQYXJhbSwgbFBhcmFtKTsKKworICAgIGlmIChtZXNzYWdlID09IFdNX0NSRUFU RSkgeworICAgICAgICBMUENSRUFURVNUUlVDVCBjcmVhdGVTdHJ1Y3QgPSByZWludGVycHJldF9j YXN0PExQQ1JFQVRFU1RSVUNUPihsUGFyYW0pOworCisgICAgICAgIC8vIEFzc29jaWF0ZSB0aGUg V2ViSW5zcGVjdG9yUHJveHkgd2l0aCB0aGUgd2luZG93LgorICAgICAgICA6OlNldFdpbmRvd0xv bmdQdHIoaFduZCwgMCwgKExPTkdfUFRSKWNyZWF0ZVN0cnVjdC0+bHBDcmVhdGVQYXJhbXMpOwor ICAgICAgICByZXR1cm4gMDsKKyAgICB9CisKKyAgICByZXR1cm4gOjpEZWZXaW5kb3dQcm9jKGhX bmQsIG1lc3NhZ2UsIHdQYXJhbSwgbFBhcmFtKTsKK30KKworTFJFU1VMVCBXZWJJbnNwZWN0b3JQ cm94eTo6d25kUHJvYyhIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBB UkFNIGxQYXJhbSkKK3sKKyAgICBMUkVTVUxUIGxSZXN1bHQgPSAwOworICAgIGJvb2wgaGFuZGxl ZCA9IHRydWU7CisKKyAgICBzd2l0Y2ggKG1lc3NhZ2UpIHsKKyAgICAgICAgY2FzZSBXTV9TSVpF OgorICAgICAgICAgICAgbFJlc3VsdCA9IG9uU2l6ZUV2ZW50KGhXbmQsIG1lc3NhZ2UsIHdQYXJh bSwgbFBhcmFtLCBoYW5kbGVkKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFdN X0dFVE1JTk1BWElORk86CisgICAgICAgICAgICBsUmVzdWx0ID0gb25NaW5NYXhJbmZvRXZlbnQo aFduZCwgbWVzc2FnZSwgd1BhcmFtLCBsUGFyYW0sIGhhbmRsZWQpOworICAgICAgICAgICAgYnJl YWs7CisgICAgICAgIGNhc2UgV01fQ0xPU0U6CisgICAgICAgICAgICBsUmVzdWx0ID0gb25DbG9z ZUV2ZW50KGhXbmQsIG1lc3NhZ2UsIHdQYXJhbSwgbFBhcmFtLCBoYW5kbGVkKTsKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgaGFuZGxlZCA9IGZhbHNl OworICAgICAgICAgICAgYnJlYWs7CisgICAgfQorCisgICAgaWYgKCFoYW5kbGVkKQorICAgICAg ICBsUmVzdWx0ID0gOjpEZWZXaW5kb3dQcm9jKGhXbmQsIG1lc3NhZ2UsIHdQYXJhbSwgbFBhcmFt KTsKKworICAgIHJldHVybiBsUmVzdWx0OworfQorCitMUkVTVUxUIFdlYkluc3BlY3RvclByb3h5 OjpvblNpemVFdmVudChIV05ELCBVSU5ULCBXUEFSQU0sIExQQVJBTSwgYm9vbCYpCit7CisgICAg UkVDVCByZWN0OworICAgIDo6R2V0Q2xpZW50UmVjdChtX2luc3BlY3RvcldpbmRvdywgJnJlY3Qp OworCisgICAgOjpTZXRXaW5kb3dQb3MoV0tWaWV3R2V0V2luZG93KG1faW5zcGVjdG9yVmlldyks IDAsIHJlY3QubGVmdCwgcmVjdC50b3AsIHJlY3QucmlnaHQgLSByZWN0LmxlZnQsIHJlY3QuYm90 dG9tIC0gcmVjdC50b3AsIFNXUF9OT1pPUkRFUik7CisKKyAgICByZXR1cm4gMDsKK30KKworTFJF U1VMVCBXZWJJbnNwZWN0b3JQcm94eTo6b25NaW5NYXhJbmZvRXZlbnQoSFdORCwgVUlOVCwgV1BB UkFNLCBMUEFSQU0gbFBhcmFtLCBib29sJikKK3sKKyAgICBNSU5NQVhJTkZPKiBpbmZvID0gcmVp bnRlcnByZXRfY2FzdDxNSU5NQVhJTkZPKj4obFBhcmFtKTsKKyAgICBQT0lOVCBzaXplID0ge21p bmltdW1XaW5kb3dXaWR0aCwgbWluaW11bVdpbmRvd0hlaWdodH07CisgICAgaW5mby0+cHRNaW5U cmFja1NpemUgPSBzaXplOworCisgICAgcmV0dXJuIDA7Cit9CisKK0xSRVNVTFQgV2ViSW5zcGVj dG9yUHJveHk6Om9uQ2xvc2VFdmVudChIV05ELCBVSU5ULCBXUEFSQU0sIExQQVJBTSwgYm9vbCYp CiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICA6OlNob3dXaW5kb3cobV9pbnNwZWN0b3JX aW5kb3csIFNXX0hJREUpOworICAgIGNsb3NlKCk7CisKICAgICByZXR1cm4gMDsKIH0KIAorV2Vi UGFnZVByb3h5KiBXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdl KCkKK3sKKyAgICBBU1NFUlQoIW1faW5zcGVjdG9yVmlldyk7CisgICAgQVNTRVJUKCFtX2luc3Bl Y3RvcldpbmRvdyk7CisKKyAgICBSRUNUIGVtcHR5UmVjdCA9IHswfTsKKyAgICBtX2luc3BlY3Rv clZpZXcgPSBXS1ZpZXdDcmVhdGUoZW1wdHlSZWN0LCB0b0FQSShtX3BhZ2UtPnBhZ2VOYW1lc3Bh Y2UoKSksIHRvQVBJKGluc3BlY3RvclBhZ2VHcm91cCgpKSwgMCk7CisgICAgCisgICAgcmV0dXJu IHRvSW1wbChXS1ZpZXdHZXRQYWdlKG1faW5zcGVjdG9yVmlldykpOworfQorCiB2b2lkIFdlYklu c3BlY3RvclByb3h5OjpwbGF0Zm9ybU9wZW4oKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7Cisg ICAgcmVnaXN0ZXJJbnNwZWN0b3JWaWV3V2luZG93Q2xhc3MoKTsKKworICAgIG1faW5zcGVjdG9y V2luZG93ID0gOjpDcmVhdGVXaW5kb3dFeCgwLCBrV2ViS2l0Mkluc3BlY3RvcldpbmRvd0NsYXNz TmFtZSwgMCwgV1NfT1ZFUkxBUFBFRFdJTkRPVyB8IFdTX0NMSVBTSUJMSU5HUyB8IFdTX0NMSVBD SElMRFJFTiwKKyAgICAgICAgMCwgMCwgaW5pdGlhbFdpbmRvd1dpZHRoLCBpbml0aWFsV2luZG93 SGVpZ2h0LCAwLCAwLCBpbnN0YW5jZUhhbmRsZSgpLCB0aGlzKTsKKyAgICBBU1NFUlQoOjpJc1dp bmRvdyhtX2luc3BlY3RvcldpbmRvdykpOworCisgICAgV0tWaWV3U2V0UGFyZW50V2luZG93KG1f aW5zcGVjdG9yVmlldywgbV9pbnNwZWN0b3JXaW5kb3cpOworICAgIDo6U2hvd1dpbmRvdyhtX2lu c3BlY3RvcldpbmRvdywgU1dfU0hPVyk7CiB9CiAKIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OnBs YXRmb3JtQ2xvc2UoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgQVNTRVJUKG1faW5z cGVjdG9yV2luZG93KTsKKyAgICBBU1NFUlQobV9pbnNwZWN0b3JWaWV3KTsKKworICAgIDo6RGVz dHJveVdpbmRvdyhtX2luc3BlY3RvcldpbmRvdyk7CisKKyAgICBtX2luc3BlY3RvcldpbmRvdyA9 IDA7CisgICAgbV9pbnNwZWN0b3JWaWV3ID0gMDsKIH0KIAogU3RyaW5nIFdlYkluc3BlY3RvclBy b3h5OjppbnNwZWN0b3JQYWdlVVJMKCkgY29uc3QKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwot ICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICBSZXRhaW5QdHI8Q0ZVUkxSZWY+IGh0bWxVUkxSZWYo QWRvcHRDRiwgQ0ZCdW5kbGVDb3B5UmVzb3VyY2VVUkwoQ0ZCdW5kbGVHZXRCdW5kbGVXaXRoSWRl bnRpZmllcihDRlNUUigiY29tLmFwcGxlLldlYktpdCIpKSwgQ0ZTVFIoImluc3BlY3RvciIpLCBD RlNUUigiaHRtbCIpLCBDRlNUUigiaW5zcGVjdG9yIikpKTsKKyAgICBpZiAoIWh0bWxVUkxSZWYp CisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKworICAgIENGU3RyaW5nUmVmIHVybFN0cmluZ1Jl ZiA9IDo6Q0ZVUkxHZXRTdHJpbmcoaHRtbFVSTFJlZi5nZXQoKSk7CisgICAgcmV0dXJuIFN0cmlu Zyh1cmxTdHJpbmdSZWYpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK