76037 2012-01-11 00:24:53 -0800 [EFL] Move macro checking to functions' definition in ewk_js.cpp. 2012-01-12 03:49:02 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) All Linux RESOLVED FIXED P2 Normal --- 0 g.czajkowski webkit-unassigned gyuyoung.kim hyuki.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 533710 0 g.czajkowski 2012-01-11 00:24:53 -0800 Moves macro checking to functions definitions instead of duplicate them in source depending on macro value. It's known practice in WebKit and EFL port. Duplicating functions in the same file whose return value is different may confuse user, especially if macro isn't included in a patch. 533711 1 121990 g.czajkowski 2012-01-11 00:26:26 -0800 Created attachment 121990 proposed patch 533815 2 rakuco 2012-01-11 05:23:57 -0800 Looks good. 533817 3 hyuki.kim 2012-01-11 05:30:31 -0800 LGTM. :) 534473 4 121990 gyuyoung.kim 2012-01-11 18:06:57 -0800 Comment on attachment 121990 proposed patch LGTM too. :-) 534721 5 121990 webkit.review.bot 2012-01-12 03:48:57 -0800 Comment on attachment 121990 proposed patch Clearing flags on attachment: 121990 Committed r104806: <http://trac.webkit.org/changeset/104806> 534722 6 webkit.review.bot 2012-01-12 03:49:02 -0800 All reviewed patches have been landed. Closing bug. 121990 2012-01-11 00:26:26 -0800 2012-01-12 03:48:57 -0800 proposed patch move_macro_checking_function_in_ewk_js.patch text/plain 5844 g.czajkowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA3ODkwYjM4Li5kODc4YjVmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTItMDEtMTAgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWpr b3dza2lAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gTW92ZSBtYWNybyBjaGVja2luZyB0 byBmdW5jdGlvbnMnIGRlZmluaXRpb24gaW4gZXdrX2pzLmNwcC4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2MDM3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZXMgbWFjcm8gY2hlY2tpbmcgdG8gZnVu Y3Rpb25zJyBkZWZpbml0aW9uIGluc3RlYWQgb2YgZHVwbGljYXRlIHRoZW0gaW4gc291cmNlIGRl cGVuZGluZyBvbiBtYWNybyB2YWx1ZS4KKyAgICAgICAgSXQncyBrbm93biBwcmFjdGljZSBpbiBX ZWJLaXQgYW5kIEVGTCBwb3J0LgorICAgICAgICBEdXBsaWNhdGluZyBmdW5jdGlvbnMgaW4gdGhl IHNhbWUgZmlsZSB3aG9zZSByZXR1cm4gdmFsdWUgaXMgZGlmZmVyZW50IG1heSBjb25mdXNlIHVz ZXIsCisgICAgICAgIGVzcGVjaWFsbHkgaWYgbWFjcm8gaXNuJ3QgaW5jbHVkZWQgaW4gYSBwYXRj aC4KKworICAgICAgICAqIGV3ay9ld2tfanMuY3BwOgorICAgICAgICAoZXdrX2pzX29iamVjdF9u ZXcpOgorICAgICAgICAoZXdrX2pzX29iamVjdF9mcmVlKToKKyAgICAgICAgKGV3a19qc19vYmpl Y3Rfdmlld19nZXQpOgorICAgICAgICAoZXdrX2pzX29iamVjdF9wcm9wZXJ0aWVzX2dldCk6Cisg ICAgICAgIChld2tfanNfb2JqZWN0X25hbWVfZ2V0KToKKyAgICAgICAgKGV3a19qc19vYmplY3Rf aW52b2tlKToKKyAgICAgICAgKGV3a19qc19vYmplY3RfdHlwZV9nZXQpOgorICAgICAgICAoZXdr X2pzX29iamVjdF90eXBlX3NldCk6CisgICAgICAgIChld2tfanNfdmFyaWFudF9mcmVlKToKKyAg ICAgICAgKGV3a19qc192YXJpYW50X2FycmF5X2ZyZWUpOgorCiAyMDEyLTAxLTA5ICBSYXBoYWVs IEt1Ym8gZGEgQ29zdGEgIDxrdWJvQHByb2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFtFRkxdIEFk ZCBnZXR0ZXIgZm9yIEV3a19KU19PYmplY3Q6OnZpZXcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX2pzLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfanMuY3Bw CmluZGV4IDNlNTgxN2IuLmE4YjIwNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3 ay9ld2tfanMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfanMuY3BwCkBAIC01 MjUsOSArNTI1LDExIEBAIHN0YXRpYyBFaW5hX0Jvb2wgZXdrX2pzX25wdmFyaWFudF90b192YXJp YW50KEV3a19KU19WYXJpYW50KiBkYXRhLCBjb25zdCBOUFZhcmlhCiAKICAgICByZXR1cm4gdHJ1 ZTsKIH0KKyNlbmRpZiAvLyBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKIAogRXdrX0pTX09i amVjdCogZXdrX2pzX29iamVjdF9uZXcoY29uc3QgRXdrX0pTX0NsYXNzX01ldGEqIGpzTWV0YUNs YXNzKQogeworI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgIEV3a19KU19PYmpl Y3QqIG9iamVjdDsKIAogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChqc01ldGFD bGFzcywgMCk7CkBAIC01OTMsMTAgKzU5NSwxNCBAQCBFd2tfSlNfT2JqZWN0KiBld2tfanNfb2Jq ZWN0X25ldyhjb25zdCBFd2tfSlNfQ2xhc3NfTWV0YSoganNNZXRhQ2xhc3MpCiBlcnJvcjoKICAg ICBld2tfanNfb2JqZWN0X2ZyZWUob2JqZWN0KTsKICAgICByZXR1cm4gMDsKKyNlbHNlCisgICAg cmV0dXJuIDA7CisjZW5kaWYKIH0KIAogdm9pZCBld2tfanNfb2JqZWN0X2ZyZWUoRXdrX0pTX09i amVjdCoganNPYmplY3QpCiB7CisjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAg RUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4oanNPYmplY3QpOwogICAgIEVJTkFfTUFHSUNfQ0hF Q0tfT1JfUkVUVVJOKGpzT2JqZWN0KTsKICAgICBFaW5hX0Jvb2wgc2NyaXB0X29iaiA9ICFqc09i amVjdC0+Y2xzLT5tZXRhOwpAQCAtNjEwLDMxICs2MTYsNDUgQEAgdm9pZCBld2tfanNfb2JqZWN0 X2ZyZWUoRXdrX0pTX09iamVjdCoganNPYmplY3QpCiAKICAgICBpZiAoc2NyaXB0X29iaikKICAg ICAgICAgZnJlZShqc09iamVjdCk7CisjZW5kaWYKIH0KIAogRXZhc19PYmplY3QqIGV3a19qc19v YmplY3Rfdmlld19nZXQoY29uc3QgRXdrX0pTX09iamVjdCoganNPYmplY3QpCiB7CisjaWYgRU5B QkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5f VkFMKGpzT2JqZWN0LCAwKTsKICAgICBFSU5BX01BR0lDX0NIRUNLX09SX1JFVFVSTihqc09iamVj dCwgMCk7CiAgICAgcmV0dXJuIGpzT2JqZWN0LT52aWV3OworI2Vsc2UKKyAgICByZXR1cm4gMDsK KyNlbmRpZgogfQogCiBFaW5hX0hhc2gqIGV3a19qc19vYmplY3RfcHJvcGVydGllc19nZXQoY29u c3QgRXdrX0pTX09iamVjdCoganNPYmplY3QpCiB7CisjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJ Tl9BUEkpCiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGpzT2JqZWN0LCAwKTsK ICAgICBFSU5BX01BR0lDX0NIRUNLX09SX1JFVFVSTihqc09iamVjdCwgMCk7CiAgICAgcmV0dXJu IGpzT2JqZWN0LT5wcm9wZXJ0aWVzOworI2Vsc2UKKyAgICByZXR1cm4gMDsKKyNlbmRpZgogfQog CiBjb25zdCBjaGFyKiBld2tfanNfb2JqZWN0X25hbWVfZ2V0KGNvbnN0IEV3a19KU19PYmplY3Qq IGpzT2JqZWN0KQogeworI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgIEVJTkFf U0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChqc09iamVjdCwgMCk7CiAgICAgRUlOQV9NQUdJQ19D SEVDS19PUl9SRVRVUk4oanNPYmplY3QsIDApOwogICAgIHJldHVybiBqc09iamVjdC0+bmFtZTsK KyNlbHNlCisgICAgcmV0dXJuIDA7CisjZW5kaWYKIH0KIAogRWluYV9Cb29sIGV3a19qc19vYmpl Y3RfaW52b2tlKEV3a19KU19PYmplY3QqIGpzT2JqZWN0LCBFd2tfSlNfVmFyaWFudCogYXJncywg aW50IGFyZ0NvdW50LCBFd2tfSlNfVmFyaWFudCogcmVzdWx0KQogeworI2lmIEVOQUJMRShORVRT Q0FQRV9QTFVHSU5fQVBJKQogICAgIE5QVmFyaWFudCogbnBfYXJnczsKICAgICBOUFZhcmlhbnQg bnBfcmVzdWx0OwogICAgIGJvb2wgZmFpbCA9IGZhbHNlOwpAQCAtNjYzLDM2ICs2ODMsNDggQEAg RWluYV9Cb29sIGV3a19qc19vYmplY3RfaW52b2tlKEV3a19KU19PYmplY3QqIGpzT2JqZWN0LCBF d2tfSlNfVmFyaWFudCogYXJncywgaW4KIGVuZDoKICAgICBmcmVlKG5wX2FyZ3MpOwogICAgIHJl dHVybiBmYWlsOworI2Vsc2UKKyAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKIH0KIAogRXdrX0pT X09iamVjdF9UeXBlIGV3a19qc19vYmplY3RfdHlwZV9nZXQoRXdrX0pTX09iamVjdCoganNPYmpl Y3QpCiB7CisjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgRUlOQV9TQUZFVFlf T05fTlVMTF9SRVRVUk5fVkFMKGpzT2JqZWN0LCBFV0tfSlNfT0JKRUNUX09CSkVDVCk7CiAgICAg RUlOQV9NQUdJQ19DSEVDS19PUl9SRVRVUk4oanNPYmplY3QsIEVXS19KU19PQkpFQ1RfT0JKRUNU KTsKIAogICAgIHJldHVybiBqc09iamVjdC0+dHlwZTsKKyNlbHNlCisgICAgcmV0dXJuIEVXS19K U19PQkpFQ1RfSU5WQUxJRDsKKyNlbmRpZgogfQogCiB2b2lkIGV3a19qc19vYmplY3RfdHlwZV9z ZXQoRXdrX0pTX09iamVjdCoganNPYmplY3QsIEV3a19KU19PYmplY3RfVHlwZSB0eXBlKQogewor I2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgIEVJTkFfU0FGRVRZX09OX05VTExf UkVUVVJOKGpzT2JqZWN0KTsKICAgICBFSU5BX01BR0lDX0NIRUNLX09SX1JFVFVSTihqc09iamVj dCk7CiAKICAgICBqc09iamVjdC0+dHlwZSA9IHR5cGU7CisjZW5kaWYKIH0KIAogdm9pZCBld2tf anNfdmFyaWFudF9mcmVlKEV3a19KU19WYXJpYW50KiBqc1ZhcmlhbnQpCiB7CisjaWYgRU5BQkxF KE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4oanNW YXJpYW50KTsKICAgICBpZiAoanNWYXJpYW50LT50eXBlID09IEVXS19KU19WQVJJQU5UX1NUUklO RykKICAgICAgICAgZnJlZShqc1ZhcmlhbnQtPnZhbHVlLnMpOwogICAgIGVsc2UgaWYgKGpzVmFy aWFudC0+dHlwZSA9PSBFV0tfSlNfVkFSSUFOVF9PQkpFQ1QpCiAgICAgICAgIGV3a19qc19vYmpl Y3RfZnJlZShqc1ZhcmlhbnQtPnZhbHVlLm8pOwogICAgIGZyZWUoanNWYXJpYW50KTsKKyNlbmRp ZgogfQogCiB2b2lkIGV3a19qc192YXJpYW50X2FycmF5X2ZyZWUoRXdrX0pTX1ZhcmlhbnQqIGpz VmFyaWFudCwgaW50IGNvdW50KQogeworI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQog ICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGpzVmFyaWFudCk7CiAgICAgZm9yIChpbnQg aSA9IDA7IGkgPCBjb3VudDsgaSsrKSB7CiAgICAgICAgIGlmIChqc1ZhcmlhbnRbaV0udHlwZSA9 PSBFV0tfSlNfVkFSSUFOVF9TVFJJTkcpCkBAIC03MDEsNTQgKzczMyw1IEBAIHZvaWQgZXdrX2pz X3ZhcmlhbnRfYXJyYXlfZnJlZShFd2tfSlNfVmFyaWFudCoganNWYXJpYW50LCBpbnQgY291bnQp CiAgICAgICAgICAgICBld2tfanNfb2JqZWN0X2ZyZWUoanNWYXJpYW50W2ldLnZhbHVlLm8pOwog ICAgIH0KICAgICBmcmVlKGpzVmFyaWFudCk7CisjZW5kaWYKIH0KLQotI2Vsc2UKLQotRWluYV9I YXNoKiBld2tfanNfb2JqZWN0X3Byb3BlcnRpZXNfZ2V0KGNvbnN0IEV3a19KU19PYmplY3QqIGpz T2JqZWN0KQotewotICAgIHJldHVybiAwOwotfQotCi1jb25zdCBjaGFyKiBld2tfanNfb2JqZWN0 X25hbWVfZ2V0KGNvbnN0IEV3a19KU19PYmplY3QqIGpzT2JqZWN0KQotewotICAgIHJldHVybiAw OwotfQotCi1FdmFzX09iamVjdCogZXdrX2pzX29iamVjdF92aWV3X2dldChjb25zdCBFd2tfSlNf T2JqZWN0KiBqc09iamVjdCkKLXsKLSAgICByZXR1cm4gMDsKLX0KLQotdm9pZCBld2tfanNfdmFy aWFudF9mcmVlKEV3a19KU19WYXJpYW50KiBqc1ZhcmlhbnQpCi17Ci19Ci0KLXZvaWQgZXdrX2pz X3ZhcmlhbnRfYXJyYXlfZnJlZShFd2tfSlNfVmFyaWFudCoganNWYXJpYW50LCBpbnQgY291bnQp Ci17Ci19Ci0KLUV3a19KU19PYmplY3QqIGV3a19qc19vYmplY3RfbmV3KGNvbnN0IEV3a19KU19D bGFzc19NZXRhKiBqc01ldGFDbGFzcykKLXsKLSAgICByZXR1cm4gMDsKLX0KLQotdm9pZCBld2tf anNfb2JqZWN0X2ZyZWUoRXdrX0pTX09iamVjdCoganNPYmplY3QpCi17Ci19Ci0KLUVpbmFfQm9v bCBld2tfanNfb2JqZWN0X2ludm9rZShFd2tfSlNfT2JqZWN0KiBqc09iamVjdCwgRXdrX0pTX1Zh cmlhbnQqIGFyZ3MsIGludCBhcmdDb3VudCwgRXdrX0pTX1ZhcmlhbnQqIHJlc3VsdCkKLXsKLSAg ICByZXR1cm4gZmFsc2U7Ci19Ci0KLUV3a19KU19PYmplY3RfVHlwZSBld2tfanNfb2JqZWN0X3R5 cGVfZ2V0KEV3a19KU19PYmplY3QqIGpzT2JqZWN0KQotewotICAgIHJldHVybiBFV0tfSlNfT0JK RUNUX0lOVkFMSUQ7Ci19Ci0KLXZvaWQgZXdrX2pzX29iamVjdF90eXBlX3NldChFd2tfSlNfT2Jq ZWN0KiBqc09iamVjdCwgRXdrX0pTX09iamVjdF9UeXBlIHR5cGUpCi17Ci19Ci0KLSNlbmRpZiAv LyBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkK