Rename from m_contentsScale to m_pageScaleFactor and from devicePixelRatio() to deviceScaleFactor() to match terms of WebCore.
Created attachment 182005 [details] Patch
Comment on attachment 182005 [details] Patch Attachment 182005 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/15756790
Created attachment 182010 [details] Patch
Created attachment 182014 [details] Patch
Comment on attachment 182014 [details] Patch Clearing flags on attachment: 182014 Committed r139274: <http://trac.webkit.org/changeset/139274>
All reviewed patches have been landed. Closing bug.
Comment on attachment 182014 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182014&action=review > Source/WebKit2/UIProcess/PageViewportController.h:71 > float minimumContentsScale() const { return m_minimumScaleToFit; } > float maximumContentsScale() const { return m_rawAttributes.maximumScale; } > - float currentContentsScale() const { return m_contentsScale; } > + float currentContentsScale() const { return m_pageScaleFactor; } Wait what? Why do you keep names mixed here?
(In reply to comment #7) > (From update of attachment 182014 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=182014&action=review > > > Source/WebKit2/UIProcess/PageViewportController.h:71 > > float minimumContentsScale() const { return m_minimumScaleToFit; } > > float maximumContentsScale() const { return m_rawAttributes.maximumScale; } > > - float currentContentsScale() const { return m_contentsScale; } > > + float currentContentsScale() const { return m_pageScaleFactor; } > > Wait what? > Why do you keep names mixed here? Good point. Those methods are used by qt test code. I'll change xxxScale instead of xxxContentsScale.
(In reply to comment #7) > (From update of attachment 182014 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=182014&action=review > > > Source/WebKit2/UIProcess/PageViewportController.h:71 > > float minimumContentsScale() const { return m_minimumScaleToFit; } > > float maximumContentsScale() const { return m_rawAttributes.maximumScale; } > > - float currentContentsScale() const { return m_contentsScale; } > > + float currentContentsScale() const { return m_pageScaleFactor; } > > Wait what? > Why do you keep names mixed here? I fixed in Bug 106537.