57516 2011-03-30 17:50:11 -0700 Add ability to get frame from v8 context to chromium WebKit API 2011-04-05 22:54:19 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 57912 57920 1 aa aa abarth commit-queue fishd oldest_to_newest 376824 0 aa 2011-03-30 17:50:11 -0700 Add ability to get frame from v8-wrapped DOMWindow to chromium WebKit API 376825 1 87647 aa 2011-03-30 17:50:59 -0700 Created attachment 87647 Patch 376826 2 87647 abarth 2011-03-30 17:55:20 -0700 Comment on attachment 87647 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87647&action=review Also, there's no test. How will we know when we break this code? > Source/WebKit/chromium/public/WebFrame.h:109 > + WEBKIT_API static WebFrame* getFrameForV8WrappedDOMWindow( > + v8::Handle<v8::Value>); Can we pass in a v8::Context instead? > Source/WebKit/chromium/src/WebFrameImpl.cpp:500 > + v8::Handle<v8::Object> windowObject = V8DOMWrapper::lookupDOMWrapper( > + V8DOMWindow::GetTemplate(), > + v8::Handle<v8::Object>::Cast(windowValue)); > + if (windowObject.IsEmpty()) > + return 0; > + > + DOMWindow* nativeWindow = V8DOMWindow::toNative(windowObject); > + ASSERT(nativeWindow); > + > + Frame* frame = nativeWindow->frame(); > + if (!frame || frame->domWindow() != nativeWindow) > + return 0; > + > + return WebFrameImpl::fromFrame(frame); This logic should be in WebCore/bindings. If we change the internal structure of these objects, we shouldn't have to change the WebKit layer. 379228 3 88163 aa 2011-04-04 16:59:00 -0700 Created attachment 88163 Patch V8 team added a way to get the context for an object, so this patch is very simple now. I tried adding a test using webkit_unit_tests, but v8 does not appear to work there. Please don't make me add layout tests. Please. 379235 4 88163 abarth 2011-04-04 17:10:31 -0700 Comment on attachment 88163 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88163&action=review This looks much better. > Source/WebKit/chromium/public/WebFrame.h:107 > + // correspond to a frame (eg workers). eg => e.g., 379239 5 abarth 2011-04-04 17:11:15 -0700 +fishd for WebKit API review. (Notice how I cleverly passed the buck on deciding whether you need to include a test!) 379249 6 88171 aa 2011-04-04 17:28:59 -0700 Created attachment 88171 Patch fix e.g. 379856 7 88171 fishd 2011-04-05 14:09:53 -0700 Comment on attachment 88171 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88171&action=review Can you extend WebFrameTest.cpp to exercise this method? > Source/WebKit/chromium/public/WebFrame.h:108 > + WEBKIT_API static WebFrame* frameForV8Context(v8::Handle<v8::Context>); hmm... i know why you called this frameForV8Context, but maybe it would be better to just name this frameForContext since the parameter type carries the V8 bit. also, this name better matches up with frameFor{Entered,Current}Context. perhaps you could put this new method above fromFrameOwnerElement so that it is grouped together with the other frameFor*Context methods? 379869 8 88310 aa 2011-04-05 14:43:03 -0700 Created attachment 88310 Patch Good ideas, done. PTAL. 379870 9 88310 aa 2011-04-05 14:51:40 -0700 Comment on attachment 88310 Patch I tried creating a unit test for this, but v8 segfaulted as soon as it was entered inside a test. I'm going to land this now, but separately dig into why the crash. I wasn't sure whether v8 was supposed to be usable inside the test environment or not. 379962 10 88334 aa 2011-04-05 16:33:18 -0700 Created attachment 88334 Patch Added a test. Turns out JavaScript wasn't enabled :| 380026 11 88334 commit-queue 2011-04-05 18:55:57 -0700 Comment on attachment 88334 Patch Clearing flags on attachment: 88334 Committed r83007: <http://trac.webkit.org/changeset/83007> 380027 12 commit-queue 2011-04-05 18:56:03 -0700 All reviewed patches have been landed. Closing bug. 87647 2011-03-30 17:50:59 -0700 2011-04-04 16:58:58 -0700 Patch bug-57516-20110330175058.patch text/plain 2988 aa U3VidmVyc2lvbiBSZXZpc2lvbjogODI1MTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg OGJlY2RiYTg0NWNjZTgwZTRmOTRiNTU5OTEzYjYwZWQ1Y2M5OGY5Ny4uZTMwMzYzNjQwN2U2ZmM5 YmY5YTM4NzFhNDQwMDZmYjA5ZWUyZTBiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAxMS0wMy0zMCAgQWFyb24gQm9vZG1hbiAgPGFhQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg YWJpbGl0eSB0byBnZXQgZnJhbWUgZnJvbSB2OC13cmFwcGVkIERPTVdpbmRvdyB0byBjaHJvbWl1 bSBXZWJLaXQgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01NzUxNgorCisgICAgICAgICogcHVibGljL1dlYkZyYW1lLmg6CisgICAgICAgICogc3Jj L1dlYkZyYW1lSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lOjpnZXRGcmFtZUZv clY4V3JhcHBlZERPTVdpbmRvdyk6CisKIDIwMTEtMDMtMjkgIEpvaG4gQWJkLUVsLU1hbGVrICA8 amFtQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaCBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgKaW5kZXggZDVkMmZmNGQyNWYzMmY3 ZTQ2N2QxNjQxYTI0MzhlNTNiYmVkMTc0OS4uOGY4MWZlY2E4OTE2OTljZjFiZWQ2Yjg0YmM4YWI3 M2JhM2ExOGRlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi RnJhbWUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCkBA IC0xMDEsNiArMTAxLDE0IEBAIHB1YmxpYzoKICAgICAvLyB0aGUgZ2l2ZW4gZWxlbWVudCBpcyBu b3QgYSBmcmFtZSwgaWZyYW1lIG9yIGlmIHRoZSBmcmFtZSBpcyBlbXB0eS4KICAgICBXRUJLSVRf QVBJIHN0YXRpYyBXZWJGcmFtZSogZnJvbUZyYW1lT3duZXJFbGVtZW50KGNvbnN0IFdlYkVsZW1l bnQmKTsKIAorI2lmIFdFQktJVF9VU0lOR19WOAorICAgIC8vIFJldHVybnMgdGhlIGZyYW1lIGNv cnJlc3BvbmRpbmcgdG8gdGhlIERPTVdpbmRvdyB3cmFwcGVkIGJ5IHRoZSBwYXNzZWQgdjgKKyAg ICAvLyB2YWx1ZS4gSWYgdGhlIHBhc3NlZCB2YWx1ZSBpcyBub3Qgd3JhcHBpbmcgYSBET01XaW5k b3csIG9yIGlmIHRoZQorICAgIC8vIERPTVdpbmRvdyBoYXMgbm8gYXNzb2NpYXRlZCBmcmFtZSwg cmV0dXJucyAwLgorICAgIFdFQktJVF9BUEkgc3RhdGljIFdlYkZyYW1lKiBnZXRGcmFtZUZvclY4 V3JhcHBlZERPTVdpbmRvdygKKyAgICAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+KTsKKyNlbmRp ZgorCiAKICAgICAvLyBCYXNpYyBwcm9wZXJ0aWVzIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViRnJhbWVJbXBsLmNwcAppbmRleCBmZGZiMTRlMTNlYWVkMWQ0NTc4MDg5YzZkYjQ3NzdmOTZk NjY2YzkyLi4xMmI3N2RmNGRmMDcxYjczMTY0NTE4OGNmYWFhYTY4ZDA4YzI0NzViIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKQEAgLTEyNiw2ICsxMjYs OCBAQAogI2luY2x1ZGUgIlN1YnN0aXR1dGVEYXRhLmgiCiAjaW5jbHVkZSAiVGV4dEFmZmluaXR5 LmgiCiAjaW5jbHVkZSAiVGV4dEl0ZXJhdG9yLmgiCisjaW5jbHVkZSAiVjhET01XaW5kb3cuaCIK KyNpbmNsdWRlICJWOERPTVdyYXBwZXIuaCIKICNpbmNsdWRlICJXZWJBbmltYXRpb25Db250cm9s bGVySW1wbC5oIgogI2luY2x1ZGUgIldlYkNvbnNvbGVNZXNzYWdlLmgiCiAjaW5jbHVkZSAiV2Vi RGF0YVNvdXJjZUltcGwuaCIKQEAgLTQ3OSw2ICs0ODEsMjUgQEAgV2ViRnJhbWUqIFdlYkZyYW1l Ojpmcm9tRnJhbWVPd25lckVsZW1lbnQoY29uc3QgV2ViRWxlbWVudCYgZWxlbWVudCkKICAgICAg ICAgUGFzc1JlZlB0cjxFbGVtZW50PihlbGVtZW50KS5nZXQoKSk7CiB9CiAKK1dlYkZyYW1lKiBX ZWJGcmFtZTo6Z2V0RnJhbWVGb3JWOFdyYXBwZWRET01XaW5kb3coCisgICAgdjg6OkhhbmRsZTx2 ODo6VmFsdWU+IHdpbmRvd1ZhbHVlKQoreworICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gd2lu ZG93T2JqZWN0ID0gVjhET01XcmFwcGVyOjpsb29rdXBET01XcmFwcGVyKAorICAgICAgICBWOERP TVdpbmRvdzo6R2V0VGVtcGxhdGUoKSwKKyAgICAgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6 Q2FzdCh3aW5kb3dWYWx1ZSkpOworICAgIGlmICh3aW5kb3dPYmplY3QuSXNFbXB0eSgpKQorICAg ICAgICByZXR1cm4gMDsKKworICAgIERPTVdpbmRvdyogbmF0aXZlV2luZG93ID0gVjhET01XaW5k b3c6OnRvTmF0aXZlKHdpbmRvd09iamVjdCk7CisgICAgQVNTRVJUKG5hdGl2ZVdpbmRvdyk7CisK KyAgICBGcmFtZSogZnJhbWUgPSBuYXRpdmVXaW5kb3ctPmZyYW1lKCk7CisgICAgaWYgKCFmcmFt ZSB8fCBmcmFtZS0+ZG9tV2luZG93KCkgIT0gbmF0aXZlV2luZG93KQorICAgICAgICByZXR1cm4g MDsKKworICAgIHJldHVybiBXZWJGcmFtZUltcGw6OmZyb21GcmFtZShmcmFtZSk7Cit9CisKIFdl YlN0cmluZyBXZWJGcmFtZUltcGw6Om5hbWUoKSBjb25zdAogewogICAgIHJldHVybiBtX2ZyYW1l LT50cmVlKCktPnVuaXF1ZU5hbWUoKTsK 88163 2011-04-04 16:59:00 -0700 2011-04-04 17:28:56 -0700 Patch bug-57516-20110404165859.patch text/plain 2272 aa U3VidmVyc2lvbiBSZXZpc2lvbjogODI4OTMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg Mjk3OWRiYjBmODUyMzAxODE1Yzk1ZTA1NmZlYWYyZTQwZmYyMDgyZi4uNTZmYjg5YzgwNTlkN2Rl MWI4MmIyYmUwZGU2ZmExNTM1NTYyNDY1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAxMS0wNC0wNCAgQWFyb24gQm9vZG1hbiAgPGFhQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg YWJpbGl0eSB0byBnZXQgZnJhbWUgZnJvbSB2OCBjb250ZXh0IHRvIGNocm9taXVtIFdlYktpdCBB UEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NTE2 CisKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWUuaDoKKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmZyYW1lRm9yVjhDb250ZXh0KToK KwogMjAxMS0wNC0wNCAgQ2hhbmcgU2h1ICA8Y3NodUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYkZyYW1lLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJG cmFtZS5oCmluZGV4IGQ1ZDJmZjRkMjVmMzJmN2U0NjdkMTY0MWEyNDM4ZTUzYmJlZDE3NDkuLmM2 YmU0MjIzZTk5Y2JkNzIwODg0MWQ4NWIxYzVkMGYyODAxMTEwNTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaApAQCAtMTAxLDYgKzEwMSwxMyBAQCBwdWJsaWM6CiAg ICAgLy8gdGhlIGdpdmVuIGVsZW1lbnQgaXMgbm90IGEgZnJhbWUsIGlmcmFtZSBvciBpZiB0aGUg ZnJhbWUgaXMgZW1wdHkuCiAgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViRnJhbWUqIGZyb21GcmFt ZU93bmVyRWxlbWVudChjb25zdCBXZWJFbGVtZW50Jik7CiAKKyNpZiBXRUJLSVRfVVNJTkdfVjgK KyAgICAvLyBSZXR1cm5zIHRoZSBmcmFtZSBjb3JyZXNwb25kaW5nIHRvIHRoZSBnaXZlbiB2OCBj b250ZXh0LiBUaGlzIGNhbiByZXR1cm4KKyAgICAvLyAwIGlmIHRoZSBjb250ZXh0IGlzIGRldGFj aGVkIGZyb20gdGhlIGZyYW1lLCBvciBpZiB0aGUgY29udGV4dCBkb2Vzbid0CisgICAgLy8gY29y cmVzcG9uZCB0byBhIGZyYW1lIChlZyB3b3JrZXJzKS4KKyAgICBXRUJLSVRfQVBJIHN0YXRpYyBX ZWJGcmFtZSogZnJhbWVGb3JWOENvbnRleHQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4pOworI2Vu ZGlmCisKIAogICAgIC8vIEJhc2ljIHByb3BlcnRpZXMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJGcmFtZUltcGwuY3BwCmluZGV4IGZkZmIxNGUxM2VhZWQxZDQ1NzgwODljNmRiNDc3N2Y5 NmQ2NjZjOTIuLjVlNWYyYjM3Njc1Y2VjM2RlNzVhZmQyZDM4OTYzYTc1YjU1NmE5YjkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcApAQCAtNDc5LDYgKzQ3 OSwxMyBAQCBXZWJGcmFtZSogV2ViRnJhbWU6OmZyb21GcmFtZU93bmVyRWxlbWVudChjb25zdCBX ZWJFbGVtZW50JiBlbGVtZW50KQogICAgICAgICBQYXNzUmVmUHRyPEVsZW1lbnQ+KGVsZW1lbnQp LmdldCgpKTsKIH0KIAorI2lmIFdFQktJVF9VU0lOR19WOAorV2ViRnJhbWUqIFdlYkZyYW1lOjpm cmFtZUZvclY4Q29udGV4dCh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0KQoreworICAg IHJldHVybiBXZWJGcmFtZUltcGw6OmZyb21GcmFtZShWOFByb3h5OjpyZXRyaWV2ZUZyYW1lKGNv bnRleHQpKTsKK30KKyNlbmRpZgorCiBXZWJTdHJpbmcgV2ViRnJhbWVJbXBsOjpuYW1lKCkgY29u c3QKIHsKICAgICByZXR1cm4gbV9mcmFtZS0+dHJlZSgpLT51bmlxdWVOYW1lKCk7Cg== 88171 2011-04-04 17:28:59 -0700 2011-04-05 14:43:00 -0700 Patch bug-57516-20110404172858.patch text/plain 2275 aa U3VidmVyc2lvbiBSZXZpc2lvbjogODI4OTMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg Mjk3OWRiYjBmODUyMzAxODE1Yzk1ZTA1NmZlYWYyZTQwZmYyMDgyZi4uNTZmYjg5YzgwNTlkN2Rl MWI4MmIyYmUwZGU2ZmExNTM1NTYyNDY1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAxMS0wNC0wNCAgQWFyb24gQm9vZG1hbiAgPGFhQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg YWJpbGl0eSB0byBnZXQgZnJhbWUgZnJvbSB2OCBjb250ZXh0IHRvIGNocm9taXVtIFdlYktpdCBB UEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NTE2 CisKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWUuaDoKKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmZyYW1lRm9yVjhDb250ZXh0KToK KwogMjAxMS0wNC0wNCAgQ2hhbmcgU2h1ICA8Y3NodUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYkZyYW1lLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJG cmFtZS5oCmluZGV4IGQ1ZDJmZjRkMjVmMzJmN2U0NjdkMTY0MWEyNDM4ZTUzYmJlZDE3NDkuLjY4 YWEwNjg5MWY0MTIxYmU3ZGU2NTM5OWE2ZjI0NjkyNjA5YzY4ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaApAQCAtMTAxLDYgKzEwMSwxMyBAQCBwdWJsaWM6CiAg ICAgLy8gdGhlIGdpdmVuIGVsZW1lbnQgaXMgbm90IGEgZnJhbWUsIGlmcmFtZSBvciBpZiB0aGUg ZnJhbWUgaXMgZW1wdHkuCiAgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViRnJhbWUqIGZyb21GcmFt ZU93bmVyRWxlbWVudChjb25zdCBXZWJFbGVtZW50Jik7CiAKKyNpZiBXRUJLSVRfVVNJTkdfVjgK KyAgICAvLyBSZXR1cm5zIHRoZSBmcmFtZSBjb3JyZXNwb25kaW5nIHRvIHRoZSBnaXZlbiB2OCBj b250ZXh0LiBUaGlzIGNhbiByZXR1cm4KKyAgICAvLyAwIGlmIHRoZSBjb250ZXh0IGlzIGRldGFj aGVkIGZyb20gdGhlIGZyYW1lLCBvciBpZiB0aGUgY29udGV4dCBkb2Vzbid0CisgICAgLy8gY29y cmVzcG9uZCB0byBhIGZyYW1lIChlLmcuLCB3b3JrZXJzKS4KKyAgICBXRUJLSVRfQVBJIHN0YXRp YyBXZWJGcmFtZSogZnJhbWVGb3JWOENvbnRleHQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4pOwor I2VuZGlmCisKIAogICAgIC8vIEJhc2ljIHByb3BlcnRpZXMgLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJGcmFtZUltcGwuY3BwCmluZGV4IGZkZmIxNGUxM2VhZWQxZDQ1NzgwODljNmRiNDc3 N2Y5NmQ2NjZjOTIuLjVlNWYyYjM3Njc1Y2VjM2RlNzVhZmQyZDM4OTYzYTc1YjU1NmE5YjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcApAQCAtNDc5LDYg KzQ3OSwxMyBAQCBXZWJGcmFtZSogV2ViRnJhbWU6OmZyb21GcmFtZU93bmVyRWxlbWVudChjb25z dCBXZWJFbGVtZW50JiBlbGVtZW50KQogICAgICAgICBQYXNzUmVmUHRyPEVsZW1lbnQ+KGVsZW1l bnQpLmdldCgpKTsKIH0KIAorI2lmIFdFQktJVF9VU0lOR19WOAorV2ViRnJhbWUqIFdlYkZyYW1l OjpmcmFtZUZvclY4Q29udGV4dCh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0KQorewor ICAgIHJldHVybiBXZWJGcmFtZUltcGw6OmZyb21GcmFtZShWOFByb3h5OjpyZXRyaWV2ZUZyYW1l KGNvbnRleHQpKTsKK30KKyNlbmRpZgorCiBXZWJTdHJpbmcgV2ViRnJhbWVJbXBsOjpuYW1lKCkg Y29uc3QKIHsKICAgICByZXR1cm4gbV9mcmFtZS0+dHJlZSgpLT51bmlxdWVOYW1lKCk7Cg== 88310 2011-04-05 14:43:03 -0700 2011-04-05 16:33:15 -0700 Patch bug-57516-20110405144302.patch text/plain 2406 aa U3VidmVyc2lvbiBSZXZpc2lvbjogODI5ODIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg Mzg4YTJmNTg0NDVjMzliZjE5MDBhZDEzNzNiMTE2ZGU2NzUyNTczZC4uYTZkN2M2NGE2MTgxODI2 NjkxNzNhZjMwMGU1NzViNTE5M2YzNjExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAxMS0wNC0wNCAgQWFyb24gQm9vZG1hbiAgPGFhQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg YWJpbGl0eSB0byBnZXQgZnJhbWUgZnJvbSB2OCBjb250ZXh0IHRvIGNocm9taXVtIFdlYktpdCBB UEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NTE2 CisKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWUuaDoKKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmZyYW1lRm9yVjhDb250ZXh0KToK KwogMjAxMS0wNC0wNSAgWmVsaWRyYWcgSG9ybnVuZyAgPHplbGlkcmFnQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJGcmFtZS5oCmluZGV4IGQ1ZDJmZjRkMjVmMzJmN2U0NjdkMTY0MWEyNDM4ZTUz YmJlZDE3NDkuLjExMTE0MjI0NWYwM2JmNThlMjczMGUwNTJjOTJmYWQ5NGMzYmQzNjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaApAQCAtOTcsNiArOTcsMTMgQEAg cHVibGljOgogICAgIFdFQktJVF9BUEkgc3RhdGljIFdlYkZyYW1lKiBmcmFtZUZvckVudGVyZWRD b250ZXh0KCk7CiAgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViRnJhbWUqIGZyYW1lRm9yQ3VycmVu dENvbnRleHQoKTsKIAorI2lmIFdFQktJVF9VU0lOR19WOAorICAgIC8vIFJldHVybnMgdGhlIGZy YW1lIGNvcnJlc3BvbmRpbmcgdG8gdGhlIGdpdmVuIGNvbnRleHQuIFRoaXMgY2FuIHJldHVybiAw CisgICAgLy8gaWYgdGhlIGNvbnRleHQgaXMgZGV0YWNoZWQgZnJvbSB0aGUgZnJhbWUsIG9yIGlm IHRoZSBjb250ZXh0IGRvZXNuJ3QKKyAgICAvLyBjb3JyZXNwb25kIHRvIGEgZnJhbWUgKGUuZy4s IHdvcmtlcnMpLgorICAgIFdFQktJVF9BUEkgc3RhdGljIFdlYkZyYW1lKiBmcmFtZUZvckNvbnRl eHQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4pOworI2VuZGlmCisKICAgICAvLyBSZXR1cm5zIHRo ZSBmcmFtZSBpbnNpZGUgYSBnaXZlbiBmcmFtZSBvciBpZnJhbWUgZWxlbWVudC4gUmV0dXJucyAw IGlmCiAgICAgLy8gdGhlIGdpdmVuIGVsZW1lbnQgaXMgbm90IGEgZnJhbWUsIGlmcmFtZSBvciBp ZiB0aGUgZnJhbWUgaXMgZW1wdHkuCiAgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViRnJhbWUqIGZy b21GcmFtZU93bmVyRWxlbWVudChjb25zdCBXZWJFbGVtZW50Jik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAppbmRleCA5YzVlMDVmNWMwZDZlODM0OGU5MDBh N2E5M2Q1MWQ0MTM3OTdmYmVjLi5hOTZiYjBiNmRmNDUxY2U3NWZiZjc4ZjBlZWVhMzM2ZTZkZTRh MWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKQEAg LTQ3Myw2ICs0NzMsMTMgQEAgV2ViRnJhbWUqIFdlYkZyYW1lOjpmcmFtZUZvckN1cnJlbnRDb250 ZXh0KCkKICAgICByZXR1cm4gV2ViRnJhbWVJbXBsOjpmcm9tRnJhbWUoZnJhbWUpOwogfQogCisj aWYgV0VCS0lUX1VTSU5HX1Y4CitXZWJGcmFtZSogV2ViRnJhbWU6OmZyYW1lRm9yQ29udGV4dCh2 ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0KQoreworICAgIHJldHVybiBXZWJGcmFtZUlt cGw6OmZyb21GcmFtZShWOFByb3h5OjpyZXRyaWV2ZUZyYW1lKGNvbnRleHQpKTsKK30KKyNlbmRp ZgorCiBXZWJGcmFtZSogV2ViRnJhbWU6OmZyb21GcmFtZU93bmVyRWxlbWVudChjb25zdCBXZWJF bGVtZW50JiBlbGVtZW50KQogewogICAgIHJldHVybiBXZWJGcmFtZUltcGw6OmZyb21GcmFtZU93 bmVyRWxlbWVudCgK 88334 2011-04-05 16:33:18 -0700 2011-04-05 18:55:57 -0700 Patch bug-57516-20110405163317.patch text/plain 8542 aa U3VidmVyc2lvbiBSZXZpc2lvbjogODI5OTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg Mzg4YTJmNTg0NDVjMzliZjE5MDBhZDEzNzNiMTE2ZGU2NzUyNTczZC4uYTZkN2M2NGE2MTgxODI2 NjkxNzNhZjMwMGU1NzViNTE5M2YzNjExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAxMS0wNC0wNCAgQWFyb24gQm9vZG1hbiAgPGFhQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg YWJpbGl0eSB0byBnZXQgZnJhbWUgZnJvbSB2OCBjb250ZXh0IHRvIGNocm9taXVtIFdlYktpdCBB UEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NTE2 CisKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWUuaDoKKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmZyYW1lRm9yVjhDb250ZXh0KToK KwogMjAxMS0wNC0wNSAgWmVsaWRyYWcgSG9ybnVuZyAgPHplbGlkcmFnQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0 Lmd5cAppbmRleCAyNjNiNDllNTQ4Mjc1ZDExYTZiNGNjMDI0ZWYxYmY1Y2ZkMDk2NGM3Li44MDAz ZWQ0YmE0NTU5ODg3Zjg5NTRmY2VhODkzZTc1Nzg3Yzk5MTEzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9X ZWJLaXQuZ3lwCkBAIC04MTUsMTEgKzgxNSwxMCBAQAogICAgICAgICAgICAgICAgICAgICAnY29u ZGl0aW9ucyc6IFsKICAgICAgICAgICAgICAgICAgICAgICAgIFsnT1M9PSJ3aW4iJywgewogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICdzb3VyY2VzJzogWwotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAjIEZJWE1FOiBQb3J0IFBvcHVwTWVudVRlc3QgYW5kIFdlYkZyYW1lVGVz dCB0byBMaW51eCBhbmQgTWFjLgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIEZJ WE1FOiBQb3J0IFBvcHVwTWVudVRlc3QgdG8gTGludXggYW5kIE1hYy4KICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgJ3Rlc3RzL1BvcHVwTWVudVRlc3QuY3BwJywKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJ3Rlc3RzL1RyYW5zcGFyZW5jeVdpblRlc3QuY3BwJywKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3Rlc3RzL1VuaXNjcmliZUhlbHBlclRlc3Qu Y3BwJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3Rlc3RzL1dlYkZyYW1lVGVz dC5jcHAnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAndGVzdHMvV2ViUGFnZVNl cmlhbGl6ZXJUZXN0LmNwcCcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXSwKICAgICAg ICAgICAgICAgICAgICAgICAgIH1dLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9XZWJLaXQuZ3lwaSBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cGkKaW5kZXgg MDE2Y2YxYTFhYmFkMzA0MzcwOWMyOGUwNmExOGYxMzFiZDc1NjE0Zi4uODgxMDFhMzFlOGRhY2Yy MmUwOTRiYjlmZjMyYzAwYWNhYzYxZjFhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9XZWJLaXQuZ3lwaQorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXBp CkBAIC02NCw2ICs2NCw3IEBACiAgICAgICAgICAgICAndGVzdHMvVGlsaW5nRGF0YVRlc3QuY3Bw JywKICAgICAgICAgICAgICd0ZXN0cy9UcmVlVGVzdEhlbHBlcnMuY3BwJywKICAgICAgICAgICAg ICd0ZXN0cy9UcmVlVGVzdEhlbHBlcnMuaCcsCisgICAgICAgICAgICAndGVzdHMvV2ViRnJhbWVU ZXN0LmNwcCcsCiAgICAgICAgIF0sCiAgICAgfSwKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJGcmFtZS5oCmluZGV4IGQ1ZDJmZjRkMjVmMzJmN2U0NjdkMTY0MWEyNDM4ZTUzYmJl ZDE3NDkuLjExMTE0MjI0NWYwM2JmNThlMjczMGUwNTJjOTJmYWQ5NGMzYmQzNjIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaApAQCAtOTcsNiArOTcsMTMgQEAgcHVi bGljOgogICAgIFdFQktJVF9BUEkgc3RhdGljIFdlYkZyYW1lKiBmcmFtZUZvckVudGVyZWRDb250 ZXh0KCk7CiAgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViRnJhbWUqIGZyYW1lRm9yQ3VycmVudENv bnRleHQoKTsKIAorI2lmIFdFQktJVF9VU0lOR19WOAorICAgIC8vIFJldHVybnMgdGhlIGZyYW1l IGNvcnJlc3BvbmRpbmcgdG8gdGhlIGdpdmVuIGNvbnRleHQuIFRoaXMgY2FuIHJldHVybiAwCisg ICAgLy8gaWYgdGhlIGNvbnRleHQgaXMgZGV0YWNoZWQgZnJvbSB0aGUgZnJhbWUsIG9yIGlmIHRo ZSBjb250ZXh0IGRvZXNuJ3QKKyAgICAvLyBjb3JyZXNwb25kIHRvIGEgZnJhbWUgKGUuZy4sIHdv cmtlcnMpLgorICAgIFdFQktJVF9BUEkgc3RhdGljIFdlYkZyYW1lKiBmcmFtZUZvckNvbnRleHQo djg6OkhhbmRsZTx2ODo6Q29udGV4dD4pOworI2VuZGlmCisKICAgICAvLyBSZXR1cm5zIHRoZSBm cmFtZSBpbnNpZGUgYSBnaXZlbiBmcmFtZSBvciBpZnJhbWUgZWxlbWVudC4gUmV0dXJucyAwIGlm CiAgICAgLy8gdGhlIGdpdmVuIGVsZW1lbnQgaXMgbm90IGEgZnJhbWUsIGlmcmFtZSBvciBpZiB0 aGUgZnJhbWUgaXMgZW1wdHkuCiAgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViRnJhbWUqIGZyb21G cmFtZU93bmVyRWxlbWVudChjb25zdCBXZWJFbGVtZW50Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAppbmRleCA5YzVlMDVmNWMwZDZlODM0OGU5MDBhN2E5 M2Q1MWQ0MTM3OTdmYmVjLi5hOTZiYjBiNmRmNDUxY2U3NWZiZjc4ZjBlZWVhMzM2ZTZkZTRhMWZl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKQEAgLTQ3 Myw2ICs0NzMsMTMgQEAgV2ViRnJhbWUqIFdlYkZyYW1lOjpmcmFtZUZvckN1cnJlbnRDb250ZXh0 KCkKICAgICByZXR1cm4gV2ViRnJhbWVJbXBsOjpmcm9tRnJhbWUoZnJhbWUpOwogfQogCisjaWYg V0VCS0lUX1VTSU5HX1Y4CitXZWJGcmFtZSogV2ViRnJhbWU6OmZyYW1lRm9yQ29udGV4dCh2ODo6 SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0KQoreworICAgIHJldHVybiBXZWJGcmFtZUltcGw6 OmZyb21GcmFtZShWOFByb3h5OjpyZXRyaWV2ZUZyYW1lKGNvbnRleHQpKTsKK30KKyNlbmRpZgor CiBXZWJGcmFtZSogV2ViRnJhbWU6OmZyb21GcmFtZU93bmVyRWxlbWVudChjb25zdCBXZWJFbGVt ZW50JiBlbGVtZW50KQogewogICAgIHJldHVybiBXZWJGcmFtZUltcGw6OmZyb21GcmFtZU93bmVy RWxlbWVudCgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViRnJh bWVUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNw cAppbmRleCA4OTFmYTgzOGQzNWE4MTNjZTEyNjA4MzA5ZmFhMjliYmM3M2Y4ZTViLi5iMzhkNTQ0 NTlhNDBmNGI3ZjdhNmE3MWZmNmE2ZTBlODNiMDNkNTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCkBAIC0zNSwxMSArMzUsMTMgQEAKICNpbmNs dWRlIDx3ZWJraXQvc3VwcG9ydC93ZWJraXRfc3VwcG9ydC5oPgogI2luY2x1ZGUgIldlYkZyYW1l LmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVDbGllbnQuaCIKKyNpbmNsdWRlICJXZWJTZXR0aW5ncy5o IgogI2luY2x1ZGUgIldlYlN0cmluZy5oIgogI2luY2x1ZGUgIldlYlVSTC5oIgogI2luY2x1ZGUg IldlYlVSTFJlcXVlc3QuaCIKICNpbmNsdWRlICJXZWJVUkxSZXNwb25zZS5oIgogI2luY2x1ZGUg IldlYlZpZXcuaCIKKyNpbmNsdWRlICJ2OC5oIgogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0Owog CkBAIC00NywyNSArNDksNDQgQEAgbmFtZXNwYWNlIHsKIAogY2xhc3MgV2ViRnJhbWVUZXN0IDog cHVibGljIHRlc3Rpbmc6OlRlc3QgewogcHVibGljOgotICAgIFdlYkZyYW1lVGVzdCgpIHt9Cisg ICAgV2ViRnJhbWVUZXN0KCkKKyAgICAgICAgOiBiYXNlVVJMKCJodHRwOi8vd3d3LnRlc3QuY29t LyIpCisgICAgeworICAgIH0KIAogICAgIHZpcnR1YWwgdm9pZCBUZWFyRG93bigpCiAgICAgewog ICAgICAgICB3ZWJraXRfc3VwcG9ydDo6VW5yZWdpc3RlckFsbE1vY2tlZFVSTHMoKTsKICAgICB9 CiAKLSAgICB2b2lkIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChjb25zdCBXZWJVUkwmIHVybCwgY29u c3QgV2ViVVJMUmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBXZWJTdHJpbmcmIGZpbGVOYW1lKQor ICAgIHZvaWQgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKGNvbnN0IHN0ZDo6c3RyaW5nJiBmaWxlTmFt ZSkKICAgICB7CisgICAgICAgIFdlYlVSTFJlc3BvbnNlIHJlc3BvbnNlOworICAgICAgICByZXNw b25zZS5pbml0aWFsaXplKCk7CisgICAgICAgIHJlc3BvbnNlLnNldE1JTUVUeXBlKCJ0ZXh0L2h0 bWwiKTsKKwogICAgICAgICBzdGQ6OnN0cmluZyBmaWxlUGF0aCA9IHdlYmtpdF9zdXBwb3J0OjpH ZXRXZWJLaXRSb290RGlyKCkudXRmOCgpOwotICAgICAgICBmaWxlUGF0aC5hcHBlbmQoIi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvIik7Ci0gICAgICAgIGZpbGVQYXRoLmFwcGVu ZChmaWxlTmFtZS51dGY4KCkpOwotICAgICAgICB3ZWJraXRfc3VwcG9ydDo6UmVnaXN0ZXJNb2Nr ZWRVUkwodXJsLCByZXNwb25zZSwgV2ViU3RyaW5nOjpmcm9tVVRGOChmaWxlUGF0aCkpOworICAg ICAgICBmaWxlUGF0aCArPSAiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvZGF0YS8iOwor ICAgICAgICBmaWxlUGF0aCArPSBmaWxlTmFtZTsKKworICAgICAgICB3ZWJraXRfc3VwcG9ydDo6 UmVnaXN0ZXJNb2NrZWRVUkwoV2ViVVJMKEdVUkwoYmFzZVVSTCArIGZpbGVOYW1lKSksIHJlc3Bv bnNlLCBXZWJTdHJpbmc6OmZyb21VVEY4KGZpbGVQYXRoKSk7CiAgICAgfQogCiAgICAgdm9pZCBz ZXJ2ZVJlcXVlc3RzKCkKICAgICB7CiAgICAgICAgIHdlYmtpdF9zdXBwb3J0OjpTZXJ2ZUFzeW5j aHJvbm91c01vY2tlZFJlcXVlc3RzKCk7CiAgICAgfQorCisgICAgdm9pZCBsb2FkRnJhbWUoV2Vi RnJhbWUqIGZyYW1lLCBjb25zdCBzdGQ6OnN0cmluZyYgZmlsZU5hbWUpCisgICAgeworICAgICAg ICBXZWJVUkxSZXF1ZXN0IHVybFJlcXVlc3Q7CisgICAgICAgIHVybFJlcXVlc3QuaW5pdGlhbGl6 ZSgpOworICAgICAgICB1cmxSZXF1ZXN0LnNldFVSTChXZWJVUkwoR1VSTChiYXNlVVJMICsgZmls ZU5hbWUpKSk7CisgICAgICAgIGZyYW1lLT5sb2FkUmVxdWVzdCh1cmxSZXF1ZXN0KTsKKyAgICB9 CisKK3Byb3RlY3RlZDoKKyAgICBzdGQ6OnN0cmluZyBiYXNlVVJMOwogfTsKIAogY2xhc3MgVGVz dFdlYkZyYW1lQ2xpZW50IDogcHVibGljIFdlYkZyYW1lQ2xpZW50IHsKQEAgLTczLDMxICs5NCwx NyBAQCBjbGFzcyBUZXN0V2ViRnJhbWVDbGllbnQgOiBwdWJsaWMgV2ViRnJhbWVDbGllbnQgewog CiBURVNUX0YoV2ViRnJhbWVUZXN0LCBDb250ZW50VGV4dCkKIHsKLSAgICAvLyBSZWdpc3RlciBv dXIgcmVzb3VyY2VzLgotICAgIFdlYlVSTFJlc3BvbnNlIHJlc3BvbnNlOwotICAgIHJlc3BvbnNl LmluaXRpYWxpemUoKTsKLSAgICByZXNwb25zZS5zZXRNSU1FVHlwZSgidGV4dC9odG1sIik7Ci0g ICAgc3RkOjpzdHJpbmcgcm9vdFVSTCA9ICJodHRwOi8vd3d3LnRlc3QuY29tLyI7Ci0gICAgY29u c3QgY2hhciogZmlsZXNbXSA9IHsgImlmcmFtZXNfdGVzdC5odG1sIiwgInZpc2libGVfaWZyYW1l Lmh0bWwiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICJpbnZpc2libGVfaWZyYW1lLmh0 bWwiLCAiemVyb19zaXplZF9pZnJhbWUuaHRtbCIgfTsKLSAgICBmb3IgKGludCBpID0gMDsgaSA8 IChzaXplb2YoZmlsZXMpIC8gc2l6ZW9mKGNoYXIqKSk7ICsraSkgewotICAgICAgICBXZWJVUkwg d2ViVVJMID0gR1VSTChyb290VVJMICsgZmlsZXNbaV0pOwotICAgICAgICByZWdpc3Rlck1vY2tl ZFVSTExvYWQod2ViVVJMLCByZXNwb25zZSwgV2ViU3RyaW5nOjpmcm9tVVRGOChmaWxlc1tpXSkp OwotICAgIH0KKyAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoImlmcmFtZXNfdGVzdC5odG1sIik7 CisgICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKCJ2aXNpYmxlX2lmcmFtZS5odG1sIik7CisgICAg cmVnaXN0ZXJNb2NrZWRVUkxMb2FkKCJpbnZpc2libGVfaWZyYW1lLmh0bWwiKTsKKyAgICByZWdp c3Rlck1vY2tlZFVSTExvYWQoInplcm9fc2l6ZWRfaWZyYW1lLmh0bWwiKTsKIAotICAgIC8vIENy ZWF0ZSBhbmQgaW5pdGlhbGl6ZSB0aGUgV2ViVmlldy4gICAgCisgICAgLy8gQ3JlYXRlIGFuZCBp bml0aWFsaXplIHRoZSBXZWJWaWV3LgogICAgIFRlc3RXZWJGcmFtZUNsaWVudCB3ZWJGcmFtZUNs aWVudDsKICAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gV2ViVmlldzo6Y3JlYXRlKDApOwogICAgIHdl YlZpZXctPmluaXRpYWxpemVNYWluRnJhbWUoJndlYkZyYW1lQ2xpZW50KTsKIAotICAgIC8vIExv YWQgdGhlIG1haW4gZnJhbWUgVVJMLgotICAgIFdlYlVSTCB0ZXN0VVJMKEdVUkwocm9vdFVSTCAr IGZpbGVzWzBdKSk7Ci0gICAgV2ViVVJMUmVxdWVzdCB1cmxSZXF1ZXN0OwotICAgIHVybFJlcXVl c3QuaW5pdGlhbGl6ZSgpOwotICAgIHVybFJlcXVlc3Quc2V0VVJMKHRlc3RVUkwpOwotICAgIHdl YlZpZXctPm1haW5GcmFtZSgpLT5sb2FkUmVxdWVzdCh1cmxSZXF1ZXN0KTsKLQotICAgIC8vIExv YWQgYWxsIHBlbmRpbmcgYXN5bmNocm9ub3VzIHJlcXVlc3RzLgorICAgIGxvYWRGcmFtZSh3ZWJW aWV3LT5tYWluRnJhbWUoKSwgImlmcmFtZXNfdGVzdC5odG1sIik7CiAgICAgc2VydmVSZXF1ZXN0 cygpOwogCiAgICAgLy8gTm93IHJldHJpZXZlIHRoZSBmcmFtZXMgdGV4dCBhbmQgdGVzdCBpdCBv bmx5IGluY2x1ZGVzIHZpc2libGUgZWxlbWVudHMuCkBAIC0xMTEsNCArMTE4LDMxIEBAIFRFU1Rf RihXZWJGcmFtZVRlc3QsIENvbnRlbnRUZXh0KQogICAgIHdlYlZpZXctPmNsb3NlKCk7CiB9CiAK K1RFU1RfRihXZWJGcmFtZVRlc3QsIEZyYW1lRm9yRW50ZXJlZENvbnRleHQpCit7CisgICAgcmVn aXN0ZXJNb2NrZWRVUkxMb2FkKCJpZnJhbWVzX3Rlc3QuaHRtbCIpOworICAgIHJlZ2lzdGVyTW9j a2VkVVJMTG9hZCgidmlzaWJsZV9pZnJhbWUuaHRtbCIpOworICAgIHJlZ2lzdGVyTW9ja2VkVVJM TG9hZCgiaW52aXNpYmxlX2lmcmFtZS5odG1sIik7CisgICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2Fk KCJ6ZXJvX3NpemVkX2lmcmFtZS5odG1sIik7CisKKyAgICAvLyBDcmVhdGUgYW5kIGluaXRpYWxp emUgdGhlIFdlYlZpZXcuCisgICAgVGVzdFdlYkZyYW1lQ2xpZW50IHdlYkZyYW1lQ2xpZW50Owor ICAgIFdlYlZpZXcqIHdlYlZpZXcgPSBXZWJWaWV3OjpjcmVhdGUoMCk7CisgICAgd2ViVmlldy0+ c2V0dGluZ3MoKS0+c2V0SmF2YVNjcmlwdEVuYWJsZWQodHJ1ZSk7CisgICAgd2ViVmlldy0+aW5p dGlhbGl6ZU1haW5GcmFtZSgmd2ViRnJhbWVDbGllbnQpOworCisgICAgbG9hZEZyYW1lKHdlYlZp ZXctPm1haW5GcmFtZSgpLCAiaWZyYW1lc190ZXN0Lmh0bWwiKTsKKyAgICBzZXJ2ZVJlcXVlc3Rz KCk7CisKKyAgICB2ODo6SGFuZGxlU2NvcGUgc2NvcGU7CisgICAgRVhQRUNUX0VRKHdlYlZpZXct Pm1haW5GcmFtZSgpLAorICAgICAgICAgICAgICBXZWJGcmFtZTo6ZnJhbWVGb3JDb250ZXh0KAor ICAgICAgICAgICAgICAgICAgd2ViVmlldy0+bWFpbkZyYW1lKCktPm1haW5Xb3JsZFNjcmlwdENv bnRleHQoKSkpOworICAgIEVYUEVDVF9FUSh3ZWJWaWV3LT5tYWluRnJhbWUoKS0+Zmlyc3RDaGls ZCgpLAorICAgICAgICAgICAgICBXZWJGcmFtZTo6ZnJhbWVGb3JDb250ZXh0KAorICAgICAgICAg ICAgICAgICAgd2ViVmlldy0+bWFpbkZyYW1lKCktPmZpcnN0Q2hpbGQoKS0+bWFpbldvcmxkU2Ny aXB0Q29udGV4dCgpKSk7CisKKyAgICB3ZWJWaWV3LT5jbG9zZSgpOworfQorCiB9Cg==