Changeset 101347 in webkit


Ignore:
Timestamp:
Nov 29, 2011 2:47:32 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[Texmap][EFL] Accelerated compositing support using TextureMapper on EFL port
​https://bugs.webkit.org/show_bug.cgi?id=73111

.:

Add feature define for TextureMapper and OpenGL package.

Patch by Hyowon Kim <​hw1008.kim@samsung.com> on 2011-11-29
Reviewed by Noam Rosenthal.

  • Source/cmake/OptionsEfl.cmake:

Source/WebCore:

This patch adds Texture Mapper related files to PlatformEfl.cmake
and removes Qt-specific types in TextureMapperNode.cpp.

Patch by Hyowon Kim <​hw1008.kim@samsung.com> on 2011-11-29
Reviewed by Noam Rosenthal.

  • PlatformEfl.cmake:
  • platform/graphics/GraphicsLayer.cpp:
  • platform/graphics/GraphicsLayer.h:
  • platform/graphics/efl/GraphicsLayerEfl.cpp: Removed.
  • platform/graphics/efl/GraphicsLayerEfl.h: Removed.
  • platform/graphics/texmap/TextureMapperNode.cpp:

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

Location:
trunk
Files:
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r101323 r101347  
     12011-11-29  Hyowon Kim  <hw1008.kim@samsung.com>
     2
     3        [Texmap][EFL] Accelerated compositing support using TextureMapper on EFL port
     4        https://bugs.webkit.org/show_bug.cgi?id=73111
     5
     6        Add feature define for TextureMapper and OpenGL package.
     7
     8        Reviewed by Noam Rosenthal.
     9
     10        * Source/cmake/OptionsEfl.cmake:
     11
    1122011-11-29  Roland Steiner  <rolandsteiner@chromium.org>
    213

  • trunk/Source/WebCore/ChangeLog

    r101345 r101347  
     12011-11-29  Hyowon Kim  <hw1008.kim@samsung.com>
     2
     3        [Texmap][EFL] Accelerated compositing support using TextureMapper on EFL port
     4        https://bugs.webkit.org/show_bug.cgi?id=73111
     5
     6        This patch adds Texture Mapper related files to PlatformEfl.cmake
     7        and removes Qt-specific types in TextureMapperNode.cpp.
     8
     9        Reviewed by Noam Rosenthal.
     10
     11        * PlatformEfl.cmake:
     12        * platform/graphics/GraphicsLayer.cpp:
     13        * platform/graphics/GraphicsLayer.h:
     14        * platform/graphics/efl/GraphicsLayerEfl.cpp: Removed.
     15        * platform/graphics/efl/GraphicsLayerEfl.h: Removed.
     16        * platform/graphics/texmap/TextureMapperNode.cpp:
     17        (WebCore::solveCubicBezierFunction):
     18        (WebCore::solveStepsFunction):
     19
    1202011-11-28  Pavel Feldman  <pfeldman@google.com>
    221

  • trunk/Source/WebCore/PlatformEfl.cmake

    r101079 r101347  
    5656  platform/efl/WidgetEfl.cpp
    5757  platform/graphics/ImageSource.cpp
    58   platform/graphics/efl/GraphicsLayerEfl.cpp
    5958  platform/graphics/efl/IconEfl.cpp
    6059  platform/graphics/efl/ImageEfl.cpp
    … …  
    209208ENDIF ()
    210209
     210IF (WTF_USE_TEXTURE_MAPPER)
     211  LIST(APPEND WebCore_INCLUDE_DIRECTORIES
     212    ${OPENGL_INCLUDE_DIR}
     213    "${WEBCORE_DIR}/platform/graphics/texmap"
     214  )
     215  LIST(APPEND WebCore_SOURCES
     216    platform/graphics/opengl/TextureMapperGL.cpp
     217    platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
     218    platform/graphics/texmap/TextureMapperNode.cpp
     219  )
     220   LIST(APPEND WebCore_LIBRARIES
     221    ${OPENGL_gl_LIBRARY}
     222  )
     223ENDIF ()
     224
    211225LIST(APPEND WebCore_LIBRARIES
    212226  ${Cairo_LIBRARIES}

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

    r98735 r101347  
    348348}
    349349
    350 #if PLATFORM(QT)
     350#if PLATFORM(QT) || PLATFORM(EFL)
    351351GraphicsLayer::GraphicsLayerFactory* GraphicsLayer::s_graphicsLayerFactory = 0;
    352352

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

    r98735 r101347  
    6969typedef LayerChromium PlatformLayer;
    7070}
     71#elif PLATFORM(EFL)
     72namespace WebCore {
     73class TextureMapperPlatformLayer;
     74typedef TextureMapperPlatformLayer PlatformLayer;
     75};
    7176#else
    7277typedef void* PlatformLayer;
    … …  
    378383    bool usingTiledLayer() const { return m_usingTiledLayer; }
    379384
    380 #if PLATFORM(QT)
     385#if PLATFORM(QT) || PLATFORM(EFL)
    381386    // This allows several alternative GraphicsLayer implementations in the same port,
    382387    // e.g. if a different GraphicsLayer implementation is needed in WebKit1 vs. WebKit2.
    … …  
    450455    int m_repaintCount;
    451456
    452 #if PLATFORM(QT)
     457#if PLATFORM(QT) || PLATFORM(EFL)
    453458    static GraphicsLayer::GraphicsLayerFactory* s_graphicsLayerFactory;
    454459#endif

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

    r101196 r101347  
    824824}
    825825
    826 static inline double solveCubicBezierFunction(qreal p1x, qreal p1y, qreal p2x, qreal p2y, double t, double duration)
     826static inline double solveCubicBezierFunction(double p1x, double p1y, double p2x, double p2y, double t, double duration)
    827827{
    828828    UnitBezier bezier(p1x, p1y, p2x, p2y);
    … …  
    833833{
    834834    if (stepAtStart)
    835         return qMin(1.0, (floor(numSteps * t) + 1) / numSteps);
     835        return fmin(1.0, (floor(numSteps * t) + 1) / numSteps);
    836836    return floor(numSteps * t) / numSteps;
    837837}

  • trunk/Source/cmake/OptionsEfl.cmake

    r101079 r101347  
    3737FIND_PACKAGE(JPEG REQUIRED)
    3838FIND_PACKAGE(PNG REQUIRED)
     39FIND_PACKAGE(OpenGL REQUIRED)
    3940
    4041ADD_DEFINITIONS(-DENABLE_CONTEXT_MENUS=0)
    … …  
    4849SET(WTF_USE_CAIRO 1)
    4950ADD_DEFINITIONS(-DWTF_USE_CAIRO=1)
     51
     52SET(WTF_USE_TEXTURE_MAPPER 1)
     53ADD_DEFINITIONS(-DWTF_USE_TEXTURE_MAPPER=1)
    5054
    5155SET(JSC_EXECUTABLE_NAME jsc_efl)
Note: See TracChangeset for help on using the changeset viewer.