Changeset 131896 in webkit


Ignore:
Timestamp:
Oct 19, 2012 6:58:03 AM (12 years ago)
Author:
rakuco@webkit.org
Message:

[EFL][WK2] Rename EflViewportHandler to PageViewportControllerClientEfl
​https://bugs.webkit.org/show_bug.cgi?id=99101

Patch by Yael Aharon <​yael.aharon@intel.com> on 2012-10-19
Reviewed by Gyuyoung Kim.

Rename EFlViewportHandler to PageViewportControllerClientEfl.
Also, make it inherit from PageViewportControllerClient. The actual implementation
of PageViewportControllerClient for Efl port will come in a separate patch.

  • CMakeLists.txt:
  • PlatformEfl.cmake:
  • UIProcess/API/efl/EflViewportHandler.cpp: Removed.
  • UIProcess/API/efl/EflViewportHandler.h: Removed.
  • UIProcess/API/efl/PageViewportControllerClientEfl.cpp: Copied from Source/WebKit2/UIProcess/API/efl/EflViewportHandler.cpp.

(WebKit::PageViewportControllerClientEfl::PageViewportControllerClientEfl):
(WebKit::PageViewportControllerClientEfl::~PageViewportControllerClientEfl):
(WebKit::PageViewportControllerClientEfl::drawingArea):
(WebKit::PageViewportControllerClientEfl::setRendererActive):
(WebKit::PageViewportControllerClientEfl::display):
(WebKit::PageViewportControllerClientEfl::updateViewportSize):
(WebKit::PageViewportControllerClientEfl::setVisibleContentsRect):
(WebKit::PageViewportControllerClientEfl::didChangeContentsSize):
(WebKit):
(WebKit::PageViewportControllerClientEfl::setViewportPosition):
(WebKit::PageViewportControllerClientEfl::setContentsScale):
(WebKit::PageViewportControllerClientEfl::didResumeContent):
(WebKit::PageViewportControllerClientEfl::didChangeVisibleContents):
(WebKit::PageViewportControllerClientEfl::didChangeViewportAttributes):
(WebKit::PageViewportControllerClientEfl::setController):

  • UIProcess/API/efl/PageViewportControllerClientEfl.h: Copied from Source/WebKit2/UIProcess/API/efl/EflViewportHandler.h.

(WebKit::PageViewportControllerClientEfl::create):
(PageViewportControllerClientEfl):

  • UIProcess/API/efl/ewk_view.cpp:

(Ewk_View_Private_Data):
(_ewk_view_initialize):
(ewk_view_scale_set):

  • UIProcess/PageViewportController.cpp:
  • UIProcess/PageViewportController.h:
