[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
yurys at chromium.org
yurys at chromium.org
Thu Apr 8 00:28:59 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 8b5025499df0ac6fede107e16531d5a839fc9ae4
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 9 13:19:53 2009 +0000
2009-12-09 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
Introduce a class for devtools message data
https://bugs.webkit.org/show_bug.cgi?id=32314
* WebKit.gyp:
* public/WebDevToolsAgent.h:
* public/WebDevToolsAgentClient.h:
(WebKit::WebDevToolsAgentClient::sendMessageToFrontend):
(WebKit::WebDevToolsAgentClient::forceRepaint):
(WebKit::WebDevToolsAgentClient::hostIdentifier):
(WebKit::WebDevToolsAgentClient::runtimeFeatureStateChanged):
* public/WebDevToolsFrontend.h:
* public/WebDevToolsFrontendClient.h:
(WebKit::WebDevToolsFrontendClient::sendMessageToAgent):
* public/WebDevToolsMessageData.h: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51897 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index af02ddd..b82ab37 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,23 @@
+2009-12-09 Yury Semikhatsky <yurys at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Introduce a class for devtools message data
+
+ https://bugs.webkit.org/show_bug.cgi?id=32314
+
+ * WebKit.gyp:
+ * public/WebDevToolsAgent.h:
+ * public/WebDevToolsAgentClient.h:
+ (WebKit::WebDevToolsAgentClient::sendMessageToFrontend):
+ (WebKit::WebDevToolsAgentClient::forceRepaint):
+ (WebKit::WebDevToolsAgentClient::hostIdentifier):
+ (WebKit::WebDevToolsAgentClient::runtimeFeatureStateChanged):
+ * public/WebDevToolsFrontend.h:
+ * public/WebDevToolsFrontendClient.h:
+ (WebKit::WebDevToolsFrontendClient::sendMessageToAgent):
+ * public/WebDevToolsMessageData.h: Added.
+
2009-12-08 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index f044279..c41bf5b 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -111,6 +111,7 @@
'public/WebDevToolsAgentClient.h',
'public/WebDevToolsFrontend.h',
'public/WebDevToolsFrontendClient.h',
+ 'public/WebDevToolsMessageData.h',
'public/WebDragData.h',
'public/WebEditingAction.h',
'public/WebElement.h',
diff --git a/WebKit/chromium/public/WebDevToolsAgent.h b/WebKit/chromium/public/WebDevToolsAgent.h
index 8276e01..4809896 100644
--- a/WebKit/chromium/public/WebDevToolsAgent.h
+++ b/WebKit/chromium/public/WebDevToolsAgent.h
@@ -40,6 +40,7 @@ class WebString;
class WebURLRequest;
class WebURLResponse;
class WebView;
+struct WebDevToolsMessageData;
struct WebPoint;
struct WebURLError;
@@ -59,6 +60,7 @@ public:
const WebString& param1,
const WebString& param2,
const WebString& param3) = 0;
+ virtual void dispatchMessageFromFrontend(const WebDevToolsMessageData&) = 0;
virtual void inspectElementAt(const WebPoint&) = 0;
diff --git a/WebKit/chromium/public/WebDevToolsAgentClient.h b/WebKit/chromium/public/WebDevToolsAgentClient.h
index 224eed6..25e8b7d 100644
--- a/WebKit/chromium/public/WebDevToolsAgentClient.h
+++ b/WebKit/chromium/public/WebDevToolsAgentClient.h
@@ -35,6 +35,7 @@
namespace WebKit {
class WebString;
+struct WebDevToolsMessageData;
class WebDevToolsAgentClient {
public:
@@ -42,16 +43,17 @@ public:
const WebString& methodName,
const WebString& param1,
const WebString& param2,
- const WebString& param3) = 0;
+ const WebString& param3) {}
+ virtual void sendMessageToFrontend(const WebDevToolsMessageData&) { }
// Invalidates widget which leads to the repaint.
- virtual void forceRepaint() = 0;
+ virtual void forceRepaint() { }
// Returns the identifier of the entity hosting this agent.
- virtual int hostIdentifier() = 0;
+ virtual int hostIdentifier() { }
// Notifies host upon runtime feature being enabled/disabled.
- virtual void runtimeFeatureStateChanged(const WebString& feature, bool enabled) = 0;
+ virtual void runtimeFeatureStateChanged(const WebString& feature, bool enabled) { }
WEBKIT_API static void sendMessageToFrontendOnIOThread(const WebString& className,
const WebString& methodName,
@@ -60,7 +62,7 @@ public:
const WebString& param3);
protected:
- ~WebDevToolsAgentClient() {}
+ ~WebDevToolsAgentClient() { }
};
} // namespace WebKit
diff --git a/WebKit/chromium/public/WebDevToolsFrontend.h b/WebKit/chromium/public/WebDevToolsFrontend.h
index a816b12..b7d7189 100644
--- a/WebKit/chromium/public/WebDevToolsFrontend.h
+++ b/WebKit/chromium/public/WebDevToolsFrontend.h
@@ -38,6 +38,7 @@ namespace WebKit {
class WebDevToolsFrontendClient;
class WebString;
class WebView;
+struct WebDevToolsMessageData;
// WebDevToolsFrontend represents DevTools client sitting in the Glue. It provides
// direct and delegate Apis to the host.
@@ -54,6 +55,7 @@ public:
const WebString& param1,
const WebString& param2,
const WebString& param3) = 0;
+ virtual void dispatchMessageFromAgent(const WebDevToolsMessageData&) = 0;
};
} // namespace WebKit
diff --git a/WebKit/chromium/public/WebDevToolsFrontendClient.h b/WebKit/chromium/public/WebDevToolsFrontendClient.h
index caa9277..2f74a8c 100644
--- a/WebKit/chromium/public/WebDevToolsFrontendClient.h
+++ b/WebKit/chromium/public/WebDevToolsFrontendClient.h
@@ -34,6 +34,7 @@
namespace WebKit {
class WebString;
+struct WebDevToolsMessageData;
class WebDevToolsFrontendClient {
public:
@@ -44,6 +45,7 @@ public:
const WebString& param1,
const WebString& param2,
const WebString& param3) {};
+ virtual void sendMessageToAgent(const WebDevToolsMessageData&) {};
virtual void sendDebuggerCommandToAgent(const WebString& command) {};
virtual void sendDebuggerPauseScript() {}
diff --git a/WebKit/chromium/public/WebDevToolsMessageData.h b/WebKit/chromium/public/WebDevToolsMessageData.h
new file mode 100644
index 0000000..9bf9acd
--- /dev/null
+++ b/WebKit/chromium/public/WebDevToolsMessageData.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebDevToolsMessageData_h
+#define WebDevToolsMessageData_h
+
+#include "WebCommon.h"
+#include "WebString.h"
+#include "WebVector.h"
+
+namespace WebKit {
+
+struct WebDevToolsMessageData {
+ WebString className;
+ WebString methodName;
+ WebVector<WebString> arguments;
+};
+
+} // namespace WebKit
+
+#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list