[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:52:28 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit e837dec8aac9b9654faae52ce140b0d7f5d9c1e9
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 12 20:53:09 2011 +0000
2011-01-12 Anders Carlsson <andersca at apple.com>
Reviewed by Beth Dakin.
Add BackingStore class
https://bugs.webkit.org/show_bug.cgi?id=52318
* UIProcess/BackingStore.cpp: Added.
(WebKit::BackingStore::create):
(WebKit::BackingStore::BackingStore):
* UIProcess/BackingStore.h: Added.
* WebKit2.xcodeproj/project.pbxproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 474f82b..8831c90 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-12 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Beth Dakin.
+
+ Add BackingStore class
+ https://bugs.webkit.org/show_bug.cgi?id=52318
+
+ * UIProcess/BackingStore.cpp: Added.
+ (WebKit::BackingStore::create):
+ (WebKit::BackingStore::BackingStore):
+ * UIProcess/BackingStore.h: Added.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2011-01-12 Brady Eidson <beidson at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/BackingStore.cpp b/WebKit2/UIProcess/BackingStore.cpp
new file mode 100644
index 0000000..0fd6ccd
--- /dev/null
+++ b/WebKit2/UIProcess/BackingStore.cpp
@@ -0,0 +1,51 @@
+/*
+ * 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 "BackingStore.h"
+
+using namespace WebCore;
+
+#if !PLATFORM(MAC)
+#error "This class is not ready for use by other ports yet."
+#endif
+
+namespace WebKit {
+
+PassOwnPtr<BackingStore> BackingStore::create(WebPageProxy* webPageProxy, const IntSize& size)
+{
+ return adoptPtr(new BackingStore(webPageProxy, size));
+}
+
+BackingStore::BackingStore(WebPageProxy* webPageProxy, const IntSize& size)
+ : m_webPageProxy(webPageProxy)
+ , m_size(size)
+{
+}
+
+BackingStore::BackingStore()
+{
+}
+
+} // namespace WebKit
diff --git a/WebKit2/UIProcess/BackingStore.h b/WebKit2/UIProcess/BackingStore.h
new file mode 100644
index 0000000..cdedd5b
--- /dev/null
+++ b/WebKit2/UIProcess/BackingStore.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 BackingStore_h
+#define BackingStore_h
+
+#include <WebCore/IntSize.h>
+#include <wtf/Noncopyable.h>
+#include <wtf/PassOwnPtr.h>
+
+namespace WebKit {
+
+class WebPageProxy;
+
+class BackingStore {
+ WTF_MAKE_NONCOPYABLE(BackingStore);
+
+public:
+ static PassOwnPtr<BackingStore> create(WebPageProxy*, const WebCore::IntSize&);
+ BackingStore();
+
+private:
+ BackingStore(WebPageProxy*, const WebCore::IntSize&);
+
+ WebPageProxy* m_webPageProxy;
+ WebCore::IntSize m_size;
+};
+
+} // namespace WebKit
+
+#endif // BackingStore_h
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 7b59c48..746b186 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -137,6 +137,8 @@
1A64235312DD187C00CAAE2C /* Region.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A64235112DD187C00CAAE2C /* Region.h */; };
1A64245E12DE29A100CAAE2C /* UpdateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A64245C12DE29A100CAAE2C /* UpdateInfo.h */; };
1A64245F12DE29A100CAAE2C /* UpdateInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */; };
+ 1A64256812DE42EC00CAAE2C /* BackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A64256612DE42EC00CAAE2C /* BackingStore.h */; };
+ 1A64256912DE42EC00CAAE2C /* BackingStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64256712DE42EC00CAAE2C /* BackingStore.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 */; };
@@ -855,6 +857,8 @@
1A64235112DD187C00CAAE2C /* Region.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Region.h; sourceTree = "<group>"; };
1A64245C12DE29A100CAAE2C /* UpdateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpdateInfo.h; sourceTree = "<group>"; };
1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UpdateInfo.cpp; sourceTree = "<group>"; };
+ 1A64256612DE42EC00CAAE2C /* BackingStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackingStore.h; sourceTree = "<group>"; };
+ 1A64256712DE42EC00CAAE2C /* BackingStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackingStore.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>"; };
@@ -2052,6 +2056,8 @@
BC111B18112F5FB400337BAB /* Launcher */,
BCCF085C113F3B7500C650C5 /* mac */,
1AEFCC0511D01F34008219D3 /* Plugins */,
+ 1A64256712DE42EC00CAAE2C /* BackingStore.cpp */,
+ 1A64256612DE42EC00CAAE2C /* BackingStore.h */,
BC2652141182608100243E12 /* ChunkedUpdateDrawingAreaProxy.cpp */,
BC2652151182608100243E12 /* ChunkedUpdateDrawingAreaProxy.h */,
BC2652121182608100243E12 /* DrawingAreaProxy.cpp */,
@@ -2062,10 +2068,10 @@
1A910070126675C4001842F5 /* FindIndicator.cpp */,
1A91006F126675C3001842F5 /* FindIndicator.h */,
BC17753E118BABF0007D9E9A /* GenericCallback.h */,
- BC06F43912DBCCFB002D78DE /* GeolocationPermissionRequestProxy.cpp */,
- BC06F43812DBCCFB002D78DE /* GeolocationPermissionRequestProxy.h */,
BC06F44912DBD1F5002D78DE /* GeolocationPermissionRequestManagerProxy.cpp */,
BC06F44812DBD1F5002D78DE /* GeolocationPermissionRequestManagerProxy.h */,
+ BC06F43912DBCCFB002D78DE /* GeolocationPermissionRequestProxy.cpp */,
+ BC06F43812DBCCFB002D78DE /* GeolocationPermissionRequestProxy.h */,
0F5265B711DD377F0006D33C /* LayerBackedDrawingAreaProxy.cpp */,
0F5265B811DD377F0006D33C /* LayerBackedDrawingAreaProxy.h */,
BC6EDAA5111271C600E7678B /* PageClient.h */,
@@ -2080,16 +2086,16 @@
BCB9E2421120DACA00A137E0 /* WebContext.cpp */,
BCB9E2411120DACA00A137E0 /* WebContext.h */,
BCEE7D0912846AED009827DA /* WebContext.messages.in */,
- 51A84CE2127F386B00CA6EA4 /* WebContextMenuProxy.cpp */,
- 51ACBB81127A8BAD00D203B9 /* WebContextMenuProxy.h */,
BCDE059A11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.cpp */,
BCDE059911CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h */,
+ 51A84CE2127F386B00CA6EA4 /* WebContextMenuProxy.cpp */,
+ 51ACBB81127A8BAD00D203B9 /* WebContextMenuProxy.h */,
BCB0B0DB12305A2500B1341E /* WebContextUserMessageCoders.h */,
- BCAC111E12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp */,
- BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */,
F62A765912B1ABC30005F1B6 /* WebDatabaseManagerProxy.cpp */,
F62A765A12B1ABC30005F1B6 /* WebDatabaseManagerProxy.h */,
F62A765B12B1ABC30005F1B6 /* WebDatabaseManagerProxy.messages.in */,
+ BCAC111E12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp */,
+ BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */,
1AB7D72B1288CAAD00CFD08C /* WebDownloadClient.cpp */,
1AB7D72A1288CAAD00CFD08C /* WebDownloadClient.h */,
BCA0EF9E12332642007D3CFB /* WebEditCommandProxy.cpp */,
@@ -2100,10 +2106,10 @@
BCE469501214E6CB000B98EB /* WebFormClient.h */,
BCE469511214E6CB000B98EB /* WebFormSubmissionListenerProxy.cpp */,
BCE469521214E6CB000B98EB /* WebFormSubmissionListenerProxy.h */,
- BCB9F69F1123A84B00A137E0 /* WebFramePolicyListenerProxy.cpp */,
- BCB9F69E1123A84B00A137E0 /* WebFramePolicyListenerProxy.h */,
BCE469781214F2B4000B98EB /* WebFrameListenerProxy.cpp */,
BCE469761214F27B000B98EB /* WebFrameListenerProxy.h */,
+ BCB9F69F1123A84B00A137E0 /* WebFramePolicyListenerProxy.cpp */,
+ BCB9F69E1123A84B00A137E0 /* WebFramePolicyListenerProxy.h */,
BC111B0A112F5E4F00337BAB /* WebFrameProxy.cpp */,
BC9B389F10F538BE00443A15 /* WebFrameProxy.h */,
BC54CACA12D64291005C67B0 /* WebGeolocationManagerProxy.cpp */,
@@ -3018,6 +3024,7 @@
1A64230912DD09EB00CAAE2C /* DrawingAreaProxyMessages.h in Headers */,
1A64235312DD187C00CAAE2C /* Region.h in Headers */,
1A64245E12DE29A100CAAE2C /* UpdateInfo.h in Headers */,
+ 1A64256812DE42EC00CAAE2C /* BackingStore.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3472,6 +3479,7 @@
1A64230812DD09EB00CAAE2C /* DrawingAreaProxyMessageReceiver.cpp in Sources */,
1A64235212DD187C00CAAE2C /* Region.cpp in Sources */,
1A64245F12DE29A100CAAE2C /* UpdateInfo.cpp in Sources */,
+ 1A64256912DE42EC00CAAE2C /* BackingStore.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list