Changeset 141495 in webkit

Timestamp:

Jan 31, 2013 3:26:01 PM (11 years ago)

Author:

rafael.lobo@openbossa.org

Message:

[Qt][WK2] Fix build after removal of MessageID.h
​https://bugs.webkit.org/show_bug.cgi?id=108534

Reviewed by Anders Carlsson.

• Platform/CoreIPC/unix/ConnectionUnix.cpp:

(CoreIPC::MessageInfo::MessageInfo):
(CoreIPC::MessageInfo::setMessageBodyIsOutOfLine):
(CoreIPC::MessageInfo::isMessageBodyIsOutOfLine):
(MessageInfo):
(CoreIPC::Connection::processMessage):
(CoreIPC::Connection::sendOutgoingMessage):

• Target.pri:
• UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp:
• UIProcess/DrawingAreaProxy.cpp:
• WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
• WebProcess/soup/WebSoupRequestManager.cpp:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/unix/ConnectionUnix.cpp (modified) (6 diffs)
• Target.pri (modified) (1 diff)
• UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp (modified) (1 diff)
• UIProcess/DrawingAreaProxy.cpp (modified) (1 diff)
• WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (modified) (1 diff)
• WebProcess/soup/WebSoupRequestManager.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-31  Rafael Brandao  <rafael.lobo@openbossa.org>
+
+        [Qt][WK2] Fix build after removal of MessageID.h
+        https://bugs.webkit.org/show_bug.cgi?id=108534
+
+        Reviewed by Anders Carlsson.
+
+        * Platform/CoreIPC/unix/ConnectionUnix.cpp:
+        (CoreIPC::MessageInfo::MessageInfo):
+        (CoreIPC::MessageInfo::setMessageBodyIsOutOfLine):
+        (CoreIPC::MessageInfo::isMessageBodyIsOutOfLine):
+        (MessageInfo):
+        (CoreIPC::Connection::processMessage):
+        (CoreIPC::Connection::sendOutgoingMessage):
+        * Target.pri:
+        * UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp:
+        * UIProcess/DrawingAreaProxy.cpp:
+        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+        * WebProcess/soup/WebSoupRequestManager.cpp:
+
 2013-01-31  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp

@@ -59 +59 @@
     MessageInfo() { }
 
-    MessageInfo(MessageID, size_t bodySize, size_t initialAttachmentCount)
-        : m_messageID(0)
-        , m_bodySize(bodySize)
+    MessageInfo(size_t bodySize, size_t initialAttachmentCount)
+        : m_bodySize(bodySize)
         , m_attachmentCount(initialAttachmentCount)
-    {
-        ASSERT(!(m_messageID & MessageBodyIsOutOfLine));
+        , m_isMessageBodyOutOfLine(false)
+    {
     }
 
@@ -71 +70 @@
         ASSERT(!isMessageBodyIsOutOfLine());
 
-        m_messageID |= MessageBodyIsOutOfLine;
+        m_isMessageBodyOutOfLine = true;
         m_attachmentCount++;
     }
 
-    bool isMessageBodyIsOutOfLine() const { return m_messageID & MessageBodyIsOutOfLine; }
+    bool isMessageBodyIsOutOfLine() const { return m_isMessageBodyOutOfLine; }
 
     size_t bodySize() const { return m_bodySize; }
@@ -82 +81 @@
 
 private:
-    uint32_t m_messageID;
     size_t m_bodySize;
     size_t m_attachmentCount;
+    bool m_isMessageBodyOutOfLine;
 };
 
@@ -287 +286 @@
         decoder = MessageDecoder::create(DataReference(messageBody, messageInfo.bodySize()), attachments);
 
-    processIncomingMessage(MessageID(), decoder.release());
+    processIncomingMessage(decoder.release());
 
     if (m_readBufferSize > messageLength) {
@@ -440 +439 @@
 }
 
-bool Connection::sendOutgoingMessage(MessageID messageID, PassOwnPtr<MessageEncoder> encoder)
+bool Connection::sendOutgoingMessage(PassOwnPtr<MessageEncoder> encoder)
 {
 #if PLATFORM(QT)
@@ -456 +455 @@
     }
 
-    MessageInfo messageInfo(messageID, encoder->bufferSize(), attachments.size());
+    MessageInfo messageInfo(encoder->bufferSize(), attachments.size());
     size_t messageSizeWithBodyInline = sizeof(messageInfo) + (attachments.size() * sizeof(AttachmentInfo)) + encoder->bufferSize();
     if (messageSizeWithBodyInline > messageMaxSize && encoder->bufferSize()) {

trunk/Source/WebKit2/Target.pri

@@ -27 +27 @@
     Platform/CoreIPC/MessageDecoder.h \
     Platform/CoreIPC/MessageEncoder.h \
-    Platform/CoreIPC/MessageID.h \
     Platform/CoreIPC/MessageReceiver.h \
     Platform/CoreIPC/MessageReceiverMap.h \

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp

@@ -27 +27 @@
 #include "CoordinatedBackingStore.h"
 #include "GraphicsLayerTextureMapper.h"
-#include "MessageID.h"
 #include "TextureMapper.h"
 #include "TextureMapperBackingStore.h"

trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp

@@ -31 +31 @@
 #if USE(COORDINATED_GRAPHICS)
 #include "CoordinatedLayerTreeHostProxy.h"
-#include <CoreIPC/MessageID.h>
 #endif
 

trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp

@@ -36 +36 @@
 #include "DrawingAreaImpl.h"
 #include "GraphicsContext.h"
-#include "MessageID.h"
 #include "SurfaceUpdateInfo.h"
 #include "WebCoordinatedSurface.h"

trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp

@@ -22 +22 @@
 
 #include "DataReference.h"
-#include "MessageID.h"
 #include "WebErrors.h"
 #include "WebKitSoupRequestGeneric.h"