Changeset 147792 in webkit


Ignore:
Timestamp:
Apr 5, 2013 1:29:44 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL] --no-tiled-backing-store build fails because of not used #if USE(ACCELERATED_COMPOSITING)
​https://bugs.webkit.org/show_bug.cgi?id=113627

Patch by Ed Bartosh <​bartosh@gmail.com> on 2013-04-05
Reviewed by Simon Fraser.

.:

  • Source/cmake/OptionsEfl.cmake: Disabled 3D_GRAPHICS and WEB_GL when accelerated compositing is on

Source/WebCore:

Wrapped code with #if USE(ACCELERATED_COMPOSITING) to make it compilable
with --no-tiled-backing-store build option:

  • page/animation/ImplicitAnimation.cpp:

(WebCore::ImplicitAnimation::animate):

  • page/animation/KeyframeAnimation.cpp:

(WebCore::KeyframeAnimation::animate):

  • platform/graphics/TextTrackRepresentation.cpp:

(NullTextTrackRepresentation):

  • platform/graphics/TextTrackRepresentation.h:

(TextTrackRepresentation):

  • testing/Internals.cpp:

(WebCore::Internals::resetToConsistentState):
(WebCore::Internals::setHeaderHeight):
(WebCore::Internals::setFooterHeight):

Source/WebKit2:

Wrapped code with #if USE(ACCELERATED_COMPOSITING) to make it compilable
with --no-tiled-backing-store build option:

  • UIProcess/API/C/efl/WKView.cpp:
  • UIProcess/API/efl/EvasGLContext.cpp:
  • UIProcess/API/efl/EvasGLContext.h:
  • UIProcess/API/efl/EvasGLSurface.cpp:
  • UIProcess/API/efl/EvasGLSurface.h:
  • UIProcess/API/efl/EwkView.cpp:

(EwkView::EwkView):
(EwkView::displayTimerFired):
(EwkView::takeSnapshot):

  • UIProcess/API/efl/EwkView.h:

(WebKit):
(EwkView):

  • UIProcess/API/efl/SnapshotImageGL.cpp:
  • UIProcess/API/efl/SnapshotImageGL.h:
  • UIProcess/PageViewportController.cpp:
  • UIProcess/PageViewportController.h:
  • UIProcess/efl/PageViewportControllerClientEfl.cpp:
  • UIProcess/efl/ViewClientEfl.cpp:

(WebKit::ViewClientEfl::didChangeContentsSize):

  • UIProcess/efl/WebView.cpp:

