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

caseq at chromium.org caseq at chromium.org
Wed Dec 22 16:38:17 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 922c14c9e753d450336415c85c33dd58400fbb67
Author: caseq at chromium.org <caseq at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 29 18:19:18 2010 +0000

    2010-11-29  Andrey Kosyakov  <caseq at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Web Inspector: [Chromium] Expose extension API to select a node in WebInspector
            Added WebDevToolsAgent::inspect()
            https://bugs.webkit.org/show_bug.cgi?id=49727
    
            * public/WebDevToolsAgent.h:
            * src/WebDevToolsAgentImpl.cpp:
            (WebKit::WebDevToolsAgentImpl::inspectNode):
            * src/WebDevToolsAgentImpl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72810 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d971892..a55d3db 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-29  Andrey Kosyakov  <caseq at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Web Inspector: [Chromium] Expose extension API to select a node in WebInspector
+        Added WebDevToolsAgent::inspect()
+        https://bugs.webkit.org/show_bug.cgi?id=49727
+
+        * public/WebDevToolsAgent.h:
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgentImpl::inspectNode):
+        * src/WebDevToolsAgentImpl.h:
+
 2010-11-29  Dimitri Glazkov  <dglazkov at chromium.org>
 
         [Chromium] Remove python_24 dependency, because it is no longer necessary.
diff --git a/WebKit/chromium/public/WebDevToolsAgent.h b/WebKit/chromium/public/WebDevToolsAgent.h
index 6b4d237..d6a7bcd 100644
--- a/WebKit/chromium/public/WebDevToolsAgent.h
+++ b/WebKit/chromium/public/WebDevToolsAgent.h
@@ -33,6 +33,13 @@
 
 #include "WebCommon.h"
 
+#if WEBKIT_USING_V8
+namespace v8 {
+class Value;
+template <class T> class Handle;
+}
+#endif
+
 namespace WebKit {
 class WebDevToolsAgentClient;
 class WebDevToolsMessageTransport;
@@ -58,7 +65,9 @@ public:
     virtual void dispatchOnInspectorBackend(const WebString& message) = 0;
 
     virtual void inspectElementAt(const WebPoint&) = 0;
-
+#if WEBKIT_USING_V8
+    virtual void inspectNode(v8::Handle<v8::Value>) = 0;
+#endif
     virtual void setRuntimeProperty(const WebString& name, const WebString& value) = 0;
 
     // Exposed for LayoutTestController.
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index 880adb4..9f4ce87 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -33,6 +33,7 @@
 
 #include "DebuggerAgentImpl.h"
 #include "DebuggerAgentManager.h"
+#include "ExceptionCode.h"
 #include "InjectedScriptHost.h"
 #include "InspectorBackendDispatcher.h"
 #include "InspectorController.h"
@@ -44,6 +45,7 @@
 #include "ResourceResponse.h"
 #include "ScriptDebugServer.h"
 #include "V8Binding.h"
+#include "V8Node.h"
 #include "V8Proxy.h"
 #include "V8Utilities.h"
 #include "WebDataSource.h"
@@ -74,6 +76,7 @@ using WebCore::ResourceRequest;
 using WebCore::ResourceResponse;
 using WTF::String;
 using WebCore::V8DOMWrapper;
+using WebCore::V8Node;
 using WebCore::V8Proxy;
 
 namespace WebKit {
@@ -243,6 +246,14 @@ void WebDevToolsAgentImpl::inspectElementAt(const WebPoint& point)
     m_webViewImpl->inspectElementAt(point);
 }
 
+void WebDevToolsAgentImpl::inspectNode(v8::Handle<v8::Value> node)
+{
+    if (!V8Node::HasInstance(node))
+        V8Proxy::setDOMException(WebCore::TYPE_MISMATCH_ERR);
+    else
+        inspectorController()->inspect(V8Node::toNative(v8::Handle<v8::Object>::Cast(node)));
+}
+
 void WebDevToolsAgentImpl::setRuntimeProperty(const WebString& name, const WebString& value)
 {
     if (name == kApuAgentFeatureName)
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.h b/WebKit/chromium/src/WebDevToolsAgentImpl.h
index feb4bdd..487cf0c 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.h
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.h
@@ -75,6 +75,7 @@ public:
     virtual void didNavigate();
     virtual void dispatchOnInspectorBackend(const WebString& message);
     virtual void inspectElementAt(const WebPoint& point);
+    virtual void inspectNode(v8::Handle<v8::Value> node);
     virtual void evaluateInWebInspector(long callId, const WebString& script);
     virtual void setRuntimeProperty(const WebString& name, const WebString& value);
     virtual void setTimelineProfilingEnabled(bool enable);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list