Attachment 64257 Details for Bug 43924 – [PATCH] Implement attach and detach

[patch] [PATCH] Implement attach and detach

bug-43924-20100812140045.patch (text/plain), 4.21 KB, created by Joseph Pecoraro on 2010-08-12 14:00:46 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2010-08-12 14:00:46 PDT

Size: 4.21 KB

patch

obsolete

>diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
>index 172fe3931830eab02089a0a602d54bbd25e6cc8e..329d3b5641dcebef0c862e8e7c2c41adf4e641df 100644
>--- a/WebCore/ChangeLog
>+++ b/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2010-08-12  Joseph Pecoraro  <joepeck@webkit.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Web Inspector: -[WebInspector attach] and detach should work
>+        https://bugs.webkit.org/show_bug.cgi?id=43924
>+
>+        * WebCore.exp.in: export InspectorController's attach and detach.
>+        * inspector/InspectorController.cpp:
>+        (WebCore::InspectorController::attach): delegate to the InspectorFrontendClient.
>+        (WebCore::InspectorController::detach): delegate to the InspectorFrontendClient.
>+        * inspector/InspectorController.h:
>+
> 2010-08-12  Ben Murdoch  <benm@google.com>
> 
>         Reviewed by Pavel Feldman.
>diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
>index 2da4dee08d4ecf0d6cb60acfaacd4ea089456d97..66e0d39832b784d313e0bd0ca5b94a7239584039 100644
>--- a/WebCore/WebCore.exp.in
>+++ b/WebCore/WebCore.exp.in
>@@ -1195,6 +1195,8 @@ __ZN7WebCore19InspectorController34inspectorStartsAttachedSettingNameEv
> __ZN7WebCore19InspectorController34inspectorStartsAttachedSettingNameEv
> __ZN7WebCore19InspectorController4showEv
> __ZN7WebCore19InspectorController5closeEv
>+__ZN7WebCore19InspectorController6attachEv
>+__ZN7WebCore19InspectorController6detachEv
> __ZN7WebCore19InspectorController7inspectEPNS_4NodeE
> __ZN7WebCore19InspectorController9showPanelERKN3WTF6StringE
> __ZN7WebCore28InspectorFrontendClientLocal12moveWindowByEff
>diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
>index 993fed4fdcf81006c7808544364ee803dc854f4c..6b0fef8796ffc1f0c334a76e921b31b3305680c3 100644
>--- a/WebCore/inspector/InspectorController.cpp
>+++ b/WebCore/inspector/InspectorController.cpp
>@@ -563,6 +563,20 @@ void InspectorController::close()
>     m_remoteFrontend->close();
> }
> 
>+void InspectorController::attach()
>+{
>+    if (!m_inspectorFrontendClient)
>+        return;
>+    m_inspectorFrontendClient->requestAttachWindow();
>+}
>+
>+void InspectorController::detach()
>+{
>+    if (!m_inspectorFrontendClient)
>+        return;
>+    m_inspectorFrontendClient->requestDetachWindow();
>+}
>+
> void InspectorController::disconnectFrontend()
> {
>     if (!m_remoteFrontend)
>diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
>index 622e1c4f5073ac16a33d287248954ab7c26250c7..0ff34294fcc6b7345fd3c84f0d7e2aa560169af7 100644
>--- a/WebCore/inspector/InspectorController.h
>+++ b/WebCore/inspector/InspectorController.h
>@@ -129,6 +129,8 @@ public:
>     void show();
>     void showPanel(const String&);
>     void close();
>+    void attach();
>+    void detach();
> 
>     // We are in transition from JS transport via webInspector to native
>     // transport via InspectorClient. After migration, webInspector parameter should
>diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
>index c5c47829fe5e2a1dcb148bba3c9aac1b1175eaf2..280503d3dc4f3c4d3a9b28f89ab9c241e839ac74 100644
>--- a/WebKit/mac/ChangeLog
>+++ b/WebKit/mac/ChangeLog
>@@ -1,3 +1,14 @@
>+2010-08-12  Joseph Pecoraro  <joepeck@webkit.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Web Inspector: -[WebInspector attach] and detach should work
>+        https://bugs.webkit.org/show_bug.cgi?id=43924
>+
>+        * WebInspector/WebInspector.mm:
>+        (-[WebInspector attach:]): delegate to the InspectorController.
>+        (-[WebInspector detach:]): delegate to the InspectorController.
>+
> 2010-08-12  Jeremy Orlow  <jorlow@chromium.org>
> 
>         Revert for now
>diff --git a/WebKit/mac/WebInspector/WebInspector.mm b/WebKit/mac/WebInspector/WebInspector.mm
>index 9b1745969b230aa91515fc52fcdc3be91839d5f0..2f3dc679f83a6062020455558c03de287e2e7934 100644
>--- a/WebKit/mac/WebInspector/WebInspector.mm
>+++ b/WebKit/mac/WebInspector/WebInspector.mm
>@@ -175,10 +175,14 @@ using namespace WebCore;
> 
> - (void)attach:(id)sender
> {
>+    if (Page* page = core(_webView))
>+        page->inspectorController()->attach();
> }
> 
> - (void)detach:(id)sender
> {
>+    if (Page* page = core(_webView))
>+        page->inspectorController()->detach();
> }
> 
> - (void)evaluateInFrontend:(id)sender callId:(long)callId script:(NSString *)script

Flags:

pfeldman: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 43924: 64257 | 64436