(WebKit::WebView::didCommitLoad):
(WebKit::WebView::updateViewportSize):
(WebKit::WebView::didChangeViewportProperties):
(WebKit::WebView::pageDidRequestScroll):
(WebKit::WebView::didRenderFrame):
(WebKit::WebView::pageTransitionViewportReady):

Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r147768 r147792  
     12013-04-05  Ed Bartosh  <bartosh@gmail.com>
     2
     3        [EFL] --no-tiled-backing-store build fails because of not used #if USE(ACCELERATED_COMPOSITING)
     4        https://bugs.webkit.org/show_bug.cgi?id=113627
     5
     6        Reviewed by Simon Fraser.
     7
     8        * Source/cmake/OptionsEfl.cmake: Disabled 3D_GRAPHICS and WEB_GL when accelerated compositing is on
     9
    1102013-04-05  Rijubrata Bhaumik  <rijubrata.bhaumik@intel.com>
    211

  • trunk/Source/WebCore/ChangeLog

    r147790 r147792  
     12013-04-05  Ed Bartosh  <bartosh@gmail.com>
     2
     3        [EFL] --no-tiled-backing-store build fails because of not used #if USE(ACCELERATED_COMPOSITING)
     4        https://bugs.webkit.org/show_bug.cgi?id=113627
     5
     6        Reviewed by Simon Fraser.
     7
     8       Wrapped code with #if USE(ACCELERATED_COMPOSITING) to make it compilable
     9       with --no-tiled-backing-store build option:
     10        * page/animation/ImplicitAnimation.cpp:
     11        (WebCore::ImplicitAnimation::animate):
     12        * page/animation/KeyframeAnimation.cpp:
     13        (WebCore::KeyframeAnimation::animate):
     14        * platform/graphics/TextTrackRepresentation.cpp:
     15        (NullTextTrackRepresentation):
     16        * platform/graphics/TextTrackRepresentation.h:
     17        (TextTrackRepresentation):
     18        * testing/Internals.cpp:
     19        (WebCore::Internals::resetToConsistentState):
     20        (WebCore::Internals::setHeaderHeight):
     21        (WebCore::Internals::setFooterHeight):
     22
    1232013-04-05  Ryosuke Niwa  <rniwa@webkit.org>
    224

  • trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp

    r145818 r147792  
    7979        animatedStyle = RenderStyle::clone(targetStyle);
    8080
     81#if USE(ACCELERATED_COMPOSITING)
    8182    bool needsAnim = CSSPropertyAnimation::blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress(1, 0, 0));
    8283    // FIXME: we also need to detect cases where we have to software animate for other reasons,
    8384    // such as a child using inheriting the transform. https://bugs.webkit.org/show_bug.cgi?id=23902
    84 #if USE(ACCELERATED_COMPOSITING)
    8585    if (!needsAnim)
    8686        // If we are running an accelerated animation, set a flag in the style which causes the style

  • trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp

    r145818 r147792  
    186186        double progress = 0.0;
    187187        fetchIntervalEndpointsForProperty(*it, fromStyle, toStyle, progress);
    188    
     188#if USE(ACCELERATED_COMPOSITING)
    189189        bool needsAnim = CSSPropertyAnimation::blendProperties(this, *it, animatedStyle.get(), fromStyle, toStyle, progress);
    190 #if USE(ACCELERATED_COMPOSITING)
    191190        if (!needsAnim)
    192191            // If we are running an accelerated animation, set a flag in the style

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

    r137782 r147792  
    3636    virtual ~NullTextTrackRepresentation() { }
    3737    virtual void update() { }
     38#if USE(ACCELERATED_COMPOSITING)
    3839    virtual PlatformLayer* platformLayer() { return 0; }
     40#endif
    3941    virtual void setContentScale(float) { }
    4042    virtual IntRect bounds() const { return IntRect(); }

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

    r137782 r147792  
    5353
    5454    virtual void update() = 0;
     55#if USE(ACCELERATED_COMPOSITING)
    5556    virtual PlatformLayer* platformLayer() = 0;
     57#endif
    5658    virtual void setContentScale(float) = 0;
    5759    virtual IntRect bounds() const = 0;

  • trunk/Source/WebCore/testing/Internals.cpp

    r147548 r147792  
    260260    page->setPageScaleFactor(1, IntPoint(0, 0));
    261261    page->setPagination(Pagination());
    262     if (FrameView* mainFrameView = page->mainFrame()->view()) {
     262
     263#if USE(ACCELERATED_COMPOSITING)
     264    FrameView* mainFrameView = page->mainFrame()->view();
     265    if (mainFrameView) {
    263266        mainFrameView->setHeaderHeight(0);
    264267        mainFrameView->setFooterHeight(0);
    265268    }
     269#endif
    266270    TextRun::setAllowsRoundingHacks(false);
    267271    WebCore::overrideUserPreferredLanguages(Vector<String>());
    … …  
    18511855    if (!document || !document->view())
    18521856        return;
    1853 
     1857#if USE(ACCELERATED_COMPOSITING)
    18541858    FrameView* frameView = document->view();
    18551859    frameView->setHeaderHeight(height);
     1860#endif
    18561861}
    18571862
    … …  
    18601865    if (!document || !document->view())
    18611866        return;
    1862 
     1867#if USE(ACCELERATED_COMPOSITING)
    18631868    FrameView* frameView = document->view();
    18641869    frameView->setFooterHeight(height);
     1870#endif
    18651871}
    18661872

  • trunk/Source/WebKit2/ChangeLog

    r147776 r147792  
     12013-04-05  Ed Bartosh  <bartosh@gmail.com>
     2
     3        [EFL] --no-tiled-backing-store build fails because of not used #if USE(ACCELERATED_COMPOSITING)
     4        https://bugs.webkit.org/show_bug.cgi?id=113627
     5
     6        Reviewed by Simon Fraser.
     7
     8        Wrapped code with #if USE(ACCELERATED_COMPOSITING) to make it compilable
     9        with --no-tiled-backing-store build option:
     10        * UIProcess/API/C/efl/WKView.cpp:
     11        * UIProcess/API/efl/EvasGLContext.cpp:
     12        * UIProcess/API/efl/EvasGLContext.h:
     13        * UIProcess/API/efl/EvasGLSurface.cpp:
     14        * UIProcess/API/efl/EvasGLSurface.h:
     15        * UIProcess/API/efl/EwkView.cpp:
     16        (EwkView::EwkView):
     17        (EwkView::displayTimerFired):
     18        (EwkView::takeSnapshot):
     19        * UIProcess/API/efl/EwkView.h:
     20        (WebKit):
     21        (EwkView):
     22        * UIProcess/API/efl/SnapshotImageGL.cpp:
     23        * UIProcess/API/efl/SnapshotImageGL.h:
     24        * UIProcess/PageViewportController.cpp:
     25        * UIProcess/PageViewportController.h:
     26        * UIProcess/efl/PageViewportControllerClientEfl.cpp:
     27        * UIProcess/efl/ViewClientEfl.cpp:
     28        (WebKit::ViewClientEfl::didChangeContentsSize):
     29        * UIProcess/efl/WebView.cpp:
     30        (WebKit::WebView::didCommitLoad):
     31        (WebKit::WebView::updateViewportSize):
     32        (WebKit::WebView::didChangeViewportProperties):
     33        (WebKit::WebView::pageDidRequestScroll):
     34        (WebKit::WebView::didRenderFrame):
     35        (WebKit::WebView::pageTransitionViewportReady):
     36
    1372013-04-05  Ed Bartosh  <bartosh@gmail.com>
    238

  • trunk/Source/WebKit2/UIProcess/API/C/efl/WKView.cpp

    r147741 r147792  
    108108}
    109109
     110#if USE(ACCELERATED_COMPOSITING)
    110111void WKViewPaintToCurrentGLContext(WKViewRef viewRef)
    111112{
    112113    toImpl(viewRef)->paintToCurrentGLContext();
    113114}
     115#endif
    114116
    115117void WKViewPaintToCairoSurface(WKViewRef viewRef, cairo_surface_t* surface)

  • trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.cpp

    r142169 r147792  
    2525
    2626#include "config.h"
     27
     28#if USE(ACCELERATED_COMPOSITING)
     29
    2730#include "EvasGLContext.h"
    2831
    … …  
    4346
    4447} // namespace WebKit
     48#endif

  • trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.h

    r142169 r147792  
    2626#ifndef EvasGLContext_h
    2727#define EvasGLContext_h
     28#if USE(ACCELERATED_COMPOSITING)
    2829
    2930#include <Evas_GL.h>
    … …  
    5758} // namespace WebKit
    5859
     60#endif // USE(ACCELERATED_COMPOSITING)
    5961#endif // EvasGLContext_h

  • trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.cpp

    r142169 r147792  
    2525
    2626#include "config.h"
     27#if USE(ACCELERATED_COMPOSITING)
     28
    2729#include "EvasGLSurface.h"
    2830
    … …  
    4345
    4446} // namespace WebKit
     47#endif

  • trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.h

    r142169 r147792  
    2626#ifndef EvasGLSurface_h
    2727#define EvasGLSurface_h
     28#if USE(ACCELERATED_COMPOSITING)
    2829
    2930#include <Evas_GL.h>
    … …  
    6566} // namespace WebKit
    6667
     68#endif // USE(ACCELERATED_COMPOSITING)
    6769#endif // EvasGLSurface_h

  • trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp

    r147741 r147792  
    6565#include <Ecore_X.h>
    6666#include <Edje.h>
     67#if USE(ACCELERATED_COMPOSITING)
    6768#include <Evas_GL.h>
     69#endif
    6870#include <WebCore/CairoUtilitiesEfl.h>
    6971#include <WebCore/Cursor.h>
    … …  
    260262    , m_displayTimer(this, &EwkView::displayTimerFired)
    261263    , m_inputMethodContext(InputMethodContextEfl::create(this, smartData()->base.evas))
     264#if USE(ACCELERATED_COMPOSITING)
    262265    , m_pageViewportControllerClient(PageViewportControllerClientEfl::create(this))
    263266    , m_pageViewportController(adoptPtr(new PageViewportController(page(), m_pageViewportControllerClient.get())))
     267#endif
    264268    , m_isAccelerated(true)
    265269{
    … …  
    269273    // FIXME: Remove when possible.
    270274    webView()->setEwkView(this);
    271 
     275#if USE(ACCELERATED_COMPOSITING)
    272276    m_evasGL = adoptPtr(evas_gl_new(evas_object_evas_get(m_evasObject)));
    273277    if (m_evasGL)
    … …  
    278282        m_isAccelerated = false;
    279283    }
    280 
     284#endif
    281285    WKViewInitialize(wkView());
    282286
    283287    WKPageGroupRef wkPageGroup = WKPageGetPageGroup(wkPage());
    284288    WKPreferencesRef wkPreferences = WKPageGroupGetPreferences(wkPageGroup);
    285 
     289#if USE(ACCELERATED_COMPOSITING)
    286290    WKPreferencesSetWebGLEnabled(wkPreferences, true);
     291#endif
    287292    WKPreferencesSetFullScreenEnabled(wkPreferences, true);
    288293    WKPreferencesSetWebAudioEnabled(wkPreferences, true);
    … …  
    530535
    531536    if (m_pendingSurfaceResize) {
     537#if USE(ACCELERATED_COMPOSITING)
    532538        // Create a GL surface here so that Evas has no chance of painting to an empty GL surface.
    533539        if (!createGLSurface())
    534540            return;
    535 
     541#endif
    536542        m_pendingSurfaceResize = false;
    537543    }
    … …  
    546552        return;
    547553    }
    548 
     554#if USE(ACCELERATED_COMPOSITING)
    549555    evas_gl_make_current(m_evasGL.get(), m_evasGLSurface->surface(), m_evasGLContext->context());
    550556
    551557    WKViewPaintToCurrentGLContext(wkView());
    552 
     558#endif
    553559    // sd->image is tied to a native surface, which is in the parent's coordinates.
    554560    evas_object_image_data_update_add(sd->image, sd->view.x, sd->view.y, sd->view.w, sd->view.h);
    … …  
    720726#endif
    721727
     728#if USE(ACCELERATED_COMPOSITING)
    722729bool EwkView::createGLSurface()
    723730{
    … …  
    753760    return true;
    754761}
     762#endif
    755763
    756764#if ENABLE(INPUT_TYPE_COLOR)
    … …  
    11021110
    11031111        WKViewSetSize(self->wkView(), WKSizeMake(width, height));
     1112#if USE(ACCELERATED_COMPOSITING)
    11041113        if (WKPageUseFixedLayout(self->wkPage()))
    11051114            self->pageViewportController()->didChangeViewportSize(self->size());
     1115#endif
    11061116
    11071117        self->setNeedsSurfaceResize();
    … …  
    12701280
    12711281    Ewk_View_Smart_Data* sd = smartData();
    1272     if (!m_isAccelerated) {
    1273         RefPtr<cairo_surface_t> snapshot = createSurfaceForImage(sd->image);
     1282#if USE(ACCELERATED_COMPOSITING)
     1283    if (m_isAccelerated) {
     1284        RefPtr<cairo_surface_t> snapshot = getImageSurfaceFromFrameBuffer(0, 0, sd->view.w, sd->view.h);
    12741285        // Resume all animations.
    12751286        WKViewResumeActiveDOMObjectsAndAnimations(wkView());
    … …  
    12771288        return snapshot.release();
    12781289    }
    1279 
    1280     RefPtr<cairo_surface_t> snapshot = getImageSurfaceFromFrameBuffer(0, 0, sd->view.w, sd->view.h);
     1290#endif
     1291    RefPtr<cairo_surface_t> snapshot = createSurfaceForImage(sd->image);
    12811292    // Resume all animations.
    12821293    WKViewResumeActiveDOMObjectsAndAnimations(wkView());

  • trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h

    r147741 r147792  
    6363class PageUIClientEfl;
    6464class ViewClientEfl;
     65#if USE(ACCELERATED_COMPOSITING)
    6566class PageViewportController;
    6667class PageViewportControllerClientEfl;
     68#endif
    6769class WebContextMenuItemData;
    6870class WebContextMenuProxyEfl;
    … …  
    9395class EwkWindowFeatures;
    9496
     97#if USE(ACCELERATED_COMPOSITING)
    9598typedef struct _Evas_GL_Context Evas_GL_Context;
    9699typedef struct _Evas_GL_Surface Evas_GL_Surface;
     100#endif
    97101
    98102typedef struct Ewk_View_Smart_Data Ewk_View_Smart_Data;
    … …  
    118122    EwkBackForwardList* backForwardList() { return m_backForwardList.get(); }
    119123    EwkWindowFeatures* windowFeatures();
     124
     125#if USE(ACCELERATED_COMPOSITING)
    120126    WebKit::PageViewportController* pageViewportController() { return m_pageViewportController.get(); }
     127#endif
    121128
    122129    void setDeviceScaleFactor(float scale);
    … …  
    154161    WKRect windowGeometry() const;
    155162    void setWindowGeometry(const WKRect&);
    156 
     163#if USE(ACCELERATED_COMPOSITING)
    157164    bool createGLSurface();
     165#endif
    158166    void setNeedsSurfaceResize() { m_pendingSurfaceResize = true; }
    159167
    … …  
    240248    RefPtr<EwkContext> m_context;
    241249    RefPtr<EwkPageGroup> m_pageGroup;
     250#if USE(ACCELERATED_COMPOSITING)
    242251    OwnPtr<Evas_GL> m_evasGL;
    243252    OwnPtr<WebKit::EvasGLContext> m_evasGLContext;
    244253    OwnPtr<WebKit::EvasGLSurface> m_evasGLSurface;
     254#endif
    245255    WebCore::TransformationMatrix m_userViewportTransform;
    246256    bool m_pendingSurfaceResize;
    … …  
    274284    OwnPtr<EwkColorPicker> m_colorPicker;
    275285#endif
     286#if USE(ACCELERATED_COMPOSITING)
    276287    OwnPtr<WebKit::PageViewportControllerClientEfl> m_pageViewportControllerClient;
    277288    OwnPtr<WebKit::PageViewportController> m_pageViewportController;
     289#endif
    278290    bool m_isAccelerated;
    279291

  • trunk/Source/WebKit2/UIProcess/API/efl/SnapshotImageGL.cpp

    r144887 r147792  
    2525
    2626#include "config.h"
     27
     28#if USE(ACCELERATED_COMPOSITING)
     29
    2730#include "SnapshotImageGL.h"
    2831
    … …  
    7174    return newSurface;
    7275}
     76#endif

  • trunk/Source/WebKit2/UIProcess/API/efl/SnapshotImageGL.h

    r142169 r147792  
    2727#define SnapshotImageGL_h
    2828
     29#if USE(ACCELERATED_COMPOSITING)
     30
    2931#include <RefPtrCairo.h>
    3032#include <wtf/OwnArrayPtr.h>
    … …  
    3234PassRefPtr<cairo_surface_t> getImageSurfaceFromFrameBuffer(int x, int y, int width, int height);
    3335
     36#endif // USE(ACCELERATED_COMPOSITING)
    3437#endif // SnapshotImageGL_h

  • trunk/Source/WebKit2/UIProcess/PageViewportController.cpp

    r146355 r147792  
    2121
    2222#include "config.h"
     23
     24#if USE(ACCELERATED_COMPOSITING)
    2325#include "PageViewportController.h"
    24 
    25 #if USE(TILED_BACKING_STORE)
    2626
    2727#include "PageViewportControllerClient.h"

  • trunk/Source/WebKit2/UIProcess/PageViewportController.h

    r146355 r147792  
    2222#ifndef PageViewportController_h
    2323#define PageViewportController_h
     24
     25#if USE(ACCELERATED_COMPOSITING)
    2426
    2527#include <WebCore/FloatPoint.h>
    … …  
    111113} // namespace WebKit
    112114
     115#endif // USE(ACCELERATED_COMPOSITING)
    113116#endif // PageViewportController_h

  • trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp

    r147741 r147792  
    2626
    2727#include "config.h"
     28
     29#if USE(ACCELERATED_COMPOSITING)
     30
    2831#include "PageViewportControllerClientEfl.h"
    2932
    … …  
    7982
    8083} // namespace WebKit
     84#endif // USE(ACCELERATED_COMPOSITING)

  • trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp

    r144975 r147792  
    5050    EwkView* ewkView = toEwkView(clientInfo);
    5151    if (WKPageUseFixedLayout(ewkView->wkPage()))
     52#if USE(ACCELERATED_COMPOSITING)
    5253        ewkView->pageViewportController()->didChangeContentsSize(toIntSize(size));
     54#else
     55        { }
     56#endif
    5357    else
    5458        ewkView->scheduleUpdateDisplay();

  • trunk/Source/WebKit2/UIProcess/efl/WebView.cpp

    r147776 r147792  
    235235{
    236236    if (m_page->useFixedLayout()) {
     237#if USE(ACCELERATED_COMPOSITING)
    237238        m_ewkView->pageViewportController()->didCommitLoad();
     239#endif
    238240        return;
    239241    }
    … …  
    540542{
    541543    if (m_page->useFixedLayout()) {
     544#if USE(ACCELERATED_COMPOSITING)
    542545        m_ewkView->pageViewportController()->didChangeViewportAttributes(attr);
     546#endif
    543547        return;
    544548    }
    … …  
    548552void WebView::pageDidRequestScroll(const IntPoint& position)
    549553{
    550     if (m_page->useFixedLayout()) {       
     554    if (m_page->useFixedLayout()) {
     555#if USE(ACCELERATED_COMPOSITING)
    551556        m_ewkView->pageViewportController()->pageDidRequestScroll(position);
     557#endif
    552558        return;
    553559    }
    … …  
    561567{
    562568    if (m_page->useFixedLayout()) {
     569#if USE(ACCELERATED_COMPOSITING)
    563570        m_ewkView->pageViewportController()->didRenderFrame(contentsSize, coveredRect);
     571#endif
    564572        return;
    565573    }
    … …  
    570578{
    571579    if (m_page->useFixedLayout()) {
     580#if USE(ACCELERATED_COMPOSITING)
    572581        m_ewkView->pageViewportController()->pageTransitionViewportReady();
     582#endif
    573583        return;
    574584    }

  • trunk/Source/cmake/OptionsEfl.cmake

    r147768 r147792  
    177177endif ()
    178178
     179if (WTF_USE_TILED_BACKING_STORE)
     180    add_definitions(-DWTF_USE_ACCELERATED_COMPOSITING=1)
     181
     182    add_definitions(-DWTF_USE_COORDINATED_GRAPHICS=1)
     183
     184    set(WTF_USE_TEXTURE_MAPPER 1)
     185    add_definitions(-DWTF_USE_TEXTURE_MAPPER=1)
     186
     187    set(WTF_USE_3D_GRAPHICS 1)
     188    add_definitions(-DWTF_USE_3D_GRAPHICS=1)
     189
     190    set(ENABLE_3D_RENDERING 1)
     191    add_definitions(-DENABLE_3D_RENDERING=1)
     192else ()
     193    # Disable 3D graphics and WEBGL if tiled backing is disabled
     194    set(ENABLE_WEBGL 0)
     195    set(WTF_USE_3D_GRAPHICS 0)
     196    add_definitions(-DWTF_USE_3D_GRAPHICS=0)
     197endif ()
     198
    179199if (ENABLE_WEBGL OR WTF_USE_TILED_BACKING_STORE)
    180200    find_package(OpenGL REQUIRED)
    … …  
    232252endif ()
    233253
    234 if (WTF_USE_TILED_BACKING_STORE)
    235     add_definitions(-DWTF_USE_ACCELERATED_COMPOSITING=1)
    236 
    237     add_definitions(-DWTF_USE_COORDINATED_GRAPHICS=1)
    238 
    239     set(WTF_USE_TEXTURE_MAPPER 1)
    240     add_definitions(-DWTF_USE_TEXTURE_MAPPER=1)
    241 
    242     set(WTF_USE_3D_GRAPHICS 1)
    243     add_definitions(-DWTF_USE_3D_GRAPHICS=1)
    244 
    245     set(ENABLE_3D_RENDERING 1)
    246     add_definitions(-DENABLE_3D_RENDERING=1)
    247 endif ()
    248 
    249254if (ENABLE_WEBGL)
    250255    set(ENABLE_WEBGL 1)
Note: See TracChangeset for help on using the changeset viewer.