Title: [127102] trunk/Source/WebKit2
- Revision
- 127102
- Author
- [email protected]
- Date
- 2012-08-29 22:45:37 -0700 (Wed, 29 Aug 2012)
Log Message
[EFL][WK2] Replace PageClientImpl with ewk view in constructor of EflViewportHandler.
https://bugs.webkit.org/show_bug.cgi?id=95408
Patch by Kangil Han <[email protected]> on 2012-08-29
Reviewed by Gyuyoung Kim.
To keep consistency of implementation, derived classes(from ewk view) should have view reference.
>From this, derived classes would have less interference from changes that would happen in port specific classes, i.e. PageClientImpl.
* UIProcess/API/efl/EflViewportHandler.cpp:
(WebKit::EflViewportHandler::EflViewportHandler):
(WebKit::EflViewportHandler::drawingArea):
(WebKit):
(WebKit::EflViewportHandler::updateViewportSize):
* UIProcess/API/efl/EflViewportHandler.h:
(WebKit::EflViewportHandler::create):
(EflViewportHandler):
* UIProcess/API/efl/ewk_view.cpp:
(_ewk_view_initialize):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (127101 => 127102)
--- trunk/Source/WebKit2/ChangeLog 2012-08-30 05:19:52 UTC (rev 127101)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-30 05:45:37 UTC (rev 127102)
@@ -1,3 +1,24 @@
+2012-08-29 Kangil Han <[email protected]>
+
+ [EFL][WK2] Replace PageClientImpl with ewk view in constructor of EflViewportHandler.
+ https://bugs.webkit.org/show_bug.cgi?id=95408
+
+ Reviewed by Gyuyoung Kim.
+
+ To keep consistency of implementation, derived classes(from ewk view) should have view reference.
+ From this, derived classes would have less interference from changes that would happen in port specific classes, i.e. PageClientImpl.
+
+ * UIProcess/API/efl/EflViewportHandler.cpp:
+ (WebKit::EflViewportHandler::EflViewportHandler):
+ (WebKit::EflViewportHandler::drawingArea):
+ (WebKit):
+ (WebKit::EflViewportHandler::updateViewportSize):
+ * UIProcess/API/efl/EflViewportHandler.h:
+ (WebKit::EflViewportHandler::create):
+ (EflViewportHandler):
+ * UIProcess/API/efl/ewk_view.cpp:
+ (_ewk_view_initialize):
+
2012-08-29 Gyuyoung Kim <[email protected]>
[WK2] Use ASCIILiteral hotness for DEFINE_STATIC_LOCAL string
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EflViewportHandler.cpp (127101 => 127102)
--- trunk/Source/WebKit2/UIProcess/API/efl/EflViewportHandler.cpp 2012-08-30 05:19:52 UTC (rev 127101)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EflViewportHandler.cpp 2012-08-30 05:45:37 UTC (rev 127102)
@@ -31,22 +31,28 @@
#include "LayerTreeCoordinatorProxy.h"
#include "LayerTreeRenderer.h"
#include "TransformationMatrix.h"
+#include "ewk_view_private.h"
using namespace WebCore;
namespace WebKit {
-EflViewportHandler::EflViewportHandler(PageClientImpl* pageClientImpl)
- : m_pageClientImpl(pageClientImpl)
+EflViewportHandler::EflViewportHandler(Evas_Object* viewWidget)
+ : m_viewWidget(viewWidget)
, m_scaleFactor(1)
{
- ASSERT(m_pageClientImpl);
+ ASSERT(m_viewWidget);
}
EflViewportHandler::~EflViewportHandler()
{
}
+DrawingAreaProxy* EflViewportHandler::drawingArea() const
+{
+ return ewk_view_page_get(m_viewWidget)->drawingArea();
+}
+
void EflViewportHandler::display(const IntRect& rect)
{
WebCore::TransformationMatrix matrix;
@@ -61,7 +67,7 @@
void EflViewportHandler::updateViewportSize(const IntSize& viewportSize)
{
m_viewportSize = viewportSize;
- m_pageClientImpl->page()->setViewportSize(viewportSize);
+ ewk_view_page_get(m_viewWidget)->setViewportSize(viewportSize);
setVisibleContentsRect(m_visibleContentRect.location(), m_scaleFactor, FloatPoint());
}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EflViewportHandler.h (127101 => 127102)
--- trunk/Source/WebKit2/UIProcess/API/efl/EflViewportHandler.h 2012-08-30 05:19:52 UTC (rev 127101)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EflViewportHandler.h 2012-08-30 05:45:37 UTC (rev 127102)
@@ -35,13 +35,13 @@
class EflViewportHandler {
public:
- static PassOwnPtr<EflViewportHandler> create(PageClientImpl* pageClientImpl)
+ static PassOwnPtr<EflViewportHandler> create(Evas_Object* viewWidget)
{
- return adoptPtr(new EflViewportHandler(pageClientImpl));
+ return adoptPtr(new EflViewportHandler(viewWidget));
}
~EflViewportHandler();
- DrawingAreaProxy* drawingArea() const { return m_pageClientImpl->page()->drawingArea(); }
+ DrawingAreaProxy* drawingArea() const;
WebCore::IntSize viewSize() { return m_viewportSize; }
void display(const WebCore::IntRect& rect);
@@ -50,9 +50,9 @@
void didChangeContentsSize(const WebCore::IntSize& size);
private:
- explicit EflViewportHandler(PageClientImpl*);
+ explicit EflViewportHandler(Evas_Object*);
- PageClientImpl* m_pageClientImpl;
+ Evas_Object* m_viewWidget;
WebCore::IntRect m_visibleContentRect;
WebCore::IntSize m_contentsSize;
WebCore::IntSize m_viewportSize;
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp (127101 => 127102)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-08-30 05:19:52 UTC (rev 127101)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-08-30 05:45:37 UTC (rev 127102)
@@ -692,7 +692,7 @@
priv->backForwardList = ewk_back_forward_list_new(toAPI(priv->pageProxy->backForwardList()));
#if USE(COORDINATED_GRAPHICS)
- priv->viewportHandler = EflViewportHandler::create(priv->pageClient.get());
+ priv->viewportHandler = EflViewportHandler::create(ewkView);
#endif
WKPageRef wkPage = toAPI(priv->pageProxy.get());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
