38525 2010-05-04 08:56:44 -0700 JavaInstanceJSC.cpp and JNIUtilityPrivate.cpp need to include jni_jsobject.h for jlong_to_pt() and ptr_to_jlong() 2010-05-04 14:18:27 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Android Android RESOLVED FIXED P2 Normal --- 1 steveblock webkit-unassigned android-webkit-unforking ap darin steveblock oldest_to_newest 220621 0 steveblock 2010-05-04 08:56:44 -0700 Change http://trac.webkit.org/changeset/55250 added code to JavaInstanceJSC.cpp and JNIUtilityPrivate.cpp which uses jlong_to_pt() and ptr_to_jlong(). These methods are provided in jni_jsobject.h but this header is not included directly. This causes build errors on Android. Furthermore, jni_jsobject.h includes Mac-specific code which is not guarded by PLATFORM(MAC). 220635 1 55024 steveblock 2010-05-04 10:04:11 -0700 Created attachment 55024 Patch 220636 2 55024 darin 2010-05-04 10:10:34 -0700 Comment on attachment 55024 Patch > + * bridge/jni/jni_jsobject.h: Guard Mac-specific code with PLATFORM(MAC) Why are you making this change? The entire file is inside #if ENABLE(MAC_JAVA_BRIDGE). 220640 3 steveblock 2010-05-04 10:16:39 -0700 > Why are you making this change? The entire file is inside #if > ENABLE(MAC_JAVA_BRIDGE). Android also defines MAC_JAVA_BRIDGE, which is used to protect all parts of the Java bridge, not just those parts specific to Mac. (The guard is probably poorly named. I can open a separate bug to fix that?) Without the additional PLATFORM(MAC) guard, the build fails on Android. 220645 4 55024 darin 2010-05-04 10:25:22 -0700 Comment on attachment 55024 Patch > #define jlong_to_impptr(a) (static_cast<JSC::JSObject*>(((void*)(uintptr_t)(a)))) > #define ptr_to_jlong(a) ((jlong)(uintptr_t)(a)) > > +#if PLATFORM(MAC) > + > +#include <CoreFoundation/CoreFoundation.h> Normally in WebKit, conditional includes go up at the top of the file with the other includes, not down below things like macros. I also think this include is unneeded. r=me 220747 5 steveblock 2010-05-04 13:48:56 -0700 I've filed Bug 38544 to track the renaming of MAC_JAVA_BRIDGE. 220750 6 55043 steveblock 2010-05-04 13:54:14 -0700 Created attachment 55043 Patch 220752 7 steveblock 2010-05-04 13:55:36 -0700 > I also think this include is unneeded. I think you're right. I've uploaded a new patch without this include to check the build on the buildbots. 220777 8 steveblock 2010-05-04 14:17:27 -0700 Builders look OK. Landed manually as http://trac.webkit.org/changeset/58775 Closing bug as resolved fixed. 55024 2010-05-04 10:04:11 -0700 2010-05-04 13:54:06 -0700 Patch bug-38525-20100504180408.patch text/plain 2536 steveblock SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1ODc2NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDUtMDQgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEphdmFJbnN0YW5jZUpTQy5jcHAgYW5kIEpOSVV0aWxpdHlQcml2YXRlLmNwcCBuZWVkIHRvIGlu Y2x1ZGUgam5pX2pzb2JqZWN0LmggZm9yIGpsb25nX3RvX3B0KCkgYW5kIHB0cl90b19qbG9uZygp CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODUyNQor CisgICAgICAgIE5vIG5ldyB0ZXN0cywgYnVpbGQgZml4IG9ubHkuCisKKyAgICAgICAgKiBicmlk Z2Uvam5pL2puaV9qc29iamVjdC5oOiBHdWFyZCBNYWMtc3BlY2lmaWMgY29kZSB3aXRoIFBMQVRG T1JNKE1BQykKKyAgICAgICAgKiBicmlkZ2Uvam5pL2pzYy9KTklVdGlsaXR5UHJpdmF0ZS5jcHA6 IEluY2x1ZGUgam5pX2pzb2JqZWN0LmgKKyAgICAgICAgKiBicmlkZ2Uvam5pL2pzYy9KYXZhSW5z dGFuY2VKU0MuY3BwOiBJbmNsdWRlIGpuaV9qc29iamVjdC5oCisKIDIwMTAtMDUtMDQgIEFsZWph bmRybyBHLiBDYXN0cm8gIDxhbGV4QGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg WGFuIExvcGV6LgpJbmRleDogV2ViQ29yZS9icmlkZ2Uvam5pL2puaV9qc29iamVjdC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvYnJpZGdlL2puaS9qbmlfanNvYmplY3QuaAkocmV2aXNpb24gNTg3 NTkpCisrKyBXZWJDb3JlL2JyaWRnZS9qbmkvam5pX2pzb2JqZWN0LmgJKHdvcmtpbmcgY29weSkK QEAgLTI4LDcgKzI4LDYgQEAKIAogI2lmIEVOQUJMRShNQUNfSkFWQV9CUklER0UpCiAKLSNpbmNs dWRlIDxDb3JlRm91bmRhdGlvbi9Db3JlRm91bmRhdGlvbi5oPgogI2luY2x1ZGUgPEphdmFWTS9q bmkuaD4KICNpbmNsdWRlIDxydW50aW1lL0pTVmFsdWUuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRy Lmg+CkBAIC0zNyw2ICszNiwxMCBAQAogI2RlZmluZSBqbG9uZ190b19pbXBwdHIoYSkgKHN0YXRp Y19jYXN0PEpTQzo6SlNPYmplY3QqPigoKHZvaWQqKSh1aW50cHRyX3QpKGEpKSkpCiAjZGVmaW5l IHB0cl90b19qbG9uZyhhKSAoKGpsb25nKSh1aW50cHRyX3QpKGEpKQogCisjaWYgUExBVEZPUk0o TUFDKQorCisjaW5jbHVkZSA8Q29yZUZvdW5kYXRpb24vQ29yZUZvdW5kYXRpb24uaD4KKwogbmFt ZXNwYWNlIEpTQyB7CiAKIGNsYXNzIEFyZ0xpc3Q7CkBAIC0xMjUsNiArMTI4LDggQEAganN0cmlu ZyBLSlNfSlNPYmplY3RfSlNPYmplY3RUb1N0cmluZyhKTgogCiB9CiAKKyNlbmRpZiAvLyBQTEFU Rk9STShNQUMpCisKICNlbmRpZiAvLyBFTkFCTEUoTUFDX0pBVkFfQlJJREdFKQogCiAjZW5kaWYg Ly8gSkFWQVNDUklQVENPUkVfQklORElOR1NfSk5JX0pTT0JKRUNUX0gKSW5kZXg6IFdlYkNvcmUv YnJpZGdlL2puaS9qc2MvSk5JVXRpbGl0eVByaXZhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvYnJpZGdlL2puaS9qc2MvSk5JVXRpbGl0eVByaXZhdGUuY3BwCShyZXZpc2lvbiA1ODc1OSkK KysrIFdlYkNvcmUvYnJpZGdlL2puaS9qc2MvSk5JVXRpbGl0eVByaXZhdGUuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zMSw2ICszMSw3IEBACiAKICNpbmNsdWRlICJKYXZhUnVudGltZU9iamVjdC5o IgogI2luY2x1ZGUgIkpOSUJyaWRnZUpTQy5oIgorI2luY2x1ZGUgImpuaV9qc29iamVjdC5oIgog I2luY2x1ZGUgInJ1bnRpbWVfYXJyYXkuaCIKICNpbmNsdWRlICJydW50aW1lX29iamVjdC5oIgog I2luY2x1ZGUgPHJ1bnRpbWUvSlNBcnJheS5oPgpJbmRleDogV2ViQ29yZS9icmlkZ2Uvam5pL2pz Yy9KYXZhSW5zdGFuY2VKU0MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYnJpZGdlL2puaS9q c2MvSmF2YUluc3RhbmNlSlNDLmNwcAkocmV2aXNpb24gNTg3NTkpCisrKyBXZWJDb3JlL2JyaWRn ZS9qbmkvanNjL0phdmFJbnN0YW5jZUpTQy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0 LDcgQEAKICNpbmNsdWRlICJKTklVdGlsaXR5UHJpdmF0ZS5oIgogI2luY2x1ZGUgIkphdmFDbGFz c0pTQy5oIgogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKKyNpbmNsdWRlICJqbmlfanNvYmplY3QuaCIK ICNpbmNsdWRlICJydW50aW1lX21ldGhvZC5oIgogI2luY2x1ZGUgInJ1bnRpbWVfb2JqZWN0Lmgi CiAjaW5jbHVkZSAicnVudGltZV9yb290LmgiCg== 55043 2010-05-04 13:54:14 -0700 2010-05-04 14:18:27 -0700 Patch bug-38525-20100504215411.patch text/plain 2492 steveblock SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1ODc3MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDUtMDQgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIEph dmFJbnN0YW5jZUpTQy5jcHAgYW5kIEpOSVV0aWxpdHlQcml2YXRlLmNwcCBuZWVkIHRvIGluY2x1 ZGUgam5pX2pzb2JqZWN0LmggZm9yIGpsb25nX3RvX3B0KCkgYW5kIHB0cl90b19qbG9uZygpCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODUyNQorCisg ICAgICAgIE5vIG5ldyB0ZXN0cywgYnVpbGQgZml4IG9ubHkuCisKKyAgICAgICAgKiBicmlkZ2Uv am5pL2puaV9qc29iamVjdC5oOiBHdWFyZCBNYWMtc3BlY2lmaWMgY29kZSB3aXRoIFBMQVRGT1JN KE1BQykKKyAgICAgICAgKiBicmlkZ2Uvam5pL2pzYy9KTklVdGlsaXR5UHJpdmF0ZS5jcHA6IElu Y2x1ZGUgam5pX2pzb2JqZWN0LmgKKyAgICAgICAgKiBicmlkZ2Uvam5pL2pzYy9KYXZhSW5zdGFu Y2VKU0MuY3BwOiBJbmNsdWRlIGpuaV9qc29iamVjdC5oCisKIDIwMTAtMDUtMDQgIFBhdmVsIEZl bGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGlt b3RoeSBIYXRjaGVyLgpJbmRleDogV2ViQ29yZS9icmlkZ2Uvam5pL2puaV9qc29iamVjdC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvYnJpZGdlL2puaS9qbmlfanNvYmplY3QuaAkocmV2aXNpb24g NTg3NzEpCisrKyBXZWJDb3JlL2JyaWRnZS9qbmkvam5pX2pzb2JqZWN0LmgJKHdvcmtpbmcgY29w eSkKQEAgLTI4LDcgKzI4LDYgQEAKIAogI2lmIEVOQUJMRShNQUNfSkFWQV9CUklER0UpCiAKLSNp bmNsdWRlIDxDb3JlRm91bmRhdGlvbi9Db3JlRm91bmRhdGlvbi5oPgogI2luY2x1ZGUgPEphdmFW TS9qbmkuaD4KICNpbmNsdWRlIDxydW50aW1lL0pTVmFsdWUuaD4KICNpbmNsdWRlIDx3dGYvUmVm UHRyLmg+CkBAIC0zNyw2ICszNiw4IEBACiAjZGVmaW5lIGpsb25nX3RvX2ltcHB0cihhKSAoc3Rh dGljX2Nhc3Q8SlNDOjpKU09iamVjdCo+KCgodm9pZCopKHVpbnRwdHJfdCkoYSkpKSkKICNkZWZp bmUgcHRyX3RvX2psb25nKGEpICgoamxvbmcpKHVpbnRwdHJfdCkoYSkpCiAKKyNpZiBQTEFURk9S TShNQUMpCisKIG5hbWVzcGFjZSBKU0MgewogCiBjbGFzcyBBcmdMaXN0OwpAQCAtMTI1LDYgKzEy Niw4IEBAIGpzdHJpbmcgS0pTX0pTT2JqZWN0X0pTT2JqZWN0VG9TdHJpbmcoSk4KIAogfQogCisj ZW5kaWYgLy8gUExBVEZPUk0oTUFDKQorCiAjZW5kaWYgLy8gRU5BQkxFKE1BQ19KQVZBX0JSSURH RSkKIAogI2VuZGlmIC8vIEpBVkFTQ1JJUFRDT1JFX0JJTkRJTkdTX0pOSV9KU09CSkVDVF9ICklu ZGV4OiBXZWJDb3JlL2JyaWRnZS9qbmkvanNjL0pOSVV0aWxpdHlQcml2YXRlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2JyaWRnZS9qbmkvanNjL0pOSVV0aWxpdHlQcml2YXRlLmNwcAkocmV2 aXNpb24gNTg3NzEpCisrKyBXZWJDb3JlL2JyaWRnZS9qbmkvanNjL0pOSVV0aWxpdHlQcml2YXRl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogCiAjaW5jbHVkZSAiSmF2YVJ1 bnRpbWVPYmplY3QuaCIKICNpbmNsdWRlICJKTklCcmlkZ2VKU0MuaCIKKyNpbmNsdWRlICJqbmlf anNvYmplY3QuaCIKICNpbmNsdWRlICJydW50aW1lX2FycmF5LmgiCiAjaW5jbHVkZSAicnVudGlt ZV9vYmplY3QuaCIKICNpbmNsdWRlIDxydW50aW1lL0pTQXJyYXkuaD4KSW5kZXg6IFdlYkNvcmUv YnJpZGdlL2puaS9qc2MvSmF2YUluc3RhbmNlSlNDLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2JyaWRnZS9qbmkvanNjL0phdmFJbnN0YW5jZUpTQy5jcHAJKHJldmlzaW9uIDU4NzcxKQorKysg V2ViQ29yZS9icmlkZ2Uvam5pL2pzYy9KYXZhSW5zdGFuY2VKU0MuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSAiSk5JVXRpbGl0eVByaXZhdGUuaCIKICNpbmNs dWRlICJKYXZhQ2xhc3NKU0MuaCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCisjaW5jbHVkZSAiam5p X2pzb2JqZWN0LmgiCiAjaW5jbHVkZSAicnVudGltZV9tZXRob2QuaCIKICNpbmNsdWRlICJydW50 aW1lX29iamVjdC5oIgogI2luY2x1ZGUgInJ1bnRpbWVfcm9vdC5oIgo=