33492 2010-01-11 14:13:35 -0800 [Chromium] Move getSessionStorageNamespace from WebKitClient to WebViewClient 2010-01-13 15:39:13 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jorlow jorlow eric oldest_to_newest 179536 0 jorlow 2010-01-11 14:13:35 -0800 [Chromium] Move getSessionStorageNamespace from WebKitClient to WebViewClient 179537 1 46308 jorlow 2010-01-11 14:14:27 -0800 Created attachment 46308 Patch 179575 2 46308 fishd 2010-01-11 15:33:25 -0800 Comment on attachment 46308 Patch > Index: WebCore/ChangeLog ... > + No new tests. (OOPS!) ^^^ need to delete this line > Index: WebKit/chromium/public/WebKitClient.h ... > + // THIS IS DEPRICATED. WebViewClient::getSessionStorageNamespace() is the new way to access this. ^^^ deprecated > Index: WebKit/chromium/public/WebViewClient.h > + // Session Storage ------------------------------------------------------ > + > + // Get the session storage namespace associated with this WebView. > + virtual WebStorageNamespace* getSessionStorageNamespace() { return 0; } why isn't this called createSessionStorageNamespace? if the embedder owns the returned pointer, then you should just call this sessionStorageNamespace. 179588 3 46315 jorlow 2010-01-11 15:58:11 -0800 Created attachment 46315 Patch 179704 4 46315 fishd 2010-01-11 23:47:55 -0800 Comment on attachment 46315 Patch > Index: WebKit/chromium/public/WebViewClient.h ... > + // Get the session storage namespace associated with this WebView. > + virtual WebStorageNamespace* createSessionStorageNamespace() { return 0; } Fix the comment to say "Create a..." Also, please move this up into the factory section of WebViewClient. R=me, but please fix these before committing. 179782 5 eric 2010-01-12 04:05:30 -0800 Attachment 46315 was posted by a committer and has review+, assigning to Jeremy Orlow for commit. 180093 6 jorlow 2010-01-12 22:51:48 -0800 Committed r53180: <http://trac.webkit.org/changeset/53180> 180307 7 jorlow 2010-01-13 11:22:24 -0800 Re-opening as my previous patch had to be reverted. 180418 8 jorlow 2010-01-13 14:51:24 -0800 Problem fixed upstream. Will re-land the r+'ed patch. 180430 9 jorlow 2010-01-13 15:39:13 -0800 Committed r53210: <http://trac.webkit.org/changeset/53210> 46308 2010-01-11 14:14:27 -0800 2010-01-11 15:58:08 -0800 Patch bug-33492-20100111141425.patch text/plain 7414 jorlow SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzA5NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDEtMTEgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W0Nocm9taXVtXSBNb3ZlIGdldFNlc3Npb25TdG9yYWdlTmFtZXNwYWNlIGZyb20gV2ViS2l0Q2xp ZW50IHRvIFdlYlZpZXdDbGllbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMzNDkyCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAg ICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6c2Vzc2lvblN0 b3JhZ2UpOgorICAgICAgICAqIHN0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTdG9yYWdlTmFtZXNwYWNlOjpzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSk6Cisg ICAgICAgICogc3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlLmg6CisgICAgICAgIChXZWJDb3JlOjpT dG9yYWdlTmFtZXNwYWNlOjp+U3RvcmFnZU5hbWVzcGFjZSk6CisKIDIwMTAtMDEtMTEgIE5pa29s YXMgWmltbWVybWFubiAgPG56aW1tZXJtYW5uQHJpbS5jb20+CiAKICAgICAgICAgTm90IHJldmll d2VkLiBBdHRlbXB0IHRvIGZpeCB3aW5kb3dzIGJ1aWxkcywgYnkgcmVtb3ZpbmcgdGhlIG5vLWxv bmdlciBleGlzdGFudCBKU1NWR1BvaW50TGlzdEN1c3RvbS5jcHAgZnJvbSBKU0JpbmRpbmdzQWxs SW5PbmUuY3BwLgpJbmRleDogV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGFnZS9QYWdlLmNwcAkocmV2aXNpb24gNTI5OTUpCisrKyBXZWJDb3JlL3BhZ2UvUGFn ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY4OSw3ICs2ODksNyBAQCB2b2lkIFBhZ2U6OnNldERl YnVnZ2VyKEpTQzo6RGVidWdnZXIqIGRlCiBTdG9yYWdlTmFtZXNwYWNlKiBQYWdlOjpzZXNzaW9u U3RvcmFnZShib29sIG9wdGlvbmFsQ3JlYXRlKQogewogICAgIGlmICghbV9zZXNzaW9uU3RvcmFn ZSAmJiBvcHRpb25hbENyZWF0ZSkKLSAgICAgICAgbV9zZXNzaW9uU3RvcmFnZSA9IFN0b3JhZ2VO YW1lc3BhY2U6OnNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKCk7CisgICAgICAgIG1fc2Vzc2lvblN0 b3JhZ2UgPSBTdG9yYWdlTmFtZXNwYWNlOjpzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSh0aGlzKTsK IAogICAgIHJldHVybiBtX3Nlc3Npb25TdG9yYWdlLmdldCgpOwogfQpJbmRleDogV2ViQ29yZS9z dG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3RvcmFn ZS9TdG9yYWdlTmFtZXNwYWNlLmNwcAkocmV2aXNpb24gNTI5OTUpCisrKyBXZWJDb3JlL3N0b3Jh Z2UvU3RvcmFnZU5hbWVzcGFjZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxLDcgKzQxLDggQEAg UGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPiBTdG9yYWdlTmFtZQogICAgIHJldHVybiBTdG9y YWdlTmFtZXNwYWNlSW1wbDo6bG9jYWxTdG9yYWdlTmFtZXNwYWNlKHBhdGgsIHF1b3RhKTsKIH0K IAotUGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPiBTdG9yYWdlTmFtZXNwYWNlOjpzZXNzaW9u U3RvcmFnZU5hbWVzcGFjZSgpCisvLyBUaGUgcGFnZSBhcmd1bWVudCBpcyBvbmx5IHVzZWQgYnkg dGhlIENocm9taXVtIHBvcnQuCitQYXNzUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2U+IFN0b3JhZ2VO YW1lc3BhY2U6OnNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKFBhZ2UqKQogewogICAgIHJldHVybiBT dG9yYWdlTmFtZXNwYWNlSW1wbDo6c2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UoKTsKIH0KSW5kZXg6 IFdlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9zdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2UuaAkocmV2aXNpb24gNTI5OTUpCisrKyBXZWJDb3Jl L3N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNSwyMSArMzUs MjIgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0gICAgY2xhc3MgU2VjdXJpdHlPcmlnaW47 Ci0gICAgY2xhc3MgU3RvcmFnZUFyZWE7Ci0KLSAgICAvLyBUaGlzIGludGVyZmFjZSBpcyByZXF1 aXJlZCBmb3IgQ2hyb21pdW0gc2luY2UgdGhlc2UgYWN0aW9ucyBuZWVkIHRvIGJlIHByb3hpZWQg YmV0d2VlbiBwcm9jZXNzZXMuCi0gICAgY2xhc3MgU3RvcmFnZU5hbWVzcGFjZSA6IHB1YmxpYyBS ZWZDb3VudGVkPFN0b3JhZ2VOYW1lc3BhY2U+IHsKLSAgICBwdWJsaWM6Ci0gICAgICAgIHN0YXRp YyBQYXNzUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2U+IGxvY2FsU3RvcmFnZU5hbWVzcGFjZShjb25z dCBTdHJpbmcmIHBhdGgsIHVuc2lnbmVkIHF1b3RhKTsKLSAgICAgICAgc3RhdGljIFBhc3NSZWZQ dHI8U3RvcmFnZU5hbWVzcGFjZT4gc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UoKTsKLQotICAgICAg ICB2aXJ0dWFsIH5TdG9yYWdlTmFtZXNwYWNlKCkgeyB9Ci0gICAgICAgIHZpcnR1YWwgUGFzc1Jl ZlB0cjxTdG9yYWdlQXJlYT4gc3RvcmFnZUFyZWEoUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4p ID0gMDsKLSAgICAgICAgdmlydHVhbCBQYXNzUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2U+IGNvcHko KSA9IDA7Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBjbG9zZSgpID0gMDsKLSAgICAgICAgdmlydHVh bCB2b2lkIHVubG9jaygpID0gMDsKLSAgICB9OworY2xhc3MgUGFnZTsKK2NsYXNzIFNlY3VyaXR5 T3JpZ2luOworY2xhc3MgU3RvcmFnZUFyZWE7CisKKy8vIFRoaXMgaW50ZXJmYWNlIGlzIHJlcXVp cmVkIGZvciBDaHJvbWl1bSBzaW5jZSB0aGVzZSBhY3Rpb25zIG5lZWQgdG8gYmUgcHJveGllZCBi ZXR3ZWVuIHByb2Nlc3Nlcy4KK2NsYXNzIFN0b3JhZ2VOYW1lc3BhY2UgOiBwdWJsaWMgUmVmQ291 bnRlZDxTdG9yYWdlTmFtZXNwYWNlPiB7CitwdWJsaWM6CisgICAgc3RhdGljIFBhc3NSZWZQdHI8 U3RvcmFnZU5hbWVzcGFjZT4gbG9jYWxTdG9yYWdlTmFtZXNwYWNlKGNvbnN0IFN0cmluZyYgcGF0 aCwgdW5zaWduZWQgcXVvdGEpOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPFN0b3JhZ2VOYW1lc3Bh Y2U+IHNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKFBhZ2UqKTsKKworICAgIHZpcnR1YWwgflN0b3Jh Z2VOYW1lc3BhY2UoKSB7IH0KKyAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8U3RvcmFnZUFyZWE+IHN0 b3JhZ2VBcmVhKFBhc3NSZWZQdHI8U2VjdXJpdHlPcmlnaW4+KSA9IDA7CisgICAgdmlydHVhbCBQ YXNzUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2U+IGNvcHkoKSA9IDA7CisgICAgdmlydHVhbCB2b2lk IGNsb3NlKCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCB1bmxvY2soKSA9IDA7Cit9OwogCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTMwOTcpCisr KyBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTAtMDEtMTEgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBN b3ZlIGdldFNlc3Npb25TdG9yYWdlTmFtZXNwYWNlIGZyb20gV2ViS2l0Q2xpZW50IHRvIFdlYlZp ZXdDbGllbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTMzNDkyCisKKyAgICAgICAgKiBwdWJsaWMvV2ViS2l0Q2xpZW50Lmg6CisgICAgICAgICogcHVi bGljL1dlYlZpZXdDbGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0NsaWVudDo6Z2V0 U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UpOgorICAgICAgICAqIHNyYy9TdG9yYWdlTmFtZXNwYWNl UHJveHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZU5hbWVzcGFjZTo6c2Vzc2lvblN0 b3JhZ2VOYW1lc3BhY2UpOgorCiAyMDEwLTAxLTA5ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYktpdENsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViS2l0Q2xpZW50LmgJKHJldmlzaW9uIDUyOTk1KQorKysgV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJLaXRDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtODksNiArODks NyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBXZWJTdG9yYWdlTmFtZXNwYWNlKiBjcmVhdGVMb2Nh bFN0b3JhZ2VOYW1lc3BhY2UoY29uc3QgV2ViU3RyaW5nJiBwYXRoLCB1bnNpZ25lZCBxdW90YSkg eyByZXR1cm4gMDsgfQogCiAgICAgLy8gUmV0dXJuIGEgbmV3IFNlc3Npb25TdG9yYWdlIG5hbWVz cGFjZS4KKyAgICAvLyBUSElTIElTIERFUFJJQ0FURUQuICBXZWJWaWV3Q2xpZW50OjpnZXRTZXNz aW9uU3RvcmFnZU5hbWVzcGFjZSgpIGlzIHRoZSBuZXcgd2F5IHRvIGFjY2VzcyB0aGlzLgogICAg IHZpcnR1YWwgV2ViU3RvcmFnZU5hbWVzcGFjZSogY3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3Bh Y2UoKSB7IHJldHVybiAwOyB9CiAKICAgICAvLyBDYWxsZWQgd2hlbiBzdG9yYWdlIGV2ZW50cyBm aXJlLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgJKHJldmlzaW9u IDUyOTk1KQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgJKHdvcmtp bmcgY29weSkKQEAgLTQ4LDYgKzQ4LDcgQEAgY2xhc3MgV2ViRnJhbWU7CiBjbGFzcyBXZWJOb2Rl OwogY2xhc3MgV2ViTm90aWZpY2F0aW9uUHJlc2VudGVyOwogY2xhc3MgV2ViUmFuZ2U7CitjbGFz cyBXZWJTdG9yYWdlTmFtZXNwYWNlOwogY2xhc3MgV2ViVVJMOwogY2xhc3MgV2ViVmlldzsKIGNs YXNzIFdlYldpZGdldDsKQEAgLTI2OSw2ICsyNzAsMTEgQEAgcHVibGljOgogICAgIHZpcnR1YWwg dm9pZCByZW1vdmVBdXRvZmlsbFN1Z2dlc3Rpb25zKGNvbnN0IFdlYlN0cmluZyYgbmFtZSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJTdHJpbmcm IHZhbHVlKSB7IH0KIAorICAgIC8vIFNlc3Npb24gU3RvcmFnZSAtLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKworICAgIC8vIEdldCB0aGUgc2Vz c2lvbiBzdG9yYWdlIG5hbWVzcGFjZSBhc3NvY2lhdGVkIHdpdGggdGhpcyBXZWJWaWV3LgorICAg IHZpcnR1YWwgV2ViU3RvcmFnZU5hbWVzcGFjZSogZ2V0U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2Uo KSB7IHJldHVybiAwOyB9CisKIHByb3RlY3RlZDoKICAgICB+V2ViVmlld0NsaWVudCgpIHsgfQog fTsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvU3RvcmFnZU5hbWVzcGFjZVByb3h5LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1N0b3JhZ2VOYW1lc3BhY2VQcm94eS5j cHAJKHJldmlzaW9uIDUyOTk1KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9TdG9yYWdlTmFtZXNw YWNlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOCwxMiArMjgsMTcgQEAKIAogI2lmIEVO QUJMRShET01fU1RPUkFHRSkKIAorI2luY2x1ZGUgIkNocm9tZS5oIgorI2luY2x1ZGUgIkNocm9t ZUNsaWVudEltcGwuaCIKKyNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiU2VjdXJpdHlPcmln aW4uaCIKICNpbmNsdWRlICJTdG9yYWdlQXJlYVByb3h5LmgiCiAjaW5jbHVkZSAiV2ViS2l0Lmgi CiAjaW5jbHVkZSAiV2ViS2l0Q2xpZW50LmgiCiAjaW5jbHVkZSAiV2ViU3RvcmFnZU5hbWVzcGFj ZS5oIgogI2luY2x1ZGUgIldlYlN0cmluZy5oIgorI2luY2x1ZGUgIldlYlZpZXdDbGllbnQuaCIK KyNpbmNsdWRlICJXZWJWaWV3SW1wbC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTQy LDkgKzQ3LDExIEBAIFBhc3NSZWZQdHI8U3RvcmFnZU5hbWVzcGFjZT4gU3RvcmFnZU5hbWUKICAg ICByZXR1cm4gbmV3IFN0b3JhZ2VOYW1lc3BhY2VQcm94eShXZWJLaXQ6OndlYktpdENsaWVudCgp LT5jcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UocGF0aCwgcXVvdGEpKTsKIH0KIAotUGFzc1Jl ZlB0cjxTdG9yYWdlTmFtZXNwYWNlPiBTdG9yYWdlTmFtZXNwYWNlOjpzZXNzaW9uU3RvcmFnZU5h bWVzcGFjZSgpCitQYXNzUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2U+IFN0b3JhZ2VOYW1lc3BhY2U6 OnNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKFBhZ2UqIHBhZ2UpCiB7Ci0gICAgcmV0dXJuIG5ldyBT dG9yYWdlTmFtZXNwYWNlUHJveHkoV2ViS2l0Ojp3ZWJLaXRDbGllbnQoKS0+Y3JlYXRlU2Vzc2lv blN0b3JhZ2VOYW1lc3BhY2UoKSk7CisgICAgV2ViS2l0OjpDaHJvbWVDbGllbnRJbXBsKiBjaHJv bWVDbGllbnRJbXBsID0gc3RhdGljX2Nhc3Q8V2ViS2l0OjpDaHJvbWVDbGllbnRJbXBsKj4ocGFn ZS0+Y2hyb21lKCktPmNsaWVudCgpKTsKKyAgICBXZWJLaXQ6OldlYlZpZXdDbGllbnQqIHdlYlZp ZXdDbGllbnQgPSBjaHJvbWVDbGllbnRJbXBsLT53ZWJWaWV3KCktPmNsaWVudCgpOworICAgIHJl dHVybiBuZXcgU3RvcmFnZU5hbWVzcGFjZVByb3h5KHdlYlZpZXdDbGllbnQtPmdldFNlc3Npb25T dG9yYWdlTmFtZXNwYWNlKCkpOwogfQogCiBTdG9yYWdlTmFtZXNwYWNlUHJveHk6OlN0b3JhZ2VO YW1lc3BhY2VQcm94eShXZWJLaXQ6OldlYlN0b3JhZ2VOYW1lc3BhY2UqIHN0b3JhZ2VOYW1lc3Bh Y2UpCg== 46315 2010-01-11 15:58:11 -0800 2010-01-11 23:47:54 -0800 Patch bug-33492-20100111155810.patch text/plain 7387 jorlow SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzA5NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDEtMTEgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W0Nocm9taXVtXSBNb3ZlIGdldFNlc3Npb25TdG9yYWdlTmFtZXNwYWNlIGZyb20gV2ViS2l0Q2xp ZW50IHRvIFdlYlZpZXdDbGllbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMzNDkyCisKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UGFnZTo6c2Vzc2lvblN0b3JhZ2UpOgorICAgICAgICAqIHN0b3JhZ2UvU3RvcmFn ZU5hbWVzcGFjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlTmFtZXNwYWNlOjpzZXNz aW9uU3RvcmFnZU5hbWVzcGFjZSk6CisgICAgICAgICogc3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNl Lmg6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlTmFtZXNwYWNlOjp+U3RvcmFnZU5hbWVzcGFj ZSk6CisKIDIwMTAtMDEtMTEgIE5pa29sYXMgWmltbWVybWFubiAgPG56aW1tZXJtYW5uQHJpbS5j b20+CiAKICAgICAgICAgTm90IHJldmlld2VkLiBBdHRlbXB0IHRvIGZpeCB3aW5kb3dzIGJ1aWxk cywgYnkgcmVtb3ZpbmcgdGhlIG5vLWxvbmdlciBleGlzdGFudCBKU1NWR1BvaW50TGlzdEN1c3Rv bS5jcHAgZnJvbSBKU0JpbmRpbmdzQWxsSW5PbmUuY3BwLgpJbmRleDogV2ViQ29yZS9wYWdlL1Bh Z2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9QYWdlLmNwcAkocmV2aXNpb24gNTI5 OTUpCisrKyBXZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY4OSw3ICs2 ODksNyBAQCB2b2lkIFBhZ2U6OnNldERlYnVnZ2VyKEpTQzo6RGVidWdnZXIqIGRlCiBTdG9yYWdl TmFtZXNwYWNlKiBQYWdlOjpzZXNzaW9uU3RvcmFnZShib29sIG9wdGlvbmFsQ3JlYXRlKQogewog ICAgIGlmICghbV9zZXNzaW9uU3RvcmFnZSAmJiBvcHRpb25hbENyZWF0ZSkKLSAgICAgICAgbV9z ZXNzaW9uU3RvcmFnZSA9IFN0b3JhZ2VOYW1lc3BhY2U6OnNlc3Npb25TdG9yYWdlTmFtZXNwYWNl KCk7CisgICAgICAgIG1fc2Vzc2lvblN0b3JhZ2UgPSBTdG9yYWdlTmFtZXNwYWNlOjpzZXNzaW9u U3RvcmFnZU5hbWVzcGFjZSh0aGlzKTsKIAogICAgIHJldHVybiBtX3Nlc3Npb25TdG9yYWdlLmdl dCgpOwogfQpJbmRleDogV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2UuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlLmNwcAkocmV2aXNpb24g NTI5OTUpCisrKyBXZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQxLDcgKzQxLDggQEAgUGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPiBTdG9y YWdlTmFtZQogICAgIHJldHVybiBTdG9yYWdlTmFtZXNwYWNlSW1wbDo6bG9jYWxTdG9yYWdlTmFt ZXNwYWNlKHBhdGgsIHF1b3RhKTsKIH0KIAotUGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPiBT dG9yYWdlTmFtZXNwYWNlOjpzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSgpCisvLyBUaGUgcGFnZSBh cmd1bWVudCBpcyBvbmx5IHVzZWQgYnkgdGhlIENocm9taXVtIHBvcnQuCitQYXNzUmVmUHRyPFN0 b3JhZ2VOYW1lc3BhY2U+IFN0b3JhZ2VOYW1lc3BhY2U6OnNlc3Npb25TdG9yYWdlTmFtZXNwYWNl KFBhZ2UqKQogewogICAgIHJldHVybiBTdG9yYWdlTmFtZXNwYWNlSW1wbDo6c2Vzc2lvblN0b3Jh Z2VOYW1lc3BhY2UoKTsKIH0KSW5kZXg6IFdlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2UuaAkocmV2 aXNpb24gNTI5OTUpCisrKyBXZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNSwyMSArMzUsMjIgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0g ICAgY2xhc3MgU2VjdXJpdHlPcmlnaW47Ci0gICAgY2xhc3MgU3RvcmFnZUFyZWE7Ci0KLSAgICAv LyBUaGlzIGludGVyZmFjZSBpcyByZXF1aXJlZCBmb3IgQ2hyb21pdW0gc2luY2UgdGhlc2UgYWN0 aW9ucyBuZWVkIHRvIGJlIHByb3hpZWQgYmV0d2VlbiBwcm9jZXNzZXMuCi0gICAgY2xhc3MgU3Rv cmFnZU5hbWVzcGFjZSA6IHB1YmxpYyBSZWZDb3VudGVkPFN0b3JhZ2VOYW1lc3BhY2U+IHsKLSAg ICBwdWJsaWM6Ci0gICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2U+IGxv Y2FsU3RvcmFnZU5hbWVzcGFjZShjb25zdCBTdHJpbmcmIHBhdGgsIHVuc2lnbmVkIHF1b3RhKTsK LSAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8U3RvcmFnZU5hbWVzcGFjZT4gc2Vzc2lvblN0b3Jh Z2VOYW1lc3BhY2UoKTsKLQotICAgICAgICB2aXJ0dWFsIH5TdG9yYWdlTmFtZXNwYWNlKCkgeyB9 Ci0gICAgICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxTdG9yYWdlQXJlYT4gc3RvcmFnZUFyZWEoUGFz c1JlZlB0cjxTZWN1cml0eU9yaWdpbj4pID0gMDsKLSAgICAgICAgdmlydHVhbCBQYXNzUmVmUHRy PFN0b3JhZ2VOYW1lc3BhY2U+IGNvcHkoKSA9IDA7Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBjbG9z ZSgpID0gMDsKLSAgICAgICAgdmlydHVhbCB2b2lkIHVubG9jaygpID0gMDsKLSAgICB9OworY2xh c3MgUGFnZTsKK2NsYXNzIFNlY3VyaXR5T3JpZ2luOworY2xhc3MgU3RvcmFnZUFyZWE7CisKKy8v IFRoaXMgaW50ZXJmYWNlIGlzIHJlcXVpcmVkIGZvciBDaHJvbWl1bSBzaW5jZSB0aGVzZSBhY3Rp b25zIG5lZWQgdG8gYmUgcHJveGllZCBiZXR3ZWVuIHByb2Nlc3Nlcy4KK2NsYXNzIFN0b3JhZ2VO YW1lc3BhY2UgOiBwdWJsaWMgUmVmQ291bnRlZDxTdG9yYWdlTmFtZXNwYWNlPiB7CitwdWJsaWM6 CisgICAgc3RhdGljIFBhc3NSZWZQdHI8U3RvcmFnZU5hbWVzcGFjZT4gbG9jYWxTdG9yYWdlTmFt ZXNwYWNlKGNvbnN0IFN0cmluZyYgcGF0aCwgdW5zaWduZWQgcXVvdGEpOworICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2U+IHNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKFBhZ2Uq KTsKKworICAgIHZpcnR1YWwgflN0b3JhZ2VOYW1lc3BhY2UoKSB7IH0KKyAgICB2aXJ0dWFsIFBh c3NSZWZQdHI8U3RvcmFnZUFyZWE+IHN0b3JhZ2VBcmVhKFBhc3NSZWZQdHI8U2VjdXJpdHlPcmln aW4+KSA9IDA7CisgICAgdmlydHVhbCBQYXNzUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2U+IGNvcHko KSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGNsb3NlKCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCB1 bmxvY2soKSA9IDA7Cit9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKSW5kZXg6IFdlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwkocmV2aXNpb24gNTMwOTcpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDEtMTEgIEplcmVteSBPcmxvdyAgPGpv cmxvd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW0Nocm9taXVtXSBNb3ZlIGdldFNlc3Npb25TdG9yYWdlTmFtZXNwYWNlIGZy b20gV2ViS2l0Q2xpZW50IHRvIFdlYlZpZXdDbGllbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzNDkyCisKKyAgICAgICAgKiBwdWJsaWMvV2ViS2l0 Q2xpZW50Lmg6CisgICAgICAgICogcHVibGljL1dlYlZpZXdDbGllbnQuaDoKKyAgICAgICAgKFdl YktpdDo6V2ViVmlld0NsaWVudDo6Z2V0U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UpOgorICAgICAg ICAqIHNyYy9TdG9yYWdlTmFtZXNwYWNlUHJveHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3Rv cmFnZU5hbWVzcGFjZTo6c2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UpOgorCiAyMDEwLTAxLTA5ICBB ZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFy aW4gQWRsZXIuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYktpdENsaWVudC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViS2l0Q2xpZW50LmgJKHJldmlz aW9uIDUyOTk1KQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJLaXRDbGllbnQuaAkod29y a2luZyBjb3B5KQpAQCAtODksNiArODksNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBXZWJTdG9y YWdlTmFtZXNwYWNlKiBjcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UoY29uc3QgV2ViU3RyaW5n JiBwYXRoLCB1bnNpZ25lZCBxdW90YSkgeyByZXR1cm4gMDsgfQogCiAgICAgLy8gUmV0dXJuIGEg bmV3IFNlc3Npb25TdG9yYWdlIG5hbWVzcGFjZS4KKyAgICAvLyBUSElTIElTIERFUFJFQ0FURUQu ICBXZWJWaWV3Q2xpZW50OjpnZXRTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSgpIGlzIHRoZSBuZXcg d2F5IHRvIGFjY2VzcyB0aGlzLgogICAgIHZpcnR1YWwgV2ViU3RvcmFnZU5hbWVzcGFjZSogY3Jl YXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UoKSB7IHJldHVybiAwOyB9CiAKICAgICAvLyBDYWxs ZWQgd2hlbiBzdG9yYWdlIGV2ZW50cyBmaXJlLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJWaWV3Q2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJWaWV3Q2xpZW50LmgJKHJldmlzaW9uIDUyOTk1KQorKysgV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJWaWV3Q2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDYgKzQ4LDcgQEAgY2xhc3Mg V2ViRnJhbWU7CiBjbGFzcyBXZWJOb2RlOwogY2xhc3MgV2ViTm90aWZpY2F0aW9uUHJlc2VudGVy OwogY2xhc3MgV2ViUmFuZ2U7CitjbGFzcyBXZWJTdG9yYWdlTmFtZXNwYWNlOwogY2xhc3MgV2Vi VVJMOwogY2xhc3MgV2ViVmlldzsKIGNsYXNzIFdlYldpZGdldDsKQEAgLTI2OSw2ICsyNzAsMTEg QEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCByZW1vdmVBdXRvZmlsbFN1Z2dlc3Rpb25zKGNv bnN0IFdlYlN0cmluZyYgbmFtZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdCBXZWJTdHJpbmcmIHZhbHVlKSB7IH0KIAorICAgIC8vIFNlc3Npb24gU3Rv cmFnZSAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KKworICAgIC8vIEdldCB0aGUgc2Vzc2lvbiBzdG9yYWdlIG5hbWVzcGFjZSBhc3NvY2lhdGVk IHdpdGggdGhpcyBXZWJWaWV3LgorICAgIHZpcnR1YWwgV2ViU3RvcmFnZU5hbWVzcGFjZSogY3Jl YXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UoKSB7IHJldHVybiAwOyB9CisKIHByb3RlY3RlZDoK ICAgICB+V2ViVmlld0NsaWVudCgpIHsgfQogfTsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMv U3RvcmFnZU5hbWVzcGFjZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0v c3JjL1N0b3JhZ2VOYW1lc3BhY2VQcm94eS5jcHAJKHJldmlzaW9uIDUyOTk1KQorKysgV2ViS2l0 L2Nocm9taXVtL3NyYy9TdG9yYWdlTmFtZXNwYWNlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yOCwxMiArMjgsMTcgQEAKIAogI2lmIEVOQUJMRShET01fU1RPUkFHRSkKIAorI2luY2x1ZGUg IkNocm9tZS5oIgorI2luY2x1ZGUgIkNocm9tZUNsaWVudEltcGwuaCIKKyNpbmNsdWRlICJQYWdl LmgiCiAjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW4uaCIKICNpbmNsdWRlICJTdG9yYWdlQXJlYVBy b3h5LmgiCiAjaW5jbHVkZSAiV2ViS2l0LmgiCiAjaW5jbHVkZSAiV2ViS2l0Q2xpZW50LmgiCiAj aW5jbHVkZSAiV2ViU3RvcmFnZU5hbWVzcGFjZS5oIgogI2luY2x1ZGUgIldlYlN0cmluZy5oIgor I2luY2x1ZGUgIldlYlZpZXdDbGllbnQuaCIKKyNpbmNsdWRlICJXZWJWaWV3SW1wbC5oIgogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTQyLDkgKzQ3LDExIEBAIFBhc3NSZWZQdHI8U3RvcmFn ZU5hbWVzcGFjZT4gU3RvcmFnZU5hbWUKICAgICByZXR1cm4gbmV3IFN0b3JhZ2VOYW1lc3BhY2VQ cm94eShXZWJLaXQ6OndlYktpdENsaWVudCgpLT5jcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2Uo cGF0aCwgcXVvdGEpKTsKIH0KIAotUGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPiBTdG9yYWdl TmFtZXNwYWNlOjpzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSgpCitQYXNzUmVmUHRyPFN0b3JhZ2VO YW1lc3BhY2U+IFN0b3JhZ2VOYW1lc3BhY2U6OnNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKFBhZ2Uq IHBhZ2UpCiB7Ci0gICAgcmV0dXJuIG5ldyBTdG9yYWdlTmFtZXNwYWNlUHJveHkoV2ViS2l0Ojp3 ZWJLaXRDbGllbnQoKS0+Y3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UoKSk7CisgICAgV2Vi S2l0OjpDaHJvbWVDbGllbnRJbXBsKiBjaHJvbWVDbGllbnRJbXBsID0gc3RhdGljX2Nhc3Q8V2Vi S2l0OjpDaHJvbWVDbGllbnRJbXBsKj4ocGFnZS0+Y2hyb21lKCktPmNsaWVudCgpKTsKKyAgICBX ZWJLaXQ6OldlYlZpZXdDbGllbnQqIHdlYlZpZXdDbGllbnQgPSBjaHJvbWVDbGllbnRJbXBsLT53 ZWJWaWV3KCktPmNsaWVudCgpOworICAgIHJldHVybiBuZXcgU3RvcmFnZU5hbWVzcGFjZVByb3h5 KHdlYlZpZXdDbGllbnQtPmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKCkpOwogfQogCiBT dG9yYWdlTmFtZXNwYWNlUHJveHk6OlN0b3JhZ2VOYW1lc3BhY2VQcm94eShXZWJLaXQ6OldlYlN0 b3JhZ2VOYW1lc3BhY2UqIHN0b3JhZ2VOYW1lc3BhY2UpCg==