Diff
Modified: trunk/Source/WebKit2/ChangeLog (137717 => 137718)
--- trunk/Source/WebKit2/ChangeLog 2012-12-14 07:45:46 UTC (rev 137717)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-14 08:01:10 UTC (rev 137718)
@@ -1,3 +1,33 @@
+2012-12-13 Kenneth Rohde Christiansen <[email protected]>
+
+ [EFL][WK2] Do not pass size to updateViewportSize
+ https://bugs.webkit.org/show_bug.cgi?id=104994
+
+ Reviewed by Gyuyoung Kim.
+
+ There is no need to pass size to updateViewportSize as we
+ have direct access to it. This makes the code differ less
+ from Qt.
+
+ * UIProcess/API/efl/ewk_view.cpp:
+ (_ewk_view_smart_calculate):
+ * UIProcess/PageViewportController.cpp:
+ (WebKit::PageViewportController::pageDidRequestScroll):
+ * UIProcess/efl/PageClientBase.h:
+ (PageClientBase):
+ * UIProcess/efl/PageClientDefaultImpl.cpp:
+ (WebKit::PageClientDefaultImpl::updateViewportSize):
+ * UIProcess/efl/PageClientDefaultImpl.h:
+ (PageClientDefaultImpl):
+ * UIProcess/efl/PageClientLegacyImpl.cpp:
+ (WebKit::PageClientLegacyImpl::updateViewportSize):
+ * UIProcess/efl/PageClientLegacyImpl.h:
+ (PageClientLegacyImpl):
+ * UIProcess/efl/PageViewportControllerClientEfl.cpp:
+ (WebKit::PageViewportControllerClientEfl::updateViewportSize):
+ * UIProcess/efl/PageViewportControllerClientEfl.h:
+ (PageViewportControllerClientEfl):
+
2012-12-13 Sanghyup Lee <[email protected]>
Fix build warning
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp (137717 => 137718)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-12-14 07:45:46 UTC (rev 137717)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-12-14 08:01:10 UTC (rev 137718)
@@ -390,7 +390,7 @@
impl->setNeedsSurfaceResize();
#endif
#if USE(TILED_BACKING_STORE)
- impl->pageClient()->updateViewportSize(IntSize(width, height));
+ impl->pageClient()->updateViewportSize();
#endif
}
}
Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.cpp (137717 => 137718)
--- trunk/Source/WebKit2/UIProcess/PageViewportController.cpp 2012-12-14 07:45:46 UTC (rev 137717)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.cpp 2012-12-14 08:01:10 UTC (rev 137718)
@@ -226,7 +226,6 @@
FloatPoint position = pixelAlignedFloatPoint(FloatPoint(cssPosition));
FloatPoint boundPosition = boundContentsPosition(position);
-
FloatRect endVisibleContentRect(boundPosition, visibleContentsSize());
if (m_lastFrameCoveredRect.intersects(endVisibleContentRect))
Modified: trunk/Source/WebKit2/UIProcess/efl/PageClientBase.h (137717 => 137718)
--- trunk/Source/WebKit2/UIProcess/efl/PageClientBase.h 2012-12-14 07:45:46 UTC (rev 137717)
+++ trunk/Source/WebKit2/UIProcess/efl/PageClientBase.h 2012-12-14 08:01:10 UTC (rev 137718)
@@ -40,7 +40,7 @@
// Called from the view
virtual void didCommitLoad() = 0;
- virtual void updateViewportSize(const WebCore::IntSize&) = 0;
+ virtual void updateViewportSize() = 0;
virtual void didChangeContentsSize(const WebCore::IntSize&) = 0;
EwkViewImpl* viewImpl() const;
Modified: trunk/Source/WebKit2/UIProcess/efl/PageClientDefaultImpl.cpp (137717 => 137718)
--- trunk/Source/WebKit2/UIProcess/efl/PageClientDefaultImpl.cpp 2012-12-14 07:45:46 UTC (rev 137717)
+++ trunk/Source/WebKit2/UIProcess/efl/PageClientDefaultImpl.cpp 2012-12-14 08:01:10 UTC (rev 137718)
@@ -53,14 +53,14 @@
#endif
}
-void PageClientDefaultImpl::updateViewportSize(const WebCore::IntSize& size)
+void PageClientDefaultImpl::updateViewportSize()
{
#if USE(TILED_BACKING_STORE)
if (!m_pageViewportControllerClient) {
m_pageViewportControllerClient = PageViewportControllerClientEfl::create(m_viewImpl);
m_pageViewportController = adoptPtr(new PageViewportController(m_viewImpl->page(), m_pageViewportControllerClient.get()));
}
- m_pageViewportControllerClient->updateViewportSize(size);
+ m_pageViewportControllerClient->updateViewportSize();
#else
UNUSED_PARAM(size);
#endif
Modified: trunk/Source/WebKit2/UIProcess/efl/PageClientDefaultImpl.h (137717 => 137718)
--- trunk/Source/WebKit2/UIProcess/efl/PageClientDefaultImpl.h 2012-12-14 07:45:46 UTC (rev 137717)
+++ trunk/Source/WebKit2/UIProcess/efl/PageClientDefaultImpl.h 2012-12-14 08:01:10 UTC (rev 137718)
@@ -44,7 +44,7 @@
virtual ~PageClientDefaultImpl() { }
virtual void didCommitLoad();
- virtual void updateViewportSize(const WebCore::IntSize&);
+ virtual void updateViewportSize();
virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&);
virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&);
Modified: trunk/Source/WebKit2/UIProcess/efl/PageClientLegacyImpl.cpp (137717 => 137718)
--- trunk/Source/WebKit2/UIProcess/efl/PageClientLegacyImpl.cpp 2012-12-14 07:45:46 UTC (rev 137717)
+++ trunk/Source/WebKit2/UIProcess/efl/PageClientLegacyImpl.cpp 2012-12-14 08:01:10 UTC (rev 137718)
@@ -47,10 +47,10 @@
m_viewImpl->update();
}
-void PageClientLegacyImpl::updateViewportSize(const WebCore::IntSize& size)
+void PageClientLegacyImpl::updateViewportSize()
{
#if USE(TILED_BACKING_STORE)
- m_viewImpl->page()->drawingArea()->setVisibleContentsRect(IntRect(roundedIntPoint(m_viewImpl->pagePosition()), size), m_viewImpl->scaleFactor(), FloatPoint());
+ m_viewImpl->page()->drawingArea()->setVisibleContentsRect(IntRect(roundedIntPoint(m_viewImpl->pagePosition()), m_viewImpl->size()), m_viewImpl->scaleFactor(), FloatPoint());
#else
UNUSED_PARAM(size);
#endif
Modified: trunk/Source/WebKit2/UIProcess/efl/PageClientLegacyImpl.h (137717 => 137718)
--- trunk/Source/WebKit2/UIProcess/efl/PageClientLegacyImpl.h 2012-12-14 07:45:46 UTC (rev 137717)
+++ trunk/Source/WebKit2/UIProcess/efl/PageClientLegacyImpl.h 2012-12-14 08:01:10 UTC (rev 137718)
@@ -41,7 +41,7 @@
virtual ~PageClientLegacyImpl() { }
virtual void didCommitLoad();
- virtual void updateViewportSize(const WebCore::IntSize&);
+ virtual void updateViewportSize();
virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&);
virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&);
Modified: trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp (137717 => 137718)
--- trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp 2012-12-14 07:45:46 UTC (rev 137717)
+++ trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp 2012-12-14 08:01:10 UTC (rev 137718)
@@ -59,12 +59,10 @@
drawingArea()->coordinatedLayerTreeHostProxy()->layerTreeRenderer()->setActive(active);
}
-void PageViewportControllerClientEfl::updateViewportSize(const IntSize& viewportSize)
+void PageViewportControllerClientEfl::updateViewportSize()
{
- m_viewportSize = viewportSize;
-
ASSERT(m_controller);
- m_controller->didChangeViewportSize(viewportSize);
+ m_controller->didChangeViewportSize(m_viewImpl->size());
}
void PageViewportControllerClientEfl::didChangeContentsSize(const WebCore::IntSize& contentsSize)
Modified: trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.h (137717 => 137718)
--- trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.h 2012-12-14 07:45:46 UTC (rev 137717)
+++ trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.h 2012-12-14 08:01:10 UTC (rev 137718)
@@ -48,7 +48,7 @@
float scaleFactor() const { return m_viewImpl->scaleFactor(); }
WebCore::FloatPoint contentPosition() const { return m_contentPosition; }
- void updateViewportSize(const WebCore::IntSize& viewportSize);
+ void updateViewportSize();
void setRendererActive(bool);
virtual void setViewportPosition(const WebCore::FloatPoint& contentsPoint);
