33608 2010-01-13 10:50:12 -0800 [Android] bindings/v8/NPV8Object.cpp does not compile on Android 2010-01-25 03:34:03 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Android Android RESOLVED FIXED P2 Normal --- 33917 0 andreip webkit-unassigned android-webkit-unforking eric ojan oldest_to_newest 180292 0 andreip 2010-01-13 10:50:12 -0800 bindings/v8/NPV8Object.cpp because 1. it includes "bindings/npruntime.h". This file is actually from the Chromium source tree in third_party/npapi/. On Android, we can live with the standard npruntime.h header in WebCore/bridge/. Ideally, Chromium would move their changes to bridge/npruntime.h and gave up using the non-standard header. 2. it uses ARRAYSIZE_UNSAFE macro, which is defined in the Chromium repository in base/basictypes.h. On Android, we will copy this macro into platform/android/PlatformBridge.h Patch coming soon. 180306 1 46476 andreip 2010-01-13 11:22:21 -0800 Created attachment 46476 Fix bindings/v8/NPV8Object.cpp to compile on Android 181027 2 eric 2010-01-14 17:23:45 -0800 Seems the ARRAYSIZE_UNSAFE macro should move into WTF at some point. Ojan filed a bug about that a while back. Not specifically about that macro, but about the idea of having a macro or template function to do C-style array size calculations. 182803 3 46476 levin 2010-01-20 08:10:19 -0800 Comment on attachment 46476 Fix bindings/v8/NPV8Object.cpp to compile on Android Pls get rid of ifdef's as discussed. 182890 4 andreip 2010-01-20 12:57:24 -0800 I filed a separate bug (33917) for adding the PlatformBridge.h header. Will upload a new patch here, as well. 183159 5 47109 andreip 2010-01-21 04:06:15 -0800 Created attachment 47109 Fix bindings/v8/NPV8Object.cpp to compile on Android 183228 6 47109 levin 2010-01-21 09:49:34 -0800 Comment on attachment 47109 Fix bindings/v8/NPV8Object.cpp to compile on Android Just a few nits to address below and submit away. > Index: WebCore/bindings/v8/NPV8Object.h > +#if PLATFORM(CHROMIUM) > +// Chromium uses a different npruntime.h, which is in > +// the Chromium source repository under third_party/npapi/bindings. > +// The Google-specific changes in that file should probably be Should this say "FIXME: " right before it. > +// moved into bridge/npruntime.h, guarded by an #if PlATFORM(CHROMIUM). > #include "bindings/npruntime.h" > +#else > +#include "bridge/npruntime.h" // use WebCore version for Android and other ports. Please capitalize the u (s/use/Use/) and only have a single space before end of line comments. > Index: WebCore/platform/android/PlatformBridge.h Add 2010 to the copyright line? > +// ARRAYSIZE_UNSAFE performs essentially the same calculation as arraysize, > +// but can be used on anonymous types or types defined inside > +// functions. It's less safe than arraysize as it accepts some Only use single spaces after periods in comments for WebKit code. > +// (although not all) pointers. Therefore, you should use arraysize Single space after period. > +// ARRAYSIZE_UNSAFE catches a few type errors. If you see a compiler error Single space after period. > +// the array) and sizeof(*(arr)) (the # of bytes in one array > +// element). If the former is divisible by the latter, perhaps arr is Single space after period. > +// indeed an array, in which case the division result is the # of > +// elements in the array. Otherwise, arr cannot possibly be an array, Single space after period. > +// and we generate a compiler error to prevent the code from > +// compiling. > +// pointers, namely where the pointer size is divisible by the pointee > +// size. Since all our code has to go through a 32-bit compiler, Single space after period. 184232 7 andreip 2010-01-25 03:34:03 -0800 Thanks for the review David. I addressed all your comments and Steve Block landed the patch in http://trac.webkit.org/changeset/53634 46476 2010-01-13 11:22:21 -0800 2010-01-21 04:06:15 -0800 Fix bindings/v8/NPV8Object.cpp to compile on Android 33608.patch text/plain 5451 andreip SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzE5MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTAtMDEtMTMgIEFuZHJlaSBQb3Blc2N1ICA8YW5kcmVpcEBnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtBbmRyb2lkXSBiaW5kaW5ncy92OC9OUFY4T2JqZWN0LmNwcCBkb2VzIG5vdCBjb21waWxlIG9u IEFuZHJvaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTMzNjA4CisKKyAgICAgICAgVXNlIHRoZSBzdGFuZGFyZCBXZWJLaXQgaGVhZGVyIGluIGJyaWRn ZS9ucHJ1bnRpbWUuaC4KKyAgICAgICAgQWRkIGFuZCB1c2UgcG9wdXBzQWxsb3dlZCgpIG1ldGhv ZCB0byBQbGF0Zm9ybUJyaWRnZS5oCisgICAgICAgIEFkZCBBUlJBWVNJWkVfVU5TQUZFIHRvIFBs YXRmb3JtQnJpZGdlLmgKKworICAgICAgICBObyBuZXcgdGVzdHMsIGZpeGluZyB0aGUgYnVpbGQu CisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9OUFY4T2JqZWN0LmNwcDoKKyAgICAgICAgKF9OUE5f RXZhbHVhdGUpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L05QVjhPYmplY3QuaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9hbmRyb2lkL1BsYXRmb3JtQnJpZGdlLmg6CisKIDIwMTAtMDEtMTMgIFN0ZXZl IEJsb2NrICA8c3RldmVibG9ja0Bnb29nbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBhcHBlbmRD bGFzc05hbWUgaW4gam5pX3J1bnRpbWUuY3BwIHRvIHVzZSBXZWJDb3JlOjpTdHJpbmdCdWlsZGVy LCByYXRoZXIgdGhhbiBKU0M6OlN0cmluZ0J1aWxkZXIuCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdz L3Y4L05QVjhPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvTlBW OE9iamVjdC5jcHAJKHJldmlzaW9uIDUxOTc2KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9OUFY4 T2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgsNyArMjgsMTEgQEAKIAogI2luY2x1ZGUg Ik5QVjhPYmplY3QuaCIKIAorI2lmIFBMQVRGT1JNKENIUk9NSVVNKQogI2luY2x1ZGUgIkNocm9t aXVtQnJpZGdlLmgiCisjZWxpZiBQTEFURk9STShBTkRST0lEKQorI2luY2x1ZGUgIlBsYXRmb3Jt QnJpZGdlLmgiCisjZW5kaWYKICNpbmNsdWRlICJET01XaW5kb3cuaCIKICNpbmNsdWRlICJGcmFt ZS5oIgogI2luY2x1ZGUgIk93bkFycmF5UHRyLmgiCkBAIC0zOSw3ICs0Myw2IEBACiAjaW5jbHVk ZSAiVjhIZWxwZXJzLmgiCiAjaW5jbHVkZSAiVjhOUFV0aWxzLmgiCiAjaW5jbHVkZSAiVjhQcm94 eS5oIgotI2luY2x1ZGUgImJpbmRpbmdzL25wcnVudGltZS5oIgogI2luY2x1ZGUgIm5wcnVudGlt ZV9pbXBsLmgiCiAjaW5jbHVkZSAibnBydW50aW1lX3ByaXYuaCIKIApAQCAtMjM1LDcgKzIzOCwx MSBAQCBib29sIF9OUE5fSW52b2tlRGVmYXVsdChOUFAgbnBwLCBOUE9iamVjCiAKIGJvb2wgX05Q Tl9FdmFsdWF0ZShOUFAgbnBwLCBOUE9iamVjdCogbnBPYmplY3QsIE5QU3RyaW5nKiBucFNjcmlw dCwgTlBWYXJpYW50KiByZXN1bHQpCiB7CisjaWYgUExBVEZPUk0oQ0hST01JVU0pCiAgICAgYm9v bCBwb3B1cHNBbGxvd2VkID0gV2ViQ29yZTo6Q2hyb21pdW1CcmlkZ2U6OnBvcHVwc0FsbG93ZWQo bnBwKTsKKyNlbGlmIFBMQVRGT1JNKEFORFJPSUQpCisgICAgYm9vbCBwb3B1cHNBbGxvd2VkID0g V2ViQ29yZTo6UGxhdGZvcm1CcmlkZ2U6OnBvcHVwc0FsbG93ZWQobnBwKTsKKyNlbmRpZgogICAg IHJldHVybiBfTlBOX0V2YWx1YXRlSGVscGVyKG5wcCwgcG9wdXBzQWxsb3dlZCwgbnBPYmplY3Qs IG5wU2NyaXB0LCByZXN1bHQpOwogfQogCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L05QVjhP YmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L05QVjhPYmplY3QuaAko cmV2aXNpb24gNTE5NzYpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L05QVjhPYmplY3QuaAkod29y a2luZyBjb3B5KQpAQCAtMzAsNyArMzAsMTUgQEAKICNpZm5kZWYgTlBWOE9iamVjdF9oCiAjZGVm aW5lIE5QVjhPYmplY3RfaAogCisjaWYgUExBVEZPUk0oQ0hST01JVU0pCisvLyBDaHJvbWl1bSB1 c2VzIGEgZGlmZmVyZW50IG5wcnVudGltZS5oLCB3aGljaCBpcyBpbgorLy8gdGhlIENocm9taXVt IHNvdXJjZSByZXBvc2l0b3J5IHVuZGVyIHRoaXJkX3BhcnR5L25wYXBpL2JpbmRpbmdzLgorLy8g VGhlIEdvb2dsZS1zcGVjaWZpYyBjaGFuZ2VzIGluIHRoYXQgZmlsZSBzaG91bGQgcHJvYmFibHkg YmUKKy8vIG1vdmVkIGludG8gYnJpZGdlL25wcnVudGltZS5oLCBndWFyZGVkIGJ5IGFuICNpZiBQ bEFURk9STShDSFJPTUlVTSkuCiAjaW5jbHVkZSAiYmluZGluZ3MvbnBydW50aW1lLmgiCisjZWxz ZQorI2luY2x1ZGUgImJyaWRnZS9ucHJ1bnRpbWUuaCIgIC8vIHVzZSBXZWJDb3JlIHZlcnNpb24g Zm9yIEFuZHJvaWQgYW5kIG90aGVyIHBvcnRzLgorI2VuZGlmCiAjaW5jbHVkZSA8djguaD4KIAog bmFtZXNwYWNlIFdlYkNvcmUgewpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1BsYXRm b3JtQnJpZGdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1BsYXRm b3JtQnJpZGdlLmgJKHJldmlzaW9uIDUzMTkzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lk L1BsYXRmb3JtQnJpZGdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDEwICsyNyw1NSBAQAogI2Rl ZmluZSBQbGF0Zm9ybUJyaWRnZV9oCiAKICNpbmNsdWRlICJLVVJMLmgiCisjaW5jbHVkZSAibnBh cGkuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgogCiAjaW5jbHVkZSA8d3RmL1ZlY3Rv ci5oPgogCisvLyBWOCBiaW5kaW5ncyB1c2UgdGhlIEFSUkFZU0laRV9VTlNBRkUgbWFjcm8uIFRo aXMgbWFjcm8gd2FzIGNvcGllZAorLy8gZnJvbSBodHRwOi8vc3JjLmNocm9taXVtLm9yZy92aWV3 dmMvY2hyb21lL3RydW5rL3NyYy9iYXNlL2Jhc2ljdHlwZXMuaAorCisvLyBBUlJBWVNJWkVfVU5T QUZFIHBlcmZvcm1zIGVzc2VudGlhbGx5IHRoZSBzYW1lIGNhbGN1bGF0aW9uIGFzIGFycmF5c2l6 ZSwKKy8vIGJ1dCBjYW4gYmUgdXNlZCBvbiBhbm9ueW1vdXMgdHlwZXMgb3IgdHlwZXMgZGVmaW5l ZCBpbnNpZGUKKy8vIGZ1bmN0aW9ucy4gIEl0J3MgbGVzcyBzYWZlIHRoYW4gYXJyYXlzaXplIGFz IGl0IGFjY2VwdHMgc29tZQorLy8gKGFsdGhvdWdoIG5vdCBhbGwpIHBvaW50ZXJzLiAgVGhlcmVm b3JlLCB5b3Ugc2hvdWxkIHVzZSBhcnJheXNpemUKKy8vIHdoZW5ldmVyIHBvc3NpYmxlLgorLy8K Ky8vIFRoZSBleHByZXNzaW9uIEFSUkFZU0laRV9VTlNBRkUoYSkgaXMgYSBjb21waWxlLXRpbWUg Y29uc3RhbnQgb2YgdHlwZQorLy8gc2l6ZV90LgorLy8KKy8vIEFSUkFZU0laRV9VTlNBRkUgY2F0 Y2hlcyBhIGZldyB0eXBlIGVycm9ycy4gIElmIHlvdSBzZWUgYSBjb21waWxlciBlcnJvcgorLy8K Ky8vICAgIndhcm5pbmc6IGRpdmlzaW9uIGJ5IHplcm8gaW4gLi4uIgorLy8KKy8vIHdoZW4gdXNp bmcgQVJSQVlTSVpFX1VOU0FGRSwgeW91IGFyZSAod3JvbmdmdWxseSkgZ2l2aW5nIGl0IGEgcG9p bnRlci4KKy8vIFlvdSBzaG91bGQgb25seSB1c2UgQVJSQVlTSVpFX1VOU0FGRSBvbiBzdGF0aWNh bGx5IGFsbG9jYXRlZCBhcnJheXMuCisvLworLy8gVGhlIGZvbGxvd2luZyBjb21tZW50cyBhcmUg b24gdGhlIGltcGxlbWVudGF0aW9uIGRldGFpbHMsIGFuZCBjYW4KKy8vIGJlIGlnbm9yZWQgYnkg dGhlIHVzZXJzLgorLy8KKy8vIEFSUkFZU0laRV9VTlNBRkUoYXJyKSB3b3JrcyBieSBpbnNwZWN0 aW5nIHNpemVvZihhcnIpICh0aGUgIyBvZiBieXRlcyBpbgorLy8gdGhlIGFycmF5KSBhbmQgc2l6 ZW9mKCooYXJyKSkgKHRoZSAjIG9mIGJ5dGVzIGluIG9uZSBhcnJheQorLy8gZWxlbWVudCkuICBJ ZiB0aGUgZm9ybWVyIGlzIGRpdmlzaWJsZSBieSB0aGUgbGF0dGVyLCBwZXJoYXBzIGFyciBpcwor Ly8gaW5kZWVkIGFuIGFycmF5LCBpbiB3aGljaCBjYXNlIHRoZSBkaXZpc2lvbiByZXN1bHQgaXMg dGhlICMgb2YKKy8vIGVsZW1lbnRzIGluIHRoZSBhcnJheS4gIE90aGVyd2lzZSwgYXJyIGNhbm5v dCBwb3NzaWJseSBiZSBhbiBhcnJheSwKKy8vIGFuZCB3ZSBnZW5lcmF0ZSBhIGNvbXBpbGVyIGVy cm9yIHRvIHByZXZlbnQgdGhlIGNvZGUgZnJvbQorLy8gY29tcGlsaW5nLgorLy8KKy8vIFNpbmNl IHRoZSBzaXplIG9mIGJvb2wgaXMgaW1wbGVtZW50YXRpb24tZGVmaW5lZCwgd2UgbmVlZCB0byBj YXN0CisvLyAhKHNpemVvZihhKSAmIHNpemVvZigqKGEpKSkgdG8gc2l6ZV90IGluIG9yZGVyIHRv IGVuc3VyZSB0aGUgZmluYWwKKy8vIHJlc3VsdCBoYXMgdHlwZSBzaXplX3QuCisvLworLy8gVGhp cyBtYWNybyBpcyBub3QgcGVyZmVjdCBhcyBpdCB3cm9uZ2Z1bGx5IGFjY2VwdHMgY2VydGFpbgor Ly8gcG9pbnRlcnMsIG5hbWVseSB3aGVyZSB0aGUgcG9pbnRlciBzaXplIGlzIGRpdmlzaWJsZSBi eSB0aGUgcG9pbnRlZQorLy8gc2l6ZS4gIFNpbmNlIGFsbCBvdXIgY29kZSBoYXMgdG8gZ28gdGhy b3VnaCBhIDMyLWJpdCBjb21waWxlciwKKy8vIHdoZXJlIGEgcG9pbnRlciBpcyA0IGJ5dGVzLCB0 aGlzIG1lYW5zIGFsbCBwb2ludGVycyB0byBhIHR5cGUgd2hvc2UKKy8vIHNpemUgaXMgMyBvciBn cmVhdGVyIHRoYW4gNCB3aWxsIGJlIChyaWdodGVvdXNseSkgcmVqZWN0ZWQuCisKKyNkZWZpbmUg QVJSQVlTSVpFX1VOU0FGRShhKSBcCisgICgoc2l6ZW9mKGEpIC8gc2l6ZW9mKCooYSkpKSAvIFwK KyAgIHN0YXRpY19jYXN0PHNpemVfdD4oIShzaXplb2YoYSkgJSBzaXplb2YoKihhKSkpKSkKKwog bmFtZXNwYWNlIFdlYkNvcmUgewogCiAvLyBBbiBpbnRlcmZhY2UgdG8gdGhlIGVtYmVkZGluZyBs YXllciwgd2hpY2ggaGFzIHRoZSBhYmlsaXR5IHRvIGFuc3dlcgpAQCAtNTIsNiArOTcsOCBAQCBw dWJsaWM6CiAgICAgc3RhdGljIHZvaWQgc2V0Q29va2llcyhjb25zdCBLVVJMJiwgY29uc3QgU3Ry aW5nJiB2YWx1ZSk7CiAgICAgc3RhdGljIFN0cmluZyBjb29raWVzKGNvbnN0IEtVUkwmKTsKICAg ICBzdGF0aWMgYm9vbCBjb29raWVzRW5hYmxlZCgpOworICAgIC8vIFBvcHVwcworICAgIHN0YXRp YyBib29sIHBvcHVwc0FsbG93ZWQoTlBQKTsKIH07CiAKIH0K 47109 2010-01-21 04:06:15 -0800 2010-01-21 09:49:34 -0800 Fix bindings/v8/NPV8Object.cpp to compile on Android 33608.patch.v2 text/plain 5421 andreip SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzU2MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDEtMjEgIEFuZHJlaSBQb3Blc2N1ICA8YW5kcmVpcEBnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtBbmRyb2lkXSBiaW5kaW5ncy92OC9OUFY4T2JqZWN0LmNwcCBkb2VzIG5vdCBjb21waWxlIG9u IEFuZHJvaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTMzNjA4CisKKyAgICAgICAgVXNlIHRoZSBzdGFuZGFyZCBXZWJLaXQgaGVhZGVyIGluIGJyaWRn ZS9ucHJ1bnRpbWUuaC4KKyAgICAgICAgSW5jbHVkZSBQbGF0Zm9ybUJyaWRnZS5oIGluc3RlYWQg b2YgQ2hyb2ltaXVtQnJpZGdlLmguCisgICAgICAgIFVzZSBQbGF0Zm9ybUJyaWRnZSBjbGFzcyBp biBfTlBOX0V2YWx1YXRlIGluc3RlYWQgb2YgQ2hyb21pdW1CcmlkZ2UuCisgICAgICAgIEFkZCBw b3B1cHNBbGxvd2VkKCkgbWV0aG9kIHRvIFBsYXRmb3JtQnJpZGdlLmggb24gQW5kcm9pZC4KKyAg ICAgICAgQWRkIEFSUkFZU0laRV9VTlNBRkUgdG8gUGxhdGZvcm1CcmlkZ2UuaCBvbiBBbmRyb2lk LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgZml4aW5nIHRoZSBidWlsZC4KKworICAgICAgICAq IGJpbmRpbmdzL3Y4L05QVjhPYmplY3QuY3BwOgorICAgICAgICAoX05QTl9FdmFsdWF0ZSk6Cisg ICAgICAgICogYmluZGluZ3MvdjgvTlBWOE9iamVjdC5oOgorICAgICAgICAqIHBsYXRmb3JtL2Fu ZHJvaWQvUGxhdGZvcm1CcmlkZ2UuaDoKKwogMjAxMC0wMS0yMCAgS2V2aW4gT2xsaXZpZXIgIDxr ZXZpbm9AdGhlb2xsaXZpZXJzLmNvbT4KIAogICAgICAgICBCdWlsZCBmaXggZm9yICFFTkFCTEUo U1ZHKS4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvTlBWOE9iamVjdC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9OUFY4T2JqZWN0LmNwcAkocmV2aXNpb24gNTE5NzYp CisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L05QVjhPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yOCw3ICsyOCw3IEBACiAKICNpbmNsdWRlICJOUFY4T2JqZWN0LmgiCiAKLSNpbmNsdWRlICJD aHJvbWl1bUJyaWRnZS5oIgorI2luY2x1ZGUgIlBsYXRmb3JtQnJpZGdlLmgiCiAjaW5jbHVkZSAi RE9NV2luZG93LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJPd25BcnJheVB0ci5o IgpAQCAtMzksNyArMzksNiBAQAogI2luY2x1ZGUgIlY4SGVscGVycy5oIgogI2luY2x1ZGUgIlY4 TlBVdGlscy5oIgogI2luY2x1ZGUgIlY4UHJveHkuaCIKLSNpbmNsdWRlICJiaW5kaW5ncy9ucHJ1 bnRpbWUuaCIKICNpbmNsdWRlICJucHJ1bnRpbWVfaW1wbC5oIgogI2luY2x1ZGUgIm5wcnVudGlt ZV9wcml2LmgiCiAKQEAgLTIzNSw3ICsyMzQsNyBAQCBib29sIF9OUE5fSW52b2tlRGVmYXVsdChO UFAgbnBwLCBOUE9iamVjCiAKIGJvb2wgX05QTl9FdmFsdWF0ZShOUFAgbnBwLCBOUE9iamVjdCog bnBPYmplY3QsIE5QU3RyaW5nKiBucFNjcmlwdCwgTlBWYXJpYW50KiByZXN1bHQpCiB7Ci0gICAg Ym9vbCBwb3B1cHNBbGxvd2VkID0gV2ViQ29yZTo6Q2hyb21pdW1CcmlkZ2U6OnBvcHVwc0FsbG93 ZWQobnBwKTsKKyAgICBib29sIHBvcHVwc0FsbG93ZWQgPSBXZWJDb3JlOjpQbGF0Zm9ybUJyaWRn ZTo6cG9wdXBzQWxsb3dlZChucHApOwogICAgIHJldHVybiBfTlBOX0V2YWx1YXRlSGVscGVyKG5w cCwgcG9wdXBzQWxsb3dlZCwgbnBPYmplY3QsIG5wU2NyaXB0LCByZXN1bHQpOwogfQogCkluZGV4 OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L05QVjhPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2JpbmRpbmdzL3Y4L05QVjhPYmplY3QuaAkocmV2aXNpb24gNTE5NzYpCisrKyBXZWJDb3JlL2Jp bmRpbmdzL3Y4L05QVjhPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtMzAsNyArMzAsMTUgQEAK ICNpZm5kZWYgTlBWOE9iamVjdF9oCiAjZGVmaW5lIE5QVjhPYmplY3RfaAogCisjaWYgUExBVEZP Uk0oQ0hST01JVU0pCisvLyBDaHJvbWl1bSB1c2VzIGEgZGlmZmVyZW50IG5wcnVudGltZS5oLCB3 aGljaCBpcyBpbgorLy8gdGhlIENocm9taXVtIHNvdXJjZSByZXBvc2l0b3J5IHVuZGVyIHRoaXJk X3BhcnR5L25wYXBpL2JpbmRpbmdzLgorLy8gVGhlIEdvb2dsZS1zcGVjaWZpYyBjaGFuZ2VzIGlu IHRoYXQgZmlsZSBzaG91bGQgcHJvYmFibHkgYmUKKy8vIG1vdmVkIGludG8gYnJpZGdlL25wcnVu dGltZS5oLCBndWFyZGVkIGJ5IGFuICNpZiBQbEFURk9STShDSFJPTUlVTSkuCiAjaW5jbHVkZSAi YmluZGluZ3MvbnBydW50aW1lLmgiCisjZWxzZQorI2luY2x1ZGUgImJyaWRnZS9ucHJ1bnRpbWUu aCIgIC8vIHVzZSBXZWJDb3JlIHZlcnNpb24gZm9yIEFuZHJvaWQgYW5kIG90aGVyIHBvcnRzLgor I2VuZGlmCiAjaW5jbHVkZSA8djguaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpJbmRleDogV2Vi Q29yZS9wbGF0Zm9ybS9hbmRyb2lkL1BsYXRmb3JtQnJpZGdlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS9hbmRyb2lkL1BsYXRmb3JtQnJpZGdlLmgJKHJldmlzaW9uIDUzMTkzKQor KysgV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1BsYXRmb3JtQnJpZGdlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTI3LDEwICsyNyw1NSBAQAogI2RlZmluZSBQbGF0Zm9ybUJyaWRnZV9oCiAKICNpbmNs dWRlICJLVVJMLmgiCisjaW5jbHVkZSAibnBhcGkuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmlu Zy5oIgogCiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCisvLyBWOCBiaW5kaW5ncyB1c2UgdGhl IEFSUkFZU0laRV9VTlNBRkUgbWFjcm8uIFRoaXMgbWFjcm8gd2FzIGNvcGllZAorLy8gZnJvbSBo dHRwOi8vc3JjLmNocm9taXVtLm9yZy92aWV3dmMvY2hyb21lL3RydW5rL3NyYy9iYXNlL2Jhc2lj dHlwZXMuaAorCisvLyBBUlJBWVNJWkVfVU5TQUZFIHBlcmZvcm1zIGVzc2VudGlhbGx5IHRoZSBz YW1lIGNhbGN1bGF0aW9uIGFzIGFycmF5c2l6ZSwKKy8vIGJ1dCBjYW4gYmUgdXNlZCBvbiBhbm9u eW1vdXMgdHlwZXMgb3IgdHlwZXMgZGVmaW5lZCBpbnNpZGUKKy8vIGZ1bmN0aW9ucy4gIEl0J3Mg bGVzcyBzYWZlIHRoYW4gYXJyYXlzaXplIGFzIGl0IGFjY2VwdHMgc29tZQorLy8gKGFsdGhvdWdo IG5vdCBhbGwpIHBvaW50ZXJzLiAgVGhlcmVmb3JlLCB5b3Ugc2hvdWxkIHVzZSBhcnJheXNpemUK Ky8vIHdoZW5ldmVyIHBvc3NpYmxlLgorLy8KKy8vIFRoZSBleHByZXNzaW9uIEFSUkFZU0laRV9V TlNBRkUoYSkgaXMgYSBjb21waWxlLXRpbWUgY29uc3RhbnQgb2YgdHlwZQorLy8gc2l6ZV90Lgor Ly8KKy8vIEFSUkFZU0laRV9VTlNBRkUgY2F0Y2hlcyBhIGZldyB0eXBlIGVycm9ycy4gIElmIHlv dSBzZWUgYSBjb21waWxlciBlcnJvcgorLy8KKy8vICAgIndhcm5pbmc6IGRpdmlzaW9uIGJ5IHpl cm8gaW4gLi4uIgorLy8KKy8vIHdoZW4gdXNpbmcgQVJSQVlTSVpFX1VOU0FGRSwgeW91IGFyZSAo d3JvbmdmdWxseSkgZ2l2aW5nIGl0IGEgcG9pbnRlci4KKy8vIFlvdSBzaG91bGQgb25seSB1c2Ug QVJSQVlTSVpFX1VOU0FGRSBvbiBzdGF0aWNhbGx5IGFsbG9jYXRlZCBhcnJheXMuCisvLworLy8g VGhlIGZvbGxvd2luZyBjb21tZW50cyBhcmUgb24gdGhlIGltcGxlbWVudGF0aW9uIGRldGFpbHMs IGFuZCBjYW4KKy8vIGJlIGlnbm9yZWQgYnkgdGhlIHVzZXJzLgorLy8KKy8vIEFSUkFZU0laRV9V TlNBRkUoYXJyKSB3b3JrcyBieSBpbnNwZWN0aW5nIHNpemVvZihhcnIpICh0aGUgIyBvZiBieXRl cyBpbgorLy8gdGhlIGFycmF5KSBhbmQgc2l6ZW9mKCooYXJyKSkgKHRoZSAjIG9mIGJ5dGVzIGlu IG9uZSBhcnJheQorLy8gZWxlbWVudCkuICBJZiB0aGUgZm9ybWVyIGlzIGRpdmlzaWJsZSBieSB0 aGUgbGF0dGVyLCBwZXJoYXBzIGFyciBpcworLy8gaW5kZWVkIGFuIGFycmF5LCBpbiB3aGljaCBj YXNlIHRoZSBkaXZpc2lvbiByZXN1bHQgaXMgdGhlICMgb2YKKy8vIGVsZW1lbnRzIGluIHRoZSBh cnJheS4gIE90aGVyd2lzZSwgYXJyIGNhbm5vdCBwb3NzaWJseSBiZSBhbiBhcnJheSwKKy8vIGFu ZCB3ZSBnZW5lcmF0ZSBhIGNvbXBpbGVyIGVycm9yIHRvIHByZXZlbnQgdGhlIGNvZGUgZnJvbQor Ly8gY29tcGlsaW5nLgorLy8KKy8vIFNpbmNlIHRoZSBzaXplIG9mIGJvb2wgaXMgaW1wbGVtZW50 YXRpb24tZGVmaW5lZCwgd2UgbmVlZCB0byBjYXN0CisvLyAhKHNpemVvZihhKSAmIHNpemVvZigq KGEpKSkgdG8gc2l6ZV90IGluIG9yZGVyIHRvIGVuc3VyZSB0aGUgZmluYWwKKy8vIHJlc3VsdCBo YXMgdHlwZSBzaXplX3QuCisvLworLy8gVGhpcyBtYWNybyBpcyBub3QgcGVyZmVjdCBhcyBpdCB3 cm9uZ2Z1bGx5IGFjY2VwdHMgY2VydGFpbgorLy8gcG9pbnRlcnMsIG5hbWVseSB3aGVyZSB0aGUg cG9pbnRlciBzaXplIGlzIGRpdmlzaWJsZSBieSB0aGUgcG9pbnRlZQorLy8gc2l6ZS4gIFNpbmNl IGFsbCBvdXIgY29kZSBoYXMgdG8gZ28gdGhyb3VnaCBhIDMyLWJpdCBjb21waWxlciwKKy8vIHdo ZXJlIGEgcG9pbnRlciBpcyA0IGJ5dGVzLCB0aGlzIG1lYW5zIGFsbCBwb2ludGVycyB0byBhIHR5 cGUgd2hvc2UKKy8vIHNpemUgaXMgMyBvciBncmVhdGVyIHRoYW4gNCB3aWxsIGJlIChyaWdodGVv dXNseSkgcmVqZWN0ZWQuCisKKyNkZWZpbmUgQVJSQVlTSVpFX1VOU0FGRShhKSBcCisgICgoc2l6 ZW9mKGEpIC8gc2l6ZW9mKCooYSkpKSAvIFwKKyAgIHN0YXRpY19jYXN0PHNpemVfdD4oIShzaXpl b2YoYSkgJSBzaXplb2YoKihhKSkpKSkKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiAvLyBBbiBp bnRlcmZhY2UgdG8gdGhlIGVtYmVkZGluZyBsYXllciwgd2hpY2ggaGFzIHRoZSBhYmlsaXR5IHRv IGFuc3dlcgpAQCAtNTIsNiArOTcsOCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgc2V0Q29v a2llcyhjb25zdCBLVVJMJiwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CiAgICAgc3RhdGljIFN0cmlu ZyBjb29raWVzKGNvbnN0IEtVUkwmKTsKICAgICBzdGF0aWMgYm9vbCBjb29raWVzRW5hYmxlZCgp OworICAgIC8vIFBvcHVwcworICAgIHN0YXRpYyBib29sIHBvcHVwc0FsbG93ZWQoTlBQKTsKIH07 CiAKIH0K