Changeset 142169 in webkit


Ignore:
Timestamp:
Feb 7, 2013 1:20:14 PM (11 years ago)
Author:
mikhail.pozdnyakov@intel.com
Message:

[WK2][EFL] Removal of non coordinated graphics code path from WK2 EFL
https://bugs.webkit.org/show_bug.cgi?id=109165

Reviewed by Anders Carlsson.

Removed non coordinated graphics code path from WK2 EFL as it was not used by
anyone and caused a lot of preprocessor macros in the code making it less readable.

  • UIProcess/API/efl/EvasGLContext.cpp:
  • UIProcess/API/efl/EvasGLContext.h:

(WebKit::EvasGLContext::context):

  • UIProcess/API/efl/EvasGLSurface.cpp:
  • UIProcess/API/efl/EvasGLSurface.h:

(WebKit::EvasGLSurface::surface):

Removed also 'inline' and 'const' keywords from functions declaration,
as both EvasGLContext::context() and EvasGLSurface::surface()
are defined inside their classes and return mutable pointer.

  • UIProcess/API/efl/EwkView.cpp:

(EwkView::EwkView):
(EwkView::transformFromScene):
(EwkView::transformToScreen):
(EwkView::coordinatedGraphicsScene):
(EwkView::displayTimerFired):
(EwkView::scheduleUpdateDisplay): Renamed from EwkView::update().
(EwkView::exitAcceleratedCompositingMode):
(EwkView::handleEvasObjectCalculate):
(EwkView::takeSnapshot):

  • UIProcess/API/efl/EwkView.h:

(WebCore):
(EwkView):

  • UIProcess/API/efl/SnapshotImageGL.cpp:

(getImageSurfaceFromFrameBuffer):

  • UIProcess/API/efl/SnapshotImageGL.h:
  • UIProcess/API/efl/ewk_view.cpp:
  • UIProcess/efl/PageClientBase.cpp:

(WebKit::PageClientBase::setViewNeedsDisplay):
(WebKit::PageClientBase::updateAcceleratedCompositingMode):

  • UIProcess/efl/PageClientBase.h:

(PageClientBase):

  • UIProcess/efl/PageClientDefaultImpl.cpp:

(WebKit::PageClientDefaultImpl::didCommitLoad):
(WebKit::PageClientDefaultImpl::updateViewportSize):
(WebKit::PageClientDefaultImpl::didChangeViewportProperties):
(WebKit::PageClientDefaultImpl::didChangeContentsSize):
(WebKit::PageClientDefaultImpl::pageTransitionViewportReady):

  • UIProcess/efl/PageClientDefaultImpl.h:

(PageClientDefaultImpl):

  • UIProcess/efl/PageClientLegacyImpl.cpp:

(WebKit::PageClientLegacyImpl::didCommitLoad):
(WebKit::PageClientLegacyImpl::updateViewportSize):
(WebKit::PageClientLegacyImpl::didChangeViewportProperties):
(WebKit::PageClientLegacyImpl::didChangeContentsSize):
(WebKit::PageClientLegacyImpl::pageDidRequestScroll):
(WebKit::PageClientLegacyImpl::didRenderFrame):
(WebKit::PageClientLegacyImpl::pageTransitionViewportReady):

  • UIProcess/efl/PageClientLegacyImpl.h:

(PageClientLegacyImpl):

  • UIProcess/efl/PageLoadClientEfl.cpp:

(WebKit::PageLoadClientEfl::didCommitLoadForFrame):
(WebKit::PageLoadClientEfl::PageLoadClientEfl):

  • UIProcess/efl/PageLoadClientEfl.h:

(PageLoadClientEfl):

  • UIProcess/efl/PageViewportControllerClientEfl.cpp:

(WebKit::PageViewportControllerClientEfl::didChangeContentsSize):
(WebKit::PageViewportControllerClientEfl::didChangeVisibleContents):

  • UIProcess/efl/PageViewportControllerClientEfl.h:
  • UIProcess/efl/WebInspectorProxyEfl.cpp:

(WebKit::WebInspectorProxy::platformCreateInspectorPage):

  • WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::contentsSizeChanged):

