38750 2010-05-07 08:09:47 -0700 [Chromium] Add quota parameter to WebViewClient::createSessionStorageNamespace() 2010-05-10 07:27:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 hans webkit-unassigned commit-queue dglazkov eric fishd jorlow oldest_to_newest 222376 0 hans 2010-05-07 08:09:47 -0700 [Chromium] StorageNamespaceProxy should pass quota argument for SessionStorage 222380 1 55377 hans 2010-05-07 08:12:41 -0700 Created attachment 55377 Patch 222790 2 55377 eric 2010-05-07 21:50:04 -0700 Comment on attachment 55377 Patch Never in this bug or ChangeLog is there any explanation of "why". 223193 3 55377 jorlow 2010-05-10 01:31:33 -0700 Comment on attachment 55377 Patch Didn't you mean to commit-queue+ this? > diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog > index 039cd6c8cf40225242ab5e344228330c25ff298a..f524215c85002614593e2d1f2bc09fa3bef93f91 100644 > --- a/WebKit/chromium/ChangeLog > +++ b/WebKit/chromium/ChangeLog > @@ -1,3 +1,16 @@ > +2010-05-07 Hans Wennborg <hans@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + [Chromium] StorageNamespaceProxy should pass quota argument for SessionStorage > + https://bugs.webkit.org/show_bug.cgi?id=38750 Please explain why you're doing this and maybe a high level of what you're doing. > + > + * public/WebStorageNamespace.h: > + * public/WebViewClient.h: > + (WebKit::WebViewClient::createSessionStorageNamespace): > + * src/StorageNamespaceProxy.cpp: > + (WebCore::StorageNamespace::sessionStorageNamespace): > + > 2010-05-06 Pavel Feldman <pfeldman@chromium.org> > > Reviewed by Timothy Hatcher. > diff --git a/WebKit/chromium/public/WebStorageNamespace.h b/WebKit/chromium/public/WebStorageNamespace.h > index 4b648d43a63622dd5b149af588715879ee1f403a..df9feaaeee11a6e89391d7287de5214ae49aef8e 100644 > --- a/WebKit/chromium/public/WebStorageNamespace.h > +++ b/WebKit/chromium/public/WebStorageNamespace.h > @@ -49,11 +49,22 @@ public: > // object when you're finished. > WEBKIT_API static WebStorageNamespace* createLocalStorageNamespace(const WebString& backingDirectoryPath, unsigned quota); > WEBKIT_API static WebStorageNamespace* createSessionStorageNamespace(unsigned quota); > + > + // FIXME(hans) Remove this when Chromium is rolled and all callers pass // FIXME:Remove this .... > + // the quota argument. Don't line wrap. > WEBKIT_API static WebStorageNamespace* createSessionStorageNamespace() > { > return createSessionStorageNamespace(noQuota); > } > > + // The quota for each storage area. Suggested by the spec. > + static const unsigned m_localStorageQuota = 5 * 1024 * 1024; > + > + // Since SessionStorage memory is allocated in the browser process, we place a > + // per-origin quota on it. Like LocalStorage there are known attacks against > + // this, so it's more of a sanity check than a real security measure. > + static const unsigned m_sessionStorageQuota = 5 * 1024 * 1024; > + > static const unsigned noQuota = UINT_MAX; > > virtual ~WebStorageNamespace() { } > diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h > index 98e048593658f8bb97d8ed48a604f6cf3ad98679..749f559061430c67608f307aa0ade250c6ace6d1 100644 > --- a/WebKit/chromium/public/WebViewClient.h > +++ b/WebKit/chromium/public/WebViewClient.h > @@ -81,6 +81,10 @@ public: > virtual WebWidget* createPopupMenu(const WebPopupMenuInfo&) { return 0; } > > // Create a session storage namespace object associated with this WebView. > + > + // FIXME(hans) This is needed while subclasses implement the method without ditto > + // the quota parameter but callers inside WebKit pass a quota argument. ditto 223208 4 55531 hans 2010-05-10 02:34:23 -0700 Created attachment 55531 Patch 223212 5 55531 jorlow 2010-05-10 02:39:44 -0700 Comment on attachment 55531 Patch > diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog > index 8a25606961ee8b3995a77c5a97e7bedcb9135890..5d13f4d8b182fd1ae743f5c3c0548e1414c47a4a 100644 > --- a/WebKit/chromium/ChangeLog > +++ b/WebKit/chromium/ChangeLog > @@ -1,3 +1,21 @@ > +2010-05-10 Hans Wennborg <hans@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + [Chromium] Add quota parameter to WebViewClient::createSessionStorageNamespace() > + > + Put a per-origin quota on session storage since it is using memory in > + the browser process, and should not be allowed to grow arbitrarily > + large. See also r58828. Links to trac.webkit.org are probably better than just saying rXXXXX. > + https://bugs.webkit.org/show_bug.cgi?id=38750 This goes directly below the subject line...then a blank newline...then the full description. Same goes for the other change log. Otherwise, looks good. Please fix and re-upload with commit queue bit since you can't commit yet. 223216 6 55532 hans 2010-05-10 02:45:49 -0700 Created attachment 55532 Patch 223302 7 55532 commit-queue 2010-05-10 07:27:36 -0700 Comment on attachment 55532 Patch Clearing flags on attachment: 55532 Committed r59077: <http://trac.webkit.org/changeset/59077> 223303 8 commit-queue 2010-05-10 07:27:43 -0700 All reviewed patches have been landed. Closing bug. 55377 2010-05-07 08:12:41 -0700 2010-05-10 02:34:16 -0700 Patch bug-38750-20100507161239.patch text/plain 6663 hans ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDAzOWNkNmM4Y2Y0MDIyNTI0MmFiNWUzNDQyMjgzMzBjMjVmZjI5OGEu LmY1MjQyMTVjODUwMDI2MTQ1OTNlMmQxZjJiYzA5ZmEzYmVmOTNmOTEgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE2IEBACisyMDEwLTA1LTA3ICBIYW5zIFdlbm5ib3JnICA8aGFuc0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W0Nocm9taXVtXSBTdG9yYWdlTmFtZXNwYWNlUHJveHkgc2hvdWxkIHBhc3MgcXVvdGEgYXJndW1l bnQgZm9yIFNlc3Npb25TdG9yYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zODc1MAorCisgICAgICAgICogcHVibGljL1dlYlN0b3JhZ2VOYW1lc3Bh Y2UuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViVmlld0NsaWVudC5oOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3Q2xpZW50OjpjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSk6CisgICAgICAg ICogc3JjL1N0b3JhZ2VOYW1lc3BhY2VQcm94eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdG9y YWdlTmFtZXNwYWNlOjpzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSk6CisKIDIwMTAtMDUtMDYgIFBh dmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgVGltb3RoeSBIYXRjaGVyLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJTdG9yYWdlTmFtZXNwYWNlLmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlN0b3JhZ2VO YW1lc3BhY2UuaAppbmRleCA0YjY0OGQ0M2E2MzYyMmRkNWIxNDlhZjU4ODcxNTg3OWVlMWY0MDNh Li5kZjlmZWFhZWVlMTFhNmU4OTM5MWQ3Mjg3ZGU1MjE0YWU0OWFlZjhlIDEwMDY0NAotLS0gYS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlN0b3JhZ2VOYW1lc3BhY2UuaAorKysgYi9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYlN0b3JhZ2VOYW1lc3BhY2UuaApAQCAtNDksMTEgKzQ5LDIyIEBA IHB1YmxpYzoKICAgICAvLyBvYmplY3Qgd2hlbiB5b3UncmUgZmluaXNoZWQuCiAgICAgV0VCS0lU X0FQSSBzdGF0aWMgV2ViU3RvcmFnZU5hbWVzcGFjZSogY3JlYXRlTG9jYWxTdG9yYWdlTmFtZXNw YWNlKGNvbnN0IFdlYlN0cmluZyYgYmFja2luZ0RpcmVjdG9yeVBhdGgsIHVuc2lnbmVkIHF1b3Rh KTsKICAgICBXRUJLSVRfQVBJIHN0YXRpYyBXZWJTdG9yYWdlTmFtZXNwYWNlKiBjcmVhdGVTZXNz aW9uU3RvcmFnZU5hbWVzcGFjZSh1bnNpZ25lZCBxdW90YSk7CisKKyAgICAvLyBGSVhNRShoYW5z KSBSZW1vdmUgdGhpcyB3aGVuIENocm9taXVtIGlzIHJvbGxlZCBhbmQgYWxsIGNhbGxlcnMgcGFz cworICAgIC8vIHRoZSBxdW90YSBhcmd1bWVudC4KICAgICBXRUJLSVRfQVBJIHN0YXRpYyBXZWJT dG9yYWdlTmFtZXNwYWNlKiBjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSgpCiAgICAgewog ICAgICAgICByZXR1cm4gY3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2Uobm9RdW90YSk7CiAg ICAgfQogCisgICAgLy8gVGhlIHF1b3RhIGZvciBlYWNoIHN0b3JhZ2UgYXJlYS4gIFN1Z2dlc3Rl ZCBieSB0aGUgc3BlYy4KKyAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgbV9sb2NhbFN0b3JhZ2VR dW90YSA9IDUgKiAxMDI0ICogMTAyNDsKKworICAgIC8vIFNpbmNlIFNlc3Npb25TdG9yYWdlIG1l bW9yeSBpcyBhbGxvY2F0ZWQgaW4gdGhlIGJyb3dzZXIgcHJvY2Vzcywgd2UgcGxhY2UgYQorICAg IC8vIHBlci1vcmlnaW4gcXVvdGEgb24gaXQuICBMaWtlIExvY2FsU3RvcmFnZSB0aGVyZSBhcmUg a25vd24gYXR0YWNrcyBhZ2FpbnN0CisgICAgLy8gdGhpcywgc28gaXQncyBtb3JlIG9mIGEgc2Fu aXR5IGNoZWNrIHRoYW4gYSByZWFsIHNlY3VyaXR5IG1lYXN1cmUuCisgICAgc3RhdGljIGNvbnN0 IHVuc2lnbmVkIG1fc2Vzc2lvblN0b3JhZ2VRdW90YSA9IDUgKiAxMDI0ICogMTAyNDsKKwogICAg IHN0YXRpYyBjb25zdCB1bnNpZ25lZCBub1F1b3RhID0gVUlOVF9NQVg7CiAKICAgICB2aXJ0dWFs IH5XZWJTdG9yYWdlTmFtZXNwYWNlKCkgeyB9CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYlZpZXdDbGllbnQuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0Ns aWVudC5oCmluZGV4IDk4ZTA0ODU5MzY1OGY4YmI5N2Q4ZWQ0OGE2MDRmNmNmM2FkOTg2NzkuLjc0 OWY1NTkwNjE0MzBjNjc2MDhmMzA3YWEwYWRlMjUwYzZhY2U2ZDEgMTAwNjQ0Ci0tLSBhL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViVmlld0NsaWVudC5oCkBAIC04MSw2ICs4MSwxMCBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCBXZWJXaWRnZXQqIGNyZWF0ZVBvcHVwTWVudShjb25zdCBXZWJQb3B1cE1lbnVJbmZvJikg eyByZXR1cm4gMDsgfQogCiAgICAgLy8gQ3JlYXRlIGEgc2Vzc2lvbiBzdG9yYWdlIG5hbWVzcGFj ZSBvYmplY3QgYXNzb2NpYXRlZCB3aXRoIHRoaXMgV2ViVmlldy4KKworICAgIC8vIEZJWE1FKGhh bnMpIFRoaXMgaXMgbmVlZGVkIHdoaWxlIHN1YmNsYXNzZXMgaW1wbGVtZW50IHRoZSBtZXRob2Qg d2l0aG91dAorICAgIC8vIHRoZSBxdW90YSBwYXJhbWV0ZXIgYnV0IGNhbGxlcnMgaW5zaWRlIFdl YktpdCBwYXNzIGEgcXVvdGEgYXJndW1lbnQuCisgICAgdmlydHVhbCBXZWJTdG9yYWdlTmFtZXNw YWNlKiBjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSh1bnNpZ25lZCBxdW90YSkgeyByZXR1 cm4gY3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UoKTsgfQogICAgIHZpcnR1YWwgV2ViU3Rv cmFnZU5hbWVzcGFjZSogY3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UoKSB7IHJldHVybiAw OyB9CiAKICAgICAvLyBNaXNjIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9z cmMvU3RvcmFnZU5hbWVzcGFjZVByb3h5LmNwcCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvU3RvcmFn ZU5hbWVzcGFjZVByb3h5LmNwcAppbmRleCAyNTJiYzE0NGE3ZWYyODc2MThkYmYyMTcyMmQ4ODM4 YmU3ZWViZjQ5Li5lYzBkYmNlYzFkYjRkNDhjODdmYTU4ZGYyNWFlYjgxNjYzMzU3ZDc4IDEwMDY0 NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1N0b3JhZ2VOYW1lc3BhY2VQcm94eS5jcHAKKysr IGIvV2ViS2l0L2Nocm9taXVtL3NyYy9TdG9yYWdlTmFtZXNwYWNlUHJveHkuY3BwCkBAIC01MSw3 ICs1MSw3IEBAIFBhc3NSZWZQdHI8U3RvcmFnZU5hbWVzcGFjZT4gU3RvcmFnZU5hbWVzcGFjZTo6 c2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UoUGFnZSogcGFnCiB7CiAgICAgV2ViS2l0OjpDaHJvbWVD bGllbnRJbXBsKiBjaHJvbWVDbGllbnRJbXBsID0gc3RhdGljX2Nhc3Q8V2ViS2l0OjpDaHJvbWVD bGllbnRJbXBsKj4ocGFnZS0+Y2hyb21lKCktPmNsaWVudCgpKTsKICAgICBXZWJLaXQ6OldlYlZp ZXdDbGllbnQqIHdlYlZpZXdDbGllbnQgPSBjaHJvbWVDbGllbnRJbXBsLT53ZWJWaWV3KCktPmNs aWVudCgpOwotICAgIHJldHVybiBhZG9wdFJlZihuZXcgU3RvcmFnZU5hbWVzcGFjZVByb3h5KHdl YlZpZXdDbGllbnQtPmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKCksIFNlc3Npb25TdG9y YWdlKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTdG9yYWdlTmFtZXNwYWNlUHJveHkod2Vi Vmlld0NsaWVudC0+Y3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UocXVvdGEpLCBTZXNzaW9u U3RvcmFnZSkpOwogfQogCiBTdG9yYWdlTmFtZXNwYWNlUHJveHk6OlN0b3JhZ2VOYW1lc3BhY2VQ cm94eShXZWJLaXQ6OldlYlN0b3JhZ2VOYW1lc3BhY2UqIHN0b3JhZ2VOYW1lc3BhY2UsIFN0b3Jh Z2VUeXBlIHN0b3JhZ2VUeXBlKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIv V2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGY1YmI4NTkxMGQwOTdiMDZjOTQ2YWQzMzIyYTVk MzdiZjM1ZmVmMmQuLjQwNGQ3M2Y5ZWU5Y2I2MTZjNDZiZTBhNWViOGE5NjIzY2FjNGE4YTAgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wNS0wNyAgSGFucyBXZW5uYm9yZyAgPGhhbnNAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFtDaHJvbWl1bV0gU3RvcmFnZU5hbWVzcGFjZVByb3h5IHNob3VsZCBwYXNzIHF1b3RhIGFy Z3VtZW50IGZvciBTZXNzaW9uU3RvcmFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Mzg3NTAKKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1dlYlZpZXdIb3N0LmNwcDoKKyAgICAgICAgKFdlYlZpZXdIb3N0OjpjcmVhdGVTZXNzaW9u U3RvcmFnZU5hbWVzcGFjZSk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2Vi Vmlld0hvc3QuaDoKKwogMjAxMC0wNS0wNiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFtRdF0gVW5yZXZpZXdlZCBidWlsZGZpeCBhZnRlciByNTg5MTcu CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3 SG9zdC5jcHAgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9z dC5jcHAKaW5kZXggNmVhMWRlMWNhMjdiZjE3NzVlZjQ2N2E4YTQ5MWRkZThkM2E4ZDQ2MS4uNDYz ZTRmNTIwODNmZmVkOWRlMGM1ZTE5NWU4MjdhN2FkYTc3MDhiMSAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwCisrKyBiL1dlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcApAQCAtMjY3LDkg KzI2Nyw5IEBAIFdlYldpZGdldCogV2ViVmlld0hvc3Q6OmNyZWF0ZVBvcHVwTWVudShjb25zdCBX ZWJQb3B1cE1lbnVJbmZvJikKICAgICByZXR1cm4gMDsKIH0KIAotV2ViU3RvcmFnZU5hbWVzcGFj ZSogV2ViVmlld0hvc3Q6OmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKCkKK1dlYlN0b3Jh Z2VOYW1lc3BhY2UqIFdlYlZpZXdIb3N0OjpjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSh1 bnNpZ25lZCBxdW90YSkKIHsKLSAgICByZXR1cm4gV2ViS2l0OjpXZWJTdG9yYWdlTmFtZXNwYWNl OjpjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSgpOworICAgIHJldHVybiBXZWJLaXQ6Oldl YlN0b3JhZ2VOYW1lc3BhY2U6OmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKHF1b3RhKTsK IH0KIAogdm9pZCBXZWJWaWV3SG9zdDo6ZGlkQWRkTWVzc2FnZVRvQ29uc29sZShjb25zdCBXZWJD b25zb2xlTWVzc2FnZSYgbWVzc2FnZSwgY29uc3QgV2ViU3RyaW5nJiBzb3VyY2VOYW1lLCB1bnNp Z25lZCBzb3VyY2VMaW5lKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vV2ViVmlld0hvc3QuaCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1dlYlZpZXdIb3N0LmgKaW5kZXggYzViZWQ3YTRjN2EzYmE4YzEzY2RlOWMwYzBlM2ZkYWVm NmJhNzYwNy4uOTJmMTY1YWM1ZjA3ZDU4MTc0MzczYWNjMjM2N2QxM2U2OWNmNzBiMSAxMDA2NDQK LS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaAor KysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCkBA IC04Niw3ICs4Niw3IEBAIGNsYXNzIFdlYlZpZXdIb3N0IDogcHVibGljIFdlYktpdDo6V2ViVmll d0NsaWVudCwgcHVibGljIFdlYktpdDo6V2ViRnJhbWVDbGllbnQsCiAgICAgdmlydHVhbCBXZWJL aXQ6OldlYlZpZXcqIGNyZWF0ZVZpZXcoV2ViS2l0OjpXZWJGcmFtZSopOwogICAgIHZpcnR1YWwg V2ViS2l0OjpXZWJXaWRnZXQqIGNyZWF0ZVBvcHVwTWVudShib29sIGFjdGl2YXRhYmxlKTsKICAg ICB2aXJ0dWFsIFdlYktpdDo6V2ViV2lkZ2V0KiBjcmVhdGVQb3B1cE1lbnUoY29uc3QgV2ViS2l0 OjpXZWJQb3B1cE1lbnVJbmZvJik7Ci0gICAgdmlydHVhbCBXZWJLaXQ6OldlYlN0b3JhZ2VOYW1l c3BhY2UqIGNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKCk7CisgICAgdmlydHVhbCBXZWJL aXQ6OldlYlN0b3JhZ2VOYW1lc3BhY2UqIGNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKHVu c2lnbmVkIHF1b3RhKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQWRkTWVzc2FnZVRvQ29uc29sZShj b25zdCBXZWJLaXQ6OldlYkNvbnNvbGVNZXNzYWdlJiwgY29uc3QgV2ViS2l0OjpXZWJTdHJpbmcm IHNvdXJjZU5hbWUsIHVuc2lnbmVkIHNvdXJjZUxpbmUpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRT dGFydExvYWRpbmcoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkU3RvcExvYWRpbmcoKTsK 55531 2010-05-10 02:34:23 -0700 2010-05-10 02:45:42 -0700 Patch bug-38750-20100510103421.patch text/plain 7025 hans ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDhhMjU2MDY5NjFlZThiMzk5NWE3N2M1YTk3ZTdiZWRjYjkxMzU4OTAu LjVkMTNmNGQ4YjE4MmZkMWFlNzQzZjVjM2MwNTQ4ZTE0MTRjNDdhNGEgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIxIEBACisyMDEwLTA1LTEwICBIYW5zIFdlbm5ib3JnICA8aGFuc0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W0Nocm9taXVtXSBBZGQgcXVvdGEgcGFyYW1ldGVyIHRvIFdlYlZpZXdDbGllbnQ6OmNyZWF0ZVNl c3Npb25TdG9yYWdlTmFtZXNwYWNlKCkKKworICAgICAgICBQdXQgYSBwZXItb3JpZ2luIHF1b3Rh IG9uIHNlc3Npb24gc3RvcmFnZSBzaW5jZSBpdCBpcyB1c2luZyBtZW1vcnkgaW4KKyAgICAgICAg dGhlIGJyb3dzZXIgcHJvY2VzcywgYW5kIHNob3VsZCBub3QgYmUgYWxsb3dlZCB0byBncm93IGFy Yml0cmFyaWx5CisgICAgICAgIGxhcmdlLiBTZWUgYWxzbyByNTg4MjguCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODc1MAorCisgICAgICAgICogcHVi bGljL1dlYlN0b3JhZ2VOYW1lc3BhY2UuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViVmlld0NsaWVu dC5oOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Q2xpZW50OjpjcmVhdGVTZXNzaW9uU3RvcmFn ZU5hbWVzcGFjZSk6CisgICAgICAgICogc3JjL1N0b3JhZ2VOYW1lc3BhY2VQcm94eS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTdG9yYWdlTmFtZXNwYWNlOjpzZXNzaW9uU3RvcmFnZU5hbWVzcGFj ZSk6CisKKwogMjAxMC0wNS0wNyAgRGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViU3RvcmFnZU5hbWVzcGFjZS5oIGIvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJTdG9yYWdlTmFtZXNwYWNlLmgKaW5kZXggNGI2NDhkNDNhNjM2MjJkZDViMTQ5 YWY1ODg3MTU4NzllZTFmNDAzYS4uM2ZjMGFiMDhiYTgwYzcxZjIzNGVkOWE0OGUyMjkxY2NiMmI1 NmE5NiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTdG9yYWdlTmFtZXNw YWNlLmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTdG9yYWdlTmFtZXNwYWNlLmgK QEAgLTQ5LDExICs0OSwyMSBAQCBwdWJsaWM6CiAgICAgLy8gb2JqZWN0IHdoZW4geW91J3JlIGZp bmlzaGVkLgogICAgIFdFQktJVF9BUEkgc3RhdGljIFdlYlN0b3JhZ2VOYW1lc3BhY2UqIGNyZWF0 ZUxvY2FsU3RvcmFnZU5hbWVzcGFjZShjb25zdCBXZWJTdHJpbmcmIGJhY2tpbmdEaXJlY3RvcnlQ YXRoLCB1bnNpZ25lZCBxdW90YSk7CiAgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViU3RvcmFnZU5h bWVzcGFjZSogY3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UodW5zaWduZWQgcXVvdGEpOwor CisgICAgLy8gRklYTUU6IFJlbW92ZSB0aGlzIHdoZW4gQ2hyb21pdW0gaXMgcm9sbGVkIGFuZCBh bGwgY2FsbGVycyBwYXNzIHRoZSBxdW90YSBhcmd1bWVudC4KICAgICBXRUJLSVRfQVBJIHN0YXRp YyBXZWJTdG9yYWdlTmFtZXNwYWNlKiBjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSgpCiAg ICAgewogICAgICAgICByZXR1cm4gY3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2Uobm9RdW90 YSk7CiAgICAgfQogCisgICAgLy8gVGhlIHF1b3RhIGZvciBlYWNoIHN0b3JhZ2UgYXJlYS4gIFN1 Z2dlc3RlZCBieSB0aGUgc3BlYy4KKyAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgbV9sb2NhbFN0 b3JhZ2VRdW90YSA9IDUgKiAxMDI0ICogMTAyNDsKKworICAgIC8vIFNpbmNlIFNlc3Npb25TdG9y YWdlIG1lbW9yeSBpcyBhbGxvY2F0ZWQgaW4gdGhlIGJyb3dzZXIgcHJvY2Vzcywgd2UgcGxhY2Ug YQorICAgIC8vIHBlci1vcmlnaW4gcXVvdGEgb24gaXQuICBMaWtlIExvY2FsU3RvcmFnZSB0aGVy ZSBhcmUga25vd24gYXR0YWNrcyBhZ2FpbnN0CisgICAgLy8gdGhpcywgc28gaXQncyBtb3JlIG9m IGEgc2FuaXR5IGNoZWNrIHRoYW4gYSByZWFsIHNlY3VyaXR5IG1lYXN1cmUuCisgICAgc3RhdGlj IGNvbnN0IHVuc2lnbmVkIG1fc2Vzc2lvblN0b3JhZ2VRdW90YSA9IDUgKiAxMDI0ICogMTAyNDsK KwogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBub1F1b3RhID0gVUlOVF9NQVg7CiAKICAgICB2 aXJ0dWFsIH5XZWJTdG9yYWdlTmFtZXNwYWNlKCkgeyB9CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYlZpZXdDbGllbnQuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Vmlld0NsaWVudC5oCmluZGV4IDk4ZTA0ODU5MzY1OGY4YmI5N2Q4ZWQ0OGE2MDRmNmNmM2FkOTg2 NzkuLjBlZTM5MDdjMTdlNmI1OTI2ZjU0ZDFmMjkxNGYwYjEwYjhkMzI4NmIgMTAwNjQ0Ci0tLSBh L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCisrKyBiL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCkBAIC04MSw2ICs4MSw5IEBAIHB1YmxpYzoKICAg ICB2aXJ0dWFsIFdlYldpZGdldCogY3JlYXRlUG9wdXBNZW51KGNvbnN0IFdlYlBvcHVwTWVudUlu Zm8mKSB7IHJldHVybiAwOyB9CiAKICAgICAvLyBDcmVhdGUgYSBzZXNzaW9uIHN0b3JhZ2UgbmFt ZXNwYWNlIG9iamVjdCBhc3NvY2lhdGVkIHdpdGggdGhpcyBXZWJWaWV3LgorCisgICAgLy8gRklY TUU6IFRoaXMgaXMgbmVlZGVkIHdoaWxlIHN1YmNsYXNzZXMgaW1wbGVtZW50IHRoZSBtZXRob2Qg d2l0aG91dCB0aGUgcXVvdGEgcGFyYW1ldGVyIGJ1dCBjYWxsZXJzIGluc2lkZSBXZWJLaXQgcGFz cyBhIHF1b3RhIGFyZ3VtZW50LgorICAgIHZpcnR1YWwgV2ViU3RvcmFnZU5hbWVzcGFjZSogY3Jl YXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UodW5zaWduZWQgcXVvdGEpIHsgcmV0dXJuIGNyZWF0 ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKCk7IH0KICAgICB2aXJ0dWFsIFdlYlN0b3JhZ2VOYW1l c3BhY2UqIGNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKCkgeyByZXR1cm4gMDsgfQogCiAg ICAgLy8gTWlzYyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL1N0b3Jh Z2VOYW1lc3BhY2VQcm94eS5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1N0b3JhZ2VOYW1lc3Bh Y2VQcm94eS5jcHAKaW5kZXggMjUyYmMxNDRhN2VmMjg3NjE4ZGJmMjE3MjJkODgzOGJlN2VlYmY0 OS4uZWMwZGJjZWMxZGI0ZDQ4Yzg3ZmE1OGRmMjVhZWI4MTY2MzM1N2Q3OCAxMDA2NDQKLS0tIGEv V2ViS2l0L2Nocm9taXVtL3NyYy9TdG9yYWdlTmFtZXNwYWNlUHJveHkuY3BwCisrKyBiL1dlYktp dC9jaHJvbWl1bS9zcmMvU3RvcmFnZU5hbWVzcGFjZVByb3h5LmNwcApAQCAtNTEsNyArNTEsNyBA QCBQYXNzUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2U+IFN0b3JhZ2VOYW1lc3BhY2U6OnNlc3Npb25T dG9yYWdlTmFtZXNwYWNlKFBhZ2UqIHBhZwogewogICAgIFdlYktpdDo6Q2hyb21lQ2xpZW50SW1w bCogY2hyb21lQ2xpZW50SW1wbCA9IHN0YXRpY19jYXN0PFdlYktpdDo6Q2hyb21lQ2xpZW50SW1w bCo+KHBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKSk7CiAgICAgV2ViS2l0OjpXZWJWaWV3Q2xpZW50 KiB3ZWJWaWV3Q2xpZW50ID0gY2hyb21lQ2xpZW50SW1wbC0+d2ViVmlldygpLT5jbGllbnQoKTsK LSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFN0b3JhZ2VOYW1lc3BhY2VQcm94eSh3ZWJWaWV3Q2xp ZW50LT5jcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSgpLCBTZXNzaW9uU3RvcmFnZSkpOwor ICAgIHJldHVybiBhZG9wdFJlZihuZXcgU3RvcmFnZU5hbWVzcGFjZVByb3h5KHdlYlZpZXdDbGll bnQtPmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKHF1b3RhKSwgU2Vzc2lvblN0b3JhZ2Up KTsKIH0KIAogU3RvcmFnZU5hbWVzcGFjZVByb3h5OjpTdG9yYWdlTmFtZXNwYWNlUHJveHkoV2Vi S2l0OjpXZWJTdG9yYWdlTmFtZXNwYWNlKiBzdG9yYWdlTmFtZXNwYWNlLCBTdG9yYWdlVHlwZSBz dG9yYWdlVHlwZSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRv b2xzL0NoYW5nZUxvZwppbmRleCBlYmY4ZjhhOTJmNGQxMjEzNTFkNTdjYWFkZWM3ZDgyMGMyZjcy MDkyLi42ZDAxMDE3ZDg5MmU5ZDRmOWM4ZmI0MGE2YmZmZTk1M2FiMTRmNjlhIDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTggQEAKKzIwMTAtMDUtMTAgIEhhbnMgV2VubmJvcmcgIDxoYW5zQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbQ2hy b21pdW1dIEFkZCBxdW90YSBwYXJhbWV0ZXIgdG8gV2ViVmlld0NsaWVudDo6Y3JlYXRlU2Vzc2lv blN0b3JhZ2VOYW1lc3BhY2UoKQorCisgICAgICAgIFB1dCBhIHBlci1vcmlnaW4gcXVvdGEgb24g c2Vzc2lvbiBzdG9yYWdlIHNpbmNlIGl0IGlzIHVzaW5nIG1lbW9yeSBpbgorICAgICAgICB0aGUg YnJvd3NlciBwcm9jZXNzLCBhbmQgc2hvdWxkIG5vdCBiZSBhbGxvd2VkIHRvIGdyb3cgYXJiaXRy YXJpbHkKKyAgICAgICAgbGFyZ2UuIFNlZSBhbHNvIHI1ODgyOC4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4NzUwCisKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHA6CisgICAgICAgIChXZWJWaWV3SG9zdDo6 Y3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1dlYlZpZXdIb3N0Lmg6CisKIDIwMTAtMDUtMDcgIERhcmluIEZpc2hlciAgPGRh cmluQGNocm9taXVtLm9yZz4KIAogICAgICAgICBGaXggYnVpbGQgYnVzdGFnZTogdG9FbGVtZW50 PFQ+IHNob3VsZCBiZSB0bzxUPi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcAppbmRleCA2ZWExZGUxY2EyN2JmMTc3NWVmNDY3YThh NDkxZGRlOGQzYThkNDYxLi40NjNlNGY1MjA4M2ZmZWQ5ZGUwYzVlMTk1ZTgyN2E3YWRhNzcwOGIx IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3 SG9zdC5jcHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmll d0hvc3QuY3BwCkBAIC0yNjcsOSArMjY3LDkgQEAgV2ViV2lkZ2V0KiBXZWJWaWV3SG9zdDo6Y3Jl YXRlUG9wdXBNZW51KGNvbnN0IFdlYlBvcHVwTWVudUluZm8mKQogICAgIHJldHVybiAwOwogfQog Ci1XZWJTdG9yYWdlTmFtZXNwYWNlKiBXZWJWaWV3SG9zdDo6Y3JlYXRlU2Vzc2lvblN0b3JhZ2VO YW1lc3BhY2UoKQorV2ViU3RvcmFnZU5hbWVzcGFjZSogV2ViVmlld0hvc3Q6OmNyZWF0ZVNlc3Np b25TdG9yYWdlTmFtZXNwYWNlKHVuc2lnbmVkIHF1b3RhKQogewotICAgIHJldHVybiBXZWJLaXQ6 OldlYlN0b3JhZ2VOYW1lc3BhY2U6OmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKCk7Cisg ICAgcmV0dXJuIFdlYktpdDo6V2ViU3RvcmFnZU5hbWVzcGFjZTo6Y3JlYXRlU2Vzc2lvblN0b3Jh Z2VOYW1lc3BhY2UocXVvdGEpOwogfQogCiB2b2lkIFdlYlZpZXdIb3N0OjpkaWRBZGRNZXNzYWdl VG9Db25zb2xlKGNvbnN0IFdlYkNvbnNvbGVNZXNzYWdlJiBtZXNzYWdlLCBjb25zdCBXZWJTdHJp bmcmIHNvdXJjZU5hbWUsIHVuc2lnbmVkIHNvdXJjZUxpbmUpCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oIGIvV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaAppbmRleCBjNWJlZDdhNGM3YTNi YThjMTNjZGU5YzBjMGUzZmRhZWY2YmE3NjA3Li45MmYxNjVhYzVmMDdkNTgxNzQzNzNhY2MyMzY3 ZDEzZTY5Y2Y3MGIxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9XZWJWaWV3SG9zdC5oCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1dlYlZpZXdIb3N0LmgKQEAgLTg2LDcgKzg2LDcgQEAgY2xhc3MgV2ViVmlld0hvc3QgOiBw dWJsaWMgV2ViS2l0OjpXZWJWaWV3Q2xpZW50LCBwdWJsaWMgV2ViS2l0OjpXZWJGcmFtZUNsaWVu dCwKICAgICB2aXJ0dWFsIFdlYktpdDo6V2ViVmlldyogY3JlYXRlVmlldyhXZWJLaXQ6OldlYkZy YW1lKik7CiAgICAgdmlydHVhbCBXZWJLaXQ6OldlYldpZGdldCogY3JlYXRlUG9wdXBNZW51KGJv b2wgYWN0aXZhdGFibGUpOwogICAgIHZpcnR1YWwgV2ViS2l0OjpXZWJXaWRnZXQqIGNyZWF0ZVBv cHVwTWVudShjb25zdCBXZWJLaXQ6OldlYlBvcHVwTWVudUluZm8mKTsKLSAgICB2aXJ0dWFsIFdl YktpdDo6V2ViU3RvcmFnZU5hbWVzcGFjZSogY3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2Uo KTsKKyAgICB2aXJ0dWFsIFdlYktpdDo6V2ViU3RvcmFnZU5hbWVzcGFjZSogY3JlYXRlU2Vzc2lv blN0b3JhZ2VOYW1lc3BhY2UodW5zaWduZWQgcXVvdGEpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRB ZGRNZXNzYWdlVG9Db25zb2xlKGNvbnN0IFdlYktpdDo6V2ViQ29uc29sZU1lc3NhZ2UmLCBjb25z dCBXZWJLaXQ6OldlYlN0cmluZyYgc291cmNlTmFtZSwgdW5zaWduZWQgc291cmNlTGluZSk7CiAg ICAgdmlydHVhbCB2b2lkIGRpZFN0YXJ0TG9hZGluZygpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRT dG9wTG9hZGluZygpOwo= 55532 2010-05-10 02:45:49 -0700 2010-05-10 07:27:36 -0700 Patch bug-38750-20100510104547.patch text/plain 7089 hans ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDhhMjU2MDY5NjFlZThiMzk5NWE3N2M1YTk3ZTdiZWRjYjkxMzU4OTAu LmJhMzJiNTFkN2ExNzdkYWM1NWMyMjE2NmQxMjI0NTk0MGFkYzM2MjAgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIxIEBACisyMDEwLTA1LTEwICBIYW5zIFdlbm5ib3JnICA8aGFuc0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W0Nocm9taXVtXSBBZGQgcXVvdGEgcGFyYW1ldGVyIHRvIFdlYlZpZXdDbGllbnQ6OmNyZWF0ZVNl c3Npb25TdG9yYWdlTmFtZXNwYWNlKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM4NzUwCisKKyAgICAgICAgUHV0IGEgcGVyLW9yaWdpbiBxdW90YSBv biBzZXNzaW9uIHN0b3JhZ2Ugc2luY2UgaXQgaXMgdXNpbmcgbWVtb3J5IGluCisgICAgICAgIHRo ZSBicm93c2VyIHByb2Nlc3MsIGFuZCBzaG91bGQgbm90IGJlIGFsbG93ZWQgdG8gZ3JvdyBhcmJp dHJhcmlseQorICAgICAgICBsYXJnZS4gU2VlIGFsc28gaHR0cDovL3RyYWMud2Via2l0Lm9yZy9j aGFuZ2VzZXQvNTg4MjguCisKKyAgICAgICAgKiBwdWJsaWMvV2ViU3RvcmFnZU5hbWVzcGFjZS5o OgorICAgICAgICAqIHB1YmxpYy9XZWJWaWV3Q2xpZW50Lmg6CisgICAgICAgIChXZWJLaXQ6Oldl YlZpZXdDbGllbnQ6OmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKToKKyAgICAgICAgKiBz cmMvU3RvcmFnZU5hbWVzcGFjZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VO YW1lc3BhY2U6OnNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKToKKworCiAyMDEwLTA1LTA3ICBEYXJp biBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGlt aXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTdG9y YWdlTmFtZXNwYWNlLmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlN0b3JhZ2VOYW1lc3Bh Y2UuaAppbmRleCA0YjY0OGQ0M2E2MzYyMmRkNWIxNDlhZjU4ODcxNTg3OWVlMWY0MDNhLi4zZmMw YWIwOGJhODBjNzFmMjM0ZWQ5YTQ4ZTIyOTFjY2IyYjU2YTk2IDEwMDY0NAotLS0gYS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYlN0b3JhZ2VOYW1lc3BhY2UuaAorKysgYi9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYlN0b3JhZ2VOYW1lc3BhY2UuaApAQCAtNDksMTEgKzQ5LDIxIEBAIHB1Ymxp YzoKICAgICAvLyBvYmplY3Qgd2hlbiB5b3UncmUgZmluaXNoZWQuCiAgICAgV0VCS0lUX0FQSSBz dGF0aWMgV2ViU3RvcmFnZU5hbWVzcGFjZSogY3JlYXRlTG9jYWxTdG9yYWdlTmFtZXNwYWNlKGNv bnN0IFdlYlN0cmluZyYgYmFja2luZ0RpcmVjdG9yeVBhdGgsIHVuc2lnbmVkIHF1b3RhKTsKICAg ICBXRUJLSVRfQVBJIHN0YXRpYyBXZWJTdG9yYWdlTmFtZXNwYWNlKiBjcmVhdGVTZXNzaW9uU3Rv cmFnZU5hbWVzcGFjZSh1bnNpZ25lZCBxdW90YSk7CisKKyAgICAvLyBGSVhNRTogUmVtb3ZlIHRo aXMgd2hlbiBDaHJvbWl1bSBpcyByb2xsZWQgYW5kIGFsbCBjYWxsZXJzIHBhc3MgdGhlIHF1b3Rh IGFyZ3VtZW50LgogICAgIFdFQktJVF9BUEkgc3RhdGljIFdlYlN0b3JhZ2VOYW1lc3BhY2UqIGNy ZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKCkKICAgICB7CiAgICAgICAgIHJldHVybiBjcmVh dGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZShub1F1b3RhKTsKICAgICB9CiAKKyAgICAvLyBUaGUg cXVvdGEgZm9yIGVhY2ggc3RvcmFnZSBhcmVhLiAgU3VnZ2VzdGVkIGJ5IHRoZSBzcGVjLgorICAg IHN0YXRpYyBjb25zdCB1bnNpZ25lZCBtX2xvY2FsU3RvcmFnZVF1b3RhID0gNSAqIDEwMjQgKiAx MDI0OworCisgICAgLy8gU2luY2UgU2Vzc2lvblN0b3JhZ2UgbWVtb3J5IGlzIGFsbG9jYXRlZCBp biB0aGUgYnJvd3NlciBwcm9jZXNzLCB3ZSBwbGFjZSBhCisgICAgLy8gcGVyLW9yaWdpbiBxdW90 YSBvbiBpdC4gIExpa2UgTG9jYWxTdG9yYWdlIHRoZXJlIGFyZSBrbm93biBhdHRhY2tzIGFnYWlu c3QKKyAgICAvLyB0aGlzLCBzbyBpdCdzIG1vcmUgb2YgYSBzYW5pdHkgY2hlY2sgdGhhbiBhIHJl YWwgc2VjdXJpdHkgbWVhc3VyZS4KKyAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgbV9zZXNzaW9u U3RvcmFnZVF1b3RhID0gNSAqIDEwMjQgKiAxMDI0OworCiAgICAgc3RhdGljIGNvbnN0IHVuc2ln bmVkIG5vUXVvdGEgPSBVSU5UX01BWDsKIAogICAgIHZpcnR1YWwgfldlYlN0b3JhZ2VOYW1lc3Bh Y2UoKSB7IH0KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVu dC5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgKaW5kZXggOThlMDQ4 NTkzNjU4ZjhiYjk3ZDhlZDQ4YTYwNGY2Y2YzYWQ5ODY3OS4uMGVlMzkwN2MxN2U2YjU5MjZmNTRk MWYyOTE0ZjBiMTBiOGQzMjg2YiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJWaWV3Q2xpZW50LmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50 LmgKQEAgLTgxLDYgKzgxLDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgV2ViV2lkZ2V0KiBjcmVh dGVQb3B1cE1lbnUoY29uc3QgV2ViUG9wdXBNZW51SW5mbyYpIHsgcmV0dXJuIDA7IH0KIAogICAg IC8vIENyZWF0ZSBhIHNlc3Npb24gc3RvcmFnZSBuYW1lc3BhY2Ugb2JqZWN0IGFzc29jaWF0ZWQg d2l0aCB0aGlzIFdlYlZpZXcuCisKKyAgICAvLyBGSVhNRTogVGhpcyBpcyBuZWVkZWQgd2hpbGUg c3ViY2xhc3NlcyBpbXBsZW1lbnQgdGhlIG1ldGhvZCB3aXRob3V0IHRoZSBxdW90YSBwYXJhbWV0 ZXIgYnV0IGNhbGxlcnMgaW5zaWRlIFdlYktpdCBwYXNzIGEgcXVvdGEgYXJndW1lbnQuCisgICAg dmlydHVhbCBXZWJTdG9yYWdlTmFtZXNwYWNlKiBjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFj ZSh1bnNpZ25lZCBxdW90YSkgeyByZXR1cm4gY3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2Uo KTsgfQogICAgIHZpcnR1YWwgV2ViU3RvcmFnZU5hbWVzcGFjZSogY3JlYXRlU2Vzc2lvblN0b3Jh Z2VOYW1lc3BhY2UoKSB7IHJldHVybiAwOyB9CiAKICAgICAvLyBNaXNjIC0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KZGlmZiAt LWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvU3RvcmFnZU5hbWVzcGFjZVByb3h5LmNwcCBiL1dl YktpdC9jaHJvbWl1bS9zcmMvU3RvcmFnZU5hbWVzcGFjZVByb3h5LmNwcAppbmRleCAyNTJiYzE0 NGE3ZWYyODc2MThkYmYyMTcyMmQ4ODM4YmU3ZWViZjQ5Li5lYzBkYmNlYzFkYjRkNDhjODdmYTU4 ZGYyNWFlYjgxNjYzMzU3ZDc4IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1N0b3Jh Z2VOYW1lc3BhY2VQcm94eS5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9TdG9yYWdlTmFt ZXNwYWNlUHJveHkuY3BwCkBAIC01MSw3ICs1MSw3IEBAIFBhc3NSZWZQdHI8U3RvcmFnZU5hbWVz cGFjZT4gU3RvcmFnZU5hbWVzcGFjZTo6c2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UoUGFnZSogcGFn CiB7CiAgICAgV2ViS2l0OjpDaHJvbWVDbGllbnRJbXBsKiBjaHJvbWVDbGllbnRJbXBsID0gc3Rh dGljX2Nhc3Q8V2ViS2l0OjpDaHJvbWVDbGllbnRJbXBsKj4ocGFnZS0+Y2hyb21lKCktPmNsaWVu dCgpKTsKICAgICBXZWJLaXQ6OldlYlZpZXdDbGllbnQqIHdlYlZpZXdDbGllbnQgPSBjaHJvbWVD bGllbnRJbXBsLT53ZWJWaWV3KCktPmNsaWVudCgpOwotICAgIHJldHVybiBhZG9wdFJlZihuZXcg U3RvcmFnZU5hbWVzcGFjZVByb3h5KHdlYlZpZXdDbGllbnQtPmNyZWF0ZVNlc3Npb25TdG9yYWdl TmFtZXNwYWNlKCksIFNlc3Npb25TdG9yYWdlKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBT dG9yYWdlTmFtZXNwYWNlUHJveHkod2ViVmlld0NsaWVudC0+Y3JlYXRlU2Vzc2lvblN0b3JhZ2VO YW1lc3BhY2UocXVvdGEpLCBTZXNzaW9uU3RvcmFnZSkpOwogfQogCiBTdG9yYWdlTmFtZXNwYWNl UHJveHk6OlN0b3JhZ2VOYW1lc3BhY2VQcm94eShXZWJLaXQ6OldlYlN0b3JhZ2VOYW1lc3BhY2Uq IHN0b3JhZ2VOYW1lc3BhY2UsIFN0b3JhZ2VUeXBlIHN0b3JhZ2VUeXBlKQpkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGViZjhm OGE5MmY0ZDEyMTM1MWQ1N2NhYWRlYzdkODIwYzJmNzIwOTIuLmIzZjAzOGJlM2UwNjI3YTFmZWQ2 ZWJiOGVkMmJkOWRjYTJlZThlZDggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZwor KysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wNS0xMCAg SGFucyBXZW5uYm9yZyAgPGhhbnNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gQWRkIHF1b3RhIHBhcmFtZXRl ciB0byBXZWJWaWV3Q2xpZW50OjpjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSgpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODc1MAorCisgICAg ICAgIFB1dCBhIHBlci1vcmlnaW4gcXVvdGEgb24gc2Vzc2lvbiBzdG9yYWdlIHNpbmNlIGl0IGlz IHVzaW5nIG1lbW9yeSBpbgorICAgICAgICB0aGUgYnJvd3NlciBwcm9jZXNzLCBhbmQgc2hvdWxk IG5vdCBiZSBhbGxvd2VkIHRvIGdyb3cgYXJiaXRyYXJpbHkKKyAgICAgICAgbGFyZ2UuIFNlZSBh bHNvIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzU4ODI4LgorCisgICAgICAgICog RHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwOgorICAgICAgICAoV2ViVmll d0hvc3Q6OmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKToKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oOgorCiAyMDEwLTA1LTA3ICBEYXJpbiBGaXNo ZXIgIDxkYXJpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRml4IGJ1aWxkIGJ1c3RhZ2U6IHRv RWxlbWVudDxUPiBzaG91bGQgYmUgdG88VD4uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAgYi9XZWJLaXRUb29scy9EdW1wUmVu ZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAKaW5kZXggNmVhMWRlMWNhMjdiZjE3NzVl ZjQ2N2E4YTQ5MWRkZThkM2E4ZDQ2MS4uNDYzZTRmNTIwODNmZmVkOWRlMGM1ZTE5NWU4MjdhN2Fk YTc3MDhiMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v V2ViVmlld0hvc3QuY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVt L1dlYlZpZXdIb3N0LmNwcApAQCAtMjY3LDkgKzI2Nyw5IEBAIFdlYldpZGdldCogV2ViVmlld0hv c3Q6OmNyZWF0ZVBvcHVwTWVudShjb25zdCBXZWJQb3B1cE1lbnVJbmZvJikKICAgICByZXR1cm4g MDsKIH0KIAotV2ViU3RvcmFnZU5hbWVzcGFjZSogV2ViVmlld0hvc3Q6OmNyZWF0ZVNlc3Npb25T dG9yYWdlTmFtZXNwYWNlKCkKK1dlYlN0b3JhZ2VOYW1lc3BhY2UqIFdlYlZpZXdIb3N0OjpjcmVh dGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSh1bnNpZ25lZCBxdW90YSkKIHsKLSAgICByZXR1cm4g V2ViS2l0OjpXZWJTdG9yYWdlTmFtZXNwYWNlOjpjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFj ZSgpOworICAgIHJldHVybiBXZWJLaXQ6OldlYlN0b3JhZ2VOYW1lc3BhY2U6OmNyZWF0ZVNlc3Np b25TdG9yYWdlTmFtZXNwYWNlKHF1b3RhKTsKIH0KIAogdm9pZCBXZWJWaWV3SG9zdDo6ZGlkQWRk TWVzc2FnZVRvQ29uc29sZShjb25zdCBXZWJDb25zb2xlTWVzc2FnZSYgbWVzc2FnZSwgY29uc3Qg V2ViU3RyaW5nJiBzb3VyY2VOYW1lLCB1bnNpZ25lZCBzb3VyY2VMaW5lKQpkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaCBiL1dlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmgKaW5kZXggYzViZWQ3 YTRjN2EzYmE4YzEzY2RlOWMwYzBlM2ZkYWVmNmJhNzYwNy4uOTJmMTY1YWM1ZjA3ZDU4MTc0Mzcz YWNjMjM2N2QxM2U2OWNmNzBiMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCkBAIC04Niw3ICs4Niw3IEBAIGNsYXNzIFdlYlZpZXdI b3N0IDogcHVibGljIFdlYktpdDo6V2ViVmlld0NsaWVudCwgcHVibGljIFdlYktpdDo6V2ViRnJh bWVDbGllbnQsCiAgICAgdmlydHVhbCBXZWJLaXQ6OldlYlZpZXcqIGNyZWF0ZVZpZXcoV2ViS2l0 OjpXZWJGcmFtZSopOwogICAgIHZpcnR1YWwgV2ViS2l0OjpXZWJXaWRnZXQqIGNyZWF0ZVBvcHVw TWVudShib29sIGFjdGl2YXRhYmxlKTsKICAgICB2aXJ0dWFsIFdlYktpdDo6V2ViV2lkZ2V0KiBj cmVhdGVQb3B1cE1lbnUoY29uc3QgV2ViS2l0OjpXZWJQb3B1cE1lbnVJbmZvJik7Ci0gICAgdmly dHVhbCBXZWJLaXQ6OldlYlN0b3JhZ2VOYW1lc3BhY2UqIGNyZWF0ZVNlc3Npb25TdG9yYWdlTmFt ZXNwYWNlKCk7CisgICAgdmlydHVhbCBXZWJLaXQ6OldlYlN0b3JhZ2VOYW1lc3BhY2UqIGNyZWF0 ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKHVuc2lnbmVkIHF1b3RhKTsKICAgICB2aXJ0dWFsIHZv aWQgZGlkQWRkTWVzc2FnZVRvQ29uc29sZShjb25zdCBXZWJLaXQ6OldlYkNvbnNvbGVNZXNzYWdl JiwgY29uc3QgV2ViS2l0OjpXZWJTdHJpbmcmIHNvdXJjZU5hbWUsIHVuc2lnbmVkIHNvdXJjZUxp bmUpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRTdGFydExvYWRpbmcoKTsKICAgICB2aXJ0dWFsIHZv aWQgZGlkU3RvcExvYWRpbmcoKTsK