Location:
trunk/Source/WebKit2
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r131884 r131896  
     12012-10-19  Yael Aharon  <yael.aharon@intel.com>
     2
     3        [EFL][WK2] Rename EflViewportHandler to PageViewportControllerClientEfl
     4        https://bugs.webkit.org/show_bug.cgi?id=99101
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        Rename EFlViewportHandler to PageViewportControllerClientEfl.
     9        Also, make it inherit from PageViewportControllerClient. The actual implementation
     10        of PageViewportControllerClient for Efl port will come in a separate patch.
     11
     12        * CMakeLists.txt:
     13        * PlatformEfl.cmake:
     14        * UIProcess/API/efl/EflViewportHandler.cpp: Removed.
     15        * UIProcess/API/efl/EflViewportHandler.h: Removed.
     16        * UIProcess/API/efl/PageViewportControllerClientEfl.cpp: Copied from Source/WebKit2/UIProcess/API/efl/EflViewportHandler.cpp.
     17        (WebKit::PageViewportControllerClientEfl::PageViewportControllerClientEfl):
     18        (WebKit::PageViewportControllerClientEfl::~PageViewportControllerClientEfl):
     19        (WebKit::PageViewportControllerClientEfl::drawingArea):
     20        (WebKit::PageViewportControllerClientEfl::setRendererActive):
     21        (WebKit::PageViewportControllerClientEfl::display):
     22        (WebKit::PageViewportControllerClientEfl::updateViewportSize):
     23        (WebKit::PageViewportControllerClientEfl::setVisibleContentsRect):
     24        (WebKit::PageViewportControllerClientEfl::didChangeContentsSize):
     25        (WebKit):
     26        (WebKit::PageViewportControllerClientEfl::setViewportPosition):
     27        (WebKit::PageViewportControllerClientEfl::setContentsScale):
     28        (WebKit::PageViewportControllerClientEfl::didResumeContent):
     29        (WebKit::PageViewportControllerClientEfl::didChangeVisibleContents):
     30        (WebKit::PageViewportControllerClientEfl::didChangeViewportAttributes):
     31        (WebKit::PageViewportControllerClientEfl::setController):
     32        * UIProcess/API/efl/PageViewportControllerClientEfl.h: Copied from Source/WebKit2/UIProcess/API/efl/EflViewportHandler.h.
     33        (WebKit::PageViewportControllerClientEfl::create):
     34        (PageViewportControllerClientEfl):
     35        * UIProcess/API/efl/ewk_view.cpp:
     36        (Ewk_View_Private_Data):
     37        (_ewk_view_initialize):
     38        (ewk_view_scale_set):
     39        * UIProcess/PageViewportController.cpp:
     40        * UIProcess/PageViewportController.h:
     41
    1422012-10-19  Csaba Osztrogonác  <ossy@webkit.org>
    243

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r131650 r131896  
    4343
    4444    UIProcess/API/efl/BatteryProvider.cpp
    45     UIProcess/API/efl/EflViewportHandler.cpp
     45    UIProcess/API/efl/PageViewportControllerClientEfl.cpp
    4646    UIProcess/API/efl/NetworkInfoProvider.cpp
    4747    UIProcess/API/efl/PageClientImpl.cpp

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

    r131895 r131896  
    2525
    2626#include "config.h"
    27 #include "EflViewportHandler.h"
     27#include "PageViewportControllerClientEfl.h"
    2828
    2929#if USE(COORDINATED_GRAPHICS)
    … …  
    3838namespace WebKit {
    3939
    40 EflViewportHandler::EflViewportHandler(Evas_Object* viewWidget)
     40PageViewportControllerClientEfl::PageViewportControllerClientEfl(Evas_Object* viewWidget)
    4141    : m_viewWidget(viewWidget)
    4242    , m_scaleFactor(1)
    … …  
    4545}
    4646
    47 EflViewportHandler::~EflViewportHandler()
     47PageViewportControllerClientEfl::~PageViewportControllerClientEfl()
    4848{
    4949}
    5050
    51 DrawingAreaProxy* EflViewportHandler::drawingArea() const
     51DrawingAreaProxy* PageViewportControllerClientEfl::drawingArea() const
    5252{
    5353    return ewk_view_page_get(m_viewWidget)->drawingArea();
    5454}
    5555
    56 void EflViewportHandler::setRendererActive(bool active)
     56void PageViewportControllerClientEfl::setRendererActive(bool active)
    5757{
    5858    drawingArea()->layerTreeCoordinatorProxy()->layerTreeRenderer()->setActive(active);
    5959}
    6060
    61 void EflViewportHandler::display(const IntRect& rect, const IntPoint& viewPosition)
     61void PageViewportControllerClientEfl::display(const IntRect& rect, const IntPoint& viewPosition)
    6262{
    6363    WebCore::TransformationMatrix matrix;
    … …  
    7272}
    7373
    74 void EflViewportHandler::updateViewportSize(const IntSize& viewportSize)
     74void PageViewportControllerClientEfl::updateViewportSize(const IntSize& viewportSize)
    7575{
    7676    m_viewportSize = viewportSize;
    … …  
    7979}
    8080
    81 void EflViewportHandler::setVisibleContentsRect(const IntPoint& newScrollPosition, float newScale, const FloatPoint& trajectory)
     81void PageViewportControllerClientEfl::setVisibleContentsRect(const IntPoint& newScrollPosition, float newScale, const FloatPoint& trajectory)
    8282{
    8383    m_scaleFactor = newScale;
    … …  
    101101}
    102102
    103 void EflViewportHandler::didChangeContentsSize(const WebCore::IntSize& size)
     103void PageViewportControllerClientEfl::didChangeContentsSize(const WebCore::IntSize& size)
    104104{
    105105    m_contentsSize = size;
    … …  
    108108}
    109109
     110void PageViewportControllerClientEfl::setViewportPosition(const WebCore::FloatPoint& /*contentsPoint*/)
     111{
     112}
     113
     114void PageViewportControllerClientEfl::setContentsScale(float, bool /*treatAsInitialValue*/)
     115{
     116}
     117
     118void PageViewportControllerClientEfl::didResumeContent()
     119{
     120}
     121
     122void PageViewportControllerClientEfl::didChangeVisibleContents()
     123{
     124}
     125
     126void PageViewportControllerClientEfl::didChangeViewportAttributes()
     127{
     128}
     129
     130void PageViewportControllerClientEfl::setController(PageViewportController* pageViewportController)
     131{
     132}
     133
    110134} // namespace WebKit
    111135#endif // USE(COORDINATED_GRAPHICS)

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

    r131895 r131896  
    2424 */
    2525
    26 #ifndef EflViewportHandler_h
    27 #define EflViewportHandler_h
     26#ifndef PageViewportControllerClientEfl_h
     27#define PageViewportControllerClientEfl_h
    2828
    2929#if USE(COORDINATED_GRAPHICS)
    3030
    3131#include "PageClientImpl.h"
     32#include "PageViewportControllerClient.h"
    3233#include <wtf/PassOwnPtr.h>
    3334
    3435namespace WebKit {
    3536
    36 class EflViewportHandler {
     37class PageViewportControllerClientEfl : public PageViewportControllerClient {
    3738public:
    38     static PassOwnPtr<EflViewportHandler> create(Evas_Object* viewWidget)
     39    static PassOwnPtr<PageViewportControllerClientEfl> create(Evas_Object* viewWidget)
    3940    {
    40         return adoptPtr(new EflViewportHandler(viewWidget));
     41        return adoptPtr(new PageViewportControllerClientEfl(viewWidget));
    4142    }
    42     ~EflViewportHandler();
     43    ~PageViewportControllerClientEfl();
    4344
    4445    DrawingAreaProxy* drawingArea() const;
    … …  
    4849    void updateViewportSize(const WebCore::IntSize& viewportSize);
    4950    void setVisibleContentsRect(const WebCore::IntPoint&, float, const WebCore::FloatPoint&);
    50     void didChangeContentsSize(const WebCore::IntSize& size);
    5151    void setRendererActive(bool);
     52
     53    virtual void setViewportPosition(const WebCore::FloatPoint& contentsPoint);
     54    virtual void setContentsScale(float, bool treatAsInitialValue);
     55
     56    virtual void didResumeContent();
     57    virtual void didChangeContentsSize(const WebCore::IntSize&);
     58    virtual void didChangeVisibleContents();
     59    virtual void didChangeViewportAttributes();
     60
     61    virtual void setController(PageViewportController*);
     62
    5263private:
    53     explicit EflViewportHandler(Evas_Object*);
     64    explicit PageViewportControllerClientEfl(Evas_Object*);
    5465
    5566    Evas_Object* m_viewWidget;
    … …  
    6475#endif
    6576
    66 #endif // EflViewportHandler_h
     77#endif // PageViewportControllerClientEfl_h

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

    r131712 r131896  
    7676
    7777#if USE(COORDINATED_GRAPHICS)
    78 #include "EflViewportHandler.h"
     78#include "PageViewportControllerClientEfl.h"
    7979#endif
    8080
    … …  
    116116    OwnPtr<PageClientImpl> pageClient;
    117117#if USE(COORDINATED_GRAPHICS)
    118     OwnPtr<EflViewportHandler> viewportHandler;
     118    OwnPtr<PageViewportControllerClientEfl> pageViewportControllerClient;
    119119#endif
    120120    RefPtr<WebPageProxy> pageProxy;
    … …  
    624624    }
    625625
    626     priv->viewportHandler->setRendererActive(true);
     626    priv->pageViewportControllerClient->setRendererActive(true);
    627627    return true;
    628628}
    … …  
    668668    if (smartData->changed.size) {
    669669#if USE(COORDINATED_GRAPHICS)
    670         priv->viewportHandler->updateViewportSize(IntSize(width, height));
     670        priv->pageViewportControllerClient->updateViewportSize(IntSize(width, height));
    671671#endif
    672672#if USE(ACCELERATED_COMPOSITING)
    … …  
    825825
    826826#if USE(COORDINATED_GRAPHICS)
    827     priv->viewportHandler = EflViewportHandler::create(ewkView);
     827    priv->pageViewportControllerClient = PageViewportControllerClientEfl::create(ewkView);
    828828#endif
    829829
    … …  
    12961296
    12971297    evas_gl_make_current(priv->evasGl, priv->evasGlSurface, priv->evasGlContext);
    1298     priv->viewportHandler->display(rect, IntPoint(smartData->view.x, smartData->view.y));
     1298    priv->pageViewportControllerClient->display(rect, IntPoint(smartData->view.x, smartData->view.y));
    12991299#endif
    13001300
    … …  
    17341734    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
    17351735
    1736     priv->viewportHandler->didChangeContentsSize(size);
     1736    priv->pageViewportControllerClient->didChangeContentsSize(size);
    17371737#else
    17381738    UNUSED_PARAM(ewkView);
Note: See TracChangeset for help on using the changeset viewer.