Location:
trunk/Source/WebKit2
Files:
22 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r142160 r142169  
     12013-02-07  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
     2
     3        [WK2][EFL] Removal of non coordinated graphics code path from WK2 EFL
     4        https://bugs.webkit.org/show_bug.cgi?id=109165
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Removed non coordinated graphics code path from WK2 EFL as it was not used by
     9        anyone and caused a lot of preprocessor macros in the code making it less readable.
     10
     11        * UIProcess/API/efl/EvasGLContext.cpp:
     12        * UIProcess/API/efl/EvasGLContext.h:
     13        (WebKit::EvasGLContext::context):
     14        * UIProcess/API/efl/EvasGLSurface.cpp:
     15        * UIProcess/API/efl/EvasGLSurface.h:
     16        (WebKit::EvasGLSurface::surface):
     17
     18            Removed also 'inline' and 'const' keywords from functions declaration,
     19            as both EvasGLContext::context() and EvasGLSurface::surface()
     20            are defined inside their classes and return mutable pointer.
     21
     22        * UIProcess/API/efl/EwkView.cpp:
     23        (EwkView::EwkView):
     24        (EwkView::transformFromScene):
     25        (EwkView::transformToScreen):
     26        (EwkView::coordinatedGraphicsScene):
     27        (EwkView::displayTimerFired):
     28        (EwkView::scheduleUpdateDisplay): Renamed from EwkView::update().
     29        (EwkView::exitAcceleratedCompositingMode):
     30        (EwkView::handleEvasObjectCalculate):
     31        (EwkView::takeSnapshot):
     32        * UIProcess/API/efl/EwkView.h:
     33        (WebCore):
     34        (EwkView):
     35        * UIProcess/API/efl/SnapshotImageGL.cpp:
     36        (getImageSurfaceFromFrameBuffer):
     37        * UIProcess/API/efl/SnapshotImageGL.h:
     38        * UIProcess/API/efl/ewk_view.cpp:
     39        * UIProcess/efl/PageClientBase.cpp:
     40        (WebKit::PageClientBase::setViewNeedsDisplay):
     41        (WebKit::PageClientBase::updateAcceleratedCompositingMode):
     42        * UIProcess/efl/PageClientBase.h:
     43        (PageClientBase):
     44        * UIProcess/efl/PageClientDefaultImpl.cpp:
     45        (WebKit::PageClientDefaultImpl::didCommitLoad):
     46        (WebKit::PageClientDefaultImpl::updateViewportSize):
     47        (WebKit::PageClientDefaultImpl::didChangeViewportProperties):
     48        (WebKit::PageClientDefaultImpl::didChangeContentsSize):
     49        (WebKit::PageClientDefaultImpl::pageTransitionViewportReady):
     50        * UIProcess/efl/PageClientDefaultImpl.h:
     51        (PageClientDefaultImpl):
     52        * UIProcess/efl/PageClientLegacyImpl.cpp:
     53        (WebKit::PageClientLegacyImpl::didCommitLoad):
     54        (WebKit::PageClientLegacyImpl::updateViewportSize):
     55        (WebKit::PageClientLegacyImpl::didChangeViewportProperties):
     56        (WebKit::PageClientLegacyImpl::didChangeContentsSize):
     57        (WebKit::PageClientLegacyImpl::pageDidRequestScroll):
     58        (WebKit::PageClientLegacyImpl::didRenderFrame):
     59        (WebKit::PageClientLegacyImpl::pageTransitionViewportReady):
     60        * UIProcess/efl/PageClientLegacyImpl.h:
     61        (PageClientLegacyImpl):
     62        * UIProcess/efl/PageLoadClientEfl.cpp:
     63        (WebKit::PageLoadClientEfl::didCommitLoadForFrame):
     64        (WebKit::PageLoadClientEfl::PageLoadClientEfl):
     65        * UIProcess/efl/PageLoadClientEfl.h:
     66        (PageLoadClientEfl):
     67        * UIProcess/efl/PageViewportControllerClientEfl.cpp:
     68        (WebKit::PageViewportControllerClientEfl::didChangeContentsSize):
     69        (WebKit::PageViewportControllerClientEfl::didChangeVisibleContents):
     70        * UIProcess/efl/PageViewportControllerClientEfl.h:
     71        * UIProcess/efl/WebInspectorProxyEfl.cpp:
     72        (WebKit::WebInspectorProxy::platformCreateInspectorPage):
     73        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     74        (WebKit::WebChromeClient::contentsSizeChanged):
     75
    1762013-02-06  Sam Weinig  <sam@webkit.org>
    277
  • trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.cpp

    r133041 r142169  
    2727#include "EvasGLContext.h"
    2828
    29 #if USE(ACCELERATED_COMPOSITING)
    30 
    3129namespace WebKit {
    3230
     
    4543
    4644} // namespace WebKit
    47 
    48 #endif // USE(ACCELERATED_COMPOSITING)
  • trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.h

    r133041 r142169  
    2727#define EvasGLContext_h
    2828
    29 #if USE(ACCELERATED_COMPOSITING)
    3029#include <Evas_GL.h>
    3130#include <wtf/PassOwnPtr.h>
     
    4746    ~EvasGLContext();
    4847
    49     inline Evas_GL_Context* context() const { return m_context; }
     48    Evas_GL_Context* context() { return m_context; }
    5049
    5150private:
     
    5857} // namespace WebKit
    5958
    60 #endif // USE(ACCELERATED_COMPOSITING)
    61 
    6259#endif // EvasGLContext_h
  • trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.cpp

    r133041 r142169  
    2727#include "EvasGLSurface.h"
    2828
    29 #if USE(ACCELERATED_COMPOSITING)
    30 
    3129namespace WebKit {
    3230
     
    4543
    4644} // namespace WebKit
    47 
    48 #endif // USE(ACCELERATED_COMPOSITING)
  • trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.h

    r138154 r142169  
    2727#define EvasGLSurface_h
    2828
    29 #if USE(ACCELERATED_COMPOSITING)
    3029#include <Evas_GL.h>
    3130#include <WebCore/IntSize.h>
     
    5554    ~EvasGLSurface();
    5655
    57     inline Evas_GL_Surface* surface() const { return m_surface; }
     56    Evas_GL_Surface* surface() { return m_surface; }
    5857
    5958private:
     
    6665} // namespace WebKit
    6766
    68 #endif // USE(ACCELERATED_COMPOSITING)
    69 
    7067#endif // EvasGLSurface_h
  • trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp

    r142157 r142169  
    6565#include <Ecore_X.h>
    6666#include <Edje.h>
     67#include <Evas_GL.h>
    6768#include <WebCore/CairoUtilitiesEfl.h>
    6869#include <WebCore/CoordinatedGraphicsScene.h>
     
    7778#if ENABLE(FULLSCREEN_API)
    7879#include "WebFullScreenManagerProxy.h"
    79 #endif
    80 
    81 #if USE(ACCELERATED_COMPOSITING)
    82 #include <Evas_GL.h>
    8380#endif
    8481
     
    227224    : m_evasObject(evasObject)
    228225    , m_context(context)
    229 #if USE(ACCELERATED_COMPOSITING)
    230226    , m_pendingSurfaceResize(false)
    231 #endif
    232227    , m_pageClient(behavior == DefaultBehavior ? PageClientDefaultImpl::create(this) : PageClientLegacyImpl::create(this))
    233228    , m_webView(adoptRef(new WebView(toImpl(m_context->wkContext()), m_pageClient.get(), toImpl(pageGroup), evasObject)))
     
    242237#endif
    243238    , m_backForwardList(EwkBackForwardList::create(WKPageGetBackForwardList(wkPage())))
    244 #if USE(TILED_BACKING_STORE)
    245239    , m_pageScaleFactor(1)
    246 #endif
    247240    , m_settings(EwkSettings::create(this))
    248241    , m_cursorIdentifier(0)
     
    453446    AffineTransform transform;
    454447
    455 #if USE(TILED_BACKING_STORE)
    456448    // Note that we apply both page and device scale factors.
    457449    transform.scale(1 / pageScaleFactor());
    458450    transform.scale(1 / deviceScaleFactor());
    459451    transform.translate(pagePosition().x(), pagePosition().y());
    460 #endif
    461452
    462453    Ewk_View_Smart_Data* sd = smartData();
     
    484475
    485476    Ecore_X_Window window;
    486 #if USE(ACCELERATED_COMPOSITING)
    487477    window = ecore_evas_gl_x11_window_get(ecoreEvas);
    488478    // Fallback to software mode if necessary.
    489479    if (!window)
    490 #endif
    491     window = ecore_evas_software_x11_window_get(ecoreEvas); // Returns 0 if none.
     480        window = ecore_evas_software_x11_window_get(ecoreEvas); // Returns 0 if none.
    492481
    493482    int x, y; // x, y are relative to parent (in a reparenting window manager).
     
    506495}
    507496
    508 #if USE(COORDINATED_GRAPHICS)
    509497CoordinatedGraphicsScene* EwkView::coordinatedGraphicsScene()
    510498{
     
    519507    return coordinatedLayerTreeHostProxy->coordinatedGraphicsScene();
    520508}
    521 #endif
    522509
    523510inline Ewk_View_Smart_Data* EwkView::smartData() const
     
    528515void EwkView::displayTimerFired(Timer<EwkView>*)
    529516{
    530 #if USE(COORDINATED_GRAPHICS)
    531517    Ewk_View_Smart_Data* sd = smartData();
    532518
     
    568554        evas_object_image_data_update_add(sd->image, 0, 0, viewport.width(), viewport.height());
    569555    }
    570 #endif
    571 }
    572 
    573 void EwkView::update(const IntRect& rect)
    574 {
    575     Ewk_View_Smart_Data* sd = smartData();
    576 #if USE(COORDINATED_GRAPHICS)
     556}
     557
     558void EwkView::scheduleUpdateDisplay()
     559{
    577560    // Coordinated graphices needs to schedule an full update, not
    578561    // repainting of a region. Update in the event loop.
    579     UNUSED_PARAM(rect);
    580 
     562    Ewk_View_Smart_Data* sd = smartData();
    581563    // Guard for zero sized viewport.
    582564    if (!(sd->view.w && sd->view.h))
     
    585567    if (!m_displayTimer.isActive())
    586568        m_displayTimer.startOneShot(0);
    587 #else
    588     if (!sd->image)
    589         return;
    590 
    591     evas_object_image_data_update_add(sd->image, rect.x(), rect.y(), rect.width(), rect.height());
    592 #endif
    593569}
    594570
     
    789765}
    790766
    791 #if USE(ACCELERATED_COMPOSITING)
    792767bool EwkView::createGLSurface(const IntSize& viewSize)
    793768{
     
    863838    return true;
    864839}
    865 #endif
    866840
    867841#if ENABLE(INPUT_TYPE_COLOR)
     
    11961170            view->page()->drawingArea()->setSize(IntSize(width, height), IntSize());
    11971171
    1198 #if USE(ACCELERATED_COMPOSITING)
    11991172        view->setNeedsSurfaceResize();
    1200 #endif
    1201 #if USE(TILED_BACKING_STORE)
    12021173        view->pageClient()->updateViewportSize();
    1203 #endif
    12041174    }
    12051175}
     
    13661336
    13671337    Ewk_View_Smart_Data* sd = smartData();
    1368 #if USE(ACCELERATED_COMPOSITING)
    13691338    if (!m_isHardwareAccelerated) {
    1370 #endif
    13711339        RefPtr<cairo_surface_t> snapshot = createSurfaceForImage(sd->image);
    13721340        // Resume all animations.
     
    13741342
    13751343        return snapshot.release();
    1376 #if USE(ACCELERATED_COMPOSITING)
    13771344    }
    13781345
     
    13821349
    13831350    return snapshot.release();
    1384 #endif
    13851351}
    13861352
  • trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h

    r142157 r142169  
    2222#define EwkView_h
    2323
     24#include "EvasGLContext.h"
     25#include "EvasGLSurface.h"
    2426#include "EwkViewCallbacks.h"
    2527#include "ImmutableDictionary.h"
     
    4648#endif
    4749
    48 #if USE(ACCELERATED_COMPOSITING)
    49 #include "EvasGLContext.h"
    50 #include "EvasGLSurface.h"
    51 #endif
    5250
    5351#include "WebContext.h"
     
    8179class Cursor;
    8280class IntSize;
    83 #if USE(COORDINATED_GRAPHICS)
    8481class CoordinatedGraphicsScene;
    85 #endif
    8682}
    8783
     
    9490class EwkWindowFeatures;
    9591
    96 #if USE(ACCELERATED_COMPOSITING)
    9792typedef struct _Evas_GL_Context Evas_GL_Context;
    9893typedef struct _Evas_GL_Surface Evas_GL_Surface;
    99 #endif
    10094
    10195typedef struct Ewk_View_Smart_Data Ewk_View_Smart_Data;
     
    160154    void setImageData(void* imageData, const WebCore::IntSize& size);
    161155
    162     void update(const WebCore::IntRect& rect = WebCore::IntRect());   
     156    void scheduleUpdateDisplay();
    163157
    164158#if ENABLE(FULLSCREEN_API)
     
    170164    void setWindowGeometry(const WKRect&);
    171165
    172 #if USE(ACCELERATED_COMPOSITING)
    173166    bool createGLSurface(const WebCore::IntSize& viewSize);
    174167    bool enterAcceleratedCompositingMode();
    175168    bool exitAcceleratedCompositingMode();
    176169    void setNeedsSurfaceResize() { m_pendingSurfaceResize = true; }
    177 #endif
    178170
    179171#if ENABLE(INPUT_TYPE_COLOR)
     
    205197    unsigned long long informDatabaseQuotaReached(const String& databaseName, const String& displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage);
    206198
    207 #if USE(TILED_BACKING_STORE)
    208199    WebKit::PageClientBase* pageClient() { return m_pageClient.get(); }
    209200
     
    213204    void setPagePosition(const WebCore::FloatPoint& position) { m_pagePosition = position; }
    214205    const WebCore::FloatPoint pagePosition() const { return m_pagePosition; }
    215 #endif
    216206
    217207    // FIXME: needs refactoring (split callback invoke)
     
    230220    void displayTimerFired(WebCore::Timer<EwkView>*);
    231221
    232 #if USE(COORDINATED_GRAPHICS)
    233222    WebCore::CoordinatedGraphicsScene* coordinatedGraphicsScene();
    234 #endif
    235223
    236224    void informIconChange();
     
    268256    Evas_Object* m_evasObject;
    269257    RefPtr<EwkContext> m_context;
    270 #if USE(ACCELERATED_COMPOSITING)
    271258    OwnPtr<Evas_GL> m_evasGL;
    272259    OwnPtr<WebKit::EvasGLContext> m_evasGLContext;
    273260    OwnPtr<WebKit::EvasGLSurface> m_evasGLSurface;
    274261    bool m_pendingSurfaceResize;
    275 #endif
    276262    OwnPtr<WebKit::PageClientBase> m_pageClient;
    277263    RefPtr<WebKit::WebView> m_webView;
     
    286272#endif
    287273    OwnPtr<EwkBackForwardList> m_backForwardList;
    288 #if USE(TILED_BACKING_STORE)
    289274    float m_pageScaleFactor;
    290275    WebCore::FloatPoint m_pagePosition;
    291 #endif
    292276    OwnPtr<EwkSettings> m_settings;
    293277    RefPtr<EwkWindowFeatures> m_windowFeatures;
  • trunk/Source/WebKit2/UIProcess/API/efl/SnapshotImageGL.cpp

    r138518 r142169  
    2727#include "SnapshotImageGL.h"
    2828
    29 #if USE(ACCELERATED_COMPOSITING)
    3029#if USE(OPENGL_ES_2)
    3130#include <GLES2/gl2.h>
     
    5857    return newSurface;
    5958}
    60 
    61 #endif
  • trunk/Source/WebKit2/UIProcess/API/efl/SnapshotImageGL.h

    r138518 r142169  
    3030#include <wtf/OwnArrayPtr.h>
    3131
    32 #if USE(ACCELERATED_COMPOSITING)
    3332PassRefPtr<cairo_surface_t> getImageSurfaceFromFrameBuffer(int x, int y, int width, int height);
    34 #endif
    3533
    3634#endif // SnapshotImageGL_h
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp

    r142157 r142169  
    3030#include "PagePolicyClientEfl.h"
    3131#include "PageUIClientEfl.h"
     32#include "PageViewportController.h"
     33#include "PageViewportControllerClientEfl.h"
    3234#include "WKAPICast.h"
    3335#include "WKEinaSharedString.h"
     
    5860#endif
    5961
    60 #if USE(TILED_BACKING_STORE)
    61 #include "PageViewportController.h"
    62 #include "PageViewportControllerClientEfl.h"
    63 #endif
    64 
    6562using namespace WebKit;
    6663using namespace WebCore;
  • trunk/Source/WebKit2/UIProcess/efl/PageClientBase.cpp

    r141978 r142169  
    7474}
    7575
    76 void PageClientBase::setViewNeedsDisplay(const WebCore::IntRect& rect)
    77 {
    78     m_view->update(rect);
     76void PageClientBase::setViewNeedsDisplay(const WebCore::IntRect&)
     77{
     78    m_view->scheduleUpdateDisplay();
    7979}
    8080
     
    236236}
    237237
    238 #if USE(ACCELERATED_COMPOSITING)
    239238void PageClientBase::enterAcceleratedCompositingMode(const LayerTreeContext&)
    240239{
     
    251250    notImplemented();
    252251}
    253 #endif // USE(ACCELERATED_COMPOSITING)
    254252
    255253void PageClientBase::didCommitLoadForMainFrame(bool)
  • trunk/Source/WebKit2/UIProcess/efl/PageClientBase.h

    r140686 r142169  
    9595
    9696    virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool, bool);
    97 #if USE(ACCELERATED_COMPOSITING)
    9897    virtual void enterAcceleratedCompositingMode(const LayerTreeContext&);
    9998    virtual void exitAcceleratedCompositingMode();
    10099    virtual void updateAcceleratedCompositingMode(const LayerTreeContext&);
    101 #endif
    102100
    103101    virtual void didCommitLoadForMainFrame(bool);
     
    110108    virtual void countStringMatchesInCustomRepresentation(const String&, FindOptions, unsigned);
    111109
    112 #if USE(TILED_BACKING_STORE)
    113110    virtual void pageDidRequestScroll(const WebCore::IntPoint&) = 0;
    114111    virtual void didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect) = 0;
    115112    virtual void pageTransitionViewportReady() = 0;
    116 #endif
    117113
    118114protected:
  • trunk/Source/WebKit2/UIProcess/efl/PageClientDefaultImpl.cpp

    r140686 r142169  
    2727#include "config.h"
    2828#include "PageClientDefaultImpl.h"
     29#include "PageViewportController.h"
     30#include "PageViewportControllerClientEfl.h"
    2931
    3032#include "EwkView.h"
    3133#include "ewk_view.h"
    32 
    33 #if USE(TILED_BACKING_STORE)
    34 #include "PageViewportController.h"
    35 #include "PageViewportControllerClientEfl.h"
    36 #endif
    3734
    3835using namespace WebCore;
     
    4845void PageClientDefaultImpl::didCommitLoad()
    4946{
    50 #if USE(TILED_BACKING_STORE)
    5147    ASSERT(m_pageViewportController);
    5248    m_pageViewportController->didCommitLoad();
    53 #endif
    5449}
    5550
    5651void PageClientDefaultImpl::updateViewportSize()
    5752{
    58 #if USE(TILED_BACKING_STORE)
    5953    if (!m_pageViewportControllerClient) {
    6054        m_pageViewportControllerClient = PageViewportControllerClientEfl::create(m_view);
     
    6256    }
    6357    m_pageViewportControllerClient->updateViewportSize();
    64 #endif
    6558}
    6659
     
    8174void PageClientDefaultImpl::didChangeViewportProperties(const WebCore::ViewportAttributes& attr)
    8275{
    83 #if USE(TILED_BACKING_STORE)
    8476    ASSERT(m_pageViewportController);
    8577    m_pageViewportController->didChangeViewportAttributes(attr);
    86 #else
    87     UNUSED_PARAM(attr);
    88 #endif
    8978}
    9079
    9180void PageClientDefaultImpl::didChangeContentsSize(const WebCore::IntSize& size)
    9281{
    93 #if USE(TILED_BACKING_STORE)
    9482    ASSERT(m_pageViewportController);
    9583    m_pageViewportController->didChangeContentsSize(size);
    96 #endif
    97 
    9884    m_view->smartCallback<ContentsSizeChanged>().call(size);
    9985}
    10086
    101 #if USE(TILED_BACKING_STORE)
    10287void PageClientDefaultImpl::pageDidRequestScroll(const IntPoint& position)
    10388{
     
    117102    m_pageViewportController->pageTransitionViewportReady();
    118103}
    119 #endif
    120104
    121105} // namespace WebKit
  • trunk/Source/WebKit2/UIProcess/efl/PageClientDefaultImpl.h

    r140686 r142169  
    5555    virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&);
    5656    virtual void didChangeContentsSize(const WebCore::IntSize&);
    57 #if USE(TILED_BACKING_STORE)
    5857    virtual void pageDidRequestScroll(const WebCore::IntPoint&);
    5958    virtual void didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect);
     
    6261    OwnPtr<WebKit::PageViewportControllerClientEfl> m_pageViewportControllerClient;
    6362    OwnPtr<WebKit::PageViewportController> m_pageViewportController;
    64 #endif
    6563};
    6664
  • trunk/Source/WebKit2/UIProcess/efl/PageClientLegacyImpl.cpp

    r141310 r142169  
    4545void PageClientLegacyImpl::didCommitLoad()
    4646{
    47     m_view->update();
     47    m_view->scheduleUpdateDisplay();
    4848}
    4949
    5050void PageClientLegacyImpl::updateViewportSize()
    5151{
    52 #if USE(TILED_BACKING_STORE)
    5352    m_view->page()->drawingArea()->setVisibleContentsRect(IntRect(roundedIntPoint(m_view->pagePosition()), m_view->size()), FloatPoint());
    54 #endif
    5553}
    5654
     
    6967void PageClientLegacyImpl::didChangeViewportProperties(const WebCore::ViewportAttributes&)
    7068{
    71     m_view->update();
     69    m_view->scheduleUpdateDisplay();
    7270}
    7371
    7472void PageClientLegacyImpl::didChangeContentsSize(const WebCore::IntSize& size)
    7573{
    76 #if USE(TILED_BACKING_STORE)
    7774    m_view->page()->drawingArea()->coordinatedLayerTreeHostProxy()->setContentsSize(FloatSize(size.width(), size.height()));
    78     m_view->update();
    79 #endif
     75    m_view->scheduleUpdateDisplay();
    8076
    8177    m_view->smartCallback<ContentsSizeChanged>().call(size);
    8278}
    8379
    84 #if USE(TILED_BACKING_STORE)
    8580void PageClientLegacyImpl::pageDidRequestScroll(const IntPoint& position)
    8681{
    8782    m_view->setPagePosition(FloatPoint(position));
    88     m_view->update();
     83    m_view->scheduleUpdateDisplay();
    8984}
    9085
    9186void PageClientLegacyImpl::didRenderFrame(const WebCore::IntSize&, const WebCore::IntRect&)
    9287{
    93     m_view->update();
     88    m_view->scheduleUpdateDisplay();
    9489}
    9590
    9691void PageClientLegacyImpl::pageTransitionViewportReady()
    9792{
    98     m_view->update();
     93    m_view->scheduleUpdateDisplay();
    9994}
    100 #endif
    10195
    10296} // namespace WebKit
  • trunk/Source/WebKit2/UIProcess/efl/PageClientLegacyImpl.h

    r140686 r142169  
    5252    virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&);
    5353    virtual void didChangeContentsSize(const WebCore::IntSize&);
    54 #if USE(TILED_BACKING_STORE)
    5554    virtual void pageDidRequestScroll(const WebCore::IntPoint&);
    5655    virtual void didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect);
    5756    virtual void pageTransitionViewportReady();
    58 #endif
    5957};
    6058
  • trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp

    r141978 r142169  
    112112}
    113113
    114 #if USE(TILED_BACKING_STORE)
    115114void PageLoadClientEfl::didCommitLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void* clientInfo)
    116115{
     
    121120    view->pageClient()->didCommitLoad();
    122121}
    123 #endif
    124122
    125123void PageLoadClientEfl::didChangeBackForwardList(WKPageRef, WKBackForwardListItemRef addedItem, WKArrayRef removedItems, const void* clientInfo)
     
    171169    loadClient.didReceiveServerRedirectForProvisionalLoadForFrame = didReceiveServerRedirectForProvisionalLoadForFrame;
    172170    loadClient.didFailProvisionalLoadWithErrorForFrame = didFailProvisionalLoadWithErrorForFrame;
    173 #if USE(TILED_BACKING_STORE)
    174171    loadClient.didCommitLoadForFrame = didCommitLoadForFrame;
    175 #endif
    176172    loadClient.didChangeBackForwardList = didChangeBackForwardList;
    177173    loadClient.didSameDocumentNavigationForFrame = didSameDocumentNavigationForFrame;
  • trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.h

    r141439 r142169  
    5454    static void didReceiveServerRedirectForProvisionalLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef userData, const void* clientInfo);
    5555    static void didFailProvisionalLoadWithErrorForFrame(WKPageRef, WKFrameRef, WKErrorRef, WKTypeRef userData, const void* clientInfo);
    56 #if USE(TILED_BACKING_STORE)
    5756    static void didCommitLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef userData, const void* clientInfo);
    58 #endif
    5957    static void didChangeBackForwardList(WKPageRef, WKBackForwardListItemRef addedItem, WKArrayRef removedItems, const void* clientInfo);
    6058    static void didSameDocumentNavigationForFrame(WKPageRef, WKFrameRef, WKSameDocumentNavigationType, WKTypeRef, const void* clientInfo);
  • trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp

    r141543 r142169  
    2626#include "config.h"
    2727#include "PageViewportControllerClientEfl.h"
    28 
    29 #if USE(TILED_BACKING_STORE)
    3028
    3129#include "CoordinatedLayerTreeHostProxy.h"
     
    7270{
    7371    drawingArea()->coordinatedLayerTreeHostProxy()->setContentsSize(contentsSize);
    74     m_view->update();
     72    m_view->scheduleUpdateDisplay();
    7573}
    7674
     
    10098void PageViewportControllerClientEfl::didChangeVisibleContents()
    10199{
    102     m_view->update();
     100    m_view->scheduleUpdateDisplay();
    103101}
    104102
     
    113111
    114112} // namespace WebKit
    115 #endif // USE(TILED_BACKING_STORE)
    116 
  • trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.h

    r140686 r142169  
    2626#ifndef PageViewportControllerClientEfl_h
    2727#define PageViewportControllerClientEfl_h
    28 
    29 #if USE(TILED_BACKING_STORE)
    3028
    3129#include "EwkView.h"
     
    7270} // namespace WebKit
    7371
    74 #endif
    75 
    7672#endif // PageViewportControllerClientEfl_h
  • trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp

    r141978 r142169  
    8888    ASSERT(m_page);
    8989
    90 #if USE(ACCELERATED_COMPOSITING) && defined HAVE_ECORE_X
     90#ifdef HAVE_ECORE_X
    9191    const char* engine = "opengl_x11";
    9292    m_inspectorWindow = ecore_evas_new(engine, 0, 0, initialWindowWidth, initialWindowHeight, 0);
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r140713 r142169  
    447447        return;
    448448
    449 #if PLATFORM(QT) || (PLATFORM(EFL) && USE(TILED_BACKING_STORE))
     449#if PLATFORM(QT) || PLATFORM(EFL)
    450450    if (m_page->useFixedLayout()) {
    451451        // The below method updates the size().
Note: See TracChangeset for help on using the changeset viewer.