[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[loislo at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit a179adf1b79bc49e6ceaa98d8fc9428280e86557
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 07:32:22 2010 +0000

    2010-08-24  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            WebInspector: setAttachedWindow was modified at r65809 but it should be implemented another way.
            https://bugs.webkit.org/show_bug.cgi?id=44493
    
            * inspector/Inspector.idl:
            * inspector/InspectorController.cpp:
            * inspector/InspectorController.h:
            * inspector/InspectorFrontendClientLocal.cpp:
            (WebCore::InspectorFrontendClientLocal::setAttachedWindow):
    
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65870 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e7b6945..4249061 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-24  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        WebInspector: setAttachedWindow was modified at r65809 but it should be implemented another way.
+        https://bugs.webkit.org/show_bug.cgi?id=44493
+
+        * inspector/Inspector.idl:
+        * inspector/InspectorController.cpp:
+        * inspector/InspectorController.h:
+        * inspector/InspectorFrontendClientLocal.cpp:
+        (WebCore::InspectorFrontendClientLocal::setAttachedWindow):
+
 2010-08-23  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/inspector/Inspector.idl b/WebCore/inspector/Inspector.idl
index 203636a..392d1df 100644
--- a/WebCore/inspector/Inspector.idl
+++ b/WebCore/inspector/Inspector.idl
@@ -57,7 +57,6 @@ module core {
         [notify] void resourceTrackingWasDisabled();
         [notify] void searchingForNodeWasEnabled();
         [notify] void searchingForNodeWasDisabled();
-        [notify] void setAttachedWindow(out boolean attached);
         [notify] void setChildNodes(out long parentId, out Array nodes);
         [notify] void setDetachedRoot(out Object root);
         [notify] void setDocument(out Value root);
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index d5f9a3b..89c9132 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -420,15 +420,6 @@ void InspectorController::setInspectorFrontendClient(PassOwnPtr<InspectorFronten
     m_inspectorFrontendClient = client;
 }
 
-void InspectorController::setAttachedWindow(bool attached)
-{
-    if (!m_remoteFrontend) {
-        ASSERT_NOT_REACHED();
-        return;
-    }
-    m_remoteFrontend->setAttachedWindow(attached);
-}
-
 void InspectorController::inspectedWindowScriptObjectCleared(Frame* frame)
 {
     // If the page is supposed to serve as InspectorFrontend notify inspetor frontend
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index bdb7b29..4fe67ce 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -147,7 +147,6 @@ public:
 
     void setInspectorFrontendClient(PassOwnPtr<InspectorFrontendClient> client);
     bool hasInspectorFrontendClient() const { return m_inspectorFrontendClient; }
-    void setAttachedWindow(bool attached);
 
     void inspectedWindowScriptObjectCleared(Frame*);
 
diff --git a/WebCore/inspector/InspectorFrontendClientLocal.cpp b/WebCore/inspector/InspectorFrontendClientLocal.cpp
index 0ee0985..77616da 100644
--- a/WebCore/inspector/InspectorFrontendClientLocal.cpp
+++ b/WebCore/inspector/InspectorFrontendClientLocal.cpp
@@ -121,7 +121,14 @@ void InspectorFrontendClientLocal::moveWindowBy(float x, float y)
 
 void InspectorFrontendClientLocal::setAttachedWindow(bool attached)
 {
-    m_inspectorController->setAttachedWindow(attached);
+    ScriptObject webInspectorObj;
+    if (!ScriptGlobalObject::get(m_frontendScriptState, "WebInspector", webInspectorObj)) {
+        ASSERT_NOT_REACHED();
+        return;
+    }
+    ScriptFunctionCall function(webInspectorObj, "setAttachedWindow");
+    function.appendArgument(attached);
+    function.call();
 }
 
 void InspectorFrontendClientLocal::restoreAttachedWindowHeight()

-- 
WebKit Debian packaging