Changeset 49305 in webkit

Timestamp:

Oct 8, 2009 9:11:08 AM (15 years ago)

Author:

Adam Roben

Message:

Make IWebInspectorPrivate be accessed in a more standard way

Fixes <​http://webkit.org/b/30215> Make IWebInspectorPrivate be
accessed in a more standard way

Reviewed by John Sullivan and Tim Hatcher.

WebKit/win:

IWebViewPrivate::inspectorPrivate has been removed. Callers should
instead use IWebViewPrivate::inspector and then use QueryInterface to
get the IWebInspectorPrivate interface. This matches how our other COM
classes work.

• Interfaces/IWebViewPrivate.idl: Removed inspectorPrivate.

• WebInspector.cpp:

(WebInspector::QueryInterface): Support querying to
IWebInspectorPrivate.

• WebView.cpp:
• WebView.h:

Removed inspectorPrivate.

WebKitTools:

Use QueryInterface to get IWebInspectorPrivate

• DumpRenderTree/win/LayoutTestControllerWin.cpp:

(LayoutTestController::evaluateInWebInspector): Get the IWebInspector
by calling IWebViewPrivate::inspector, then use QueryInterface to get
to the IWebInspectorPrivate interface.

Location:

trunk

Files:

• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/Interfaces/IWebViewPrivate.idl (modified) (1 diff)
• WebKit/win/WebInspector.cpp (modified) (1 diff)
• WebKit/win/WebView.cpp (modified) (1 diff)
• WebKit/win/WebView.h (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp (modified) (1 diff)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2009-10-08  Adam Roben  <aroben@apple.com>
+
+        Make IWebInspectorPrivate be accessed in a more standard way
+
+        IWebViewPrivate::inspectorPrivate has been removed. Callers should
+        instead use IWebViewPrivate::inspector and then use QueryInterface to
+        get the IWebInspectorPrivate interface. This matches how our other COM
+        classes work.
+
+        Fixes <http://webkit.org/b/30215> Make IWebInspectorPrivate be
+        accessed in a more standard way
+
+        Reviewed by John Sullivan and Tim Hatcher.
+
+        * Interfaces/IWebViewPrivate.idl: Removed inspectorPrivate.
+
+        * WebInspector.cpp:
+        (WebInspector::QueryInterface): Support querying to
+        IWebInspectorPrivate.
+
+        * WebView.cpp:
+        * WebView.h:
+        Removed inspectorPrivate.
+
 2009-10-08  Adam Roben  <aroben@apple.com>
 

trunk/WebKit/win/Interfaces/IWebViewPrivate.idl

@@ -209 +209 @@
     // Removes all white list entries created with whiteListAccessFromOrigin.
     HRESULT resetOriginAccessWhiteLists();
-
-    HRESULT inspectorPrivate([out, retval] IWebInspectorPrivate**);
 }

trunk/WebKit/win/WebInspector.cpp

@@ -73 +73 @@
     if (IsEqualGUID(riid, IID_IWebInspector))
         *ppvObject = static_cast<IWebInspector*>(this);
+    else if (IsEqualGUID(riid, IID_IWebInspectorPrivate))
+        *ppvObject = static_cast<IWebInspectorPrivate*>(this);
     else if (IsEqualGUID(riid, IID_IUnknown))
         *ppvObject = static_cast<IWebInspector*>(this);

trunk/WebKit/win/WebView.cpp

@@ -5178 +5178 @@
 }
 
-HRESULT STDMETHODCALLTYPE WebView::inspectorPrivate(IWebInspectorPrivate** inspector)
-{
-    if (!m_webInspector)
-        m_webInspector.adoptRef(WebInspector::createInstance(this));
-
-    return m_webInspector.copyRefTo(inspector);
-}
-
 HRESULT STDMETHODCALLTYPE WebView::windowAncestryDidChange()
 {

trunk/WebKit/win/WebView.h

@@ -673 +673 @@
     virtual HRESULT STDMETHODCALLTYPE inspector(
         /* [retval][out] */ IWebInspector**);
-
-    virtual HRESULT STDMETHODCALLTYPE inspectorPrivate(
-        /* [retval][out] */ IWebInspectorPrivate**);
 
     virtual HRESULT STDMETHODCALLTYPE clearUndoRedoOperations( void);

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-10-08  Adam Roben  <aroben@apple.com>
+
+        Use QueryInterface to get IWebInspectorPrivate
+
+        Fixes <http://webkit.org/b/30215> Make IWebInspectorPrivate be
+        accessed in a more standard way
+
+        Reviewed by John Sullivan and Tim Hatcher.
+
+        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+        (LayoutTestController::evaluateInWebInspector): Get the IWebInspector
+        by calling IWebViewPrivate::inspector, then use QueryInterface to get
+        to the IWebInspectorPrivate interface.
+
 2009-10-07  Adam Roben  <aroben@apple.com>
 

trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp

@@ -903 +903 @@
         return;
 
-    COMPtr<IWebInspectorPrivate> inspector;
-    if (SUCCEEDED(webView->inspectorPrivate(&inspector)))
-        inspector->evaluateInFrontend(callId, bstrT(script).GetBSTR());
-}
+    COMPtr<IWebInspector> inspector;
+    if (FAILED(webView->inspector(&inspector)))
+        return;
+
+    COMPtr<IWebInspectorPrivate> inspectorPrivate(Query, inspector);
+    if (!inspectorPrivate)
+        return;
+
+    inspectorPrivate->evaluateInFrontend(callId, bstrT(script).GetBSTR());
+}