Changeset 65870 in webkit


Ignore:
Timestamp:
Aug 24, 2010 12:32:22 AM (14 years ago)
Author:
loislo@chromium.org
Message:

2010-08-24 Ilya Tikhonovsky <loislo@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):
Location:
trunk/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r65868 r65870  
     12010-08-24  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        WebInspector: setAttachedWindow was modified at r65809 but it should be implemented another way.
     6        https://bugs.webkit.org/show_bug.cgi?id=44493
     7
     8        * inspector/Inspector.idl:
     9        * inspector/InspectorController.cpp:
     10        * inspector/InspectorController.h:
     11        * inspector/InspectorFrontendClientLocal.cpp:
     12        (WebCore::InspectorFrontendClientLocal::setAttachedWindow):
     13
    1142010-08-23  Eric Seidel  <eric@webkit.org>
    215
  • trunk/WebCore/inspector/Inspector.idl

    r65809 r65870  
    5858        [notify] void searchingForNodeWasEnabled();
    5959        [notify] void searchingForNodeWasDisabled();
    60         [notify] void setAttachedWindow(out boolean attached);
    6160        [notify] void setChildNodes(out long parentId, out Array nodes);
    6261        [notify] void setDetachedRoot(out Object root);
  • trunk/WebCore/inspector/InspectorController.cpp

    r65809 r65870  
    421421}
    422422
    423 void InspectorController::setAttachedWindow(bool attached)
    424 {
    425     if (!m_remoteFrontend) {
    426         ASSERT_NOT_REACHED();
    427         return;
    428     }
    429     m_remoteFrontend->setAttachedWindow(attached);
    430 }
    431 
    432423void InspectorController::inspectedWindowScriptObjectCleared(Frame* frame)
    433424{
  • trunk/WebCore/inspector/InspectorController.h

    r65809 r65870  
    148148    void setInspectorFrontendClient(PassOwnPtr<InspectorFrontendClient> client);
    149149    bool hasInspectorFrontendClient() const { return m_inspectorFrontendClient; }
    150     void setAttachedWindow(bool attached);
    151150
    152151    void inspectedWindowScriptObjectCleared(Frame*);
  • trunk/WebCore/inspector/InspectorFrontendClientLocal.cpp

    r65809 r65870  
    122122void InspectorFrontendClientLocal::setAttachedWindow(bool attached)
    123123{
    124     m_inspectorController->setAttachedWindow(attached);
     124    ScriptObject webInspectorObj;
     125    if (!ScriptGlobalObject::get(m_frontendScriptState, "WebInspector", webInspectorObj)) {
     126        ASSERT_NOT_REACHED();
     127        return;
     128    }
     129    ScriptFunctionCall function(webInspectorObj, "setAttachedWindow");
     130    function.appendArgument(attached);
     131    function.call();
    125132}
    126133
Note: See TracChangeset for help on using the changeset viewer.