Source/WebKit/chromium/ChangeLog

 12013-02-27 Alexandre Elias <aelias@chromium.org>
 2
 3 [chromium] Remove WebLayerTreeView::setViewportSize call
 4 https://bugs.webkit.org/show_bug.cgi?id=110727
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 After https://codereview.chromium.org/12328080 lands,
 9 setViewportSize is called from the Chromium side. The multiplication
 10 by deviceScaleFactor here was prone to off-by-one errors.
 11 The layoutSize() function was only used here so delete it as well.
 12
 13 DumpRenderTree WebViewHost must now call this method as well.
 14
 15 * src/WebViewImpl.cpp:
 16 (WebKit::WebViewImpl::updateLayerTreeViewport):
 17 * src/WebViewImpl.h:
 18 (WebViewImpl):
 19
1202013-02-23 Mark Pilgrim <pilgrim@chromium.org>
221
322 [Chromium] WebKit::initialize should take a Platform* now that WebKitPlatformSupport is empty

Source/WebKit/chromium/src/WebViewImpl.cpp

@@IntSize WebViewImpl::contentsSize() const
31573157 return root->documentRect().size();
31583158}
31593159
3160 IntSize WebViewImpl::layoutSize() const
3161 {
3162  if (!isFixedLayoutModeEnabled())
3163  return m_size;
3164 
3165  IntSize contentSize = contentsSize();
3166 
3167  if (fixedLayoutSize().width >= contentSize.width())
3168  return fixedLayoutSize();
3169 
3170  float aspectRatio = static_cast<float>(m_size.height) / m_size.width;
3171  return IntSize(contentSize.width(), contentSize.width() * aspectRatio);
3172 }
3173 
31743160void WebViewImpl::computePageScaleFactorLimits()
31753161{
31763162 if (!mainFrame() || !page() || !page()->mainFrame() || !page()->mainFrame()->view())

@@void WebViewImpl::updateLayerTreeViewport()
43214307 return;
43224308
43234309 FrameView* view = page()->mainFrame()->view();
4324 
4325  IntSize layoutViewportSize = layoutSize();
4326  IntSize deviceViewportSize = m_size;
4327  if (m_webSettings->applyDeviceScaleFactorInCompositor())
4328  deviceViewportSize.scale(deviceScaleFactor());
4329 
4330  m_nonCompositedContentHost->setViewport(deviceViewportSize, view->contentsSize(), view->scrollPosition(), view->scrollOrigin());
4331 
4332  m_layerTreeView->setViewportSize(layoutViewportSize, deviceViewportSize);
 4310 m_nonCompositedContentHost->setViewport(m_size, view->contentsSize(), view->scrollPosition(), view->scrollOrigin());
43334311 m_layerTreeView->setPageScaleFactorAndLimits(pageScaleFactor(), m_minimumPageScaleFactor, m_maximumPageScaleFactor);
43344312}
43354313

Source/WebKit/chromium/src/WebViewImpl.h

@@public:
459459 }
460460
461461 WebCore::IntSize dipSize() const;
462  WebCore::IntSize layoutSize() const;
463462 WebCore::IntSize scaledSize(float) const;
464463
465464 // Set the disposition for how this webview is to be initially shown.

Tools/ChangeLog

 12013-02-27 Alexandre Elias <aelias@chromium.org>
 2
 3 [chromium] Remove WebLayerTreeView::setViewportSize call
 4 https://bugs.webkit.org/show_bug.cgi?id=110727
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 After https://codereview.chromium.org/12328080 lands,
 9 setViewportSize is called from the Chromium side. The multiplication
 10 by deviceScaleFactor here was prone to off-by-one errors.
 11 The layoutSize() function was only used here so delete it as well.
 12
 13 DumpRenderTree WebViewHost must now call this method as well.
 14
 15 * DumpRenderTree/chromium/WebViewHost.cpp:
 16 (WebViewHost::initializeLayerTreeView):
 17 (WebViewHost::setWindowRect):
 18 (WebViewHost::setDeviceScaleFactor):
 19 (WebViewHost::updateViewportSize):
 20 * DumpRenderTree/chromium/WebViewHost.h:
 21 (WebViewHost):
 22
1232013-02-23 Mark Pilgrim <pilgrim@chromium.org>
224
325 [Chromium] DumpRenderTree TestShell::initialize should take Platform* now that WebKitPlatformSupport is empty

Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@void WebViewHost::initializeLayerTreeView(WebLayerTreeViewClient* client, const
270270 m_layerTreeView = adoptPtr(webkit_support::CreateLayerTreeView3d(client));
271271
272272 ASSERT(m_layerTreeView);
 273 updateViewportSize();
273274 m_layerTreeView->setRootLayer(rootLayer);
274275 m_layerTreeView->setSurfaceReady();
275276}

@@void WebViewHost::setWindowRect(const WebRect& rect)
352353 int width = m_windowRect.width - border2;
353354 int height = m_windowRect.height - border2;
354355 webWidget()->resize(WebSize(width, height));
 356 updateViewportSize();
355357}
356358
357359WebRect WebViewHost::rootWindowRect()

@@void WebViewHost::setDatabaseQuota(int quota)
603605void WebViewHost::setDeviceScaleFactor(float deviceScaleFactor)
604606{
605607 webView()->setDeviceScaleFactor(deviceScaleFactor);
 608 updateViewportSize();
606609}
607610
608611void WebViewHost::setFocus(bool focused)

@@void WebViewHost::updateSessionHistory(WebFrame* frame)
927930 entry->setContentState(historyItem);
928931}
929932
 933void WebViewHost::updateViewportSize()
 934{
 935 if (!m_layerTreeView)
 936 return;
 937
 938 WebSize deviceViewportSize(webWidget()->size().width * webView()->deviceScaleFactor(),
 939 webWidget()->size().height * webView()->deviceScaleFactor());
 940 m_layerTreeView->setViewportSize(webWidget()->size(), deviceViewportSize);
 941}
 942
930943void WebViewHost::printFrameDescription(WebFrame* webframe)
931944{
932945 string name8 = webframe->uniqueName().utf8();

Tools/DumpRenderTree/chromium/WebViewHost.h

@@private:
233233
234234 bool hasWindow() const { return m_hasWindow; }
235235
 236 void updateViewportSize();
 237
236238#if ENABLE(MEDIA_STREAM)
237239 webkit_support::TestMediaStreamClient* testMediaStreamClient();
238240#endif