Changeset 101796 in webkit

Timestamp:

Dec 2, 2011 7:32:05 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, revert r101347.
​https://bugs.webkit.org/show_bug.cgi?id=73580

It breaks the linking of Tools/ targets due to missing functions.

Patch by Raphael Kubo da Costa <​kubo@profusion.mobi> on 2011-12-02

.:

• Source/cmake/OptionsEfl.cmake:

Source/WebCore:

• PlatformEfl.cmake:
• platform/graphics/GraphicsLayer.cpp:
• platform/graphics/GraphicsLayer.h:
• platform/graphics/efl/GraphicsLayerEfl.cpp: Added.

(WebCore::GraphicsLayer::create):
(WebCore::GraphicsLayerEfl::GraphicsLayerEfl):
(WebCore::GraphicsLayerEfl::~GraphicsLayerEfl):
(WebCore::GraphicsLayerEfl::setNeedsDisplay):
(WebCore::GraphicsLayerEfl::setNeedsDisplayInRect):

• platform/graphics/efl/GraphicsLayerEfl.h: Added.
• platform/graphics/texmap/TextureMapperNode.cpp:

(WebCore::solveCubicBezierFunction):
(WebCore::solveStepsFunction):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/PlatformEfl.cmake (modified) (2 diffs)
• Source/WebCore/platform/graphics/GraphicsLayer.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/GraphicsLayer.h (modified) (3 diffs)
• Source/WebCore/platform/graphics/efl/GraphicsLayerEfl.cpp (added)
• Source/WebCore/platform/graphics/efl/GraphicsLayerEfl.h (added)
• Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp (modified) (2 diffs)
• Source/cmake/OptionsEfl.cmake (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2011-12-02  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        Unreviewed, revert r101347.
+        https://bugs.webkit.org/show_bug.cgi?id=73580
+
+        It breaks the linking of Tools/ targets due to missing functions.
+
+        * Source/cmake/OptionsEfl.cmake:
+
 2011-12-02  Alejandro G. Castro  <alex@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-02  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        Unreviewed, revert r101347.
+        https://bugs.webkit.org/show_bug.cgi?id=73580
+
+        It breaks the linking of Tools/ targets due to missing functions.
+
+        * PlatformEfl.cmake:
+        * platform/graphics/GraphicsLayer.cpp:
+        * platform/graphics/GraphicsLayer.h:
+        * platform/graphics/efl/GraphicsLayerEfl.cpp: Added.
+        (WebCore::GraphicsLayer::create):
+        (WebCore::GraphicsLayerEfl::GraphicsLayerEfl):
+        (WebCore::GraphicsLayerEfl::~GraphicsLayerEfl):
+        (WebCore::GraphicsLayerEfl::setNeedsDisplay):
+        (WebCore::GraphicsLayerEfl::setNeedsDisplayInRect):
+        * platform/graphics/efl/GraphicsLayerEfl.h: Added.
+        * platform/graphics/texmap/TextureMapperNode.cpp:
+        (WebCore::solveCubicBezierFunction):
+        (WebCore::solveStepsFunction):
+
 2011-12-01  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/PlatformEfl.cmake

@@ -56 +56 @@
   platform/efl/WidgetEfl.cpp
   platform/graphics/ImageSource.cpp
+  platform/graphics/efl/GraphicsLayerEfl.cpp
   platform/graphics/efl/IconEfl.cpp
   platform/graphics/efl/ImageEfl.cpp
@@ -208 +209 @@
 ENDIF ()
 
-IF (WTF_USE_TEXTURE_MAPPER)
-  LIST(APPEND WebCore_INCLUDE_DIRECTORIES
-    ${OPENGL_INCLUDE_DIR}
-    "${WEBCORE_DIR}/platform/graphics/texmap"
-  )
-  LIST(APPEND WebCore_SOURCES
-    platform/graphics/opengl/TextureMapperGL.cpp
-    platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
-    platform/graphics/texmap/TextureMapperNode.cpp
-  )
-   LIST(APPEND WebCore_LIBRARIES
-    ${OPENGL_gl_LIBRARY}
-  )
-ENDIF ()
-
 LIST(APPEND WebCore_LIBRARIES
   ${Cairo_LIBRARIES}

trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

@@ -348 +348 @@
 }
 
-#if PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(QT) || PLATFORM(GTK)
 GraphicsLayer::GraphicsLayerFactory* GraphicsLayer::s_graphicsLayerFactory = 0;
 

trunk/Source/WebCore/platform/graphics/GraphicsLayer.h

@@ -69 +69 @@
 typedef LayerChromium PlatformLayer;
 }
-#elif PLATFORM(EFL)
-namespace WebCore {
-class TextureMapperPlatformLayer;
-typedef TextureMapperPlatformLayer PlatformLayer;
-};
 #elif PLATFORM(GTK)
 #if USE(TEXTURE_MAPPER_CAIRO) || USE(TEXTURE_MAPPER_GL)
@@ -390 +385 @@
     bool usingTiledLayer() const { return m_usingTiledLayer; }
 
-#if PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(QT) || PLATFORM(GTK)
     // This allows several alternative GraphicsLayer implementations in the same port,
     // e.g. if a different GraphicsLayer implementation is needed in WebKit1 vs. WebKit2.
@@ -462 +457 @@
     int m_repaintCount;
 
-#if PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(QT) || PLATFORM(GTK)
     static GraphicsLayer::GraphicsLayerFactory* s_graphicsLayerFactory;
 #endif

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp

@@ -824 +824 @@
 }
 
-static inline double solveCubicBezierFunction(double p1x, double p1y, double p2x, double p2y, double t, double duration)
+static inline double solveCubicBezierFunction(qreal p1x, qreal p1y, qreal p2x, qreal p2y, double t, double duration)
 {
     UnitBezier bezier(p1x, p1y, p2x, p2y);
@@ -833 +833 @@
 {
     if (stepAtStart)
-        return fmin(1.0, (floor(numSteps * t) + 1) / numSteps);
+        return qMin(1.0, (floor(numSteps * t) + 1) / numSteps);
     return floor(numSteps * t) / numSteps;
 }

trunk/Source/cmake/OptionsEfl.cmake

@@ -37 +37 @@
 FIND_PACKAGE(JPEG REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
-FIND_PACKAGE(OpenGL REQUIRED)
 
 ADD_DEFINITIONS(-DENABLE_CONTEXT_MENUS=0)
@@ -49 +48 @@
 SET(WTF_USE_CAIRO 1)
 ADD_DEFINITIONS(-DWTF_USE_CAIRO=1)
-
-SET(WTF_USE_TEXTURE_MAPPER 1)
-ADD_DEFINITIONS(-DWTF_USE_TEXTURE_MAPPER=1)
 
 SET(JSC_EXECUTABLE_NAME jsc_efl)