Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (123998 => 123999)
--- trunk/Source/WebCore/CMakeLists.txt 2012-07-30 06:09:55 UTC (rev 123998)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-07-30 06:25:19 UTC (rev 123999)
@@ -1794,6 +1794,8 @@
platform/graphics/Gradient.cpp
platform/graphics/GraphicsContext.cpp
platform/graphics/GraphicsLayer.cpp
+ platform/graphics/GraphicsLayerAnimation.cpp
+ platform/graphics/GraphicsLayerTransform.cpp
platform/graphics/GraphicsTypes.cpp
platform/graphics/Image.cpp
platform/graphics/ImageBuffer.cpp
@@ -1854,6 +1856,11 @@
platform/graphics/filters/arm/FELightingNEON.cpp
platform/graphics/filters/arm/FELightingNEON.h
+ platform/graphics/texmap/TextureMapper.cpp
+ platform/graphics/texmap/TextureMapperBackingStore.cpp
+ platform/graphics/texmap/TextureMapperImageBuffer.cpp
+ platform/graphics/texmap/TextureMapperLayer.cpp
+
platform/graphics/transforms/AffineTransform.cpp
platform/graphics/transforms/Matrix3DTransformOperation.cpp
platform/graphics/transforms/MatrixTransformOperation.cpp
Modified: trunk/Source/WebCore/ChangeLog (123998 => 123999)
--- trunk/Source/WebCore/ChangeLog 2012-07-30 06:09:55 UTC (rev 123998)
+++ trunk/Source/WebCore/ChangeLog 2012-07-30 06:25:19 UTC (rev 123999)
@@ -1,5 +1,30 @@
2012-07-29 YoungTaeck Song <youngtaeck.s...@samsung.com>
+ [WK2][EFL] Accelerated compositing support using TextureMapper on Efl WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=91583
+
+ Reviewed by Noam Rosenthal.
+
+ This patch is a subset of Efl's UI_SIDE_COMPOSITING implementation.
+ This patch adds Texture Mapper related files to PlatformEfl.cmake.
+ And wrapped TextureMapperLayer and TextureMapperBackingStore with USE(ACCELERATED_COMPOSITING) for fixing building error when disable ACCELERATED_COMPOSITING.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore):
+ * platform/graphics/GraphicsLayer.h:
+ (GraphicsLayer):
+ * platform/graphics/GraphicsLayerAnimation.cpp:
+ * platform/graphics/GraphicsLayerAnimation.h:
+ * platform/graphics/PlatformLayer.h:
+ (WebCore):
+ * platform/graphics/texmap/TextureMapperBackingStore.cpp:
+ * platform/graphics/texmap/TextureMapperBackingStore.h:
+ * platform/graphics/texmap/TextureMapperLayer.h:
+
+2012-07-29 YoungTaeck Song <youngtaeck.s...@samsung.com>
+
[WK2][EFL] TILED_BACKING_STORE support on Efl WebKit2
https://bugs.webkit.org/show_bug.cgi?id=91582
Modified: trunk/Source/WebCore/PlatformEfl.cmake (123998 => 123999)
--- trunk/Source/WebCore/PlatformEfl.cmake 2012-07-30 06:09:55 UTC (rev 123998)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2012-07-30 06:25:19 UTC (rev 123999)
@@ -65,7 +65,6 @@
platform/efl/TemporaryLinkStubs.cpp
platform/efl/WidgetEfl.cpp
platform/graphics/ImageSource.cpp
- platform/graphics/efl/GraphicsLayerEfl.cpp
platform/graphics/efl/IconEfl.cpp
platform/graphics/efl/ImageEfl.cpp
platform/graphics/efl/IntPointEfl.cpp
@@ -204,6 +203,16 @@
)
ENDIF ()
+IF (WTF_USE_TEXTURE_MAPPER)
+ LIST(APPEND WebCore_SOURCES
+ platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
+ )
+ELSE ()
+ LIST(APPEND WebCore_SOURCES
+ platform/graphics/efl/GraphicsLayerEfl.cpp
+ )
+ENDIF ()
+
LIST(APPEND WebCore_LIBRARIES
${CAIRO_LIBRARIES}
${ECORE_X_LIBRARIES}
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (123998 => 123999)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2012-07-30 06:09:55 UTC (rev 123998)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2012-07-30 06:25:19 UTC (rev 123999)
@@ -384,7 +384,7 @@
}
}
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL)
GraphicsLayer::GraphicsLayerFactory* GraphicsLayer::s_graphicsLayerFactory = 0;
void GraphicsLayer::setGraphicsLayerFactory(GraphicsLayer::GraphicsLayerFactory factory)
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (123998 => 123999)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2012-07-30 06:09:55 UTC (rev 123998)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2012-07-30 06:25:19 UTC (rev 123999)
@@ -394,7 +394,7 @@
virtual TiledBacking* tiledBacking() { return 0; }
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL)
// This allows several alternative GraphicsLayer implementations in the same port,
// e.g. if a different GraphicsLayer implementation is needed in WebKit1 vs. WebKit2.
typedef PassOwnPtr<GraphicsLayer> GraphicsLayerFactory(GraphicsLayerClient*);
@@ -485,7 +485,7 @@
int m_repaintCount;
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL)
static GraphicsLayer::GraphicsLayerFactory* s_graphicsLayerFactory;
#endif
};
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp (123998 => 123999)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp 2012-07-30 06:09:55 UTC (rev 123998)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp 2012-07-30 06:25:19 UTC (rev 123999)
@@ -18,6 +18,8 @@
*/
#include "config.h"
+
+#if USE(ACCELERATED_COMPOSITING)
#include "GraphicsLayerAnimation.h"
#include "UnitBezier.h"
@@ -295,3 +297,5 @@
}
}
+#endif
+
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h (123998 => 123999)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h 2012-07-30 06:09:55 UTC (rev 123998)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h 2012-07-30 06:25:19 UTC (rev 123999)
@@ -20,6 +20,8 @@
#ifndef GraphicsLayerAnimation_h
#define GraphicsLayerAnimation_h
+#if USE(ACCELERATED_COMPOSITING)
+
#include "GraphicsLayer.h"
#include "TransformationMatrix.h"
#include <wtf/HashMap.h>
@@ -78,4 +80,6 @@
};
}
+#endif
+
#endif // GraphicsLayerAnimation_h
Modified: trunk/Source/WebCore/platform/graphics/PlatformLayer.h (123998 => 123999)
--- trunk/Source/WebCore/platform/graphics/PlatformLayer.h 2012-07-30 06:09:55 UTC (rev 123998)
+++ trunk/Source/WebCore/platform/graphics/PlatformLayer.h 2012-07-30 06:25:19 UTC (rev 123999)
@@ -55,6 +55,13 @@
typedef ClutterActor PlatformLayer;
};
#endif
+#elif PLATFORM(EFL)
+#if USE(TEXTURE_MAPPER)
+namespace WebCore {
+class TextureMapperPlatformLayer;
+typedef TextureMapperPlatformLayer PlatformLayer;
+};
+#endif
#else
typedef void* PlatformLayer;
#endif
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp (123998 => 123999)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp 2012-07-30 06:09:55 UTC (rev 123998)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp 2012-07-30 06:25:19 UTC (rev 123999)
@@ -18,6 +18,8 @@
*/
#include "config.h"
+
+#if USE(ACCELERATED_COMPOSITING)
#include "TextureMapperBackingStore.h"
#include "GraphicsLayer.h"
@@ -222,3 +224,4 @@
}
}
+#endif
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h (123998 => 123999)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h 2012-07-30 06:09:55 UTC (rev 123998)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h 2012-07-30 06:25:19 UTC (rev 123999)
@@ -20,6 +20,8 @@
#ifndef TextureMapperBackingStore_h
#define TextureMapperBackingStore_h
+#if USE(ACCELERATED_COMPOSITING)
+
#include "FloatRect.h"
#include "Image.h"
#include "TextureMapper.h"
@@ -128,4 +130,6 @@
};
}
+#endif
+
#endif // TextureMapperBackingStore_h
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h (123998 => 123999)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2012-07-30 06:09:55 UTC (rev 123998)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2012-07-30 06:25:19 UTC (rev 123999)
@@ -20,6 +20,8 @@
#ifndef TextureMapperLayer_h
#define TextureMapperLayer_h
+#if USE(ACCELERATED_COMPOSITING)
+
#include "FilterOperations.h"
#include "FloatRect.h"
#include "GraphicsContext.h"
@@ -245,4 +247,6 @@
TextureMapperLayer* toTextureMapperLayer(GraphicsLayer*);
}
+#endif
+
#endif // TextureMapperLayer_h
