36587 2010-03-25 02:49:36 -0700 Web Inspector: Expect console object wrapping to fail. 2010-03-25 05:20:04 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck rik timothy oldest_to_newest 203959 0 pfeldman 2010-03-25 02:49:36 -0700 This can happen if page overrides some basic prototypes. 203964 1 51615 pfeldman 2010-03-25 03:18:46 -0700 Created attachment 51615 [PATCH] Proposed fix. 203995 2 51615 timothy 2010-03-25 04:34:39 -0700 Comment on attachment 51615 [PATCH] Proposed fix. > + // FIXME(33716) Please add a comment with the FIXME, not just the bug number. 204003 3 pfeldman 2010-03-25 05:20:04 -0700 Landed with comment addressed. Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/InjectedScript.cpp M WebCore/inspector/front-end/InjectedScript.js Committed r56532 51615 2010-03-25 03:18:46 -0700 2010-03-25 04:34:38 -0700 [PATCH] Proposed fix. crash_wrap text/plain 4301 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGFiZjFkZS4uMTdhZmRlNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wMy0yNSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBFeHBlY3QgY29uc29sZSBvYmplY3Qg d3JhcHBpbmcgdG8gZmFpbC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzY1ODcKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0 ZWRTY3JpcHQuanM6CisgICAgICAgIChpbmplY3RlZFNjcmlwdENvbnN0cnVjdG9yKToKKwogMjAx MC0wMy0yNSAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0 ZWRTY3JpcHQuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwCmluZGV4 IDQyYTI4NTYuLjBhNTNjZjQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVk U2NyaXB0LmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5jcHAKQEAg LTc0LDcgKzc0LDEwIEBAIFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBJbmplY3Rl ZFNjcmlwdDo6d3JhcEZvckNvbnNvbGUoU2NyaXB0VmFsdWUgdmFsCiAgICAgU2NyaXB0RnVuY3Rp b25DYWxsIHdyYXBGdW5jdGlvbihtX2luamVjdGVkU2NyaXB0T2JqZWN0LCAid3JhcE9iamVjdCIp OwogICAgIHdyYXBGdW5jdGlvbi5hcHBlbmRBcmd1bWVudCh2YWx1ZSk7CiAgICAgd3JhcEZ1bmN0 aW9uLmFwcGVuZEFyZ3VtZW50KCJjb25zb2xlIik7Ci0gICAgU2NyaXB0VmFsdWUgciA9IHdyYXBG dW5jdGlvbi5jYWxsKCk7CisgICAgYm9vbCBoYWRFeGNlcHRpb24gPSBmYWxzZTsKKyAgICBTY3Jp cHRWYWx1ZSByID0gd3JhcEZ1bmN0aW9uLmNhbGwoaGFkRXhjZXB0aW9uKTsKKyAgICBpZiAoaGFk RXhjZXB0aW9uKQorICAgICAgICByZXR1cm4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpjcmVhdGUo IjxleGNlcHRpb24+Iik7CiAgICAgcmV0dXJuIHIuc2VyaWFsaXplKG1faW5qZWN0ZWRTY3JpcHRP YmplY3Quc2NyaXB0U3RhdGUoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9JbmplY3RlZFNjcmlwdC5qcwppbmRleCBhYTk5OWY3Li5mZDk2ZTVhIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3JpcHQuanMKKysrIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzCkBAIC0zNSwxOSArMzUsMjMg QEAgSW5qZWN0ZWRTY3JpcHQuaWRUb1dyYXBwZWRPYmplY3QgPSB7fTsKIEluamVjdGVkU2NyaXB0 Lm9iamVjdEdyb3VwcyA9IHt9OwogSW5qZWN0ZWRTY3JpcHQud3JhcE9iamVjdCA9IGZ1bmN0aW9u KG9iamVjdCwgb2JqZWN0R3JvdXBOYW1lKQogewotICAgIHZhciBvYmplY3RJZDsKLSAgICBpZiAo dHlwZW9mIG9iamVjdCA9PT0gIm9iamVjdCIgfHwgdHlwZW9mIG9iamVjdCA9PT0gImZ1bmN0aW9u IiB8fAotICAgICAgICAodHlwZW9mIG9iamVjdCA9PT0gInVuZGVmaW5lZCIgJiYgb2JqZWN0IGlu c3RhbmNlb2YgaW5zcGVjdGVkV2luZG93LkhUTUxBbGxDb2xsZWN0aW9uKSkgeyAvLyBGSVhNRSgz MzcxNikKLSAgICAgICAgdmFyIGlkID0gSW5qZWN0ZWRTY3JpcHQubGFzdEJvdW5kT2JqZWN0SWQr KzsKLSAgICAgICAgb2JqZWN0SWQgPSAib2JqZWN0IyIgKyBpZDsKLSAgICAgICAgSW5qZWN0ZWRT Y3JpcHQuaWRUb1dyYXBwZWRPYmplY3Rbb2JqZWN0SWRdID0gb2JqZWN0OwotCi0gICAgICAgIHZh ciBncm91cCA9IEluamVjdGVkU2NyaXB0Lm9iamVjdEdyb3Vwc1tvYmplY3RHcm91cE5hbWVdOwot ICAgICAgICBpZiAoIWdyb3VwKSB7Ci0gICAgICAgICAgICBncm91cCA9IFtdOwotICAgICAgICAg ICAgSW5qZWN0ZWRTY3JpcHQub2JqZWN0R3JvdXBzW29iamVjdEdyb3VwTmFtZV0gPSBncm91cDsK KyAgICB0cnkgeworICAgICAgICB2YXIgb2JqZWN0SWQ7CisgICAgICAgIGlmICh0eXBlb2Ygb2Jq ZWN0ID09PSAib2JqZWN0IiB8fCB0eXBlb2Ygb2JqZWN0ID09PSAiZnVuY3Rpb24iIHx8IEluamVj dGVkU2NyaXB0Ll9pc0hUTUxBbGxDb2xsZWN0aW9uKG9iamVjdCkpIHsKKyAgICAgICAgICAgIHZh ciBpZCA9IEluamVjdGVkU2NyaXB0Lmxhc3RCb3VuZE9iamVjdElkKys7CisgICAgICAgICAgICBv YmplY3RJZCA9ICJvYmplY3QjIiArIGlkOworICAgICAgICAgICAgSW5qZWN0ZWRTY3JpcHQuaWRU b1dyYXBwZWRPYmplY3Rbb2JqZWN0SWRdID0gb2JqZWN0OworCisgICAgICAgICAgICB2YXIgZ3Jv dXAgPSBJbmplY3RlZFNjcmlwdC5vYmplY3RHcm91cHNbb2JqZWN0R3JvdXBOYW1lXTsKKyAgICAg ICAgICAgIGlmICghZ3JvdXApIHsKKyAgICAgICAgICAgICAgICBncm91cCA9IFtdOworICAgICAg ICAgICAgICAgIEluamVjdGVkU2NyaXB0Lm9iamVjdEdyb3Vwc1tvYmplY3RHcm91cE5hbWVdID0g Z3JvdXA7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBncm91cC5wdXNoKG9iamVjdElkKTsK ICAgICAgICAgfQotICAgICAgICBncm91cC5wdXNoKG9iamVjdElkKTsKKyAgICAgICAgcmV0dXJu IEluamVjdGVkU2NyaXB0LmNyZWF0ZVByb3h5T2JqZWN0KG9iamVjdCwgb2JqZWN0SWQpOworICAg IH0gY2F0Y2ggKGUpIHsKKyAgICAgICAgcmV0dXJuIEluamVjdGVkU2NyaXB0LmNyZWF0ZVByb3h5 T2JqZWN0KCJbIEV4Y2VwdGlvbjogIiArIGUudG9TdHJpbmcoKSArICIgXSIpOwogICAgIH0KICAg ICByZXR1cm4gSW5qZWN0ZWRTY3JpcHQuY3JlYXRlUHJveHlPYmplY3Qob2JqZWN0LCBvYmplY3RJ ZCk7CiB9OwpAQCAtODczLDcgKzg3NywxMyBAQCBJbmplY3RlZFNjcmlwdC5leGVjdXRlU3FsID0g ZnVuY3Rpb24oY2FsbElkLCBkYXRhYmFzZUlkLCBxdWVyeSkKIAogSW5qZWN0ZWRTY3JpcHQuX2lz RGVmaW5lZCA9IGZ1bmN0aW9uKG9iamVjdCkKIHsKLSAgICByZXR1cm4gb2JqZWN0IHx8IG9iamVj dCBpbnN0YW5jZW9mIGluc3BlY3RlZFdpbmRvdy5IVE1MQWxsQ29sbGVjdGlvbjsKKyAgICByZXR1 cm4gb2JqZWN0IHx8IEluamVjdGVkU2NyaXB0Ll9pc0hUTUxBbGxDb2xsZWN0aW9uKG9iamVjdCk7 Cit9CisKK0luamVjdGVkU2NyaXB0Ll9pc0hUTUxBbGxDb2xsZWN0aW9uID0gZnVuY3Rpb24ob2Jq ZWN0KQoreworICAgIC8vIEZJWE1FKDMzNzE2KQorICAgIHJldHVybiAodHlwZW9mIG9iamVjdCA9 PT0gInVuZGVmaW5lZCIpICYmIGluc3BlY3RlZFdpbmRvdy5IVE1MQWxsQ29sbGVjdGlvbiAmJiBv YmplY3QgaW5zdGFuY2VvZiBpbnNwZWN0ZWRXaW5kb3cuSFRNTEFsbENvbGxlY3Rpb247CiB9CiAK IEluamVjdGVkU2NyaXB0Ll90eXBlID0gZnVuY3Rpb24ob2JqKQpAQCAtODgyLDcgKzg5Miw3IEBA IEluamVjdGVkU2NyaXB0Ll90eXBlID0gZnVuY3Rpb24ob2JqKQogICAgICAgICByZXR1cm4gIm51 bGwiOwogCiAgICAgLy8gRklYTUUoMzM3MTYpOiB0eXBlb2YgZG9jdW1lbnQuYWxsIGlzIGFsd2F5 cyAndW5kZWZpbmVkJy4KLSAgICBpZiAob2JqIGluc3RhbmNlb2YgaW5zcGVjdGVkV2luZG93LkhU TUxBbGxDb2xsZWN0aW9uKQorICAgIGlmIChJbmplY3RlZFNjcmlwdC5faXNIVE1MQWxsQ29sbGVj dGlvbihvYmopKQogICAgICAgICByZXR1cm4gImFycmF5IjsKIAogICAgIHZhciB0eXBlID0gdHlw ZW9mIG9iajsKQEAgLTkwNyw3ICs5MTcsNyBAQCBJbmplY3RlZFNjcmlwdC5fdHlwZSA9IGZ1bmN0 aW9uKG9iaikKICAgICAgICAgcmV0dXJuICJyZWdleHAiOwogICAgIGlmIChvYmogaW5zdGFuY2Vv ZiB3aW4uTm9kZUxpc3QpCiAgICAgICAgIHJldHVybiAiYXJyYXkiOwotICAgIGlmIChvYmogaW5z dGFuY2VvZiB3aW4uSFRNTENvbGxlY3Rpb24gfHwgb2JqIGluc3RhbmNlb2Ygd2luLkhUTUxBbGxD b2xsZWN0aW9uKQorICAgIGlmIChvYmogaW5zdGFuY2VvZiB3aW4uSFRNTENvbGxlY3Rpb24pCiAg ICAgICAgIHJldHVybiAiYXJyYXkiOwogICAgIGlmIChvYmogaW5zdGFuY2VvZiB3aW4uRXJyb3Ip CiAgICAgICAgIHJldHVybiAiZXJyb3IiOwo=