35113 2010-02-18 10:40:33 -0800 Web Inspector: Expand Object.__proto__ properly. 2010-02-18 10:46:01 -0800 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 191656 0 pfeldman 2010-02-18 10:40:33 -0800 It is currently blank. 191657 1 49031 pfeldman 2010-02-18 10:43:03 -0800 Created attachment 49031 [PATCH] Proposed fix. 191658 2 pfeldman 2010-02-18 10:46:01 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/EventListenersSidebarPane.js M WebCore/inspector/front-end/InjectedScript.js M WebCore/inspector/front-end/ObjectProxy.js M WebCore/inspector/front-end/PropertiesSidebarPane.js M WebCore/inspector/front-end/inspector.js Committed r54973 49031 2010-02-18 10:43:03 -0800 2010-02-18 10:43:46 -0800 [PATCH] Proposed fix. proto text/plain 6884 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjY2Mzk5Yi4uOGNjMDA4ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyNiBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IFRp bW90aHkgSGF0Y2hlci4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBFeHBhbmQgT2JqZWN0Ll9f cHJvdG9fXyBwcm9wZXJseS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzUxMTMKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRXZlbnRM aXN0ZW5lcnNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKCk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5qczoKKyAgICAgICAgKGluamVjdGVkU2NyaXB0Q29u c3RydWN0b3IpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJveHkuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0UHJveHkpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvUHJvcGVydGllc1NpZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlByb3BlcnRpZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUudXBkYXRlLmNhbGxiYWNrKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5sb2cubG9nTWVzc2FnZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IubG9nKToKKwor MjAxMC0wMi0xOCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCisKICAgICAgICAgV2ViIEluc3BlY3Rv cjogb24taG92ZXIgZXZhbHVhdGlvbiByZW5kZXJzIG5vZGVzIGFuZCBhcnJheXMgYXMgc3RyaW5n cy4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzUx MDMKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FdmVudExpc3RlbmVy c1NpZGViYXJQYW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V2ZW50TGlzdGVu ZXJzU2lkZWJhclBhbmUuanMKaW5kZXggNjQ5ZWVhOC4uZTQ1NDI1NiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V2ZW50TGlzdGVuZXJzU2lkZWJhclBhbmUuanMKKysr IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V2ZW50TGlzdGVuZXJzU2lkZWJhclBhbmUu anMKQEAgLTE5MSw3ICsxOTEsNyBAQCBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJhci5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICAvLyBKdXN0IGJ1aWxkIHByb3BlcnRpZXMgaW4gcGxhY2Ug LSBubyBuZWVkIHRvIHJlYWNoIG91dCBmb3IgaW5qZWN0ZWQgc2NyaXB0LgogICAgICAgICAgICAg dmFyIHZhbHVlID0gdGhpcy5ldmVudExpc3RlbmVyW3Byb3BlcnR5TmFtZV07CiAgICAgICAgICAg ICBpZiAodmFsdWUgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuRE9NTm9kZSkKLSAgICAgICAgICAg ICAgICB2YWx1ZSA9IG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0UHJveHkodmFsdWUuaW5qZWN0ZWRT Y3JpcHRJZCwgdmFsdWUuaWQsIFtdLCAwLCBhcHByb3ByaWF0ZVNlbGVjdG9yRm9yTm9kZSh2YWx1 ZSksIHRydWUpOworICAgICAgICAgICAgICAgIHZhbHVlID0gbmV3IFdlYkluc3BlY3Rvci5PYmpl Y3RQcm94eSh2YWx1ZS5pbmplY3RlZFNjcmlwdElkLCB2YWx1ZS5pZCwgW10sIGFwcHJvcHJpYXRl U2VsZWN0b3JGb3JOb2RlKHZhbHVlKSwgdHJ1ZSk7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAg ICAgICAgICAgdmFsdWUgPSBXZWJJbnNwZWN0b3IuT2JqZWN0UHJveHkud3JhcFByaW1pdGl2ZVZh bHVlKHZhbHVlKTsKICAgICAgICAgICAgIHByb3BlcnRpZXMucHVzaChuZXcgV2ViSW5zcGVjdG9y Lk9iamVjdFByb3BlcnR5UHJveHkocHJvcGVydHlOYW1lLCB2YWx1ZSkpOwpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzIGIvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzCmluZGV4IGYyNDhiOTEuLjk2YzY0 MjggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlw dC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3JpcHQuanMK QEAgLTQ4NSw3ICs0ODUsNiBAQCBJbmplY3RlZFNjcmlwdC5nZXRQcm9wZXJ0aWVzID0gZnVuY3Rp b24ob2JqZWN0UHJveHksIGlnbm9yZUhhc093blByb3BlcnR5LCBhYmJyZQogICAgIHZhciBvYmpl Y3QgPSBJbmplY3RlZFNjcmlwdC5fcmVzb2x2ZU9iamVjdChvYmplY3RQcm94eSk7CiAgICAgaWYg KCFJbmplY3RlZFNjcmlwdC5faXNEZWZpbmVkKG9iamVjdCkpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKLQogICAgIHZhciBwcm9wZXJ0aWVzID0gW107CiAgICAgdmFyIHByb3BlcnR5TmFtZXMgPSBp Z25vcmVIYXNPd25Qcm9wZXJ0eSA/IEluamVjdGVkU2NyaXB0Ll9nZXRQcm9wZXJ0eU5hbWVzKG9i amVjdCkgOiBPYmplY3QuZ2V0T3duUHJvcGVydHlOYW1lcyhvYmplY3QpOwogICAgIGlmICghaWdu b3JlSGFzT3duUHJvcGVydHkgJiYgb2JqZWN0Ll9fcHJvdG9fXykKQEAgLTUwNSw3ICs1MDQsNiBA QCBJbmplY3RlZFNjcmlwdC5nZXRQcm9wZXJ0aWVzID0gZnVuY3Rpb24ob2JqZWN0UHJveHksIGln bm9yZUhhc093blByb3BlcnR5LCBhYmJyZQogICAgICAgICAgICAgICAgIHZhciBjaGlsZE9iamVj dFByb3h5ID0gbmV3IEluamVjdGVkU2NyaXB0LmNyZWF0ZVByb3h5T2JqZWN0KGNoaWxkT2JqZWN0 LCBvYmplY3RQcm94eS5vYmplY3RJZCwgYWJicmV2aWF0ZSk7CiAgICAgICAgICAgICAgICAgY2hp bGRPYmplY3RQcm94eS5wYXRoID0gb2JqZWN0UHJveHkucGF0aCA/IG9iamVjdFByb3h5LnBhdGgu c2xpY2UoKSA6IFtdOwogICAgICAgICAgICAgICAgIGNoaWxkT2JqZWN0UHJveHkucGF0aC5wdXNo KHByb3BlcnR5TmFtZSk7Ci0gICAgICAgICAgICAgICAgY2hpbGRPYmplY3RQcm94eS5wcm90b0Rl cHRoID0gb2JqZWN0UHJveHkucHJvdG9EZXB0aCB8fCAwOwogICAgICAgICAgICAgICAgIHByb3Bl cnR5LnZhbHVlID0gY2hpbGRPYmplY3RQcm94eTsKICAgICAgICAgICAgIH0gY2F0Y2goZSkgewog ICAgICAgICAgICAgICAgIHByb3BlcnR5LnZhbHVlID0geyBkZXNjcmlwdGlvbjogZS50b1N0cmlu ZygpIH07CkBAIC0xMDg3LDEwICsxMDg1LDYgQEAgSW5qZWN0ZWRTY3JpcHQuX3Jlc29sdmVPYmpl Y3QgPSBmdW5jdGlvbihvYmplY3RQcm94eSkKICAgICBmb3IgKHZhciBpID0gMDsgSW5qZWN0ZWRT Y3JpcHQuX2lzRGVmaW5lZChvYmplY3QpICYmIHBhdGggJiYgaSA8IHBhdGgubGVuZ3RoOyArK2kp CiAgICAgICAgIG9iamVjdCA9IG9iamVjdFtwYXRoW2ldXTsKIAotICAgIC8vIEdldCB0byB0aGUg bmVjZXNzYXJ5IHByb3RvIGxheWVyLgotICAgIGZvciAodmFyIGkgPSAwOyBJbmplY3RlZFNjcmlw dC5faXNEZWZpbmVkKG9iamVjdCkgJiYgcHJvdG9EZXB0aCAmJiBpIDwgcHJvdG9EZXB0aDsgKytp KQotICAgICAgICBvYmplY3QgPSBvYmplY3QuX19wcm90b19fOwotCiAgICAgcmV0dXJuIG9iamVj dDsKIH0KIApAQCAtMTE1NCwxMiArMTE0OCw3IEBAIEluamVjdGVkU2NyaXB0LmNyZWF0ZVByb3h5 T2JqZWN0ID0gZnVuY3Rpb24ob2JqZWN0LCBvYmplY3RJZCwgYWJicmV2aWF0ZSkKICAgICAgICAg cmVzdWx0LnByb3BlcnR5TGVuZ3RoID0gb2JqZWN0Lmxlbmd0aDsKIAogICAgIHZhciB0eXBlID0g dHlwZW9mIG9iamVjdDsKLSAgICBpZiAoKHR5cGUgPT09ICJvYmplY3QiICYmIG9iamVjdCAhPT0g bnVsbCkgfHwgdHlwZSA9PT0gImZ1bmN0aW9uIikgewotICAgICAgICBmb3IgKHZhciBzdWJQcm9w ZXJ0eU5hbWUgaW4gb2JqZWN0KSB7Ci0gICAgICAgICAgICByZXN1bHQuaGFzQ2hpbGRyZW4gPSB0 cnVlOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICB9CisgICAgcmVzdWx0Lmhh c0NoaWxkcmVuID0gKHR5cGUgPT09ICJvYmplY3QiICYmIG9iamVjdCAhPT0gbnVsbCAmJiBPYmpl Y3QuZ2V0T3duUHJvcGVydHlOYW1lcyhvYmplY3QpLmxlbmd0aCkgfHwgdHlwZSA9PT0gImZ1bmN0 aW9uIjsKICAgICB0cnkgewogICAgICAgICByZXN1bHQuZGVzY3JpcHRpb24gPSBJbmplY3RlZFNj cmlwdC5fZGVzY3JpYmUob2JqZWN0LCBhYmJyZXZpYXRlKTsKICAgICB9IGNhdGNoIChlKSB7CmRp ZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJveHkuanMgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJveHkuanMKaW5kZXggNjI1MTdiOC4u ZWYxMzljNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFBy b3h5LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm94eS5qcwpA QCAtMjgsMTIgKzI4LDExIEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLVdlYkluc3BlY3Rvci5P YmplY3RQcm94eSA9IGZ1bmN0aW9uKGluamVjdGVkU2NyaXB0SWQsIG9iamVjdElkLCBwYXRoLCBw cm90b0RlcHRoLCBkZXNjcmlwdGlvbiwgaGFzQ2hpbGRyZW4pCitXZWJJbnNwZWN0b3IuT2JqZWN0 UHJveHkgPSBmdW5jdGlvbihpbmplY3RlZFNjcmlwdElkLCBvYmplY3RJZCwgcGF0aCwgZGVzY3Jp cHRpb24sIGhhc0NoaWxkcmVuKQogewogICAgIHRoaXMub2JqZWN0SWQgPSBvYmplY3RJZDsKICAg ICB0aGlzLmluamVjdGVkU2NyaXB0SWQgPSBpbmplY3RlZFNjcmlwdElkOwogICAgIHRoaXMucGF0 aCA9IHBhdGggfHwgW107Ci0gICAgdGhpcy5wcm90b0RlcHRoID0gcHJvdG9EZXB0aCB8fCAwOwog ICAgIHRoaXMuZGVzY3JpcHRpb24gPSBkZXNjcmlwdGlvbjsKICAgICB0aGlzLmhhc0NoaWxkcmVu ID0gaGFzQ2hpbGRyZW47CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUHJvcGVydGllc1NpZGViYXJQYW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Byb3BlcnRpZXNTaWRlYmFyUGFuZS5qcwppbmRleCA4NTdkOWE3Li45ZGY2NDQ4IDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvcGVydGllc1NpZGViYXJQYW5lLmpz CisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9wZXJ0aWVzU2lkZWJhclBhbmUu anMKQEAgLTQ4LDEyICs0OCwxNCBAQCBXZWJJbnNwZWN0b3IuUHJvcGVydGllc1NpZGViYXJQYW5l LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGJvZHkucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAg ICAgICAgIHNlbGYuc2VjdGlvbnMgPSBbXTsKIAorICAgICAgICAgICAgdmFyIHBhdGggPSBbXTsK ICAgICAgICAgICAgIC8vIEdldCBhcnJheSBvZiBwcm90b3R5cGUgdXNlci1mcmllbmRseSBuYW1l cy4KICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcHJvdG90eXBlcy5sZW5ndGg7ICsr aSkgewotICAgICAgICAgICAgICAgIHZhciBwcm90b3R5cGUgPSBuZXcgV2ViSW5zcGVjdG9yLk9i amVjdFByb3h5KG5vZGUuaW5qZWN0ZWRTY3JpcHRJZCwgbm9kZS5pZCwgW10sIGkpOworICAgICAg ICAgICAgICAgIHZhciBwcm90b3R5cGUgPSBuZXcgV2ViSW5zcGVjdG9yLk9iamVjdFByb3h5KG5v ZGUuaW5qZWN0ZWRTY3JpcHRJZCwgbm9kZS5pZCwgcGF0aC5zbGljZSgpKTsKICAgICAgICAgICAg ICAgICB2YXIgc2VjdGlvbiA9IG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rp b24ocHJvdG90eXBlLCBwcm90b3R5cGVzW2ldLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlByb3Rv dHlwZSIpKTsKICAgICAgICAgICAgICAgICBzZWxmLnNlY3Rpb25zLnB1c2goc2VjdGlvbik7CiAg ICAgICAgICAgICAgICAgYm9keS5hcHBlbmRDaGlsZChzZWN0aW9uLmVsZW1lbnQpOworICAgICAg ICAgICAgICAgIHBhdGgucHVzaCgiX19wcm90b19fIik7CiAgICAgICAgICAgICB9CiAgICAgICAg IH07CiAgICAgICAgIEluamVjdGVkU2NyaXB0QWNjZXNzLmdldChub2RlLmluamVjdGVkU2NyaXB0 SWQpLmdldFByb3RvdHlwZXMobm9kZS5pZCwgY2FsbGJhY2spOwpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggMzU0YmYyMS4uOGJjZGY2MyAxMDA2NDQKLS0tIGEv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC0xMzQyLDcgKzEzNDIsNyBAQCBXZWJJ bnNwZWN0b3IubG9nID0gZnVuY3Rpb24obWVzc2FnZSkKICAgICAgICAgV2ViSW5zcGVjdG9yLmxv Zy5yZXBlYXRDb3VudCA9IHJlcGVhdENvdW50OwogCiAgICAgICAgIC8vIENvbnNvbGVNZXNzYWdl IGV4cGVjdHMgYSBwcm94eSBvYmplY3QKLSAgICAgICAgbWVzc2FnZSA9IG5ldyBXZWJJbnNwZWN0 b3IuT2JqZWN0UHJveHkobnVsbCwgbnVsbCwgW10sIDAsIG1lc3NhZ2UsIGZhbHNlKTsKKyAgICAg ICAgbWVzc2FnZSA9IG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0UHJveHkobnVsbCwgbnVsbCwgW10s IG1lc3NhZ2UsIGZhbHNlKTsKIAogICAgICAgICAvLyBwb3N0IHRoZSBtZXNzYWdlCiAgICAgICAg IHZhciBtc2cgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlKAo=