[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aroben at apple.com
aroben at apple.com
Wed Dec 22 13:44:22 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 91bd458e8f3d70cac975fd7bb445f3be2c5c574a
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 24 17:23:37 2010 +0000
Stop pretending that we know how to encode a DrawingArea and just encode the DrawingAreaInfo directly
DrawingAreaBase and friends were trying to hide the fact that they
were just encoding/decoding a DrawingAreaInfo behind the scenes, but
everyone knew what was going on and it was getting embarassing.
Fixes <http://webkit.org/b/46469> Code to encode/decode a
DrawingAreaInfo is confusing
Reviewed by Anders Carlsson.
* Shared/DrawingAreaBase.cpp: Removed.
* Shared/DrawingAreaBase.h: Removed encode/decode.
* UIProcess/ChunkedUpdateDrawingAreaProxy.h: Removed encode override.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::initializeWebPage):
(WebKit::WebPageProxy::reinitializeWebPage):
(WebKit::WebPageProxy::didReceiveSyncMessage):
Changed to encode the DrawingAreaInfo directly.
* WebKit2.pro:
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
Removed DrawingAreaBase.cpp.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68271 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0c37a64..5252abc 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,34 @@
2010-09-24 Adam Roben <aroben at apple.com>
+ Stop pretending that we know how to encode a DrawingArea and just
+ encode the DrawingAreaInfo directly
+
+ DrawingAreaBase and friends were trying to hide the fact that they
+ were just encoding/decoding a DrawingAreaInfo behind the scenes, but
+ everyone knew what was going on and it was getting embarassing.
+
+ Fixes <http://webkit.org/b/46469> Code to encode/decode a
+ DrawingAreaInfo is confusing
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/DrawingAreaBase.cpp: Removed.
+ * Shared/DrawingAreaBase.h: Removed encode/decode.
+ * UIProcess/ChunkedUpdateDrawingAreaProxy.h: Removed encode override.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::initializeWebPage):
+ (WebKit::WebPageProxy::reinitializeWebPage):
+ (WebKit::WebPageProxy::didReceiveSyncMessage):
+ Changed to encode the DrawingAreaInfo directly.
+
+ * WebKit2.pro:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+ Removed DrawingAreaBase.cpp.
+
+2010-09-24 Adam Roben <aroben at apple.com>
+
Expose a whole DrawingAreaInfo instead of its constituent parts from
DrawingAreaBase
diff --git a/WebKit2/Shared/DrawingAreaBase.cpp b/WebKit2/Shared/DrawingAreaBase.cpp
deleted file mode 100644
index e0c3ccc..0000000
--- a/WebKit2/Shared/DrawingAreaBase.cpp
+++ /dev/null
@@ -1,51 +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.
- */
-
-#include "DrawingAreaBase.h"
-
-namespace WebKit {
-
-void DrawingAreaBase::encode(CoreIPC::ArgumentEncoder* encoder) const
-{
- encoder->encode(info());
-}
-
-bool DrawingAreaBase::decode(CoreIPC::ArgumentDecoder* decoder, DrawingAreaInfo& info)
-{
- uint32_t drawingAreaType;
- if (!decoder->decode(drawingAreaType))
- return false;
-
- DrawingAreaID drawingAreaID;
- if (!decoder->decode(drawingAreaID))
- return false;
-
- info.type = static_cast<Type>(drawingAreaType);
- info.id = drawingAreaID;
-
- return true;
-}
-
-} // namespace WebKit
diff --git a/WebKit2/Shared/DrawingAreaBase.h b/WebKit2/Shared/DrawingAreaBase.h
index 0a23502..41656d8 100644
--- a/WebKit2/Shared/DrawingAreaBase.h
+++ b/WebKit2/Shared/DrawingAreaBase.h
@@ -63,10 +63,6 @@ public:
const DrawingAreaInfo& info() const { return m_info; }
- // The DrawingAreaProxy should never be decoded itself. Instead, the DrawingArea should be decoded.
- void encode(CoreIPC::ArgumentEncoder* encoder) const;
- static bool decode(CoreIPC::ArgumentDecoder*, DrawingAreaInfo&);
-
protected:
DrawingAreaBase(Type type, DrawingAreaID identifier)
: m_info(type, identifier)
diff --git a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
index 78f1bd0..9963f02 100644
--- a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
+++ b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
@@ -61,12 +61,6 @@ public:
virtual ~ChunkedUpdateDrawingAreaProxy();
- // The DrawingAreaProxy should never be decoded itself. Instead, the DrawingArea should be decoded.
- virtual void encode(CoreIPC::ArgumentEncoder* encoder) const
- {
- DrawingAreaProxy::encode(encoder);
- }
-
private:
ChunkedUpdateDrawingAreaProxy(PlatformWebView*);
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 8c7fea0..2b44228 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -153,7 +153,7 @@ void WebPageProxy::initializeWebPage(const IntSize& size)
}
ASSERT(m_drawingArea);
- process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(size, pageNamespace()->context()->preferences()->store(), *(m_drawingArea.get())));
+ process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(size, pageNamespace()->context()->preferences()->store(), m_drawingArea->info()));
}
void WebPageProxy::reinitializeWebPage(const WebCore::IntSize& size)
@@ -162,7 +162,7 @@ void WebPageProxy::reinitializeWebPage(const WebCore::IntSize& size)
return;
ASSERT(m_drawingArea);
- process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(size, pageNamespace()->context()->preferences()->store(), *(m_drawingArea.get())));
+ process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(size, pageNamespace()->context()->preferences()->store(), m_drawingArea->info()));
}
void WebPageProxy::close()
@@ -883,7 +883,7 @@ void WebPageProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIP
// FIXME: Pass the real size.
reply->encode(CoreIPC::In(newPage->pageID(), IntSize(100, 100),
newPage->pageNamespace()->context()->preferences()->store(),
- *(newPage->drawingArea())));
+ newPage->drawingArea()->info()));
} else {
reply->encode(CoreIPC::In(static_cast<uint64_t>(0), IntSize(), WebPreferencesStore(), DrawingAreaBase::DrawingAreaInfo()));
}
@@ -966,7 +966,7 @@ void WebPageProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIP
return;
didChangeAcceleratedCompositing(compositing);
- reply->encode(*(drawingArea()));
+ reply->encode(drawingArea()->info());
break;
}
#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index e93082a..9cfaf7c 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -293,7 +293,6 @@ SOURCES += \
Platform/qt/RunLoopQt.cpp \
Platform/qt/SharedMemoryQt.cpp \
Platform/qt/WorkQueueQt.cpp \
- Shared/DrawingAreaBase.cpp \
Shared/ImmutableArray.cpp \
Shared/ImmutableDictionary.cpp \
Shared/MutableArray.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index ce47f11..5b995c4 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -43,7 +43,6 @@
0F5265BC11DD37860006D33C /* LayerBackedDrawingAreaProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F5265BB11DD37860006D33C /* LayerBackedDrawingAreaProxyMac.mm */; };
0F52667411DD4A490006D33C /* WebProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F52667311DD4A490006D33C /* WebProcessProxyMac.mm */; };
0FB659231208B4DB0044816C /* DrawingAreaBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB659221208B4DB0044816C /* DrawingAreaBase.h */; };
- 0FB659A61208B9EE0044816C /* DrawingAreaBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FB659A51208B9EE0044816C /* DrawingAreaBase.cpp */; };
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 */; };
@@ -448,7 +447,6 @@
0F5265BB11DD37860006D33C /* LayerBackedDrawingAreaProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LayerBackedDrawingAreaProxyMac.mm; sourceTree = "<group>"; };
0F52667311DD4A490006D33C /* WebProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessProxyMac.mm; sourceTree = "<group>"; };
0FB659221208B4DB0044816C /* DrawingAreaBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaBase.h; sourceTree = "<group>"; };
- 0FB659A51208B9EE0044816C /* DrawingAreaBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingAreaBase.cpp; 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>"; };
@@ -1029,7 +1027,6 @@
BC111B5A112F628200337BAB /* mac */,
BCF04C8C11FF9B7D00F86A58 /* APIObject.h */,
1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */,
- 0FB659A51208B9EE0044816C /* DrawingAreaBase.cpp */,
0FB659221208B4DB0044816C /* DrawingAreaBase.h */,
762B7481120BBA0100819339 /* FontSmoothingLevel.h */,
BC64696D11DBE603006455B0 /* ImmutableArray.cpp */,
@@ -2022,7 +2019,6 @@
BCDB85831200EC57007254BE /* WKType.cpp in Sources */,
D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */,
D3B9484811FF4B6500032B39 /* WebSearchPopupMenu.cpp in Sources */,
- 0FB659A61208B9EE0044816C /* DrawingAreaBase.cpp in Sources */,
514AF6C81209EE7300A26C97 /* WKData.cpp in Sources */,
C0E3AA7A1209E83000A49D01 /* ModuleMac.mm in Sources */,
C0E3AA7B1209E83500A49D01 /* Module.cpp in Sources */,
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index bab67e7..4476a08 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -397,10 +397,6 @@
>
</File>
<File
- RelativePath="..\Shared\DrawingAreaBase.cpp"
- >
- </File>
- <File
RelativePath="..\Shared\DrawingAreaBase.h"
>
</File>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list