Diff
Modified: trunk/ChangeLog (101795 => 101796)
--- trunk/ChangeLog 2011-12-02 15:27:57 UTC (rev 101795)
+++ trunk/ChangeLog 2011-12-02 15:32:05 UTC (rev 101796)
@@ -1,3 +1,12 @@
+2011-12-02 Raphael Kubo da Costa <[email protected]>
+
+ 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 <[email protected]>
[GTK] Improve C++0x compat warnings check
Modified: trunk/Source/WebCore/ChangeLog (101795 => 101796)
--- trunk/Source/WebCore/ChangeLog 2011-12-02 15:27:57 UTC (rev 101795)
+++ trunk/Source/WebCore/ChangeLog 2011-12-02 15:32:05 UTC (rev 101796)
@@ -1,3 +1,24 @@
+2011-12-02 Raphael Kubo da Costa <[email protected]>
+
+ 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 <[email protected]>
Web Inspector: Extract default call stack creation and check for front-end from console.
Modified: trunk/Source/WebCore/PlatformEfl.cmake (101795 => 101796)
--- trunk/Source/WebCore/PlatformEfl.cmake 2011-12-02 15:27:57 UTC (rev 101795)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2011-12-02 15:32:05 UTC (rev 101796)
@@ -55,6 +55,7 @@
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
@@ -207,21 +208,6 @@
)
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}
${ECORE_X_LIBRARIES}
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (101795 => 101796)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2011-12-02 15:27:57 UTC (rev 101795)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2011-12-02 15:32:05 UTC (rev 101796)
@@ -347,7 +347,7 @@
}
}
-#if PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(QT) || PLATFORM(GTK)
GraphicsLayer::GraphicsLayerFactory* GraphicsLayer::s_graphicsLayerFactory = 0;
void GraphicsLayer::setGraphicsLayerFactory(GraphicsLayer::GraphicsLayerFactory factory)
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (101795 => 101796)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2011-12-02 15:27:57 UTC (rev 101795)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2011-12-02 15:32:05 UTC (rev 101796)
@@ -68,11 +68,6 @@
class LayerChromium;
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)
namespace WebCore {
@@ -389,7 +384,7 @@
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.
typedef PassOwnPtr<GraphicsLayer> GraphicsLayerFactory(GraphicsLayerClient*);
@@ -461,7 +456,7 @@
int m_repaintCount;
-#if PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(QT) || PLATFORM(GTK)
static GraphicsLayer::GraphicsLayerFactory* s_graphicsLayerFactory;
#endif
};
Added: trunk/Source/WebCore/platform/graphics/efl/GraphicsLayerEfl.cpp (0 => 101796)
--- trunk/Source/WebCore/platform/graphics/efl/GraphicsLayerEfl.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/efl/GraphicsLayerEfl.cpp 2011-12-02 15:32:05 UTC (rev 101796)
@@ -0,0 +1,56 @@
+/*
+Copyright (C) 2009-2011 Samsung Electronics
+
+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(ACCELERATED_COMPOSITING)
+
+#include "GraphicsLayerEfl.h"
+
+#include "NotImplemented.h"
+
+namespace WebCore {
+
+PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client)
+{
+ return adoptPtr(new GraphicsLayerEfl(client));
+}
+
+GraphicsLayerEfl::GraphicsLayerEfl(GraphicsLayerClient* client)
+ : GraphicsLayer(client)
+{
+}
+
+GraphicsLayerEfl::~GraphicsLayerEfl()
+{
+}
+
+void GraphicsLayerEfl::setNeedsDisplay()
+{
+ notImplemented();
+}
+
+void GraphicsLayerEfl::setNeedsDisplayInRect(const FloatRect&)
+{
+ notImplemented();
+}
+
+} // namespace WebCore
+
+#endif // USE(ACCELERATED_COMPOSITING)
Added: trunk/Source/WebCore/platform/graphics/efl/GraphicsLayerEfl.h (0 => 101796)
--- trunk/Source/WebCore/platform/graphics/efl/GraphicsLayerEfl.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/efl/GraphicsLayerEfl.h 2011-12-02 15:32:05 UTC (rev 101796)
@@ -0,0 +1,42 @@
+/*
+ Copyright (C) 2009-2011 Samsung Electronics
+
+ 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.
+*/
+
+#ifndef GraphicsLayerEfl_h
+#define GraphicsLayerEfl_h
+
+#if USE(ACCELERATED_COMPOSITING)
+
+#include "GraphicsLayer.h"
+
+namespace WebCore {
+
+class GraphicsLayerEfl : public GraphicsLayer {
+public:
+ GraphicsLayerEfl(GraphicsLayerClient*);
+ virtual ~GraphicsLayerEfl();
+
+ virtual void setNeedsDisplay();
+ virtual void setNeedsDisplayInRect(const FloatRect&);
+};
+
+} // namespace WebCore
+
+#endif // USE(ACCELERATED_COMPOSITING)
+
+#endif // GraphicsLayerEfl_h
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp (101795 => 101796)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp 2011-12-02 15:27:57 UTC (rev 101795)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp 2011-12-02 15:32:05 UTC (rev 101796)
@@ -823,7 +823,7 @@
return 1.0 / (200.0 * duration);
}
-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);
return bezier.solve(t, solveEpsilon(duration));
@@ -832,7 +832,7 @@
static inline double solveStepsFunction(int numSteps, bool stepAtStart, double t)
{
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;
}
Modified: trunk/Source/cmake/OptionsEfl.cmake (101795 => 101796)
--- trunk/Source/cmake/OptionsEfl.cmake 2011-12-02 15:27:57 UTC (rev 101795)
+++ trunk/Source/cmake/OptionsEfl.cmake 2011-12-02 15:32:05 UTC (rev 101796)
@@ -36,7 +36,6 @@
FIND_PACKAGE(Threads REQUIRED)
FIND_PACKAGE(JPEG REQUIRED)
FIND_PACKAGE(PNG REQUIRED)
-FIND_PACKAGE(OpenGL REQUIRED)
ADD_DEFINITIONS(-DENABLE_CONTEXT_MENUS=0)
@@ -49,9 +48,6 @@
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)
SET(WTF_LIBRARY_NAME wtf_efl)
SET(_javascript_Core_LIBRARY_NAME _javascript_core_efl)
