Changeset 107737 in webkit


Ignore:
Timestamp:
Feb 14, 2012 2:30:52 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[BlackBerry] Remove OpenVG references
https://bugs.webkit.org/show_bug.cgi?id=78623

Patch by Jeff Rogers <jrogers@rim.com> on 2012-02-14
Reviewed by Rob Buis.

Removed references to USE(OPENVG) and the related code.

  • blackberry/Api/BackingStore.cpp:

(BlackBerry::WebKit::BackingStorePrivate::BackingStorePrivate):
(BlackBerry::WebKit::BackingStorePrivate::repaint):
(BlackBerry::WebKit::BackingStorePrivate::renderContents):
(BlackBerry::WebKit::BackingStore::createSurface):

  • blackberry/Api/BackingStore_p.h:
Location:
trunk/Source/WebKit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r107736 r107737  
     12012-02-14  Jeff Rogers  <jrogers@rim.com>
     2
     3        [BlackBerry] Remove OpenVG references
     4        https://bugs.webkit.org/show_bug.cgi?id=78623
     5
     6        Reviewed by Rob Buis.
     7
     8        Removed references to USE(OPENVG) and the related code.
     9
     10        * blackberry/Api/BackingStore.cpp:
     11        (BlackBerry::WebKit::BackingStorePrivate::BackingStorePrivate):
     12        (BlackBerry::WebKit::BackingStorePrivate::repaint):
     13        (BlackBerry::WebKit::BackingStorePrivate::renderContents):
     14        (BlackBerry::WebKit::BackingStore::createSurface):
     15        * blackberry/Api/BackingStore_p.h:
     16
    1172012-02-14  Andy Chen  <andchen@rim.com>
    218
  • trunk/Source/WebKit/blackberry/Api/BackingStore.cpp

    r106790 r107737  
    5555#define DEBUG_COMPOSITING_DIRTY_REGION 0
    5656
    57 #if USE(OPENVG)
    58 #include "EGLDisplayOpenVG.h"
    59 #include "EGLUtils.h"
    60 #endif
    61 
    6257#include <BlackBerryPlatformScreen.h>
    6358
     
    203198    , m_defersBlit(true)
    204199    , m_hasBlitJobs(false)
    205 #if USE(OPENVG)
    206     , m_eglDisplay(EGL_NO_DISPLAY)
    207 #endif
    208200    , m_currentWindowBackBuffer(0)
    209201    , m_preferredTileMatrixDimension(Vertical)
     
    299291                                  bool contentChanged, bool immediate)
    300292{
    301 #if USE(OPENVG)
    302     ASSERT(m_eglDisplay != EGL_NO_DISPLAY);
    303 #endif
    304 
    305293    if (m_suspendBackingStoreUpdates)
    306294        return;
     
    22162204
    22172205    // Grab the requested region from the drawing surface into the tile image.
    2218 #if USE(OPENVG)
    2219     surface->makeCurrent();
    2220 #endif
    22212206
    22222207    delete bufferPlatformGraphicsContext;
     
    25262511    }
    25272512
    2528 #if USE(OPENVG)
    2529     d->m_eglDisplay = BlackBerry::Platform::Graphics::eglDisplay();
    2530 
    2531     // Make sure we are using OpenVG.
    2532     eglBindAPI(EGL_OPENVG_API);
    2533     ASSERT_EGL_NO_ERROR();
    2534 
    2535     EGLDisplayOpenVG::setCurrentDisplay(d->m_eglDisplay);
    2536 #endif
    2537 
    25382513    // Triggers creation of surfaces in backingstore.
    25392514    d->createSurfaces();
    2540 
    2541 #if USE(OPENVG)
    2542     EGLDisplayOpenVG::current()->sharedPlatformSurface()->makeCurrent();
    2543 #endif
    25442515
    25452516    // Focusing the WebPage triggers a repaint, so while we want it to be
  • trunk/Source/WebKit/blackberry/Api/BackingStore_p.h

    r102998 r107737  
    3030#include <wtf/Vector.h>
    3131
    32 #if USE(OPENVG)
    33 #include <egl.h>
    34 #endif
    35 
    3632#include <pthread.h>
    3733
     
    333329    bool m_hasBlitJobs;
    334330
    335 #if USE(OPENVG)
    336     EGLDisplay m_eglDisplay;
    337 #endif
    338331    mutable unsigned m_frontState;
    339332    mutable unsigned m_backState;
Note: See TracChangeset for help on using the changeset viewer.