85621 2012-05-04 07:29:48 -0700 Web Inspector: use single method for retrieving evaluation context in the runtime agent 2012-05-04 07:36:04 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 85612 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 616187 0 yurys 2012-05-04 07:29:48 -0700 It is a small refactoring that makes things a bit simpler. 616188 1 140220 yurys 2012-05-04 07:31:34 -0700 Created attachment 140220 Patch 616193 2 140220 pfeldman 2012-05-04 07:32:51 -0700 Comment on attachment 140220 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140220&action=review > Source/WebCore/inspector/PageRuntimeAgent.cpp:55 > +ScriptState* PageRuntimeAgent::getScriptStateForEval(ErrorString* errorString, const String* frameId) we don't use get prefixes in WebKit. 616194 3 yurys 2012-05-04 07:34:13 -0700 (In reply to comment #2) > (From update of attachment 140220 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=140220&action=review > > > Source/WebCore/inspector/PageRuntimeAgent.cpp:55 > > +ScriptState* PageRuntimeAgent::getScriptStateForEval(ErrorString* errorString, const String* frameId) > > we don't use get prefixes in WebKit. Fixed. 616198 4 yurys 2012-05-04 07:36:04 -0700 Committed r116099: <http://trac.webkit.org/changeset/116099> 140220 2012-05-04 07:31:34 -0700 2012-05-04 07:32:51 -0700 Patch bug-85621-20120504183132.patch text/plain 6904 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MDkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzY1NGM0Njg2YjU2MDM5 NDVhZmIxMWU0N2M5NzFhMmMyZTUwYjgxNS4uZDM5NzU2ZTE0ZGY2M2EwZjEwMjhkNmEyMDViOTY5 YjA2OGY3ZGFiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA1LTA0ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHVzZSBzaW5nbGUgbWV0aG9kIGZvciByZXRyaWV2aW5nIGV2YWx1YXRpb24gY29udGV4dCBp biB0aGUgcnVudGltZSBhZ2VudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODU2MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBNZXJnZWQgdHdvIHNjcmlwdCBzdGF0ZSByZXRyaWV2YWwgbWV0aG9kcyBpbnRv IG9uZS4gTW92ZWQgUGFnZSBzcGVjaWZpYyBsb2dpYworICAgICAgICBpbnRvIFBhZ2VSdW50aW1l QWdlbnQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUnVudGltZUFnZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJ1bnRpbWVBZ2VudDo6ZXZhbHVhdGUpOgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuaDoKKyAgICAgICAgKEluc3Bl Y3RvclJ1bnRpbWVBZ2VudCk6CisgICAgICAgICogaW5zcGVjdG9yL1BhZ2VSdW50aW1lQWdlbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZVJ1bnRpbWVBZ2VudDo6Z2V0U2NyaXB0U3RhdGVG b3JFdmFsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvUGFnZVJ1bnRpbWVBZ2VudC5oOgorICAgICAg ICAoUGFnZVJ1bnRpbWVBZ2VudCk6CisgICAgICAgICogaW5zcGVjdG9yL1dvcmtlclJ1bnRpbWVB Z2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJSdW50aW1lQWdlbnQ6OmdldFNjcmlw dFN0YXRlRm9yRXZhbCk6CisgICAgICAgICogaW5zcGVjdG9yL1dvcmtlclJ1bnRpbWVBZ2VudC5o OgorICAgICAgICAoV29ya2VyUnVudGltZUFnZW50KToKKwogMjAxMi0wNS0wNCAgQWxleGlzIE1l bmFyZCAgPGFsZXhpcy5tZW5hcmRAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBbUXRdIEJ1aWxk IGZpeCB3aGVuIHVzaW5nIGxpYnBuZyB2ZXJzaW9uID4gMS4yLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUnVudGltZUFnZW50LmNwcAppbmRleCBhZDZjOGM2ZGNl NTk2MjI3ZmM0NzNjNDBjNDc5ZGUxNDdhZDg0OWIxLi5kYmUxNzI2ZTk4YmYzN2U0ZjExODE2NTg2 YmQyZDY5OGNhODAyNWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUnVudGltZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUnVudGltZUFnZW50LmNwcApAQCAtODUsMTUgKzg1LDkgQEAgc3RhdGljIFNjcmlwdERl YnVnU2VydmVyOjpQYXVzZU9uRXhjZXB0aW9uc1N0YXRlIHNldFBhdXNlT25FeGNlcHRpb25zU3Rh dGUoU2NyaXAKIAogdm9pZCBJbnNwZWN0b3JSdW50aW1lQWdlbnQ6OmV2YWx1YXRlKEVycm9yU3Ry aW5nKiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBjb25zdCBTdHJpbmcq IGNvbnN0IG9iamVjdEdyb3VwLCBjb25zdCBib29sKiBjb25zdCBpbmNsdWRlQ29tbWFuZExpbmVB UEksIGNvbnN0IGJvb2wqIGNvbnN0IGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29s ZSwgY29uc3QgU3RyaW5nKiBjb25zdCBmcmFtZUlkLCBjb25zdCBib29sKiBjb25zdCByZXR1cm5C eVZhbHVlLCBSZWZQdHI8VHlwZUJ1aWxkZXI6OlJ1bnRpbWU6OlJlbW90ZU9iamVjdD4mIHJlc3Vs dCwgVHlwZUJ1aWxkZXI6Ok9wdE91dHB1dDxib29sPiogd2FzVGhyb3duKQogewotICAgIFNjcmlw dFN0YXRlKiBzY3JpcHRTdGF0ZSA9IDA7Ci0gICAgaWYgKGZyYW1lSWQpIHsKLSAgICAgICAgc2Ny aXB0U3RhdGUgPSBzY3JpcHRTdGF0ZUZvckZyYW1lSWQoKmZyYW1lSWQpOwotICAgICAgICBpZiAo IXNjcmlwdFN0YXRlKSB7Ci0gICAgICAgICAgICAqZXJyb3JTdHJpbmcgPSAiRnJhbWUgd2l0aCBn aXZlbiBpZCBub3QgZm91bmQuIjsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAg IH0gZWxzZQotICAgICAgICBzY3JpcHRTdGF0ZSA9IGdldERlZmF1bHRJbnNwZWN0ZWRTdGF0ZSgp OworICAgIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSA9IGdldFNjcmlwdFN0YXRlRm9yRXZhbChl cnJvclN0cmluZywgZnJhbWVJZCk7CisgICAgaWYgKCFzY3JpcHRTdGF0ZSkKKyAgICAgICAgcmV0 dXJuOwogICAgIEluamVjdGVkU2NyaXB0IGluamVjdGVkU2NyaXB0ID0gbV9pbmplY3RlZFNjcmlw dE1hbmFnZXItPmluamVjdGVkU2NyaXB0Rm9yKHNjcmlwdFN0YXRlKTsKICAgICBpZiAoaW5qZWN0 ZWRTY3JpcHQuaGFzTm9WYWx1ZSgpKSB7CiAgICAgICAgICplcnJvclN0cmluZyA9ICJJbnNwZWN0 ZWQgZnJhbWUgaGFzIGdvbmUiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclJ1bnRpbWVBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclJ1bnRpbWVBZ2VudC5oCmluZGV4IDgyODBhZTJlNTBlYWZhM2IxZDE0MzFkYTdlYWJmZjkw NTg2Yzc0Y2IuLjVhZTc5YmEyYjViZDY1ZGVkNTEwNTk1MTg3NjFlNjdhODZlZDU0MjAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUnVudGltZUFnZW50LmgKQEAg LTg4LDggKzg4LDggQEAgcHVibGljOgogCiBwcm90ZWN0ZWQ6CiAgICAgSW5zcGVjdG9yUnVudGlt ZUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqLCBJbnNwZWN0b3JTdGF0ZSosIEluamVjdGVkU2Ny aXB0TWFuYWdlciopOwotICAgIHZpcnR1YWwgU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlRm9yRnJh bWVJZChjb25zdCBTdHJpbmcmIGZyYW1lSWQpID0gMDsKLSAgICB2aXJ0dWFsIFNjcmlwdFN0YXRl KiBnZXREZWZhdWx0SW5zcGVjdGVkU3RhdGUoKSA9IDA7CisgICAgdmlydHVhbCBTY3JpcHRTdGF0 ZSogZ2V0U2NyaXB0U3RhdGVGb3JFdmFsKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nKiBmcmFt ZUlkKSA9IDA7CisKICAgICB2aXJ0dWFsIHZvaWQgbXV0ZUNvbnNvbGUoKSA9IDA7CiAgICAgdmly dHVhbCB2b2lkIHVubXV0ZUNvbnNvbGUoKSA9IDA7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9QYWdlUnVudGltZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9QYWdlUnVudGltZUFnZW50LmNwcAppbmRleCA5Mjg0ZjM5MjY0OTdhNWJkMWVhZmJiZWFk NjJkNGZjMjQ0MzcyMGFmLi5kNTQyNGEzMjE3MmMyZDM2NDIyYjRkOGIwNDZkYmMwYzFlNmYzYzEx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvUGFnZVJ1bnRpbWVBZ2VudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1BhZ2VSdW50aW1lQWdlbnQuY3BwCkBA IC01MiwxOSArNTIsMTkgQEAgUGFnZVJ1bnRpbWVBZ2VudDo6flBhZ2VSdW50aW1lQWdlbnQoKQog ewogfQogCi1TY3JpcHRTdGF0ZSogUGFnZVJ1bnRpbWVBZ2VudDo6c2NyaXB0U3RhdGVGb3JGcmFt ZUlkKGNvbnN0IFN0cmluZyYgZnJhbWVJZCkKK1NjcmlwdFN0YXRlKiBQYWdlUnVudGltZUFnZW50 OjpnZXRTY3JpcHRTdGF0ZUZvckV2YWwoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25zdCBT dHJpbmcqIGZyYW1lSWQpCiB7Ci0gICAgRnJhbWUqIGZyYW1lID0gbV9wYWdlQWdlbnQtPmZyYW1l Rm9ySWQoZnJhbWVJZCk7Ci0gICAgaWYgKCFmcmFtZSkKKyAgICBpZiAoIWZyYW1lSWQpCisgICAg ICAgIHJldHVybiBtYWluV29ybGRTY3JpcHRTdGF0ZShtX2luc3BlY3RlZFBhZ2UtPm1haW5GcmFt ZSgpKTsKKworICAgIEZyYW1lKiBmcmFtZSA9IG1fcGFnZUFnZW50LT5mcmFtZUZvcklkKCpmcmFt ZUlkKTsKKyAgICBpZiAoIWZyYW1lKSB7CisgICAgICAgICplcnJvclN0cmluZyA9ICJGcmFtZSB3 aXRoIGdpdmVuIGlkIG5vdCBmb3VuZC4iOwogICAgICAgICByZXR1cm4gMDsKKyAgICB9CiAgICAg cmV0dXJuIG1haW5Xb3JsZFNjcmlwdFN0YXRlKGZyYW1lKTsKIH0KIAotU2NyaXB0U3RhdGUqIFBh Z2VSdW50aW1lQWdlbnQ6OmdldERlZmF1bHRJbnNwZWN0ZWRTdGF0ZSgpCi17Ci0gICAgcmV0dXJu IG1haW5Xb3JsZFNjcmlwdFN0YXRlKG1faW5zcGVjdGVkUGFnZS0+bWFpbkZyYW1lKCkpOwotfQot CiB2b2lkIFBhZ2VSdW50aW1lQWdlbnQ6Om11dGVDb25zb2xlKCkKIHsKICAgICBDb25zb2xlOjpt dXRlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvUGFnZVJ1bnRpbWVB Z2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1BhZ2VSdW50aW1lQWdlbnQuaAppbmRl eCAzMjYxNGE4OTRmYTY2NTY5OTQ2MTAwZWUxZDMyYzkwY2FlN2MxNTg3Li5iYmE0NTFiNmZkMzc0 NWY5YTc0M2Q5YTdjYjM1MmU1MGZjMDJjZmRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvUGFnZVJ1bnRpbWVBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9QYWdlUnVudGltZUFnZW50LmgKQEAgLTUyLDggKzUyLDcgQEAgcHVibGljOgogcHJpdmF0ZToK ICAgICBQYWdlUnVudGltZUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqLCBJbnNwZWN0b3JTdGF0 ZSosIEluamVjdGVkU2NyaXB0TWFuYWdlciosIFBhZ2UqLCBJbnNwZWN0b3JQYWdlQWdlbnQqKTsK IAotICAgIHZpcnR1YWwgU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlRm9yRnJhbWVJZChjb25zdCBT dHJpbmcmIGZyYW1lSWQpOwotICAgIHZpcnR1YWwgU2NyaXB0U3RhdGUqIGdldERlZmF1bHRJbnNw ZWN0ZWRTdGF0ZSgpOworICAgIHZpcnR1YWwgU2NyaXB0U3RhdGUqIGdldFNjcmlwdFN0YXRlRm9y RXZhbChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyogZnJhbWVJZCk7CiAgICAgdmlydHVhbCB2 b2lkIG11dGVDb25zb2xlKCk7CiAgICAgdmlydHVhbCB2b2lkIHVubXV0ZUNvbnNvbGUoKTsKICAg ICBQYWdlKiBtX2luc3BlY3RlZFBhZ2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvV29ya2VyUnVudGltZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9X b3JrZXJSdW50aW1lQWdlbnQuY3BwCmluZGV4IDFjNDQ1N2UxOWMzMzQ4N2FiNGNmODliZDFiODJi MWZhMDMxMzhjMzguLjNlYWZhOTViYjA0ZDA0ZjUwZTEyZDU4NGYyZDk4YmRlNjE4Y2UzMjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Xb3JrZXJSdW50aW1lQWdlbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Xb3JrZXJSdW50aW1lQWdlbnQuY3BwCkBA IC00OCwxMyArNDgsMTIgQEAgV29ya2VyUnVudGltZUFnZW50Ojp+V29ya2VyUnVudGltZUFnZW50 KCkKIHsKIH0KIAotU2NyaXB0U3RhdGUqIFdvcmtlclJ1bnRpbWVBZ2VudDo6c2NyaXB0U3RhdGVG b3JGcmFtZUlkKGNvbnN0IFN0cmluZyYpCi17Ci0gICAgcmV0dXJuIDA7Ci19Ci0KLVNjcmlwdFN0 YXRlKiBXb3JrZXJSdW50aW1lQWdlbnQ6OmdldERlZmF1bHRJbnNwZWN0ZWRTdGF0ZSgpCitTY3Jp cHRTdGF0ZSogV29ya2VyUnVudGltZUFnZW50OjpnZXRTY3JpcHRTdGF0ZUZvckV2YWwoRXJyb3JT dHJpbmcqIGVycm9yLCBjb25zdCBTdHJpbmcqIGZyYW1lSWQpCiB7CisgICAgaWYgKGZyYW1lSWQp IHsKKyAgICAgICAgKmVycm9yID0gIkZyYW1lIGlkIGlzIG5vdCBzdXBwb3J0ZWQgZm9yIHdvcmtl cnMuIjsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQogICAgIHJldHVybiBzY3JpcHRTdGF0ZUZy b21Xb3JrZXJDb250ZXh0KG1fd29ya2VyQ29udGV4dCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9Xb3JrZXJSdW50aW1lQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9Xb3JrZXJSdW50aW1lQWdlbnQuaAppbmRleCBjY2ZlMWZiMDNhZDg4YjVmMDU5 ZTM1ZmZiNTI0YzFkNzU5NmFjZmYxLi5lOWU3M2ViODE1OWFiNWViMGUzZjllZmE1YWNmZDU3YWVm N2IxMWUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV29ya2VyUnVudGlt ZUFnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dvcmtlclJ1bnRpbWVBZ2Vu dC5oCkBAIC01MCw4ICs1MCw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBXb3JrZXJSdW50 aW1lQWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50cyosIEluc3BlY3RvclN0YXRlKiwgSW5qZWN0ZWRT Y3JpcHRNYW5hZ2VyKiwgV29ya2VyQ29udGV4dCopOwotICAgIHZpcnR1YWwgU2NyaXB0U3RhdGUq IHNjcmlwdFN0YXRlRm9yRnJhbWVJZChjb25zdCBTdHJpbmcmIGZyYW1lSWQpOwotICAgIHZpcnR1 YWwgU2NyaXB0U3RhdGUqIGdldERlZmF1bHRJbnNwZWN0ZWRTdGF0ZSgpOworICAgIHZpcnR1YWwg U2NyaXB0U3RhdGUqIGdldFNjcmlwdFN0YXRlRm9yRXZhbChFcnJvclN0cmluZyosIGNvbnN0IFN0 cmluZyogZnJhbWVJZCk7CiAgICAgdmlydHVhbCB2b2lkIG11dGVDb25zb2xlKCk7CiAgICAgdmly dHVhbCB2b2lkIHVubXV0ZUNvbnNvbGUoKTsKICAgICBXb3JrZXJDb250ZXh0KiBtX3dvcmtlckNv bnRleHQ7Cg==