Changeset 32210 in webkit

Timestamp:

Apr 18, 2008 8:19:38 AM (16 years ago)

Author:

Adam Roben

Message:

Add wrappers around InspectorClient::{show,close}Window

This will let us perform actions when the window is actually
showing/closing (InspectorController::show doesn't always directly
show the window).

Reviewed by Tim Hatcher.

• page/InspectorController.cpp: (WebCore::InspectorController::scriptObjectReady): Call showWindow() instead of m_client->showWindow(). (WebCore::InspectorController::show): Ditto. (WebCore::InspectorController::close): Ditto for closeWindow(). (WebCore::InspectorController::showWindow): (WebCore::InspectorController::closeWindow):
• page/InspectorController.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/InspectorController.cpp (modified) (4 diffs)
• page/InspectorController.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-17  Adam Roben  <aroben@apple.com>
+
+        Add wrappers around InspectorClient::{show,close}Window
+
+        This will let us perform actions when the window is actually
+        showing/closing (InspectorController::show doesn't always directly
+        show the window).
+
+        Reviewed by Tim Hatcher.
+
+        * page/InspectorController.cpp:
+        (WebCore::InspectorController::scriptObjectReady): Call showWindow()
+        instead of m_client->showWindow().
+        (WebCore::InspectorController::show): Ditto.
+        (WebCore::InspectorController::close): Ditto for closeWindow().
+        (WebCore::InspectorController::showWindow):
+        (WebCore::InspectorController::closeWindow):
+        * page/InspectorController.h:
+
 2008-04-18  Simon Hausmann  <hausmann@webkit.org>
 

trunk/WebCore/page/InspectorController.cpp

@@ -1019 +1019 @@
 
     // Make sure our window is visible now that the page loaded
-    m_client->showWindow();
+    showWindow();
 }
 
@@ -1033 +1033 @@
         m_page->setParentInspectorController(this);
 
-        // m_client->showWindow() will be called after the page loads in scriptObjectReady()
-        return;
-    }
-
-    m_client->showWindow();
+        // showWindow() will be called after the page loads in scriptObjectReady()
+        return;
+    }
+
+    showWindow();
 }
 
@@ -1075 +1075 @@
         return;
 
-    m_client->closeWindow();
+    closeWindow();
     if (m_page)
         m_page->setParentInspectorController(0);
@@ -1085 +1085 @@
     m_scriptObject = 0;
     m_scriptContext = 0;
+}
+
+void InspectorController::showWindow()
+{
+    ASSERT(enabled());
+
+    m_client->showWindow();
+}
+
+void InspectorController::closeWindow()
+{
+    m_client->closeWindow();
 }
 

trunk/WebCore/page/InspectorController.h

@@ -162 +162 @@
     bool handleException(JSValueRef exception, unsigned lineNumber) const;
 
+    void showWindow();
+    void closeWindow();
+
     Page* m_inspectedPage;
     InspectorClient* m_client;