[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
timothy at apple.com
timothy at apple.com
Wed Dec 22 14:53:51 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit bc8530ae6d06e357dc5b5fb5ea7c7dad0a6a5827
Author: timothy at apple.com <timothy at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 23 14:22:51 2010 +0000
Stub out WebInspectorFrontendClient.
https://bugs.webkit.org/show_bug.cgi?id=48091
Reviewed by Adam Roben.
* WebKit2.pro: Added WebInspectorFrontendClient.{cpp,h}.
* WebKit2.xcodeproj/project.pbxproj: Added WebInspectorFrontendClient.{cpp,h}.
* WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp: Added.
(WebKit::WebInspectorFrontendClient::windowObjectCleared): Added.
(WebKit::WebInspectorFrontendClient::frontendLoaded): Added.
(WebKit::WebInspectorFrontendClient::moveWindowBy): Added.
(WebKit::WebInspectorFrontendClient::localizedStringsURL): Added.
(WebKit::WebInspectorFrontendClient::hiddenPanels): Added.
(WebKit::WebInspectorFrontendClient::bringToFront): Added.
(WebKit::WebInspectorFrontendClient::closeWindow): Added.
(WebKit::WebInspectorFrontendClient::disconnectFromBackend): Added.
(WebKit::WebInspectorFrontendClient::requestAttachWindow): Added.
(WebKit::WebInspectorFrontendClient::requestDetachWindow): Added.
(WebKit::WebInspectorFrontendClient::changeAttachedWindowHeight): Added.
(WebKit::WebInspectorFrontendClient::inspectedURLChanged): Added.
(WebKit::WebInspectorFrontendClient::sendMessageToBackend): Added.
* WebProcess/WebCoreSupport/WebInspectorFrontendClient.h: Added.
(WebKit::WebInspectorFrontendClient::WebInspectorFrontendClient): Added.
* win/WebKit2.vcproj: Added WebInspectorFrontendClient.{cpp,h}.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70387 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c6dec87..4f77e08 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,33 @@
2010-10-21 Timothy Hatcher <timothy at apple.com>
+ Stub out WebInspectorFrontendClient.
+
+ https://bugs.webkit.org/show_bug.cgi?id=48091
+
+ Reviewed by Adam Roben.
+
+ * WebKit2.pro: Added WebInspectorFrontendClient.{cpp,h}.
+ * WebKit2.xcodeproj/project.pbxproj: Added WebInspectorFrontendClient.{cpp,h}.
+ * WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp: Added.
+ (WebKit::WebInspectorFrontendClient::windowObjectCleared): Added.
+ (WebKit::WebInspectorFrontendClient::frontendLoaded): Added.
+ (WebKit::WebInspectorFrontendClient::moveWindowBy): Added.
+ (WebKit::WebInspectorFrontendClient::localizedStringsURL): Added.
+ (WebKit::WebInspectorFrontendClient::hiddenPanels): Added.
+ (WebKit::WebInspectorFrontendClient::bringToFront): Added.
+ (WebKit::WebInspectorFrontendClient::closeWindow): Added.
+ (WebKit::WebInspectorFrontendClient::disconnectFromBackend): Added.
+ (WebKit::WebInspectorFrontendClient::requestAttachWindow): Added.
+ (WebKit::WebInspectorFrontendClient::requestDetachWindow): Added.
+ (WebKit::WebInspectorFrontendClient::changeAttachedWindowHeight): Added.
+ (WebKit::WebInspectorFrontendClient::inspectedURLChanged): Added.
+ (WebKit::WebInspectorFrontendClient::sendMessageToBackend): Added.
+ * WebProcess/WebCoreSupport/WebInspectorFrontendClient.h: Added.
+ (WebKit::WebInspectorFrontendClient::WebInspectorFrontendClient): Added.
+ * win/WebKit2.vcproj: Added WebInspectorFrontendClient.{cpp,h}.
+
+2010-10-21 Timothy Hatcher <timothy at apple.com>
+
Remove stale stubs that are not longer part of InspectorClient.
https://bugs.webkit.org/show_bug.cgi?id=48090
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 4eaa2bd..f04d52e 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -309,6 +309,7 @@ HEADERS += \
WebProcess/WebCoreSupport/WebErrors.h \
WebProcess/WebCoreSupport/WebFrameLoaderClient.h \
WebProcess/WebCoreSupport/WebInspectorClient.h \
+ WebProcess/WebCoreSupport/WebInspectorFrontendClient.h \
WebProcess/WebCoreSupport/WebPopupMenu.h \
WebProcess/WebCoreSupport/WebSearchPopupMenu.h \
WebProcess/WebCoreSupport/WebPlatformStrategies.h \
@@ -454,6 +455,7 @@ SOURCES += \
WebProcess/WebCoreSupport/WebEditorClient.cpp \
WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp \
WebProcess/WebCoreSupport/WebInspectorClient.cpp \
+ WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp \
WebProcess/WebCoreSupport/WebBackForwardControllerClient.cpp \
WebProcess/WebCoreSupport/WebPopupMenu.cpp \
WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 431a5cc..9c97f29 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -149,6 +149,8 @@
1AEFCCBD11D02C5E008219D3 /* PluginInfoStoreMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEFCCBC11D02C5E008219D3 /* PluginInfoStoreMac.mm */; };
1AEFD27911D16C81008219D3 /* ArgumentCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEFD27811D16C81008219D3 /* ArgumentCoder.h */; };
1AEFD2F711D1807B008219D3 /* ArgumentCoders.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEFD2F611D1807B008219D3 /* ArgumentCoders.h */; };
+ 1C8E25A81270E3BB00BC7BD0 /* WebInspectorFrontendClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C8E256B1270DE3800BC7BD0 /* WebInspectorFrontendClient.cpp */; };
+ 1C8E25A91270E3BC00BC7BD0 /* WebInspectorFrontendClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C8E256A1270DE3800BC7BD0 /* WebInspectorFrontendClient.h */; };
51578B831209ECEF00A37C4A /* WebData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51578B821209ECEF00A37C4A /* WebData.h */; };
516A4A5D120A2CCD00C05B7F /* WebError.h in Headers */ = {isa = PBXBuildFile; fileRef = 516A4A5B120A2CCD00C05B7F /* WebError.h */; };
51A7F2F3125BF820008AEB1D /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A7F2F2125BF820008AEB1D /* Logging.h */; };
@@ -622,6 +624,8 @@
1AEFCCBC11D02C5E008219D3 /* PluginInfoStoreMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginInfoStoreMac.mm; sourceTree = "<group>"; };
1AEFD27811D16C81008219D3 /* ArgumentCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArgumentCoder.h; sourceTree = "<group>"; };
1AEFD2F611D1807B008219D3 /* ArgumentCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArgumentCoders.h; sourceTree = "<group>"; };
+ 1C8E256A1270DE3800BC7BD0 /* WebInspectorFrontendClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInspectorFrontendClient.h; sourceTree = "<group>"; };
+ 1C8E256B1270DE3800BC7BD0 /* WebInspectorFrontendClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInspectorFrontendClient.cpp; sourceTree = "<group>"; };
32DBCF5E0370ADEE00C91783 /* WebKit2Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2Prefix.h; sourceTree = "<group>"; };
51578B821209ECEF00A37C4A /* WebData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebData.h; sourceTree = "<group>"; };
516A4A5B120A2CCD00C05B7F /* WebError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebError.h; sourceTree = "<group>"; };
@@ -1323,6 +1327,8 @@
BC032D6A10F4378D0058C15A /* WebFrameLoaderClient.h */,
BC111A59112F4FBB00337BAB /* WebInspectorClient.cpp */,
BC032D6D10F4378D0058C15A /* WebInspectorClient.h */,
+ 1C8E256B1270DE3800BC7BD0 /* WebInspectorFrontendClient.cpp */,
+ 1C8E256A1270DE3800BC7BD0 /* WebInspectorFrontendClient.h */,
1A3E736011CC2659007BD539 /* WebPlatformStrategies.cpp */,
1A3E735F11CC2659007BD539 /* WebPlatformStrategies.h */,
D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */,
@@ -2064,6 +2070,7 @@
1A91010A1268C8CA001842F5 /* FindIndicatorWindow.h in Headers */,
F6113E25126CE1820057D0A7 /* WebUserContentURLPattern.h in Headers */,
F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */,
+ 1C8E25A91270E3BC00BC7BD0 /* WebInspectorFrontendClient.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2377,6 +2384,7 @@
1A91010B1268C8CA001842F5 /* FindIndicatorWindow.mm in Sources */,
F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */,
BC575613126E0138006F0F12 /* WebError.cpp in Sources */,
+ 1C8E25A81270E3BB00BC7BD0 /* WebInspectorFrontendClient.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
new file mode 100644
index 0000000..7476fe5
--- /dev/null
+++ b/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2010 Apple 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:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
+ */
+
+#include "WebInspectorFrontendClient.h"
+
+#include <wtf/text/WTFString.h>
+
+#define DISABLE_NOT_IMPLEMENTED_WARNINGS 1
+#include "NotImplemented.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+void WebInspectorFrontendClient::windowObjectCleared()
+{
+ notImplemented();
+}
+
+void WebInspectorFrontendClient::frontendLoaded()
+{
+ notImplemented();
+}
+
+void WebInspectorFrontendClient::moveWindowBy(float, float)
+{
+ notImplemented();
+}
+
+String WebInspectorFrontendClient::localizedStringsURL()
+{
+ notImplemented();
+ return String();
+}
+
+String WebInspectorFrontendClient::hiddenPanels()
+{
+ notImplemented();
+ return String();
+}
+
+void WebInspectorFrontendClient::bringToFront()
+{
+ notImplemented();
+}
+
+void WebInspectorFrontendClient::closeWindow()
+{
+ notImplemented();
+}
+
+void WebInspectorFrontendClient::disconnectFromBackend()
+{
+ notImplemented();
+}
+
+void WebInspectorFrontendClient::requestAttachWindow()
+{
+ notImplemented();
+}
+
+void WebInspectorFrontendClient::requestDetachWindow()
+{
+ notImplemented();
+}
+
+void WebInspectorFrontendClient::changeAttachedWindowHeight(unsigned)
+{
+ notImplemented();
+}
+
+void WebInspectorFrontendClient::inspectedURLChanged(const String&)
+{
+ notImplemented();
+}
+
+void WebInspectorFrontendClient::sendMessageToBackend(const String&)
+{
+ notImplemented();
+}
+
+} // namespace WebKit
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.h b/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.h
new file mode 100644
index 0000000..a218eb8
--- /dev/null
+++ b/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2010 Apple 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:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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 WebInspectorFrontendClient_h
+#define WebInspectorFrontendClient_h
+
+#include <WebCore/InspectorFrontendClient.h>
+
+namespace WebKit {
+
+class WebPage;
+
+class WebInspectorFrontendClient : public WebCore::InspectorFrontendClient {
+public:
+ WebInspectorFrontendClient(WebPage* page)
+ : m_page(page)
+ {
+ }
+
+private:
+ virtual void windowObjectCleared();
+ virtual void frontendLoaded();
+
+ virtual void moveWindowBy(float x, float y);
+
+ virtual String localizedStringsURL();
+ virtual String hiddenPanels();
+
+ virtual void bringToFront();
+ virtual void closeWindow();
+ virtual void disconnectFromBackend();
+
+ virtual void requestAttachWindow();
+ virtual void requestDetachWindow();
+ virtual void changeAttachedWindowHeight(unsigned);
+
+ virtual void inspectedURLChanged(const String&);
+
+ virtual void sendMessageToBackend(const String&);
+
+ WebPage* m_page;
+};
+
+} // namespace WebKit
+
+#endif // WebInspectorFrontendClient_h
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index f179ef6..8efe0ec 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -1072,6 +1072,14 @@
>
</File>
<File
+ RelativePath="..\WebProcess\WebCoreSupport\WebInspectorFrontendClient.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\WebProcess\WebCoreSupport\WebInspectorFrontendClient.h"
+ >
+ </File>
+ <File
RelativePath="..\WebProcess\WebCoreSupport\WebPlatformStrategies.cpp"
>
</File>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list