115865 2013-05-09 10:41:43 -0700 Web Inspector: implement runOpenPanel callback for WebKit2-hosted inspector page 2013-05-10 13:34:26 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) Mac OS X 10.8 RESOLVED FIXED P2 Normal --- 0 burg webkit-unassigned commit-queue graouts joepeck timothy oldest_to_newest 886944 0 burg 2013-05-09 10:41:43 -0700 To reproduce: open the legacy inspector, right click on the timelines panel to load timeline data. Nothing will happen. The WKPageUIClient defined in WebInspectorProxy::createInspectorPage() has no callback for runOpenPanel (triggered by file selector element). The Mac WK1 code for this can probably be reused with some adaptation. It is located in Source/WebKit/WebCoreSupport/WebInspectorClient.mm:687. 887132 1 201295 burg 2013-05-09 15:52:20 -0700 Created attachment 201295 Patch v1 887150 2 201295 timothy 2013-05-09 16:36:38 -0700 Comment on attachment 201295 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=201295&action=review Looking good! > Source/WebKit2/UIProcess/WebInspectorProxy.h:99 > + NSWindow* inspectorWindow() const { return m_inspectorWindow.get(); } This will only be non-nil when the Inspector is detached. I assume that is what you wanted, since having the open panel as a sheet on the Safari window when docked would be odd. > Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm:37 > +#import "WKRetainPtr.h" I don't think you use this? You should if you can. > Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm:244 > + NSURL *nsURL; > + for (nsURL in [openPanel URLs]) { You can put the type in the for(). > Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm:245 > + WKURLRef wkURL = WKURLCreateWithCFURL((CFURLRef)nsURL); Use static_cast<CFURLRef>(nsURL) instead. 887197 3 burg 2013-05-09 18:59:29 -0700 (In reply to comment #2) > (From update of attachment 201295 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=201295&action=review > > > Source/WebKit2/UIProcess/WebInspectorProxy.h:99 > > + NSWindow* inspectorWindow() const { return m_inspectorWindow.get(); } > > This will only be non-nil when the Inspector is detached. I assume that is what you wanted, since having the open panel as a sheet on the Safari window when docked would be odd. I added an assert and early exit in this unlikely case. > > Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm:37 > > +#import "WKRetainPtr.h" > > I don't think you use this? You should if you can. It's used to refcount the listener object. > > Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm:245 > > + WKURLRef wkURL = WKURLCreateWithCFURL((CFURLRef)nsURL); > > Use static_cast<CFURLRef>(nsURL) instead. I can't :-( I think this is related to __CFURL being an opaque type. Normally, for such toll-free bridged types I wouldn't expect a cast to be required. So, I changed it to reinterpret_cast. "Cannot cast from type 'NSURL *' to pointer type 'CFURLRef' (aka 'const __CFURL *')" 887198 4 201310 burg 2013-05-09 19:00:41 -0700 Created attachment 201310 Patch v1b 887285 5 201310 timothy 2013-05-10 04:36:08 -0700 Comment on attachment 201310 Patch v1b View in context: https://bugs.webkit.org/attachment.cgi?id=201310&action=review > Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm:237 > + if (!inspectorWindow) Sorry, I didn't mean to cause confusion. What you had before was fine. If window is nil (which it is when the Inspector is docked) passing nil to NSOpenPanel will create a modal dialog instead of a sheet. Now with this patch Open does not work when docked. You can remove the ASSERT and early return. I just wanted you to understand and test the docked vs windowed case and make sure you get what you expect. 887378 6 burg 2013-05-10 09:10:32 -0700 (In reply to comment #5) > (From update of attachment 201310 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=201310&action=review > > > Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm:237 > > + if (!inspectorWindow) > > Sorry, I didn't mean to cause confusion. What you had before was fine. If window is nil (which it is when the Inspector is docked) passing nil to NSOpenPanel will create a modal dialog instead of a sheet. Now with this patch Open does not work when docked. You can remove the ASSERT and early return. > > I just wanted you to understand and test the docked vs windowed case and make sure you get what you expect. Confusion leads to understanding. :-) In this case, I wasn't aware that behavior would happen with a nil window argument. I couldn't find any documentation of what happens with nil window (seems I'm not the only one: http://stackoverflow.com/questions/671204/why-isnt-my-sheet-attached-to-the-window-its-run-for?rq=1). I'll revert that guard, add a comment to document the intended modal behaviors, and test on a bigger screen. 887405 7 201358 burg 2013-05-10 10:18:55 -0700 Created attachment 201358 Patch v2 887410 8 201358 timothy 2013-05-10 10:30:02 -0700 Comment on attachment 201358 Patch v2 Looks good. Needs a WK2 owner to r+. 887584 9 201358 commit-queue 2013-05-10 13:34:24 -0700 Comment on attachment 201358 Patch v2 Clearing flags on attachment: 201358 Committed r149903: <http://trac.webkit.org/changeset/149903> 887585 10 commit-queue 2013-05-10 13:34:26 -0700 All reviewed patches have been landed. Closing bug. 201295 2013-05-09 15:52:20 -0700 2013-05-09 19:00:35 -0700 Patch v1 bug-115865-20130509155123.patch text/plain 4139 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5Njk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDM1MjBmMzg3NjkzZjQz YjhjNDBmZWNmYTRhYzEzZjAyMzlhY2M1My4uNDkyYzFlODY5ZmZlMDMwYmI3ZTE1Y2RmMjYwNGY0 ODMwZDM1NDQ4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA1LTA5ICBCcmlh biBKLiBCdXJnICA8YnVyZ0Bjcy53YXNoaW5ndG9uLmVkdT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBpbXBsZW1lbnQgcnVuT3BlblBhbmVsIGNhbGxiYWNrIGZvciBXZWJLaXQyIGluc3BlY3Rv cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1ODY1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9y UHJveHk6Omluc3BlY3RvcldpbmRvdyk6CisgICAgICAgIEFkZCBhbiBhY2Nlc3NvciBmb3IgbV9p bnNwZWN0b3JXaW5kb3cuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclBy b3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpydW5PcGVuUGFuZWwpOgorICAgICAgICBTaG93 IHRoZSBvcGVuIHBhbmVsIGRpYWxvZyB3aGVuIHJlcXVlc3RlZC4KKworICAgICAgICAoV2ViS2l0 OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdlKToKKyAgICAg ICAgUmVnaXN0ZXIgdGhlIGNhbGxiYWNrIHdoZW4gdGhlIGluc3BlY3RvciBwYWdlIGlzIGNyZWF0 ZWQuCisKIDIwMTMtMDUtMDcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K IAogICAgICAgICBDbGVhbiB1cCBLZXlmcmFtZVZhbHVlTGlzdCBhbmQgcmVsYXRlZCBjbGFzc2Vz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHku aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCmluZGV4IGRi OThkNDFkNDYwNGJkNDMyY2MyNTkxODA5NWYzZjcxMTE1MmJiMjMuLmVmNzE4ZjNhYjJkY2MyNWZi NTFmMTFmYTZkZDJiMDYzOGZlYjc2OGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJJbnNwZWN0b3JQcm94eS5oCkBAIC05Niw2ICs5Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHVw ZGF0ZUluc3BlY3RvcldpbmRvd1RpdGxlKCkgY29uc3Q7CiAgICAgdm9pZCBpbnNwZWN0ZWRWaWV3 RnJhbWVEaWRDaGFuZ2UoQ0dGbG9hdCA9IDApOwogICAgIHZvaWQgd2luZG93RnJhbWVEaWRDaGFu Z2UoKTsKKyAgICBOU1dpbmRvdyogaW5zcGVjdG9yV2luZG93KCkgY29uc3QgeyByZXR1cm4gbV9p bnNwZWN0b3JXaW5kb3cuZ2V0KCk7IH0KIAogICAgIHZvaWQgc2V0SW5zcGVjdG9yV2luZG93RnJh bWUoV0tSZWN0Jik7CiAgICAgV0tSZWN0IGluc3BlY3RvcldpbmRvd0ZyYW1lKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1t IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5tbQpp bmRleCA2MmZkYjU3MjY3NDliZDUyOTkzMjRjNzM5YzViNDU0OWVlMTZiODNhLi4wNmJkM2JmMTk3 MmM1N2U5OWExMjFiMTVmZTk4MTBkZWE3MzM0ZWIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvV2ViSW5zcGVjdG9yUHJveHlNYWMubW0KQEAgLTMxLDYgKzMxLDEx IEBACiAjaW1wb3J0ICJXS0FQSUNhc3QuaCIKICNpbXBvcnQgIldlYkNvbnRleHQuaCIKICNpbXBv cnQgIldLSW5zcGVjdG9yUHJpdmF0ZU1hYy5oIgorI2ltcG9ydCAiV0tNdXRhYmxlQXJyYXkuaCIK KyNpbXBvcnQgIldLT3BlblBhbmVsUGFyYW1ldGVycy5oIgorI2ltcG9ydCAiV0tPcGVuUGFuZWxS ZXN1bHRMaXN0ZW5lci5oIgorI2ltcG9ydCAiV0tSZXRhaW5QdHIuaCIKKyNpbXBvcnQgIldLVVJM Q0YuaCIKICNpbXBvcnQgIldLVmlld1ByaXZhdGUuaCIKICNpbXBvcnQgIldlYlBhZ2VHcm91cC5o IgogI2ltcG9ydCAiV2ViUGFnZVByb3h5LmgiCkBAIC0yMjEsNiArMjI2LDM3IEBAIHN0YXRpYyB1 bnNpZ25lZCBsb25nIGxvbmcgZXhjZWVkZWREYXRhYmFzZVF1b3RhKFdLUGFnZVJlZiwgV0tGcmFt ZVJlZiwgV0tTZWN1cml0CiAgICAgcmV0dXJuIHN0ZDo6bWF4PHVuc2lnbmVkIGxvbmcgbG9uZz4o ZXhwZWN0ZWRVc2FnZSwgY3VycmVudERhdGFiYXNlVXNhZ2UgKiAxLjI1KTsKIH0KIAorc3RhdGlj IHZvaWQgcnVuT3BlblBhbmVsKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS09w ZW5QYW5lbFBhcmFtZXRlcnNSZWYgcGFyYW1ldGVycywgV0tPcGVuUGFuZWxSZXN1bHRMaXN0ZW5l clJlZiBsaXN0ZW5lciwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3sKKyAgICBXZWJJbnNwZWN0 b3JQcm94eSogd2ViSW5zcGVjdG9yUHJveHkgPSBzdGF0aWNfY2FzdDxXZWJJbnNwZWN0b3JQcm94 eSo+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8pKTsKKyAgICBBU1NFUlQod2ViSW5zcGVj dG9yUHJveHkpOworCisgICAgTlNPcGVuUGFuZWwgKm9wZW5QYW5lbCA9IFtOU09wZW5QYW5lbCBv cGVuUGFuZWxdOworICAgIFtvcGVuUGFuZWwgc2V0QWxsb3dzTXVsdGlwbGVTZWxlY3Rpb246V0tP cGVuUGFuZWxQYXJhbWV0ZXJzR2V0QWxsb3dzTXVsdGlwbGVGaWxlcyhwYXJhbWV0ZXJzKV07CisK KyAgICBXS1JldGFpbihsaXN0ZW5lcik7CisKKyAgICBbb3BlblBhbmVsIGJlZ2luU2hlZXRNb2Rh bEZvcldpbmRvdzp3ZWJJbnNwZWN0b3JQcm94eS0+aW5zcGVjdG9yV2luZG93KCkgY29tcGxldGlv bkhhbmRsZXI6XihOU0ludGVnZXIgcmVzdWx0KSB7CisgICAgICAgIGlmIChyZXN1bHQgPT0gTlNG aWxlSGFuZGxpbmdQYW5lbE9LQnV0dG9uKSB7CisgICAgICAgICAgICBXS011dGFibGVBcnJheVJl ZiBmaWxlVVJMcyA9IFdLTXV0YWJsZUFycmF5Q3JlYXRlKCk7CisKKyAgICAgICAgICAgIE5TVVJM ICpuc1VSTDsKKyAgICAgICAgICAgIGZvciAobnNVUkwgaW4gW29wZW5QYW5lbCBVUkxzXSkgewor ICAgICAgICAgICAgICAgIFdLVVJMUmVmIHdrVVJMID0gV0tVUkxDcmVhdGVXaXRoQ0ZVUkwoKENG VVJMUmVmKW5zVVJMKTsKKyAgICAgICAgICAgICAgICBXS0FycmF5QXBwZW5kSXRlbShmaWxlVVJM cywgd2tVUkwpOworICAgICAgICAgICAgICAgIFdLUmVsZWFzZSh3a1VSTCk7CisgICAgICAgICAg ICB9CisKKyAgICAgICAgICAgIFdLT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJDaG9vc2VGaWxlcyhs aXN0ZW5lciwgZmlsZVVSTHMpOworCisgICAgICAgICAgICBXS1JlbGVhc2UoZmlsZVVSTHMpOwor ICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIFdLT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJDYW5j ZWwobGlzdGVuZXIpOworICAgICAgICAKKyAgICAgICAgV0tSZWxlYXNlKGxpc3RlbmVyKTsKKyAg ICB9XTsKK30KKwogdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6c2V0SW5zcGVjdG9yV2luZG93RnJh bWUoV0tSZWN0JiBmcmFtZSkKIHsKICAgICBpZiAobV9pc0F0dGFjaGVkKQpAQCAtNDA4LDcgKzQ0 NCw3IEBAIFdlYlBhZ2VQcm94eSogV2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlSW5z cGVjdG9yUGFnZSgpCiAgICAgICAgIDAsIC8vIGRpZERyYXcKICAgICAgICAgMCwgLy8gcGFnZURp ZFNjcm9sbAogICAgICAgICBleGNlZWRlZERhdGFiYXNlUXVvdGEsCi0gICAgICAgIDAsIC8vIHJ1 bk9wZW5QYW5lbAorICAgICAgICBydW5PcGVuUGFuZWwsCiAgICAgICAgIDAsIC8vIGRlY2lkZVBv bGljeUZvckdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3QKICAgICAgICAgMCwgLy8gaGVhZGVy SGVpZ2h0CiAgICAgICAgIDAsIC8vIGZvb3RlckhlaWdodAo= 201310 2013-05-09 19:00:41 -0700 2013-05-10 10:18:52 -0700 Patch v1b bug-115865-20130509185943.patch text/plain 4265 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5Njk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDM1MjBmMzg3NjkzZjQz YjhjNDBmZWNmYTRhYzEzZjAyMzlhY2M1My4uNDkyYzFlODY5ZmZlMDMwYmI3ZTE1Y2RmMjYwNGY0 ODMwZDM1NDQ4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA1LTA5ICBCcmlh biBKLiBCdXJnICA8YnVyZ0Bjcy53YXNoaW5ndG9uLmVkdT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBpbXBsZW1lbnQgcnVuT3BlblBhbmVsIGNhbGxiYWNrIGZvciBXZWJLaXQyIGluc3BlY3Rv cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1ODY1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9y UHJveHk6Omluc3BlY3RvcldpbmRvdyk6CisgICAgICAgIEFkZCBhbiBhY2Nlc3NvciBmb3IgbV9p bnNwZWN0b3JXaW5kb3cuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclBy b3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpydW5PcGVuUGFuZWwpOgorICAgICAgICBTaG93 IHRoZSBvcGVuIHBhbmVsIGRpYWxvZyB3aGVuIHJlcXVlc3RlZC4KKworICAgICAgICAoV2ViS2l0 OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdlKToKKyAgICAg ICAgUmVnaXN0ZXIgdGhlIGNhbGxiYWNrIHdoZW4gdGhlIGluc3BlY3RvciBwYWdlIGlzIGNyZWF0 ZWQuCisKIDIwMTMtMDUtMDcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K IAogICAgICAgICBDbGVhbiB1cCBLZXlmcmFtZVZhbHVlTGlzdCBhbmQgcmVsYXRlZCBjbGFzc2Vz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHku aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCmluZGV4IGRi OThkNDFkNDYwNGJkNDMyY2MyNTkxODA5NWYzZjcxMTE1MmJiMjMuLmVmNzE4ZjNhYjJkY2MyNWZi NTFmMTFmYTZkZDJiMDYzOGZlYjc2OGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJJbnNwZWN0b3JQcm94eS5oCkBAIC05Niw2ICs5Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHVw ZGF0ZUluc3BlY3RvcldpbmRvd1RpdGxlKCkgY29uc3Q7CiAgICAgdm9pZCBpbnNwZWN0ZWRWaWV3 RnJhbWVEaWRDaGFuZ2UoQ0dGbG9hdCA9IDApOwogICAgIHZvaWQgd2luZG93RnJhbWVEaWRDaGFu Z2UoKTsKKyAgICBOU1dpbmRvdyogaW5zcGVjdG9yV2luZG93KCkgY29uc3QgeyByZXR1cm4gbV9p bnNwZWN0b3JXaW5kb3cuZ2V0KCk7IH0KIAogICAgIHZvaWQgc2V0SW5zcGVjdG9yV2luZG93RnJh bWUoV0tSZWN0Jik7CiAgICAgV0tSZWN0IGluc3BlY3RvcldpbmRvd0ZyYW1lKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1t IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5tbQpp bmRleCA2MmZkYjU3MjY3NDliZDUyOTkzMjRjNzM5YzViNDU0OWVlMTZiODNhLi42NmY1ZjkxZjc1 NTUyOTM5NWY4ZjA2NDE5YWVlNWJlMTljZjliMmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvV2ViSW5zcGVjdG9yUHJveHlNYWMubW0KQEAgLTMxLDYgKzMxLDEx IEBACiAjaW1wb3J0ICJXS0FQSUNhc3QuaCIKICNpbXBvcnQgIldlYkNvbnRleHQuaCIKICNpbXBv cnQgIldLSW5zcGVjdG9yUHJpdmF0ZU1hYy5oIgorI2ltcG9ydCAiV0tNdXRhYmxlQXJyYXkuaCIK KyNpbXBvcnQgIldLT3BlblBhbmVsUGFyYW1ldGVycy5oIgorI2ltcG9ydCAiV0tPcGVuUGFuZWxS ZXN1bHRMaXN0ZW5lci5oIgorI2ltcG9ydCAiV0tSZXRhaW5QdHIuaCIKKyNpbXBvcnQgIldLVVJM Q0YuaCIKICNpbXBvcnQgIldLVmlld1ByaXZhdGUuaCIKICNpbXBvcnQgIldlYlBhZ2VHcm91cC5o IgogI2ltcG9ydCAiV2ViUGFnZVByb3h5LmgiCkBAIC0yMjEsNiArMjI2LDQyIEBAIHN0YXRpYyB1 bnNpZ25lZCBsb25nIGxvbmcgZXhjZWVkZWREYXRhYmFzZVF1b3RhKFdLUGFnZVJlZiwgV0tGcmFt ZVJlZiwgV0tTZWN1cml0CiAgICAgcmV0dXJuIHN0ZDo6bWF4PHVuc2lnbmVkIGxvbmcgbG9uZz4o ZXhwZWN0ZWRVc2FnZSwgY3VycmVudERhdGFiYXNlVXNhZ2UgKiAxLjI1KTsKIH0KIAorc3RhdGlj IHZvaWQgcnVuT3BlblBhbmVsKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS09w ZW5QYW5lbFBhcmFtZXRlcnNSZWYgcGFyYW1ldGVycywgV0tPcGVuUGFuZWxSZXN1bHRMaXN0ZW5l clJlZiBsaXN0ZW5lciwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3sKKyAgICBXZWJJbnNwZWN0 b3JQcm94eSogd2ViSW5zcGVjdG9yUHJveHkgPSBzdGF0aWNfY2FzdDxXZWJJbnNwZWN0b3JQcm94 eSo+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8pKTsKKyAgICBBU1NFUlQod2ViSW5zcGVj dG9yUHJveHkpOworCisgICAgTlNXaW5kb3cqIGluc3BlY3RvcldpbmRvdyA9IHdlYkluc3BlY3Rv clByb3h5LT5pbnNwZWN0b3JXaW5kb3coKTsKKyAgICBBU1NFUlQoaW5zcGVjdG9yV2luZG93KTsK KworICAgIGlmICghaW5zcGVjdG9yV2luZG93KQorICAgICAgICByZXR1cm47CisKKyAgICBOU09w ZW5QYW5lbCAqb3BlblBhbmVsID0gW05TT3BlblBhbmVsIG9wZW5QYW5lbF07CisgICAgW29wZW5Q YW5lbCBzZXRBbGxvd3NNdWx0aXBsZVNlbGVjdGlvbjpXS09wZW5QYW5lbFBhcmFtZXRlcnNHZXRB bGxvd3NNdWx0aXBsZUZpbGVzKHBhcmFtZXRlcnMpXTsKKworICAgIFdLUmV0YWluKGxpc3RlbmVy KTsKKworICAgIFtvcGVuUGFuZWwgYmVnaW5TaGVldE1vZGFsRm9yV2luZG93Omluc3BlY3Rvcldp bmRvdyBjb21wbGV0aW9uSGFuZGxlcjpeKE5TSW50ZWdlciByZXN1bHQpIHsKKyAgICAgICAgaWYg KHJlc3VsdCA9PSBOU0ZpbGVIYW5kbGluZ1BhbmVsT0tCdXR0b24pIHsKKyAgICAgICAgICAgIFdL TXV0YWJsZUFycmF5UmVmIGZpbGVVUkxzID0gV0tNdXRhYmxlQXJyYXlDcmVhdGUoKTsKKworICAg ICAgICAgICAgZm9yIChOU1VSTCogbnNVUkwgaW4gW29wZW5QYW5lbCBVUkxzXSkgeworICAgICAg ICAgICAgICAgIFdLVVJMUmVmIHdrVVJMID0gV0tVUkxDcmVhdGVXaXRoQ0ZVUkwocmVpbnRlcnBy ZXRfY2FzdDxDRlVSTFJlZj4obnNVUkwpKTsKKyAgICAgICAgICAgICAgICBXS0FycmF5QXBwZW5k SXRlbShmaWxlVVJMcywgd2tVUkwpOworICAgICAgICAgICAgICAgIFdLUmVsZWFzZSh3a1VSTCk7 CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIFdLT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJD aG9vc2VGaWxlcyhsaXN0ZW5lciwgZmlsZVVSTHMpOworCisgICAgICAgICAgICBXS1JlbGVhc2Uo ZmlsZVVSTHMpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIFdLT3BlblBhbmVsUmVzdWx0 TGlzdGVuZXJDYW5jZWwobGlzdGVuZXIpOworICAgICAgICAKKyAgICAgICAgV0tSZWxlYXNlKGxp c3RlbmVyKTsKKyAgICB9XTsKK30KKwogdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6c2V0SW5zcGVj dG9yV2luZG93RnJhbWUoV0tSZWN0JiBmcmFtZSkKIHsKICAgICBpZiAobV9pc0F0dGFjaGVkKQpA QCAtNDA4LDcgKzQ0OSw3IEBAIFdlYlBhZ2VQcm94eSogV2ViSW5zcGVjdG9yUHJveHk6OnBsYXRm b3JtQ3JlYXRlSW5zcGVjdG9yUGFnZSgpCiAgICAgICAgIDAsIC8vIGRpZERyYXcKICAgICAgICAg MCwgLy8gcGFnZURpZFNjcm9sbAogICAgICAgICBleGNlZWRlZERhdGFiYXNlUXVvdGEsCi0gICAg ICAgIDAsIC8vIHJ1bk9wZW5QYW5lbAorICAgICAgICBydW5PcGVuUGFuZWwsCiAgICAgICAgIDAs IC8vIGRlY2lkZVBvbGljeUZvckdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3QKICAgICAgICAg MCwgLy8gaGVhZGVySGVpZ2h0CiAgICAgICAgIDAsIC8vIGZvb3RlckhlaWdodAo= 201358 2013-05-10 10:18:55 -0700 2013-05-10 13:34:24 -0700 Patch v2 bug-115865-20130510101757.patch text/plain 4260 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5Njk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDM1MjBmMzg3NjkzZjQz YjhjNDBmZWNmYTRhYzEzZjAyMzlhY2M1My4uNDkyYzFlODY5ZmZlMDMwYmI3ZTE1Y2RmMjYwNGY0 ODMwZDM1NDQ4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA1LTA5ICBCcmlh biBKLiBCdXJnICA8YnVyZ0Bjcy53YXNoaW5ndG9uLmVkdT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBpbXBsZW1lbnQgcnVuT3BlblBhbmVsIGNhbGxiYWNrIGZvciBXZWJLaXQyIGluc3BlY3Rv cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1ODY1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9y UHJveHk6Omluc3BlY3RvcldpbmRvdyk6CisgICAgICAgIEFkZCBhbiBhY2Nlc3NvciBmb3IgbV9p bnNwZWN0b3JXaW5kb3cuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclBy b3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpydW5PcGVuUGFuZWwpOgorICAgICAgICBTaG93 IHRoZSBvcGVuIHBhbmVsIGRpYWxvZyB3aGVuIHJlcXVlc3RlZC4KKworICAgICAgICAoV2ViS2l0 OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdlKToKKyAgICAg ICAgUmVnaXN0ZXIgdGhlIGNhbGxiYWNrIHdoZW4gdGhlIGluc3BlY3RvciBwYWdlIGlzIGNyZWF0 ZWQuCisKIDIwMTMtMDUtMDcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K IAogICAgICAgICBDbGVhbiB1cCBLZXlmcmFtZVZhbHVlTGlzdCBhbmQgcmVsYXRlZCBjbGFzc2Vz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHku aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCmluZGV4IGRi OThkNDFkNDYwNGJkNDMyY2MyNTkxODA5NWYzZjcxMTE1MmJiMjMuLmVmNzE4ZjNhYjJkY2MyNWZi NTFmMTFmYTZkZDJiMDYzOGZlYjc2OGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJJbnNwZWN0b3JQcm94eS5oCkBAIC05Niw2ICs5Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHVw ZGF0ZUluc3BlY3RvcldpbmRvd1RpdGxlKCkgY29uc3Q7CiAgICAgdm9pZCBpbnNwZWN0ZWRWaWV3 RnJhbWVEaWRDaGFuZ2UoQ0dGbG9hdCA9IDApOwogICAgIHZvaWQgd2luZG93RnJhbWVEaWRDaGFu Z2UoKTsKKyAgICBOU1dpbmRvdyogaW5zcGVjdG9yV2luZG93KCkgY29uc3QgeyByZXR1cm4gbV9p bnNwZWN0b3JXaW5kb3cuZ2V0KCk7IH0KIAogICAgIHZvaWQgc2V0SW5zcGVjdG9yV2luZG93RnJh bWUoV0tSZWN0Jik7CiAgICAgV0tSZWN0IGluc3BlY3RvcldpbmRvd0ZyYW1lKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1t IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5tbQpp bmRleCA2MmZkYjU3MjY3NDliZDUyOTkzMjRjNzM5YzViNDU0OWVlMTZiODNhLi5mNjQxZjg0MWI5 YTQzN2Y2MDU5Mjc5YjMyZGM3NjJmYWI0MjlmZDhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvV2ViSW5zcGVjdG9yUHJveHlNYWMubW0KQEAgLTMxLDYgKzMxLDEx IEBACiAjaW1wb3J0ICJXS0FQSUNhc3QuaCIKICNpbXBvcnQgIldlYkNvbnRleHQuaCIKICNpbXBv cnQgIldLSW5zcGVjdG9yUHJpdmF0ZU1hYy5oIgorI2ltcG9ydCAiV0tNdXRhYmxlQXJyYXkuaCIK KyNpbXBvcnQgIldLT3BlblBhbmVsUGFyYW1ldGVycy5oIgorI2ltcG9ydCAiV0tPcGVuUGFuZWxS ZXN1bHRMaXN0ZW5lci5oIgorI2ltcG9ydCAiV0tSZXRhaW5QdHIuaCIKKyNpbXBvcnQgIldLVVJM Q0YuaCIKICNpbXBvcnQgIldLVmlld1ByaXZhdGUuaCIKICNpbXBvcnQgIldlYlBhZ2VHcm91cC5o IgogI2ltcG9ydCAiV2ViUGFnZVByb3h5LmgiCkBAIC0yMjEsNiArMjI2LDM3IEBAIHN0YXRpYyB1 bnNpZ25lZCBsb25nIGxvbmcgZXhjZWVkZWREYXRhYmFzZVF1b3RhKFdLUGFnZVJlZiwgV0tGcmFt ZVJlZiwgV0tTZWN1cml0CiAgICAgcmV0dXJuIHN0ZDo6bWF4PHVuc2lnbmVkIGxvbmcgbG9uZz4o ZXhwZWN0ZWRVc2FnZSwgY3VycmVudERhdGFiYXNlVXNhZ2UgKiAxLjI1KTsKIH0KIAorc3RhdGlj IHZvaWQgcnVuT3BlblBhbmVsKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS09w ZW5QYW5lbFBhcmFtZXRlcnNSZWYgcGFyYW1ldGVycywgV0tPcGVuUGFuZWxSZXN1bHRMaXN0ZW5l clJlZiBsaXN0ZW5lciwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3sKKyAgICBXZWJJbnNwZWN0 b3JQcm94eSogd2ViSW5zcGVjdG9yUHJveHkgPSBzdGF0aWNfY2FzdDxXZWJJbnNwZWN0b3JQcm94 eSo+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8pKTsKKyAgICBBU1NFUlQod2ViSW5zcGVj dG9yUHJveHkpOworCisgICAgTlNPcGVuUGFuZWwgKm9wZW5QYW5lbCA9IFtOU09wZW5QYW5lbCBv cGVuUGFuZWxdOworICAgIFtvcGVuUGFuZWwgc2V0QWxsb3dzTXVsdGlwbGVTZWxlY3Rpb246V0tP cGVuUGFuZWxQYXJhbWV0ZXJzR2V0QWxsb3dzTXVsdGlwbGVGaWxlcyhwYXJhbWV0ZXJzKV07CisK KyAgICBXS1JldGFpbihsaXN0ZW5lcik7CisKKyAgICAvLyBJZiB0aGUgaW5zcGVjdG9yIGlzIGRl dGFjaGVkLCB0aGVuIG9wZW5QYW5lbCB3aWxsIGJlIHdpbmRvdy1tb2RhbDsgb3RoZXJ3aXNlLCBv cGVuUGFuZWwgaXMgb3BlbmVkIGluIGEgbmV3IHdpbmRvdy4KKyAgICBbb3BlblBhbmVsIGJlZ2lu U2hlZXRNb2RhbEZvcldpbmRvdzp3ZWJJbnNwZWN0b3JQcm94eS0+aW5zcGVjdG9yV2luZG93KCkg Y29tcGxldGlvbkhhbmRsZXI6XihOU0ludGVnZXIgcmVzdWx0KSB7CisgICAgICAgIGlmIChyZXN1 bHQgPT0gTlNGaWxlSGFuZGxpbmdQYW5lbE9LQnV0dG9uKSB7CisgICAgICAgICAgICBXS011dGFi bGVBcnJheVJlZiBmaWxlVVJMcyA9IFdLTXV0YWJsZUFycmF5Q3JlYXRlKCk7CisKKyAgICAgICAg ICAgIGZvciAoTlNVUkwqIG5zVVJMIGluIFtvcGVuUGFuZWwgVVJMc10pIHsKKyAgICAgICAgICAg ICAgICBXS1VSTFJlZiB3a1VSTCA9IFdLVVJMQ3JlYXRlV2l0aENGVVJMKHJlaW50ZXJwcmV0X2Nh c3Q8Q0ZVUkxSZWY+KG5zVVJMKSk7CisgICAgICAgICAgICAgICAgV0tBcnJheUFwcGVuZEl0ZW0o ZmlsZVVSTHMsIHdrVVJMKTsKKyAgICAgICAgICAgICAgICBXS1JlbGVhc2Uod2tVUkwpOworICAg ICAgICAgICAgfQorCisgICAgICAgICAgICBXS09wZW5QYW5lbFJlc3VsdExpc3RlbmVyQ2hvb3Nl RmlsZXMobGlzdGVuZXIsIGZpbGVVUkxzKTsKKworICAgICAgICAgICAgV0tSZWxlYXNlKGZpbGVV UkxzKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBXS09wZW5QYW5lbFJlc3VsdExpc3Rl bmVyQ2FuY2VsKGxpc3RlbmVyKTsKKyAgICAgICAgCisgICAgICAgIFdLUmVsZWFzZShsaXN0ZW5l cik7CisgICAgfV07Cit9CisKIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OnNldEluc3BlY3Rvcldp bmRvd0ZyYW1lKFdLUmVjdCYgZnJhbWUpCiB7CiAgICAgaWYgKG1faXNBdHRhY2hlZCkKQEAgLTQw OCw3ICs0NDQsNyBAQCBXZWJQYWdlUHJveHkqIFdlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybUNy ZWF0ZUluc3BlY3RvclBhZ2UoKQogICAgICAgICAwLCAvLyBkaWREcmF3CiAgICAgICAgIDAsIC8v IHBhZ2VEaWRTY3JvbGwKICAgICAgICAgZXhjZWVkZWREYXRhYmFzZVF1b3RhLAotICAgICAgICAw LCAvLyBydW5PcGVuUGFuZWwKKyAgICAgICAgcnVuT3BlblBhbmVsLAogICAgICAgICAwLCAvLyBk ZWNpZGVQb2xpY3lGb3JHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0CiAgICAgICAgIDAsIC8v IGhlYWRlckhlaWdodAogICAgICAgICAwLCAvLyBmb290ZXJIZWlnaHQK