Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (140600 => 140601)
--- trunk/Source/WebKit2/CMakeLists.txt 2013-01-23 22:53:10 UTC (rev 140600)
+++ trunk/Source/WebKit2/CMakeLists.txt 2013-01-23 22:54:39 UTC (rev 140601)
@@ -224,7 +224,6 @@
Shared/API/c/WKUserContentURLPattern.cpp
Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp
- Shared/CoordinatedGraphics/CoordinatedLayerInfo.cpp
Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp
Shared/CoordinatedGraphics/WebCustomFilterProgramProxy.cpp
Modified: trunk/Source/WebKit2/ChangeLog (140600 => 140601)
--- trunk/Source/WebKit2/ChangeLog 2013-01-23 22:53:10 UTC (rev 140600)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-23 22:54:39 UTC (rev 140601)
@@ -1,3 +1,24 @@
+2013-01-23 Huang Dongsung <[email protected]>
+
+ Coordinated Graphics: remove CoordinatedLayerInfo::encode/decode.
+ https://bugs.webkit.org/show_bug.cgi?id=107644
+
+ Reviewed by Anders Carlsson.
+
+ We want to remove the dependency on CoreIPC from CoordinatedLayerInfo because we
+ will extract Coordinated Graphics from WK2.
+
+ * CMakeLists.txt:
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+ (CoreIPC::::encode):
+ (CoreIPC):
+ (CoreIPC::::decode):
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h:
+ (WebKit):
+ * Shared/CoordinatedGraphics/CoordinatedLayerInfo.cpp: Removed.
+ * Shared/CoordinatedGraphics/CoordinatedLayerInfo.h:
+ * Target.pri:
+
2013-01-23 Kenneth Rohde Christiansen <[email protected]>
[WK2] Replace some internal API usage in EwkView with C API
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (140600 => 140601)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2013-01-23 22:53:10 UTC (rev 140600)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2013-01-23 22:54:39 UTC (rev 140601)
@@ -29,6 +29,7 @@
#include "CoordinatedGraphicsArgumentCoders.h"
#if USE(COORDINATED_GRAPHICS)
+#include "CoordinatedLayerInfo.h"
#include "WebCoreArgumentCoders.h"
#include <WebCore/Animation.h>
#include <WebCore/Color.h>
@@ -71,9 +72,7 @@
#endif
using namespace WebCore;
-#if ENABLE(CSS_SHADERS)
using namespace WebKit;
-#endif
namespace CoreIPC {
@@ -813,6 +812,16 @@
}
#endif
+void ArgumentCoder<CoordinatedLayerInfo>::encode(ArgumentEncoder& encoder, const CoordinatedLayerInfo& coordinatedLayerInfo)
+{
+ SimpleArgumentCoder<CoordinatedLayerInfo>::encode(encoder, coordinatedLayerInfo);
+}
+
+bool ArgumentCoder<CoordinatedLayerInfo>::decode(ArgumentDecoder* decoder, CoordinatedLayerInfo& coordinatedLayerInfo)
+{
+ return SimpleArgumentCoder<CoordinatedLayerInfo>::decode(decoder, coordinatedLayerInfo);
+}
+
} // namespace CoreIPC
#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h (140600 => 140601)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h 2013-01-23 22:53:10 UTC (rev 140600)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h 2013-01-23 22:54:39 UTC (rev 140601)
@@ -52,6 +52,10 @@
#endif
}
+namespace WebKit {
+struct CoordinatedLayerInfo;
+}
+
namespace CoreIPC {
template<> struct ArgumentCoder<WebCore::FloatPoint3D> {
@@ -105,6 +109,11 @@
};
#endif
+template<> struct ArgumentCoder<WebKit::CoordinatedLayerInfo> {
+ static void encode(ArgumentEncoder&, const WebKit::CoordinatedLayerInfo&);
+ static bool decode(ArgumentDecoder*, WebKit::CoordinatedLayerInfo&);
+};
+
} // namespace CoreIPC
#endif // USE(COORDINATED_GRAPHICS)
Deleted: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedLayerInfo.cpp (140600 => 140601)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedLayerInfo.cpp 2013-01-23 22:53:10 UTC (rev 140600)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedLayerInfo.cpp 2013-01-23 22:54:39 UTC (rev 140601)
@@ -1,43 +0,0 @@
-/*
- Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#if USE(COORDINATED_GRAPHICS)
-#include "CoordinatedLayerInfo.h"
-
-#include "ArgumentCoders.h"
-#include "Arguments.h"
-#include "SharedMemory.h"
-
-using namespace CoreIPC;
-
-namespace WebKit {
-
-void CoordinatedLayerInfo::encode(CoreIPC::ArgumentEncoder& encoder) const
-{
- SimpleArgumentCoder<CoordinatedLayerInfo>::encode(encoder, *this);
-}
-
-bool CoordinatedLayerInfo::decode(CoreIPC::ArgumentDecoder* decoder, CoordinatedLayerInfo& info)
-{
- return SimpleArgumentCoder<CoordinatedLayerInfo>::decode(decoder, info);
-}
-}
-#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedLayerInfo.h (140600 => 140601)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedLayerInfo.h 2013-01-23 22:53:10 UTC (rev 140600)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedLayerInfo.h 2013-01-23 22:54:39 UTC (rev 140601)
@@ -22,11 +22,11 @@
#if USE(COORDINATED_GRAPHICS)
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
+#include "Color.h"
#include "FloatRect.h"
#include "FloatSize.h"
-#include "GraphicsLayer.h"
+#include "IntRect.h"
+#include "TransformationMatrix.h"
namespace WebKit {
@@ -71,9 +71,6 @@
};
unsigned flags;
};
-
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder*, CoordinatedLayerInfo&);
};
}
Modified: trunk/Source/WebKit2/Target.pri (140600 => 140601)
--- trunk/Source/WebKit2/Target.pri 2013-01-23 22:53:10 UTC (rev 140600)
+++ trunk/Source/WebKit2/Target.pri 2013-01-23 22:54:39 UTC (rev 140601)
@@ -512,7 +512,6 @@
Shared/WebURLResponse.cpp \
Shared/WebWheelEvent.cpp \
Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp \
- Shared/CoordinatedGraphics/CoordinatedLayerInfo.cpp \
Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp \
Shared/CoordinatedGraphics/WebCustomFilterProgramProxy.cpp \
Shared/qt/ArgumentCodersQt.cpp \
