No subject
Wed Aug 1 07:28:53 PDT 2012
* 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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href=3D"#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeL=
og</a></li>
<li><a href=3D"#trunkSourceWebKit2UIProcessAPIeflEflViewportHandlercpp">t=
runk/Source/WebKit2/UIProcess/API/efl/EflViewportHandler.cpp</a></li>
<li><a href=3D"#trunkSourceWebKit2UIProcessAPIeflEflViewportHandlerh">tru=
nk/Source/WebKit2/UIProcess/API/efl/EflViewportHandler.h</a></li>
<li><a href=3D"#trunkSourceWebKit2UIProcessAPIeflewk_viewcpp">trunk/Sourc=
e/WebKit2/UIProcess/API/efl/ewk_view.cpp</a></li>
</ul>
</div>
<div id=3D"patch">
<h3>Diff</h3>
<a id=3D"trunkSourceWebKit2ChangeLog"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (1271=
01 =3D> 127102)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- 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)
</span><span class=3D"lines">@@ -1,3 +1,24 @@
</span><ins>+2012-08-29 Kangil Han <kangil.han at samsung.com>
+
+ [EFL][WK2] Replace PageClientImpl with ewk view in constructor o=
f EflViewportHandler.
+ https://bugs.webkit.org/show_bug.cgi?id=3D95408
+
+ 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 cha=
nges 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):
+
</ins><span class=3D"cx"> 2012-08-29 Gyuyoung Kim <gyuyoung.kim at sams=
ung.com>
</span><span class=3D"cx">=20
</span><span class=3D"cx"> [WK2] Use ASCIILiteral hotness for DEF=
INE_STATIC_LOCAL string
</span></span></pre></div>
<a id=3D"trunkSourceWebKit2UIProcessAPIeflEflViewportHandlercpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/e=
fl/EflViewportHandler.cpp (127101 =3D> 127102)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebKit2/UIProcess/API/efl/EflViewpo=
rtHandler.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)
</span><span class=3D"lines">@@ -31,22 +31,28 @@
</span><span class=3D"cx"> #include "LayerTreeCoordinatorProxy.h&quo=
t;
</span><span class=3D"cx"> #include "LayerTreeRenderer.h"
</span><span class=3D"cx"> #include "TransformationMatrix.h"
</span><ins>+#include "ewk_view_private.h"
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> using namespace WebCore;
</span><span class=3D"cx">=20
</span><span class=3D"cx"> namespace WebKit {
</span><span class=3D"cx">=20
</span><del>-EflViewportHandler::EflViewportHandler(PageClientImpl* pageC=
lientImpl)
- : m_pageClientImpl(pageClientImpl)
</del><ins>+EflViewportHandler::EflViewportHandler(Evas_Object* viewWidge=
t)
+ : m_viewWidget(viewWidget)
</ins><span class=3D"cx"> , m_scaleFactor(1)
</span><span class=3D"cx"> {
</span><del>- ASSERT(m_pageClientImpl);
</del><ins>+ ASSERT(m_viewWidget);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> EflViewportHandler::~EflViewportHandler()
</span><span class=3D"cx"> {
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><ins>+DrawingAreaProxy* EflViewportHandler::drawingArea() const
+{
+ return ewk_view_page_get(m_viewWidget)->drawingArea();
+}
+
</ins><span class=3D"cx"> void EflViewportHandler::display(const IntRect&=
amp; rect)
</span><span class=3D"cx"> {
</span><span class=3D"cx"> WebCore::TransformationMatrix matrix;
</span><span class=3D"lines">@@ -61,7 +67,7 @@
</span><span class=3D"cx"> void EflViewportHandler::updateViewportSize(co=
nst IntSize& viewportSize)
</span><span class=3D"cx"> {
</span><span class=3D"cx"> m_viewportSize =3D viewportSize;
</span><del>- m_pageClientImpl->page()->setViewportSize(viewport=
Size);
</del><ins>+ ewk_view_page_get(m_viewWidget)->setViewportSize(viewp=
ortSize);
</ins><span class=3D"cx"> setVisibleContentsRect(m_visibleContentRect=
.location(), m_scaleFactor, FloatPoint());
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span></span></pre></div>
<a id=3D"trunkSourceWebKit2UIProcessAPIeflEflViewportHandlerh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/e=
fl/EflViewportHandler.h (127101 =3D> 127102)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebKit2/UIProcess/API/efl/EflViewpo=
rtHandler.h 2012-08-30 05:19:52 UTC (rev 127101)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EflViewportHandler.h 2012-08-3=
0 05:45:37 UTC (rev 127102)
</span><span class=3D"lines">@@ -35,13 +35,13 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx"> class EflViewportHandler {
</span><span class=3D"cx"> public:
</span><del>- static PassOwnPtr<EflViewportHandler> create(PageC=
lientImpl* pageClientImpl)
</del><ins>+ static PassOwnPtr<EflViewportHandler> create(Evas_O=
bject* viewWidget)
</ins><span class=3D"cx"> {
</span><del>- return adoptPtr(new EflViewportHandler(pageClientImp=
l));
</del><ins>+ return adoptPtr(new EflViewportHandler(viewWidget));
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> ~EflViewportHandler();
</span><span class=3D"cx">=20
</span><del>- DrawingAreaProxy* drawingArea() const { return m_pageCli=
entImpl->page()->drawingArea(); }
</del><ins>+ DrawingAreaProxy* drawingArea() const;
</ins><span class=3D"cx"> WebCore::IntSize viewSize() { return m_view=
portSize; }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> void display(const WebCore::IntRect& r=
ect);
</span><span class=3D"lines">@@ -50,9 +50,9 @@
</span><span class=3D"cx"> void didChangeContentsSize(const WebCore::=
IntSize& size);
</span><span class=3D"cx">=20
</span><span class=3D"cx"> private:
</span><del>- explicit EflViewportHandler(PageClientImpl*);
</del><ins>+ explicit EflViewportHandler(Evas_Object*);
</ins><span class=3D"cx">=20
</span><del>- PageClientImpl* m_pageClientImpl;
</del><ins>+ Evas_Object* m_viewWidget;
</ins><span class=3D"cx"> WebCore::IntRect m_visibleContentRect;
</span><span class=3D"cx"> WebCore::IntSize m_contentsSize;
</span><span class=3D"cx"> WebCore::IntSize m_viewportSize;
</span></span></pre></div>
<a id=3D"trunkSourceWebKit2UIProcessAPIeflewk_viewcpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/e=
fl/ewk_view.cpp (127101 =3D> 127102)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- 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)
</span><span class=3D"lines">@@ -692,7 +692,7 @@
</span><span class=3D"cx"> priv->backForwardList =3D ewk_back_forw=
ard_list_new(toAPI(priv->pageProxy->backForwardList()));
</span><span class=3D"cx">=20
</span><span class=3D"cx"> #if USE(COORDINATED_GRAPHICS)
</span><del>- priv->viewportHandler =3D EflViewportHandler::create(=
priv->pageClient.get());
</del><ins>+ priv->viewportHandler =3D EflViewportHandler::create(e=
wkView);
</ins><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><span class=3D"cx"> WKPageRef wkPage =3D toAPI(priv->pagePr=
oxy.get());
</span></span></pre>
</div>
</div>
</body>
</html>
More information about the webkit-changes
mailing list