67302 2011-08-31 11:01:52 -0700 Add pass-throughs for NPObject/v8::Value marshalling to WebBindings 2011-08-31 23:59:12 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 gbillock webkit-unassigned fishd webkit.review.bot oldest_to_newest 459745 0 gbillock 2011-08-31 11:01:52 -0700 Expose a couple of methods to WebBindings to expose type translation from V8NPUtils. This makes complex type translation possible from the API client side. 459746 1 105796 gbillock 2011-08-31 11:05:05 -0700 Created attachment 105796 Patch 459880 2 105796 fishd 2011-08-31 13:49:36 -0700 Comment on attachment 105796 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105796&action=review > Source/WebKit/chromium/public/WebBindings.h:169 > + WEBKIT_EXPORT static v8::Handle<v8::Value> convertNPVariantToV8Object(const NPVariant*); This returns a v8::Value, not a v8::Object. Maybe the name should be convertNPVariantToV8Value? or, maybe we could even use short-cuts like: toV8Value toNPVariant 459991 3 105796 gbillock 2011-08-31 15:37:51 -0700 Comment on attachment 105796 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105796&action=review >> Source/WebKit/chromium/public/WebBindings.h:169 >> + WEBKIT_EXPORT static v8::Handle<v8::Value> convertNPVariantToV8Object(const NPVariant*); > > This returns a v8::Value, not a v8::Object. Maybe the name should be convertNPVariantToV8Value? or, maybe we could even use short-cuts like: > > toV8Value > toNPVariant I'm happy to switch to that. I was basically copying the V8NPUtils names exactly to make the wrapping very clear. It looked like other WebBindings and Web* APIs tended to do that, although not universally. 460008 4 105847 gbillock 2011-08-31 15:55:51 -0700 Created attachment 105847 Patch 460069 5 105847 fishd 2011-08-31 16:47:02 -0700 Comment on attachment 105847 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105847&action=review > Source/WebKit/chromium/public/WebBindings.h:167 > + // Conversion utilities to/from V8 native objects and NPObject wrappers. nit: s/NPObject/NPVariant/ > Source/WebKit/chromium/src/WebBindings.cpp:339 > + WebCore::convertV8ObjectToNPVariant(object, root, result); nit: note the 'using namespace WebCore' at the top of this file. you can drop the WebCore:: prefixes. > Source/WebKit/chromium/src/WebBindings.cpp:346 > + if (object->_class != WebCore::npScriptObjectClass) ditto > Source/WebKit/chromium/src/WebBindings.cpp:353 > + return WebCore::convertNPVariantToV8Object(variant, static_cast<NPObject*>(0)); is the static_cast necessary? can you just get by passing 0 or nullptr? 460087 6 105847 gbillock 2011-08-31 17:01:13 -0700 Comment on attachment 105847 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105847&action=review >> Source/WebKit/chromium/public/WebBindings.h:167 >> + // Conversion utilities to/from V8 native objects and NPObject wrappers. > > nit: s/NPObject/NPVariant/ Done. >> Source/WebKit/chromium/src/WebBindings.cpp:339 >> + WebCore::convertV8ObjectToNPVariant(object, root, result); > > nit: note the 'using namespace WebCore' at the top of this file. you can drop the WebCore:: prefixes. Done. >> Source/WebKit/chromium/src/WebBindings.cpp:346 >> + if (object->_class != WebCore::npScriptObjectClass) > > ditto Done. >> Source/WebKit/chromium/src/WebBindings.cpp:353 >> + return WebCore::convertNPVariantToV8Object(variant, static_cast<NPObject*>(0)); > > is the static_cast necessary? can you just get by passing 0 or nullptr? Yeah, that works. Changed. 460089 7 105863 gbillock 2011-08-31 17:02:07 -0700 Created attachment 105863 Patch 460272 8 105863 webkit.review.bot 2011-08-31 23:59:08 -0700 Comment on attachment 105863 Patch Clearing flags on attachment: 105863 Committed r94277: <http://trac.webkit.org/changeset/94277> 460273 9 webkit.review.bot 2011-08-31 23:59:12 -0700 All reviewed patches have been landed. Closing bug. 105796 2011-08-31 11:05:05 -0700 2011-08-31 15:55:47 -0700 Patch bug-67302-20110831110504.patch text/plain 4465 gbillock U3VidmVyc2lvbiBSZXZpc2lvbjogOTQxODkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ODYyYzM1ZjczMzJhNWVjMWY1MWJjYzhmYzRmYTE4YjAzZDU1NDc1ZS4uOTZhZmYzMDc3NjJiZTcy MjIxY2FkNGU3MmIwNWIyYTRjN2I4NjFlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNyBAQAorMjAxMS0wOC0zMSAgR3JlZyBCaWxsb2NrICA8Z2JpbGxvY2tAZ29vZ2xl LmNvbT4KKworICAgICAgICBBZGQgcGFzcy10aHJvdWdocyBmb3IgTlBPYmplY3Qvdjg6OlZhbHVl IG1hcnNoYWxsaW5nIHRvIFdlYkJpbmRpbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02NzMwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogcHVibGljL1dlYkJpbmRpbmdzLmg6CisgICAgICAgICogc3Jj L1dlYkJpbmRpbmdzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQmluZGluZ3M6OmNvbnZlcnRW OE9iamVjdFRvTlBWYXJpYW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViQmluZGluZ3M6OmNvbnZl cnROUFZhcmlhbnRUb1Y4T2JqZWN0KToKKyAgICAgICAgKiBzcmMvV2ViU2VyaWFsaXplZFNjcmlw dFZhbHVlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpz ZXJpYWxpemUpOgorCiAyMDExLTA4LTMwICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90 QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByOTQxNDIsIHI5 NDE0NCwgcjk0MTQ1LCBhbmQgcjk0MTQ4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViQmluZGluZ3MuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkJpbmRpbmdzLmgKaW5kZXggZTg1ZmUzNmNmNWNjODYzY2Y3OGYzZjk2MWVhZGIzYjIzZTFm ZmJkMi4uZjQ5YzY3MTliMTVlOTdiNjVlZTc2NzcwYmY5NzcwZGM5NzM2ODAyYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQmluZGluZ3MuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJCaW5kaW5ncy5oCkBAIC0zNiw2ICszNiwxNCBA QAogI2luY2x1ZGUgIldlYlZlY3Rvci5oIgogI2luY2x1ZGUgPGJpbmRpbmdzL25wcnVudGltZS5o PgogCisjaWYgV0VCS0lUX1VTSU5HX1Y4CituYW1lc3BhY2UgdjggeworY2xhc3MgVmFsdWU7Cit0 ZW1wbGF0ZSA8Y2xhc3MgVD4gY2xhc3MgSGFuZGxlOwordGVtcGxhdGUgPGNsYXNzIFQ+IGNsYXNz IExvY2FsOworfQorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBXZWJBcnJh eUJ1ZmZlclZpZXc7CkBAIC0xNTQsNiArMTYyLDEyIEBAIHB1YmxpYzoKICAgICAvLyBvcGVyYXRp bmcgb24gYSBOUE9iamVjdC4KICAgICBXRUJLSVRfRVhQT1JUIHN0YXRpYyB2b2lkIHB1c2hFeGNl cHRpb25IYW5kbGVyKEV4Y2VwdGlvbkhhbmRsZXIsIHZvaWQqIGRhdGEpOwogICAgIFdFQktJVF9F WFBPUlQgc3RhdGljIHZvaWQgcG9wRXhjZXB0aW9uSGFuZGxlcigpOworCisjaWYgV0VCS0lUX1VT SU5HX1Y4CisgICAgLy8gQ29udmVyc2lvbiB1dGlsaXRpZXMgdG8vZnJvbSBWOCBuYXRpdmUgb2Jq ZWN0cyBhbmQgTlBPYmplY3Qgd3JhcHBlcnMuCisgICAgV0VCS0lUX0VYUE9SVCBzdGF0aWMgdm9p ZCBjb252ZXJ0VjhPYmplY3RUb05QVmFyaWFudCh2ODo6TG9jYWw8djg6OlZhbHVlPiwgTlBPYmpl Y3QqIHJvb3QsIE5QVmFyaWFudCogcmVzdWx0KTsKKyAgICBXRUJLSVRfRVhQT1JUIHN0YXRpYyB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gY29udmVydE5QVmFyaWFudFRvVjhPYmplY3QoY29uc3QgTlBW YXJpYW50Kik7CisjZW5kaWYKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQmluZGluZ3MuY3BwIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViQmluZGluZ3MuY3BwCmluZGV4IGZiZDA2OGVkMzEwNzcxMDIz N2FjMjU0MjdjMjk1YTIzYmQxZjc2NjYuLjY4ZGRiZTFjMjlmMDNhMGM5ODk4N2U3NDc2ZTdjMDhj ZDg1ZDg3ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkJpbmRp bmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJCaW5kaW5ncy5jcHAK QEAgLTM2LDYgKzM2LDcgQEAKIAogI2lmIFVTRShWOCkKICNpbmNsdWRlICJBcnJheUJ1ZmZlclZp ZXcuaCIKKyNpbmNsdWRlICJET01XaW5kb3cuaCIKICNpbmNsdWRlICJOUFY4T2JqZWN0LmgiICAv LyBmb3IgUHJpdmF0ZUlkZW50aWZpZXIKICNpbmNsdWRlICJSYW5nZS5oIgogI2luY2x1ZGUgIlY4 QXJyYXlCdWZmZXJWaWV3LmgiCkBAIC0zMzIsNCArMzMzLDI1IEBAIHZvaWQgV2ViQmluZGluZ3M6 OnBvcEV4Y2VwdGlvbkhhbmRsZXIoKQogICAgIFdlYkNvcmU6OnBvcEV4Y2VwdGlvbkhhbmRsZXIo KTsKIH0KIAorI2lmIFdFQktJVF9VU0lOR19WOAordm9pZCBXZWJCaW5kaW5nczo6Y29udmVydFY4 T2JqZWN0VG9OUFZhcmlhbnQodjg6OkxvY2FsPHY4OjpWYWx1ZT4gb2JqZWN0LCBOUE9iamVjdCog cm9vdCwgTlBWYXJpYW50KiByZXN1bHQpCit7CisgICAgV2ViQ29yZTo6Y29udmVydFY4T2JqZWN0 VG9OUFZhcmlhbnQob2JqZWN0LCByb290LCByZXN1bHQpOworfQorCit2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gV2ViQmluZGluZ3M6OmNvbnZlcnROUFZhcmlhbnRUb1Y4T2JqZWN0KGNvbnN0IE5QVmFy aWFudCogdmFyaWFudCkKK3sKKyAgICBpZiAodmFyaWFudC0+dHlwZSA9PSBOUFZhcmlhbnRUeXBl X09iamVjdCkgeworICAgICAgICBOUE9iamVjdCogb2JqZWN0ID0gTlBWQVJJQU5UX1RPX09CSkVD VCgqdmFyaWFudCk7CisgICAgICAgIGlmIChvYmplY3QtPl9jbGFzcyAhPSBXZWJDb3JlOjpucFNj cmlwdE9iamVjdENsYXNzKQorICAgICAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKKyAg ICAgICAgVjhOUE9iamVjdCogdjhPYmplY3QgPSByZWludGVycHJldF9jYXN0PFY4TlBPYmplY3Qq PihvYmplY3QpOworICAgICAgICByZXR1cm4gV2ViQ29yZTo6Y29udmVydE5QVmFyaWFudFRvVjhP YmplY3QodmFyaWFudCwgdjhPYmplY3QtPnJvb3RPYmplY3QtPmZyYW1lKCktPnNjcmlwdCgpLT53 aW5kb3dTY3JpcHROUE9iamVjdCgpKTsKKyAgICB9CisgICAgLy8gU2FmZSB0byBwYXNzIDAgc2lu Y2Ugd2UgaGF2ZSBjaGVja2VkIHRoZSBzY3JpcHQgb2JqZWN0IGNsYXNzIHRvIG1ha2Ugc3VyZSB0 aGUKKyAgICAvLyBhcmd1bWVudCBpcyBhIHByaW1pdGl2ZSB2OCB0eXBlLgorICAgIHJldHVybiBX ZWJDb3JlOjpjb252ZXJ0TlBWYXJpYW50VG9WOE9iamVjdCh2YXJpYW50LCBzdGF0aWNfY2FzdDxO UE9iamVjdCo+KDApKTsKK30KKyNlbmRpZgorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1 ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXJpYWxpemVkU2NyaXB0VmFs dWUuY3BwCmluZGV4IGRmNGQ3MjExMzUwNzFjNjFkMWUxNmY5ODI5MzI4MDg3MGFiNzZiMTAuLmUx OTk3ZWJkZTVjODE4OGQ5MjhhOGNkZTk2NTE2ZGZjMjYwNTBlNzcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHAKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcApA QCAtNDcsMTAgKzQ3LDEwIEBAIFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSBXZWJTZXJpYWxpemVk U2NyaXB0VmFsdWU6OmZyb21TdHJpbmcoY29uc3QgV2ViU3RyaW5nJiBzCiBXZWJTZXJpYWxpemVk U2NyaXB0VmFsdWUgV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpzZXJpYWxpemUodjg6OkhhbmRs ZTx2ODo6VmFsdWU+IHZhbHVlKQogewogICAgIGJvb2wgZGlkVGhyb3c7Ci0gICAgV2ViU2VyaWFs aXplZFNjcmlwdFZhbHVlIHYgPSBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0ZSh2YWx1ZSwg ZGlkVGhyb3cpOworICAgIFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSBzZXJpYWxpemVkVmFsdWUg PSBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0ZSh2YWx1ZSwgZGlkVGhyb3cpOwogICAgIGlm IChkaWRUaHJvdykKLSAgICAgIHJldHVybiBjcmVhdGVJbnZhbGlkKCk7Ci0gICAgcmV0dXJuIHY7 CisgICAgICAgIHJldHVybiBjcmVhdGVJbnZhbGlkKCk7CisgICAgcmV0dXJuIHNlcmlhbGl6ZWRW YWx1ZTsKIH0KICNlbmRpZgogCg== 105847 2011-08-31 15:55:51 -0700 2011-08-31 17:02:01 -0700 Patch bug-67302-20110831155550.patch text/plain 4369 gbillock U3VidmVyc2lvbiBSZXZpc2lvbjogOTQxODkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ODYyYzM1ZjczMzJhNWVjMWY1MWJjYzhmYzRmYTE4YjAzZDU1NDc1ZS4uMTVhMTBlMTMzYTkzZTI5 ZTIxMGVjMmE4Nzk5OTZiYjM1ZWZlYzlkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNyBAQAorMjAxMS0wOC0zMSAgR3JlZyBCaWxsb2NrICA8Z2JpbGxvY2tAZ29vZ2xl LmNvbT4KKworICAgICAgICBBZGQgcGFzcy10aHJvdWdocyBmb3IgTlBPYmplY3Qvdjg6OlZhbHVl IG1hcnNoYWxsaW5nIHRvIFdlYkJpbmRpbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02NzMwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogcHVibGljL1dlYkJpbmRpbmdzLmg6CisgICAgICAgICogc3Jj L1dlYkJpbmRpbmdzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQmluZGluZ3M6OnRvTlBWYXJp YW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViQmluZGluZ3M6OnRvVjhWYWx1ZSk6CisgICAgICAg ICogc3JjL1dlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6c2VyaWFsaXplKToKKwogMjAxMS0wOC0zMCAgU2hlcmlm ZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjk0MTQyLCByOTQxNDQsIHI5NDE0NSwgYW5kIHI5NDE0OC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkJpbmRpbmdzLmggYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJCaW5kaW5ncy5oCmluZGV4IGU4NWZlMzZjZjVj Yzg2M2NmNzhmM2Y5NjFlYWRiM2IyM2UxZmZiZDIuLjA4NmI2ZjM5MTg5MWM2ODk1OWFmMDQ3Nzc2 ZTAyYjBkMDE0MGZmNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkJpbmRpbmdzLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQmlu ZGluZ3MuaApAQCAtMzYsNiArMzYsMTQgQEAKICNpbmNsdWRlICJXZWJWZWN0b3IuaCIKICNpbmNs dWRlIDxiaW5kaW5ncy9ucHJ1bnRpbWUuaD4KIAorI2lmIFdFQktJVF9VU0lOR19WOAorbmFtZXNw YWNlIHY4IHsKK2NsYXNzIFZhbHVlOwordGVtcGxhdGUgPGNsYXNzIFQ+IGNsYXNzIEhhbmRsZTsK K3RlbXBsYXRlIDxjbGFzcyBUPiBjbGFzcyBMb2NhbDsKK30KKyNlbmRpZgorCiBuYW1lc3BhY2Ug V2ViS2l0IHsKIAogY2xhc3MgV2ViQXJyYXlCdWZmZXJWaWV3OwpAQCAtMTU0LDYgKzE2MiwxMiBA QCBwdWJsaWM6CiAgICAgLy8gb3BlcmF0aW5nIG9uIGEgTlBPYmplY3QuCiAgICAgV0VCS0lUX0VY UE9SVCBzdGF0aWMgdm9pZCBwdXNoRXhjZXB0aW9uSGFuZGxlcihFeGNlcHRpb25IYW5kbGVyLCB2 b2lkKiBkYXRhKTsKICAgICBXRUJLSVRfRVhQT1JUIHN0YXRpYyB2b2lkIHBvcEV4Y2VwdGlvbkhh bmRsZXIoKTsKKworI2lmIFdFQktJVF9VU0lOR19WOAorICAgIC8vIENvbnZlcnNpb24gdXRpbGl0 aWVzIHRvL2Zyb20gVjggbmF0aXZlIG9iamVjdHMgYW5kIE5QT2JqZWN0IHdyYXBwZXJzLgorICAg IFdFQktJVF9FWFBPUlQgc3RhdGljIHZvaWQgdG9OUFZhcmlhbnQodjg6OkxvY2FsPHY4OjpWYWx1 ZT4sIE5QT2JqZWN0KiByb290LCBOUFZhcmlhbnQqIHJlc3VsdCk7CisgICAgV0VCS0lUX0VYUE9S VCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHRvVjhWYWx1ZShjb25zdCBOUFZhcmlhbnQq KTsKKyNlbmRpZgogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJCaW5kaW5ncy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJCaW5kaW5ncy5jcHAKaW5kZXggZmJkMDY4ZWQzMTA3NzEwMjM3YWMyNTQy N2MyOTVhMjNiZDFmNzY2Ni4uNmI4ZmU5NmI3NjhjMWFmNGU1ZjFiYzU0MWFlM2RhNzU5ZDNmMzQ4 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQmluZGluZ3MuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkJpbmRpbmdzLmNwcApAQCAtMzYs NiArMzYsNyBAQAogCiAjaWYgVVNFKFY4KQogI2luY2x1ZGUgIkFycmF5QnVmZmVyVmlldy5oIgor I2luY2x1ZGUgIkRPTVdpbmRvdy5oIgogI2luY2x1ZGUgIk5QVjhPYmplY3QuaCIgIC8vIGZvciBQ cml2YXRlSWRlbnRpZmllcgogI2luY2x1ZGUgIlJhbmdlLmgiCiAjaW5jbHVkZSAiVjhBcnJheUJ1 ZmZlclZpZXcuaCIKQEAgLTMzMiw0ICszMzMsMjUgQEAgdm9pZCBXZWJCaW5kaW5nczo6cG9wRXhj ZXB0aW9uSGFuZGxlcigpCiAgICAgV2ViQ29yZTo6cG9wRXhjZXB0aW9uSGFuZGxlcigpOwogfQog CisjaWYgV0VCS0lUX1VTSU5HX1Y4Cit2b2lkIFdlYkJpbmRpbmdzOjp0b05QVmFyaWFudCh2ODo6 TG9jYWw8djg6OlZhbHVlPiBvYmplY3QsIE5QT2JqZWN0KiByb290LCBOUFZhcmlhbnQqIHJlc3Vs dCkKK3sKKyAgICBXZWJDb3JlOjpjb252ZXJ0VjhPYmplY3RUb05QVmFyaWFudChvYmplY3QsIHJv b3QsIHJlc3VsdCk7Cit9CisKK3Y4OjpIYW5kbGU8djg6OlZhbHVlPiBXZWJCaW5kaW5nczo6dG9W OFZhbHVlKGNvbnN0IE5QVmFyaWFudCogdmFyaWFudCkKK3sKKyAgICBpZiAodmFyaWFudC0+dHlw ZSA9PSBOUFZhcmlhbnRUeXBlX09iamVjdCkgeworICAgICAgICBOUE9iamVjdCogb2JqZWN0ID0g TlBWQVJJQU5UX1RPX09CSkVDVCgqdmFyaWFudCk7CisgICAgICAgIGlmIChvYmplY3QtPl9jbGFz cyAhPSBXZWJDb3JlOjpucFNjcmlwdE9iamVjdENsYXNzKQorICAgICAgICAgICAgcmV0dXJuIHY4 OjpVbmRlZmluZWQoKTsKKyAgICAgICAgVjhOUE9iamVjdCogdjhPYmplY3QgPSByZWludGVycHJl dF9jYXN0PFY4TlBPYmplY3QqPihvYmplY3QpOworICAgICAgICByZXR1cm4gV2ViQ29yZTo6Y29u dmVydE5QVmFyaWFudFRvVjhPYmplY3QodmFyaWFudCwgdjhPYmplY3QtPnJvb3RPYmplY3QtPmZy YW1lKCktPnNjcmlwdCgpLT53aW5kb3dTY3JpcHROUE9iamVjdCgpKTsKKyAgICB9CisgICAgLy8g U2FmZSB0byBwYXNzIDAgc2luY2Ugd2UgaGF2ZSBjaGVja2VkIHRoZSBzY3JpcHQgb2JqZWN0IGNs YXNzIHRvIG1ha2Ugc3VyZSB0aGUKKyAgICAvLyBhcmd1bWVudCBpcyBhIHByaW1pdGl2ZSB2OCB0 eXBlLgorICAgIHJldHVybiBXZWJDb3JlOjpjb252ZXJ0TlBWYXJpYW50VG9WOE9iamVjdCh2YXJp YW50LCBzdGF0aWNfY2FzdDxOUE9iamVjdCo+KDApKTsKK30KKyNlbmRpZgorCiB9IC8vIG5hbWVz cGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNl cmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJT ZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwCmluZGV4IGRmNGQ3MjExMzUwNzFjNjFkMWUxNmY5ODI5 MzI4MDg3MGFiNzZiMTAuLmUxOTk3ZWJkZTVjODE4OGQ5MjhhOGNkZTk2NTE2ZGZjMjYwNTBlNzcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNlcmlhbGl6ZWRTY3Jp cHRWYWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2VyaWFsaXpl ZFNjcmlwdFZhbHVlLmNwcApAQCAtNDcsMTAgKzQ3LDEwIEBAIFdlYlNlcmlhbGl6ZWRTY3JpcHRW YWx1ZSBXZWJTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmZyb21TdHJpbmcoY29uc3QgV2ViU3RyaW5n JiBzCiBXZWJTZXJpYWxpemVkU2NyaXB0VmFsdWUgV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpz ZXJpYWxpemUodjg6OkhhbmRsZTx2ODo6VmFsdWU+IHZhbHVlKQogewogICAgIGJvb2wgZGlkVGhy b3c7Ci0gICAgV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlIHYgPSBTZXJpYWxpemVkU2NyaXB0VmFs dWU6OmNyZWF0ZSh2YWx1ZSwgZGlkVGhyb3cpOworICAgIFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1 ZSBzZXJpYWxpemVkVmFsdWUgPSBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0ZSh2YWx1ZSwg ZGlkVGhyb3cpOwogICAgIGlmIChkaWRUaHJvdykKLSAgICAgIHJldHVybiBjcmVhdGVJbnZhbGlk KCk7Ci0gICAgcmV0dXJuIHY7CisgICAgICAgIHJldHVybiBjcmVhdGVJbnZhbGlkKCk7CisgICAg cmV0dXJuIHNlcmlhbGl6ZWRWYWx1ZTsKIH0KICNlbmRpZgogCg== 105863 2011-08-31 17:02:07 -0700 2011-08-31 23:59:08 -0700 Patch bug-67302-20110831170206.patch text/plain 4319 gbillock U3VidmVyc2lvbiBSZXZpc2lvbjogOTQxODkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ODYyYzM1ZjczMzJhNWVjMWY1MWJjYzhmYzRmYTE4YjAzZDU1NDc1ZS4uMTVhMTBlMTMzYTkzZTI5 ZTIxMGVjMmE4Nzk5OTZiYjM1ZWZlYzlkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNyBAQAorMjAxMS0wOC0zMSAgR3JlZyBCaWxsb2NrICA8Z2JpbGxvY2tAZ29vZ2xl LmNvbT4KKworICAgICAgICBBZGQgcGFzcy10aHJvdWdocyBmb3IgTlBPYmplY3Qvdjg6OlZhbHVl IG1hcnNoYWxsaW5nIHRvIFdlYkJpbmRpbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02NzMwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogcHVibGljL1dlYkJpbmRpbmdzLmg6CisgICAgICAgICogc3Jj L1dlYkJpbmRpbmdzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQmluZGluZ3M6OnRvTlBWYXJp YW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViQmluZGluZ3M6OnRvVjhWYWx1ZSk6CisgICAgICAg ICogc3JjL1dlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6c2VyaWFsaXplKToKKwogMjAxMS0wOC0zMCAgU2hlcmlm ZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjk0MTQyLCByOTQxNDQsIHI5NDE0NSwgYW5kIHI5NDE0OC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkJpbmRpbmdzLmggYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJCaW5kaW5ncy5oCmluZGV4IGU4NWZlMzZjZjVj Yzg2M2NmNzhmM2Y5NjFlYWRiM2IyM2UxZmZiZDIuLmE4YTQ3MDkxZDRkZDljYzk0MTgwZWVmMzRh M2Y1OWY2NDk0YjQ1OTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkJpbmRpbmdzLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQmlu ZGluZ3MuaApAQCAtMzYsNiArMzYsMTQgQEAKICNpbmNsdWRlICJXZWJWZWN0b3IuaCIKICNpbmNs dWRlIDxiaW5kaW5ncy9ucHJ1bnRpbWUuaD4KIAorI2lmIFdFQktJVF9VU0lOR19WOAorbmFtZXNw YWNlIHY4IHsKK2NsYXNzIFZhbHVlOwordGVtcGxhdGUgPGNsYXNzIFQ+IGNsYXNzIEhhbmRsZTsK K3RlbXBsYXRlIDxjbGFzcyBUPiBjbGFzcyBMb2NhbDsKK30KKyNlbmRpZgorCiBuYW1lc3BhY2Ug V2ViS2l0IHsKIAogY2xhc3MgV2ViQXJyYXlCdWZmZXJWaWV3OwpAQCAtMTU0LDYgKzE2MiwxMiBA QCBwdWJsaWM6CiAgICAgLy8gb3BlcmF0aW5nIG9uIGEgTlBPYmplY3QuCiAgICAgV0VCS0lUX0VY UE9SVCBzdGF0aWMgdm9pZCBwdXNoRXhjZXB0aW9uSGFuZGxlcihFeGNlcHRpb25IYW5kbGVyLCB2 b2lkKiBkYXRhKTsKICAgICBXRUJLSVRfRVhQT1JUIHN0YXRpYyB2b2lkIHBvcEV4Y2VwdGlvbkhh bmRsZXIoKTsKKworI2lmIFdFQktJVF9VU0lOR19WOAorICAgIC8vIENvbnZlcnNpb24gdXRpbGl0 aWVzIHRvL2Zyb20gVjggbmF0aXZlIG9iamVjdHMgYW5kIE5QVmFyaWFudCB3cmFwcGVycy4KKyAg ICBXRUJLSVRfRVhQT1JUIHN0YXRpYyB2b2lkIHRvTlBWYXJpYW50KHY4OjpMb2NhbDx2ODo6VmFs dWU+LCBOUE9iamVjdCogcm9vdCwgTlBWYXJpYW50KiByZXN1bHQpOworICAgIFdFQktJVF9FWFBP UlQgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB0b1Y4VmFsdWUoY29uc3QgTlBWYXJpYW50 Kik7CisjZW5kaWYKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQmluZGluZ3MuY3BwIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViQmluZGluZ3MuY3BwCmluZGV4IGZiZDA2OGVkMzEwNzcxMDIzN2FjMjU0 MjdjMjk1YTIzYmQxZjc2NjYuLmI3YmQ0NjZiZGQ5MGVhZjcxMDZjNGI3MTM2ZmJiM2MwMzJjMTI1 MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkJpbmRpbmdzLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJCaW5kaW5ncy5jcHAKQEAgLTM2 LDYgKzM2LDcgQEAKIAogI2lmIFVTRShWOCkKICNpbmNsdWRlICJBcnJheUJ1ZmZlclZpZXcuaCIK KyNpbmNsdWRlICJET01XaW5kb3cuaCIKICNpbmNsdWRlICJOUFY4T2JqZWN0LmgiICAvLyBmb3Ig UHJpdmF0ZUlkZW50aWZpZXIKICNpbmNsdWRlICJSYW5nZS5oIgogI2luY2x1ZGUgIlY4QXJyYXlC dWZmZXJWaWV3LmgiCkBAIC0zMzIsNCArMzMzLDI1IEBAIHZvaWQgV2ViQmluZGluZ3M6OnBvcEV4 Y2VwdGlvbkhhbmRsZXIoKQogICAgIFdlYkNvcmU6OnBvcEV4Y2VwdGlvbkhhbmRsZXIoKTsKIH0K IAorI2lmIFdFQktJVF9VU0lOR19WOAordm9pZCBXZWJCaW5kaW5nczo6dG9OUFZhcmlhbnQodjg6 OkxvY2FsPHY4OjpWYWx1ZT4gb2JqZWN0LCBOUE9iamVjdCogcm9vdCwgTlBWYXJpYW50KiByZXN1 bHQpCit7CisgICAgV2ViQ29yZTo6Y29udmVydFY4T2JqZWN0VG9OUFZhcmlhbnQob2JqZWN0LCBy b290LCByZXN1bHQpOworfQorCit2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gV2ViQmluZGluZ3M6OnRv VjhWYWx1ZShjb25zdCBOUFZhcmlhbnQqIHZhcmlhbnQpCit7CisgICAgaWYgKHZhcmlhbnQtPnR5 cGUgPT0gTlBWYXJpYW50VHlwZV9PYmplY3QpIHsKKyAgICAgICAgTlBPYmplY3QqIG9iamVjdCA9 IE5QVkFSSUFOVF9UT19PQkpFQ1QoKnZhcmlhbnQpOworICAgICAgICBpZiAob2JqZWN0LT5fY2xh c3MgIT0gbnBTY3JpcHRPYmplY3RDbGFzcykKKyAgICAgICAgICAgIHJldHVybiB2ODo6VW5kZWZp bmVkKCk7CisgICAgICAgIFY4TlBPYmplY3QqIHY4T2JqZWN0ID0gcmVpbnRlcnByZXRfY2FzdDxW OE5QT2JqZWN0Kj4ob2JqZWN0KTsKKyAgICAgICAgcmV0dXJuIGNvbnZlcnROUFZhcmlhbnRUb1Y4 T2JqZWN0KHZhcmlhbnQsIHY4T2JqZWN0LT5yb290T2JqZWN0LT5mcmFtZSgpLT5zY3JpcHQoKS0+ d2luZG93U2NyaXB0TlBPYmplY3QoKSk7CisgICAgfQorICAgIC8vIFNhZmUgdG8gcGFzcyAwIHNp bmNlIHdlIGhhdmUgY2hlY2tlZCB0aGUgc2NyaXB0IG9iamVjdCBjbGFzcyB0byBtYWtlIHN1cmUg dGhlCisgICAgLy8gYXJndW1lbnQgaXMgYSBwcmltaXRpdmUgdjggdHlwZS4KKyAgICByZXR1cm4g Y29udmVydE5QVmFyaWFudFRvVjhPYmplY3QodmFyaWFudCwgMCk7Cit9CisjZW5kaWYKKwogfSAv LyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJTZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcAppbmRleCBkZjRkNzIxMTM1MDcxYzYxZDFl MTZmOTgyOTMyODA4NzBhYjc2YjEwLi5lMTk5N2ViZGU1YzgxODhkOTI4YThjZGU5NjUxNmRmYzI2 MDUwZTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXJpYWxp emVkU2NyaXB0VmFsdWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNl cmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHAKQEAgLTQ3LDEwICs0NywxMCBAQCBXZWJTZXJpYWxpemVk U2NyaXB0VmFsdWUgV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpmcm9tU3RyaW5nKGNvbnN0IFdl YlN0cmluZyYgcwogV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlIFdlYlNlcmlhbGl6ZWRTY3JpcHRW YWx1ZTo6c2VyaWFsaXplKHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2YWx1ZSkKIHsKICAgICBib29s IGRpZFRocm93OwotICAgIFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSB2ID0gU2VyaWFsaXplZFNj cmlwdFZhbHVlOjpjcmVhdGUodmFsdWUsIGRpZFRocm93KTsKKyAgICBXZWJTZXJpYWxpemVkU2Ny aXB0VmFsdWUgc2VyaWFsaXplZFZhbHVlID0gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpjcmVhdGUo dmFsdWUsIGRpZFRocm93KTsKICAgICBpZiAoZGlkVGhyb3cpCi0gICAgICByZXR1cm4gY3JlYXRl SW52YWxpZCgpOwotICAgIHJldHVybiB2OworICAgICAgICByZXR1cm4gY3JlYXRlSW52YWxpZCgp OworICAgIHJldHVybiBzZXJpYWxpemVkVmFsdWU7CiB9CiAjZW5kaWYKIAo=