[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
andersca at apple.com
andersca at apple.com
Sun Feb 20 22:48:54 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit c253f90ac17d9d5cb40713a3a8fc1954e4113485
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 11 20:56:58 2011 +0000
2011-01-11 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
Add Mac-only DrawingAreaProxyImpl class skeleton
https://bugs.webkit.org/show_bug.cgi?id=52243
This is the proxy side of a new drawing area implementation. This is Mac only for now
while the design is being fleshed out.
* Shared/DrawingAreaInfo.h:
* UIProcess/API/mac/WKView.mm:
(-[WKView _switchToDrawingAreaTypeIfNecessary:DrawingAreaInfo::]):
* UIProcess/DrawingAreaProxyImpl.cpp: Added.
(WebKit::DrawingAreaProxyImpl::create):
(WebKit::DrawingAreaProxyImpl::DrawingAreaProxyImpl):
(WebKit::DrawingAreaProxyImpl::~DrawingAreaProxyImpl):
(WebKit::DrawingAreaProxyImpl::didReceiveMessage):
(WebKit::DrawingAreaProxyImpl::didReceiveSyncMessage):
(WebKit::DrawingAreaProxyImpl::paint):
(WebKit::DrawingAreaProxyImpl::sizeDidChange):
(WebKit::DrawingAreaProxyImpl::setPageIsVisible):
(WebKit::DrawingAreaProxyImpl::attachCompositingContext):
(WebKit::DrawingAreaProxyImpl::detachCompositingContext):
* UIProcess/DrawingAreaProxyImpl.h: Added.
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/DrawingArea.cpp:
(WebKit::DrawingArea::create):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75540 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c7de16d..dc1756e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,34 @@
2011-01-11 Anders Carlsson <andersca at apple.com>
+ Reviewed by Sam Weinig.
+
+ Add Mac-only DrawingAreaProxyImpl class skeleton
+ https://bugs.webkit.org/show_bug.cgi?id=52243
+
+ This is the proxy side of a new drawing area implementation. This is Mac only for now
+ while the design is being fleshed out.
+
+ * Shared/DrawingAreaInfo.h:
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _switchToDrawingAreaTypeIfNecessary:DrawingAreaInfo::]):
+ * UIProcess/DrawingAreaProxyImpl.cpp: Added.
+ (WebKit::DrawingAreaProxyImpl::create):
+ (WebKit::DrawingAreaProxyImpl::DrawingAreaProxyImpl):
+ (WebKit::DrawingAreaProxyImpl::~DrawingAreaProxyImpl):
+ (WebKit::DrawingAreaProxyImpl::didReceiveMessage):
+ (WebKit::DrawingAreaProxyImpl::didReceiveSyncMessage):
+ (WebKit::DrawingAreaProxyImpl::paint):
+ (WebKit::DrawingAreaProxyImpl::sizeDidChange):
+ (WebKit::DrawingAreaProxyImpl::setPageIsVisible):
+ (WebKit::DrawingAreaProxyImpl::attachCompositingContext):
+ (WebKit::DrawingAreaProxyImpl::detachCompositingContext):
+ * UIProcess/DrawingAreaProxyImpl.h: Added.
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebPage/DrawingArea.cpp:
+ (WebKit::DrawingArea::create):
+
+2011-01-11 Anders Carlsson <andersca at apple.com>
+
Fix Windows build.
* WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp:
diff --git a/WebKit2/Shared/DrawingAreaInfo.h b/WebKit2/Shared/DrawingAreaInfo.h
index 25278b9..fdbfc75 100644
--- a/WebKit2/Shared/DrawingAreaInfo.h
+++ b/WebKit2/Shared/DrawingAreaInfo.h
@@ -39,6 +39,7 @@ namespace WebKit {
struct DrawingAreaInfo {
enum Type {
None,
+ Impl,
ChunkedUpdate,
#if USE(ACCELERATED_COMPOSITING)
LayerBacked,
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index 3bcd9f6..b09d69c 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -27,6 +27,7 @@
#import "ChunkedUpdateDrawingAreaProxy.h"
#import "DataReference.h"
+#import "DrawingAreaProxyImpl.h"
#import "FindIndicator.h"
#import "FindIndicatorWindow.h"
#import "LayerBackedDrawingAreaProxy.h"
@@ -1460,6 +1461,7 @@ static void extractUnderlines(NSAttributedString *string, Vector<CompositionUnde
OwnPtr<DrawingAreaProxy> newDrawingArea;
switch (type) {
+ case DrawingAreaInfo::Impl:
case DrawingAreaInfo::None:
break;
case DrawingAreaInfo::ChunkedUpdate: {
diff --git a/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp b/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
new file mode 100644
index 0000000..79924af
--- /dev/null
+++ b/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2011 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 "DrawingAreaProxyImpl.h"
+
+#ifndef __APPLE__
+#error "This drawing area is not ready for use by other ports yet."
+#endif
+
+namespace WebKit {
+
+PassOwnPtr<DrawingAreaProxyImpl> DrawingAreaProxyImpl::create(WebPageProxy* webPageProxy)
+{
+ return adoptPtr(new DrawingAreaProxyImpl(webPageProxy));
+}
+
+DrawingAreaProxyImpl::DrawingAreaProxyImpl(WebPageProxy* webPageProxy)
+ : DrawingAreaProxy(DrawingAreaInfo::Impl, webPageProxy)
+{
+}
+
+DrawingAreaProxyImpl::~DrawingAreaProxyImpl()
+{
+}
+
+void DrawingAreaProxyImpl::didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*)
+{
+ ASSERT_NOT_REACHED();
+}
+
+void DrawingAreaProxyImpl::didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*)
+{
+ ASSERT_NOT_REACHED();
+}
+
+bool DrawingAreaProxyImpl::paint(const WebCore::IntRect&, PlatformDrawingContext)
+{
+ ASSERT_NOT_REACHED();
+ return false;
+}
+
+void DrawingAreaProxyImpl::sizeDidChange()
+{
+ ASSERT_NOT_REACHED();
+}
+
+void DrawingAreaProxyImpl::setPageIsVisible(bool pageIsVisible)
+{
+ ASSERT_NOT_REACHED();
+}
+
+void DrawingAreaProxyImpl::attachCompositingContext(uint32_t contextID)
+{
+ ASSERT_NOT_REACHED();
+}
+
+void DrawingAreaProxyImpl::detachCompositingContext()
+{
+ ASSERT_NOT_REACHED();
+}
+
+} // namespace WebKit
diff --git a/WebKit2/UIProcess/DrawingAreaProxyImpl.h b/WebKit2/UIProcess/DrawingAreaProxyImpl.h
new file mode 100644
index 0000000..855a8cb
--- /dev/null
+++ b/WebKit2/UIProcess/DrawingAreaProxyImpl.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2011 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 DrawingAreaProxyImpl_h
+#define DrawingAreaProxyImpl_h
+
+#include "DrawingAreaProxy.h"
+
+namespace WebKit {
+
+class DrawingAreaProxyImpl : public DrawingAreaProxy {
+public:
+ static PassOwnPtr<DrawingAreaProxyImpl> create(WebPageProxy*);
+ virtual ~DrawingAreaProxyImpl();
+
+private:
+ explicit DrawingAreaProxyImpl(WebPageProxy*);
+
+ // DrawingAreaProxy
+ virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+ virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*);
+ virtual bool paint(const WebCore::IntRect&, PlatformDrawingContext);
+ virtual void sizeDidChange();
+ virtual void setPageIsVisible(bool);
+ virtual void attachCompositingContext(uint32_t contextID);
+ virtual void detachCompositingContext();
+};
+
+} // namespace WebKit
+
+#endif // DrawingAreaProxyImpl_h
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index ff1b44d..69acd2d 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -124,6 +124,8 @@
1A61639612789B2F003ACD86 /* DownloadMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A61639512789B2F003ACD86 /* DownloadMac.mm */; };
1A6420E412DCE2FF00CAAE2C /* ShareableBitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */; };
1A6420E512DCE2FF00CAAE2C /* ShareableBitmap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6420E312DCE2FF00CAAE2C /* ShareableBitmap.h */; };
+ 1A64218612DCF49200CAAE2C /* DrawingAreaProxyImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A64218412DCF49200CAAE2C /* DrawingAreaProxyImpl.h */; };
+ 1A64218712DCF49200CAAE2C /* DrawingAreaProxyImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64218512DCF49200CAAE2C /* DrawingAreaProxyImpl.cpp */; };
1A6F9F9011E13EFC00DB1371 /* CommandLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */; };
1A6F9FB711E1408500DB1371 /* CommandLineMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */; };
1A6FA01E11E1526300DB1371 /* WebProcessMainMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FA01D11E1526300DB1371 /* WebProcessMainMac.mm */; };
@@ -827,6 +829,8 @@
1A61639512789B2F003ACD86 /* DownloadMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DownloadMac.mm; sourceTree = "<group>"; };
1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShareableBitmap.cpp; sourceTree = "<group>"; };
1A6420E312DCE2FF00CAAE2C /* ShareableBitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShareableBitmap.h; sourceTree = "<group>"; };
+ 1A64218412DCF49200CAAE2C /* DrawingAreaProxyImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaProxyImpl.h; sourceTree = "<group>"; };
+ 1A64218512DCF49200CAAE2C /* DrawingAreaProxyImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingAreaProxyImpl.cpp; sourceTree = "<group>"; };
1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLine.h; sourceTree = "<group>"; };
1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLineMac.cpp; sourceTree = "<group>"; };
1A6FA01D11E1526300DB1371 /* WebProcessMainMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessMainMac.mm; sourceTree = "<group>"; };
@@ -2023,6 +2027,8 @@
BC2652151182608100243E12 /* ChunkedUpdateDrawingAreaProxy.h */,
BC2652121182608100243E12 /* DrawingAreaProxy.cpp */,
BC2652131182608100243E12 /* DrawingAreaProxy.h */,
+ 1A64218512DCF49200CAAE2C /* DrawingAreaProxyImpl.cpp */,
+ 1A64218412DCF49200CAAE2C /* DrawingAreaProxyImpl.h */,
1A910070126675C4001842F5 /* FindIndicator.cpp */,
1A91006F126675C3001842F5 /* FindIndicator.h */,
BC17753E118BABF0007D9E9A /* GenericCallback.h */,
@@ -2970,6 +2976,7 @@
BC06F44A12DBD1F5002D78DE /* GeolocationPermissionRequestManagerProxy.h in Headers */,
BC06F44E12DBDF3F002D78DE /* WKGeolocationPermissionRequest.h in Headers */,
1A6420E512DCE2FF00CAAE2C /* ShareableBitmap.h in Headers */,
+ 1A64218612DCF49200CAAE2C /* DrawingAreaProxyImpl.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3418,6 +3425,7 @@
BC06F44B12DBD1F5002D78DE /* GeolocationPermissionRequestManagerProxy.cpp in Sources */,
BC06F44F12DBDF3F002D78DE /* WKGeolocationPermissionRequest.cpp in Sources */,
1A6420E412DCE2FF00CAAE2C /* ShareableBitmap.cpp in Sources */,
+ 1A64218712DCF49200CAAE2C /* DrawingAreaProxyImpl.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/WebProcess/WebPage/DrawingArea.cpp b/WebKit2/WebProcess/WebPage/DrawingArea.cpp
index 9700884..8e494b9 100644
--- a/WebKit2/WebProcess/WebPage/DrawingArea.cpp
+++ b/WebKit2/WebProcess/WebPage/DrawingArea.cpp
@@ -44,6 +44,9 @@ PassRefPtr<DrawingArea> DrawingArea::create(DrawingAreaInfo::Type type, DrawingA
ASSERT_NOT_REACHED();
break;
+ case DrawingAreaInfo::Impl:
+ return 0;
+
case DrawingAreaInfo::ChunkedUpdate:
return adoptRef(new ChunkedUpdateDrawingArea(identifier, webPage));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list