[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
andersca at apple.com
andersca at apple.com
Wed Dec 22 17:49:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 53aa0c81dab8a97cda7a55adc5680c6405ee7a0d
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 1 00:37:28 2010 +0000
Rename DrawingAreaBase.h to DrawingAreaInfo.h.
Reviewed by Sam Weinig.
* Shared/DrawingAreaInfo.h: Renamed from WebKit2/Shared/DrawingAreaBase.h.
(WebKit::DrawingAreaBase::DrawingAreaInfo::DrawingAreaInfo):
(WebKit::DrawingAreaBase::~DrawingAreaBase):
(WebKit::DrawingAreaBase::info):
(WebKit::DrawingAreaBase::DrawingAreaBase):
* Shared/WebPageCreationParameters.h:
* UIProcess/DrawingAreaProxy.h:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/DrawingArea.h:
* win/WebKit2.vcproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72978 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d714b43..4703879 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,22 @@
2010-11-30 Anders Carlsson <andersca at apple.com>
+ Reviewed by Sam Weinig.
+
+ Rename DrawingAreaBase.h to DrawingAreaInfo.h.
+
+ * Shared/DrawingAreaInfo.h: Renamed from WebKit2/Shared/DrawingAreaBase.h.
+ (WebKit::DrawingAreaBase::DrawingAreaInfo::DrawingAreaInfo):
+ (WebKit::DrawingAreaBase::~DrawingAreaBase):
+ (WebKit::DrawingAreaBase::info):
+ (WebKit::DrawingAreaBase::DrawingAreaBase):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/DrawingAreaProxy.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebPage/DrawingArea.h:
+ * win/WebKit2.vcproj:
+
+2010-11-30 Anders Carlsson <andersca at apple.com>
+
Fix build.
* PluginProcess/mac/PluginProcessShim.cpp:
diff --git a/WebKit2/Shared/DrawingAreaBase.h b/WebKit2/Shared/DrawingAreaBase.h
deleted file mode 100644
index 146e38e..0000000
--- a/WebKit2/Shared/DrawingAreaBase.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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 DrawingAreaBase_h
-#define DrawingAreaBase_h
-
-#include "ArgumentCoders.h"
-#include "Connection.h"
-
-namespace WebCore {
- class IntRect;
- class IntSize;
-}
-
-namespace WebKit {
-
-class DrawingAreaBase {
-public:
- enum Type {
- None,
- ChunkedUpdateDrawingAreaType,
-#if USE(ACCELERATED_COMPOSITING)
- LayerBackedDrawingAreaType,
-#endif
-#if ENABLE(TILED_BACKING_STORE)
- TiledDrawingAreaType,
-#endif
- };
-
- typedef uint64_t DrawingAreaID;
-
- struct DrawingAreaInfo {
- Type type;
- DrawingAreaID id;
-
- DrawingAreaInfo(Type type = None, DrawingAreaID identifier = 0)
- : type(type)
- , id(identifier)
- {
- }
- };
-
- virtual ~DrawingAreaBase() { }
-
- const DrawingAreaInfo& info() const { return m_info; }
-
-protected:
- DrawingAreaBase(Type type, DrawingAreaID identifier)
- : m_info(type, identifier)
- {
- }
-
- DrawingAreaInfo m_info;
-};
-
-} // namespace WebKit
-
-namespace CoreIPC {
-template<> struct ArgumentCoder<WebKit::DrawingAreaBase::DrawingAreaInfo> : SimpleArgumentCoder<WebKit::DrawingAreaBase::DrawingAreaInfo> { };
-}
-
-#endif // DrawingAreaBase_h
diff --git a/WebKit2/Shared/DrawingAreaInfo.h b/WebKit2/Shared/DrawingAreaInfo.h
new file mode 100644
index 0000000..7a0e394
--- /dev/null
+++ b/WebKit2/Shared/DrawingAreaInfo.h
@@ -0,0 +1,84 @@
+/*
+ * 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 DrawingAreaInfo_h
+#define DrawingAreaInfo_h
+
+#include "ArgumentCoders.h"
+#include "Connection.h"
+
+namespace WebCore {
+ class IntRect;
+ class IntSize;
+}
+
+namespace WebKit {
+
+class DrawingAreaBase {
+public:
+ enum Type {
+ None,
+ ChunkedUpdateDrawingAreaType,
+#if USE(ACCELERATED_COMPOSITING)
+ LayerBackedDrawingAreaType,
+#endif
+#if ENABLE(TILED_BACKING_STORE)
+ TiledDrawingAreaType,
+#endif
+ };
+
+ typedef uint64_t DrawingAreaID;
+
+ struct DrawingAreaInfo {
+ Type type;
+ DrawingAreaID id;
+
+ DrawingAreaInfo(Type type = None, DrawingAreaID identifier = 0)
+ : type(type)
+ , id(identifier)
+ {
+ }
+ };
+
+ virtual ~DrawingAreaBase() { }
+
+ const DrawingAreaInfo& info() const { return m_info; }
+
+protected:
+ DrawingAreaBase(Type type, DrawingAreaID identifier)
+ : m_info(type, identifier)
+ {
+ }
+
+ DrawingAreaInfo m_info;
+};
+
+} // namespace WebKit
+
+namespace CoreIPC {
+template<> struct ArgumentCoder<WebKit::DrawingAreaBase::DrawingAreaInfo> : SimpleArgumentCoder<WebKit::DrawingAreaBase::DrawingAreaInfo> { };
+}
+
+#endif // DrawingAreaInfo_h
diff --git a/WebKit2/Shared/WebPageCreationParameters.h b/WebKit2/Shared/WebPageCreationParameters.h
index a1c91a9..0e87bd7 100644
--- a/WebKit2/Shared/WebPageCreationParameters.h
+++ b/WebKit2/Shared/WebPageCreationParameters.h
@@ -26,7 +26,7 @@
#ifndef WebPageCreationParameters_h
#define WebPageCreationParameters_h
-#include "DrawingAreaBase.h"
+#include "DrawingAreaInfo.h"
#include "WebPreferencesStore.h"
#include <WebCore/IntSize.h>
diff --git a/WebKit2/UIProcess/DrawingAreaProxy.h b/WebKit2/UIProcess/DrawingAreaProxy.h
index 73e2140..6708dcf 100644
--- a/WebKit2/UIProcess/DrawingAreaProxy.h
+++ b/WebKit2/UIProcess/DrawingAreaProxy.h
@@ -26,7 +26,7 @@
#ifndef DrawingAreaProxy_h
#define DrawingAreaProxy_h
-#include "DrawingAreaBase.h"
+#include "DrawingAreaInfo.h"
#include <WebCore/IntSize.h>
#if PLATFORM(QT)
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index f0dd69e..95ce692 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -39,7 +39,7 @@
0F5265B911DD377F0006D33C /* LayerBackedDrawingAreaProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F5265B711DD377F0006D33C /* LayerBackedDrawingAreaProxy.cpp */; };
0F5265BA11DD377F0006D33C /* LayerBackedDrawingAreaProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F5265B811DD377F0006D33C /* LayerBackedDrawingAreaProxy.h */; };
0F5265BC11DD37860006D33C /* LayerBackedDrawingAreaProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F5265BB11DD37860006D33C /* LayerBackedDrawingAreaProxyMac.mm */; };
- 0FB659231208B4DB0044816C /* DrawingAreaBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB659221208B4DB0044816C /* DrawingAreaBase.h */; };
+ 0FB659231208B4DB0044816C /* DrawingAreaInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */; };
1A043976124D034800FFBFB5 /* PluginProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043974124D034800FFBFB5 /* PluginProcess.h */; };
1A043977124D034800FFBFB5 /* PluginProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043975124D034800FFBFB5 /* PluginProcess.cpp */; };
1A043A09124D11A900FFBFB5 /* WebProcessConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043A07124D11A900FFBFB5 /* WebProcessConnection.h */; };
@@ -613,7 +613,7 @@
0F5265B711DD377F0006D33C /* LayerBackedDrawingAreaProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayerBackedDrawingAreaProxy.cpp; sourceTree = "<group>"; };
0F5265B811DD377F0006D33C /* LayerBackedDrawingAreaProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerBackedDrawingAreaProxy.h; sourceTree = "<group>"; };
0F5265BB11DD37860006D33C /* LayerBackedDrawingAreaProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LayerBackedDrawingAreaProxyMac.mm; sourceTree = "<group>"; };
- 0FB659221208B4DB0044816C /* DrawingAreaBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaBase.h; sourceTree = "<group>"; };
+ 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaInfo.h; sourceTree = "<group>"; };
1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
1A043974124D034800FFBFB5 /* PluginProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcess.h; sourceTree = "<group>"; };
1A043975124D034800FFBFB5 /* PluginProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcess.cpp; sourceTree = "<group>"; };
@@ -1427,7 +1427,7 @@
1A2D956E12848564001EB962 /* ChildProcess.cpp */,
1A2D956D12848564001EB962 /* ChildProcess.h */,
1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */,
- 0FB659221208B4DB0044816C /* DrawingAreaBase.h */,
+ 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */,
762B7481120BBA0100819339 /* FontSmoothingLevel.h */,
BC64696D11DBE603006455B0 /* ImmutableArray.cpp */,
BC64696E11DBE603006455B0 /* ImmutableArray.h */,
@@ -2339,7 +2339,7 @@
BCCB75C61203A1CE00222D1B /* WebContextMessageKinds.h in Headers */,
D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */,
D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */,
- 0FB659231208B4DB0044816C /* DrawingAreaBase.h in Headers */,
+ 0FB659231208B4DB0044816C /* DrawingAreaInfo.h in Headers */,
51578B831209ECEF00A37C4A /* WebData.h in Headers */,
C0E3AA7C1209E83C00A49D01 /* Module.h in Headers */,
516A4A5D120A2CCD00C05B7F /* WebError.h in Headers */,
diff --git a/WebKit2/WebProcess/WebPage/DrawingArea.h b/WebKit2/WebProcess/WebPage/DrawingArea.h
index 5ff3ae5..1149d01 100644
--- a/WebKit2/WebProcess/WebPage/DrawingArea.h
+++ b/WebKit2/WebProcess/WebPage/DrawingArea.h
@@ -26,7 +26,7 @@
#ifndef DrawingArea_h
#define DrawingArea_h
-#include "DrawingAreaBase.h"
+#include "DrawingAreaInfo.h"
#include <WebCore/IntRect.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index a6faae5..4039741 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -424,7 +424,7 @@
>
</File>
<File
- RelativePath="..\Shared\DrawingAreaBase.h"
+ RelativePath="..\Shared\DrawingAreaInfo.h"
>
</File>
<File
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list