Changeset 140746 in webkit

Timestamp:

Jan 24, 2013 4:11:26 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Coordinated Graphics: remove SurfaceUpdateInfo::encode/decode
​https://bugs.webkit.org/show_bug.cgi?id=107794

Patch by Jae Hyun Park <​jae.park@company100.net> on 2013-01-24
Reviewed by Anders Carlsson.

We want to remove the dependency on CoreIPC from SurfaceUpdateInfo
because we will extract Coordinated Graphics from WK2. Since
SurfaceUpdateInfo is only used in Coordinated Graphics, this patch
moves it to Shared/CoordinatedGraphics, and removes CoreIPC
dependency.

No new tests, no change in behavior.

• CMakeLists.txt:
• Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:

(CoreIPC::::encode):
(CoreIPC):
(CoreIPC::::decode):

• Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h:

(WebKit):

• Shared/CoordinatedGraphics/SurfaceUpdateInfo.h: Renamed from Source/WebKit2/Shared/SurfaceUpdateInfo.h.

(WebKit):
(SurfaceUpdateInfo):
(WebKit::SurfaceUpdateInfo::SurfaceUpdateInfo):

• Shared/SurfaceUpdateInfo.cpp: Removed.
• Target.pri:

Location:

trunk/Source/WebKit2

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (modified) (2 diffs)
• Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h (modified) (2 diffs)
• Shared/CoordinatedGraphics/SurfaceUpdateInfo.h (moved) (moved from trunk/Source/WebKit2/Shared/SurfaceUpdateInfo.h) (3 diffs)
• Shared/SurfaceUpdateInfo.cpp (deleted)
• Target.pri (modified) (3 diffs)

trunk/Source/WebKit2/CMakeLists.txt

@@ -162 +162 @@
     Shared/ShareableBitmap.cpp
     Shared/StatisticsData.cpp
-    Shared/SurfaceUpdateInfo.cpp
     Shared/UpdateInfo.cpp
     Shared/VisitedLinkTable.cpp

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-24  Jae Hyun Park  <jae.park@company100.net>
+
+        Coordinated Graphics: remove SurfaceUpdateInfo::encode/decode
+        https://bugs.webkit.org/show_bug.cgi?id=107794
+
+        Reviewed by Anders Carlsson.
+
+        We want to remove the dependency on CoreIPC from SurfaceUpdateInfo
+        because we will extract Coordinated Graphics from WK2. Since
+        SurfaceUpdateInfo is only used in Coordinated Graphics, this patch
+        moves it to Shared/CoordinatedGraphics, and removes CoreIPC
+        dependency.
+
+        No new tests, no change in behavior.
+
+        * CMakeLists.txt:
+        * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+        (CoreIPC::::encode):
+        (CoreIPC):
+        (CoreIPC::::decode):
+        * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h:
+        (WebKit):
+        * Shared/CoordinatedGraphics/SurfaceUpdateInfo.h: Renamed from Source/WebKit2/Shared/SurfaceUpdateInfo.h.
+        (WebKit):
+        (SurfaceUpdateInfo):
+        (WebKit::SurfaceUpdateInfo::SurfaceUpdateInfo):
+        * Shared/SurfaceUpdateInfo.cpp: Removed.
+        * Target.pri:
+
 2013-01-24  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp

@@ -31 +31 @@
 #if USE(COORDINATED_GRAPHICS)
 #include "CoordinatedLayerInfo.h"
+#include "SurfaceUpdateInfo.h"
 #include "WebCoreArgumentCoders.h"
 #include <WebCore/Animation.h>
@@ -823 +824 @@
 }
 
+void ArgumentCoder<SurfaceUpdateInfo>::encode(ArgumentEncoder& encoder, const SurfaceUpdateInfo& surfaceUpdateInfo)
+{
+    SimpleArgumentCoder<SurfaceUpdateInfo>::encode(encoder, surfaceUpdateInfo);
+}
+
+bool ArgumentCoder<SurfaceUpdateInfo>::decode(ArgumentDecoder* decoder, SurfaceUpdateInfo& surfaceUpdateInfo)
+{
+    return SimpleArgumentCoder<SurfaceUpdateInfo>::decode(decoder, surfaceUpdateInfo);
+}
+
 } // namespace CoreIPC
 

trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h

@@ -55 +55 @@
 namespace WebKit {
 struct CoordinatedLayerInfo;
+class SurfaceUpdateInfo;
 }
 
@@ -115 +116 @@
 };
 
+template<> struct ArgumentCoder<WebKit::SurfaceUpdateInfo> {
+    static void encode(ArgumentEncoder&, const WebKit::SurfaceUpdateInfo&);
+    static bool decode(ArgumentDecoder*, WebKit::SurfaceUpdateInfo&);
+};
+
 } // namespace CoreIPC
 

trunk/Source/WebKit2/Shared/CoordinatedGraphics/SurfaceUpdateInfo.h

@@ -21 +21 @@
 #define SurfaceUpdateInfo_h
 
+#if USE(COORDINATED_GRAPHICS)
+
 #include <WebCore/IntRect.h>
 #include <wtf/Noncopyable.h>
-
-namespace CoreIPC {
-class ArgumentDecoder;
-class ArgumentEncoder;
-}
 
 namespace WebKit {
@@ -36 +33 @@
 public:
     SurfaceUpdateInfo() { }
-
-    void encode(CoreIPC::ArgumentEncoder&) const;
-    static bool decode(CoreIPC::ArgumentDecoder*, SurfaceUpdateInfo&);
 
     // The rect to be updated.
@@ -55 +49 @@
 } // namespace WebKit
 
-#endif // UpdateInfo_h
+#endif // USE(COORDINATED_GRAPHICS)
+
+#endif // SurfaceUpdateInfo_h

trunk/Source/WebKit2/Target.pri

@@ -100 +100 @@
     Shared/StatisticsData.h \
     Shared/StringPairVector.h \
-    Shared/SurfaceUpdateInfo.h \
     Shared/UpdateInfo.h \
     Shared/UserMessageCoders.h \
@@ -138 +137 @@
     Shared/CoordinatedGraphics/CoordinatedLayerInfo.h \
     Shared/CoordinatedGraphics/CoordinatedSurface.h \
+    Shared/CoordinatedGraphics/SurfaceUpdateInfo.h \
     Shared/CoordinatedGraphics/WebCoordinatedSurface.h \
     Shared/CoordinatedGraphics/WebCustomFilterProgram.h \
@@ -475 +475 @@
     Shared/SessionState.cpp \
     Shared/StatisticsData.cpp \
-    Shared/SurfaceUpdateInfo.cpp \
     Shared/UpdateInfo.cpp \
     Shared/VisitedLinkTable.cpp \