63009 2011-06-20 13:34:31 -0700 Web Inspector: [WebKit2] Do not access InspectorController from the "Develop" menu code. 2011-11-21 08:20:37 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman joepeck timothy yurys oldest_to_newest 423917 0 pfeldman 2011-06-20 13:34:31 -0700 TL/DR: Upon "Develop" menu action (say "Start JavaScript Debugging"), do not call inspectorController, but rather evaluate "InspectorFrontendAPI.startDebugging" in the front-end page. I prepared a fix for WebKit in https://bugs.webkit.org/show_bug.cgi?id=62985, but I need your help with WebKit2 implementation. Background: I'm currently working on eliminating unnecessary methods from InspectorController.h: bool profilerEnabled(); void enableProfiler(); void startUserInitiatedProfiling(); bool isRecordingUserInitiatedProfile() const; void stopUserInitiatedProfiling(); void disableProfiler(); void showAndEnableDebugger(); bool debuggerEnabled(); void disableDebugger(); void startTimelineProfiler(); void stopTimelineProfiler(); bool timelineProfilerEnabled(); void showConsole(); WebCore does not use them, pretty much all of these are used from WebKit's support for "Develop" menu. Today, enabling debugging goes all the way: [EXISTING CONTROL FLOW] Action handler -> (via WebCore API above) -> InspectorController -> InspectorDebuggerAgent -> (via Inspector protocol) -> Front-end As a result, it looks like inspector backend has two client: 1) actual front-end and 2) develop menu implementation. Hence, we have methods such as "debuggerWasEnabled" in the protocol and "showAndEnableDebugger" in InspectorController that make sure things are in sync. It would be more straightforward if we could make "Develop" menu actions implementation talk to the backend via the front-end. I.e. [PROPOSED CONTROL FLOW] Action handler -> Open Front-end, then -> (via Frontend API) -> Front-end -> (make all calls against backend as the front-end would have) As a result - everything goes over single channel - backend and front-end are talking to each other only, there is no need to sync "Develop" menu state with the front-end via the backend - all methods above + some weird methods from the protocol vanish 506901 1 116072 pfeldman 2011-11-21 06:03:12 -0800 Created attachment 116072 Patch 506934 2 116072 yurys 2011-11-21 07:14:49 -0800 Comment on attachment 116072 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116072&action=review > Source/WebKit2/WebProcess/WebPage/WebInspector.cpp:164 > + if (m_frontendClient) { Prefer early return. 506940 3 pfeldman 2011-11-21 07:19:38 -0800 Committed r100914: <http://trac.webkit.org/changeset/100914> 506982 4 116072 timothy 2011-11-21 08:18:38 -0800 Comment on attachment 116072 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116072&action=review > Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp:-53 > ASSERT(inspectorPage); > if (!inspectorPage) > return; > - > - inspectorPage->corePage()->inspectorController()->setInspectorFrontendClient(adoptPtr(new WebInspectorFrontendClient(m_page, inspectorPage))); The rest of this method can be emptied. 506985 5 timothy 2011-11-21 08:20:37 -0800 At least the early return. The assert should stay. 116072 2011-11-21 06:03:12 -0800 2011-11-21 08:18:38 -0800 Patch bug-63009-20111121180309.patch text/plain 6843 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwOTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTJiZGU3Y2I2MzU0Y2Ji NjFiNmJiYWUyOGZhYzZlMGFhYzVjMzNkMC4uMWMxY2RiZjg4OWU1ODVjNTQ0NzI1ZDk1ZWVhZTJm ZTY3NzBiYjNkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDExLTExLTIxICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtXZWJLaXQyXSBEbyBub3QgYWNjZXNzIEluc3BlY3RvckNvbnRyb2xsZXIgZnJvbSB0aGUg IkRldmVsb3AiIG1lbnUgY29kZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTYzMDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVu dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvckNsaWVudDo6b3Blbkluc3BlY3Rv ckZyb250ZW5kKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yOjpXZWJJbnNwZWN0b3IpOgorICAgICAg ICAoV2ViS2l0OjpXZWJJbnNwZWN0b3I6OmNyZWF0ZUluc3BlY3RvclBhZ2UpOgorICAgICAgICAo V2ViS2l0OjpXZWJJbnNwZWN0b3I6OnNob3dDb25zb2xlKToKKyAgICAgICAgKFdlYktpdDo6V2Vi SW5zcGVjdG9yOjpzdGFydEphdmFTY3JpcHREZWJ1Z2dpbmcpOgorICAgICAgICAoV2ViS2l0OjpX ZWJJbnNwZWN0b3I6OnN0b3BKYXZhU2NyaXB0RGVidWdnaW5nKToKKyAgICAgICAgKFdlYktpdDo6 V2ViSW5zcGVjdG9yOjpzZXRKYXZhU2NyaXB0UHJvZmlsaW5nRW5hYmxlZCk6CisgICAgICAgIChX ZWJLaXQ6OldlYkluc3BlY3Rvcjo6c3RhcnRKYXZhU2NyaXB0UHJvZmlsaW5nKToKKyAgICAgICAg KFdlYktpdDo6V2ViSW5zcGVjdG9yOjpzdG9wSmF2YVNjcmlwdFByb2ZpbGluZyk6CisgICAgICAg IChXZWJLaXQ6OldlYkluc3BlY3Rvcjo6c3RhcnRQYWdlUHJvZmlsaW5nKToKKyAgICAgICAgKFdl YktpdDo6V2ViSW5zcGVjdG9yOjpzdG9wUGFnZVByb2ZpbGluZyk6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYkluc3BlY3Rvci5oOgorCiAyMDExLTExLTIxICBKb2NoZW4gRWlzaW5n ZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEltcGxlbWVudCBNZXRhIHJlZmVy cmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkluc3BlY3RvckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAKaW5kZXggZTQ5MzJmNjZhYzMyYjM4MWJk MTFkN2U2MmFkY2RjYzJlZDA3MzJhZi4uMTU1YTE5NmJmYTc1MjBkOGMwM2ZkYmE3MjAyOGI3M2M1 YThhZGEzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcApAQCAtMjksNyArMjksNiBA QAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCiAKICNpbmNsdWRlICJXZWJJbnNwZWN0b3IuaCIKLSNp bmNsdWRlICJXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudC5oIgogI2luY2x1ZGUgIldlYlBhZ2Uu aCIKICNpbmNsdWRlIDxXZWJDb3JlL0luc3BlY3RvckNvbnRyb2xsZXIuaD4KICNpbmNsdWRlIDxX ZWJDb3JlL1BhZ2UuaD4KQEAgLTQ5LDggKzQ4LDYgQEAgdm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6 Om9wZW5JbnNwZWN0b3JGcm9udGVuZChJbnNwZWN0b3JDb250cm9sbGVyKikKICAgICBBU1NFUlQo aW5zcGVjdG9yUGFnZSk7CiAgICAgaWYgKCFpbnNwZWN0b3JQYWdlKQogICAgICAgICByZXR1cm47 Ci0KLSAgICBpbnNwZWN0b3JQYWdlLT5jb3JlUGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCkt PnNldEluc3BlY3RvckZyb250ZW5kQ2xpZW50KGFkb3B0UHRyKG5ldyBXZWJJbnNwZWN0b3JGcm9u dGVuZENsaWVudChtX3BhZ2UsIGluc3BlY3RvclBhZ2UpKSk7CiB9CiAKIHZvaWQgV2ViSW5zcGVj dG9yQ2xpZW50OjpoaWdobGlnaHQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYkluc3BlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViSW5zcGVjdG9yLmNwcAppbmRleCAxNmMzYjM5NThiOTUzNzNhNTJiNjhkZWZk ZWMyNzBlMTdmOWM5ODVjLi5hMDlkMWQzOTYwY2I3YmU4NzliOGFjYzM2MjZmYzVhNzc5ZDMzMmRm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVj dG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVj dG9yLmNwcApAQCAtMjgsNiArMjgsNyBAQAogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKIAorI2lu Y2x1ZGUgIldlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50LmgiCiAjaW5jbHVkZSAiV2ViSW5zcGVj dG9yUHJveHlNZXNzYWdlcy5oIgogI2luY2x1ZGUgIldlYlBhZ2UuaCIKICNpbmNsdWRlICJXZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgiCkBAIC00Nyw2ICs0OCw3IEBAIFBhc3NSZWZQdHI8V2Vi SW5zcGVjdG9yPiBXZWJJbnNwZWN0b3I6OmNyZWF0ZShXZWJQYWdlKiBwYWdlKQogV2ViSW5zcGVj dG9yOjpXZWJJbnNwZWN0b3IoV2ViUGFnZSogcGFnZSkKICAgICA6IG1fcGFnZShwYWdlKQogICAg ICwgbV9pbnNwZWN0b3JQYWdlKDApCisgICAgLCBtX2Zyb250ZW5kQ2xpZW50KDApCiB7CiB9CiAK QEAgLTcyLDYgKzc0LDkgQEAgV2ViUGFnZSogV2ViSW5zcGVjdG9yOjpjcmVhdGVJbnNwZWN0b3JQ YWdlKCkKICAgICBtX2luc3BlY3RvclBhZ2UgPSBXZWJQcm9jZXNzOjpzaGFyZWQoKS53ZWJQYWdl KGluc3BlY3RvclBhZ2VJRCk7CiAgICAgQVNTRVJUKG1faW5zcGVjdG9yUGFnZSk7CiAKKyAgICBP d25QdHI8V2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ+IGZyb250ZW5kQ2xpZW50ID0gYWRvcHRQ dHIobmV3IFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50KG1fcGFnZSwgbV9pbnNwZWN0b3JQYWdl KSk7CisgICAgbV9mcm9udGVuZENsaWVudCA9IGZyb250ZW5kQ2xpZW50LmdldCgpOworICAgIG1f aW5zcGVjdG9yUGFnZS0+Y29yZVBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5zZXRJbnNw ZWN0b3JGcm9udGVuZENsaWVudChmcm9udGVuZENsaWVudC5yZWxlYXNlKCkpOwogICAgIHJldHVy biBtX2luc3BlY3RvclBhZ2U7CiB9CiAKQEAgLTEyOSw1NiArMTM0LDcyIEBAIHZvaWQgV2ViSW5z cGVjdG9yOjpldmFsdWF0ZVNjcmlwdEZvclRlc3QobG9uZyBjYWxsSUQsIGNvbnN0IFN0cmluZyYg c2NyaXB0KQogCiB2b2lkIFdlYkluc3BlY3Rvcjo6c2hvd0NvbnNvbGUoKQogewotICAgIG1fcGFn ZS0+Y29yZVBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5zaG93Q29uc29sZSgpOworICAg IG1fcGFnZS0+Y29yZVBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5zaG93KCk7CisgICAg aWYgKG1fZnJvbnRlbmRDbGllbnQpCisgICAgICAgIG1fZnJvbnRlbmRDbGllbnQtPnNob3dDb25z b2xlKCk7CiB9CiAKIHZvaWQgV2ViSW5zcGVjdG9yOjpzdGFydEphdmFTY3JpcHREZWJ1Z2dpbmco KQogewogI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQotICAgIG1fcGFnZS0+Y29yZVBh Z2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5zaG93QW5kRW5hYmxlRGVidWdnZXIoKTsKKyAg ICBtX3BhZ2UtPmNvcmVQYWdlKCktPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+c2hvdygpOworICAg IGlmIChtX2Zyb250ZW5kQ2xpZW50KQorICAgICAgICBtX2Zyb250ZW5kQ2xpZW50LT5zZXREZWJ1 Z2dpbmdFbmFibGVkKHRydWUpOwogI2VuZGlmCiB9CiAKIHZvaWQgV2ViSW5zcGVjdG9yOjpzdG9w SmF2YVNjcmlwdERlYnVnZ2luZygpCiB7CiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIp Ci0gICAgbV9wYWdlLT5jb3JlUGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmRpc2FibGVE ZWJ1Z2dlcigpOworICAgIG1fcGFnZS0+Y29yZVBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigp LT5zaG93KCk7CisgICAgaWYgKG1fZnJvbnRlbmRDbGllbnQpCisgICAgICAgIG1fZnJvbnRlbmRD bGllbnQtPnNldERlYnVnZ2luZ0VuYWJsZWQoZmFsc2UpOwogI2VuZGlmCiB9CiAKIHZvaWQgV2Vi SW5zcGVjdG9yOjpzZXRKYXZhU2NyaXB0UHJvZmlsaW5nRW5hYmxlZChib29sIGVuYWJsZWQpCiB7 CiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCi0gICAgaWYgKGVuYWJsZWQpCi0gICAg ICAgIG1fcGFnZS0+Y29yZVBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5lbmFibGVQcm9m aWxlcigpOwotICAgIGVsc2UKLSAgICAgICAgbV9wYWdlLT5jb3JlUGFnZSgpLT5pbnNwZWN0b3JD b250cm9sbGVyKCktPmRpc2FibGVQcm9maWxlcigpOyAgICAgICAgCisgICAgbV9wYWdlLT5jb3Jl UGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPnNob3coKTsKKyAgICBpZiAobV9mcm9udGVu ZENsaWVudCkgeworICAgICAgICBpZiAoZW5hYmxlZCkKKyAgICAgICAgICAgIG1fcGFnZS0+Y29y ZVBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5lbmFibGVQcm9maWxlcigpOworICAgICAg ICBlbHNlCisgICAgICAgICAgICBtX3BhZ2UtPmNvcmVQYWdlKCktPmluc3BlY3RvckNvbnRyb2xs ZXIoKS0+ZGlzYWJsZVByb2ZpbGVyKCk7ICAgICAgICAKKyAgICB9CiAjZW5kaWYKIH0KIAogdm9p ZCBXZWJJbnNwZWN0b3I6OnN0YXJ0SmF2YVNjcmlwdFByb2ZpbGluZygpCiB7CiAjaWYgRU5BQkxF KEpBVkFTQ1JJUFRfREVCVUdHRVIpCi0gICAgbV9wYWdlLT5jb3JlUGFnZSgpLT5pbnNwZWN0b3JD b250cm9sbGVyKCktPnN0YXJ0VXNlckluaXRpYXRlZFByb2ZpbGluZygpOworICAgIG1fcGFnZS0+ Y29yZVBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5zaG93KCk7CisgICAgaWYgKG1fZnJv bnRlbmRDbGllbnQpCisgICAgICAgIG1fZnJvbnRlbmRDbGllbnQtPnN0YXJ0UHJvZmlsaW5nSmF2 YVNjcmlwdCgpOwogI2VuZGlmCiB9CiAKIHZvaWQgV2ViSW5zcGVjdG9yOjpzdG9wSmF2YVNjcmlw dFByb2ZpbGluZygpCiB7CiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCi0gICAgbV9w YWdlLT5jb3JlUGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPnN0b3BVc2VySW5pdGlhdGVk UHJvZmlsaW5nKCk7CisgICAgbV9wYWdlLT5jb3JlUGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVy KCktPnNob3coKTsKKyAgICBpZiAobV9mcm9udGVuZENsaWVudCkKKyAgICAgICAgbV9mcm9udGVu ZENsaWVudC0+c3RvcFByb2ZpbGluZ0phdmFTY3JpcHQoKTsKICNlbmRpZgogfQogCiB2b2lkIFdl Ykluc3BlY3Rvcjo6c3RhcnRQYWdlUHJvZmlsaW5nKCkKIHsKLSAgICBtX3BhZ2UtPmNvcmVQYWdl KCktPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+c3RhcnRUaW1lbGluZVByb2ZpbGVyKCk7CisgICAg bV9wYWdlLT5jb3JlUGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPnNob3coKTsKKyAgICBp ZiAobV9mcm9udGVuZENsaWVudCkKKyAgICAgICAgbV9mcm9udGVuZENsaWVudC0+c2V0VGltZWxp bmVQcm9maWxpbmdFbmFibGVkKHRydWUpOwogfQogCiB2b2lkIFdlYkluc3BlY3Rvcjo6c3RvcFBh Z2VQcm9maWxpbmcoKQogewotICAgIG1fcGFnZS0+Y29yZVBhZ2UoKS0+aW5zcGVjdG9yQ29udHJv bGxlcigpLT5zdG9wVGltZWxpbmVQcm9maWxlcigpOwotICAgIC8vIEZJWE1FOiBzaG93IHRoZSBU aW1lbGluZSBwYW5lbC4KKyAgICBtX3BhZ2UtPmNvcmVQYWdlKCktPmluc3BlY3RvckNvbnRyb2xs ZXIoKS0+c2hvdygpOworICAgIGlmIChtX2Zyb250ZW5kQ2xpZW50KQorICAgICAgICBtX2Zyb250 ZW5kQ2xpZW50LT5zZXRUaW1lbGluZVByb2ZpbGluZ0VuYWJsZWQoZmFsc2UpOwogfQogCiB9IC8v IG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJJbnNwZWN0b3IuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJJbnNwZWN0b3IuaAppbmRleCAzMTVkOTlmNThjNzRlMWUxMzc1Mjc2MDhhYjUyYTFmOTM2 YzA4ZDZhLi43OWZmODA3NGExZGM1OGNjZTE1NjQxZDMxZjcyMzM0MzNlNDQ1YmI5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yLmgKKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkluc3BlY3Rvci5oCkBAIC0z NSw2ICszNSw3IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFzcyBXZWJJbnNwZWN0b3JG cm9udGVuZENsaWVudDsKIGNsYXNzIFdlYlBhZ2U7CiBzdHJ1Y3QgV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVyczsKIApAQCAtOTksNiArMTAwLDcgQEAgcHJpdmF0ZToKIAogICAgIFdlYlBhZ2UqIG1f cGFnZTsKICAgICBXZWJQYWdlKiBtX2luc3BlY3RvclBhZ2U7CisgICAgV2ViSW5zcGVjdG9yRnJv bnRlbmRDbGllbnQqIG1fZnJvbnRlbmRDbGllbnQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQK