Changeset 139274 in webkit
- Timestamp:
- Jan 9, 2013 7:11:34 PM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r139261 r139274 1 2013-01-09 Huang Dongsung <luxtella@company100.net> 2 3 [QT][EFL][WK2] Rename scale members in PageViewportController. 4 https://bugs.webkit.org/show_bug.cgi?id=106499 5 6 Reviewed by Kenneth Rohde Christiansen. 7 8 Rename from m_contentsScale to m_pageScaleFactor and from devicePixelRatio() to 9 deviceScaleFactor() to match terms of WebCore. 10 11 * UIProcess/API/qt/qwebkittest.cpp: 12 (QWebKitTest::devicePixelRatio): 13 * UIProcess/PageViewportController.cpp: 14 (WebKit::PageViewportController::PageViewportController): 15 (WebKit::PageViewportController::deviceScaleFactor): 16 (WebKit::PageViewportController::pixelAlignedFloatPoint): 17 (WebKit::PageViewportController::boundContentsPosition): 18 (WebKit::PageViewportController::didRenderFrame): 19 (WebKit::PageViewportController::didChangeContentsVisibility): 20 (WebKit::PageViewportController::syncVisibleContents): 21 (WebKit::PageViewportController::visibleContentsSize): 22 (WebKit::PageViewportController::applyScaleAfterRenderingContents): 23 (WebKit::PageViewportController::updateMinimumScaleToFit): 24 * UIProcess/PageViewportController.h: 25 (PageViewportController): 26 (WebKit::PageViewportController::currentContentsScale): 27 * UIProcess/efl/PageViewportControllerClientEfl.cpp: 28 (WebKit::PageViewportControllerClientEfl::updateViewportSize): 29 1 30 2013-01-09 KyungTae Kim <ktf.kim@samsung.com> 2 31 -
trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp
r128035 r139274 167 167 { 168 168 if (const PageViewportController* const viewport = m_webViewPrivate->viewportController()) 169 return viewport->device PixelRatio();169 return viewport->deviceScaleFactor(); 170 170 return 1.0; 171 171 } -
trunk/Source/WebKit2/UIProcess/PageViewportController.cpp
r139189 r139274 48 48 , m_hasSuspendedContent(false) 49 49 , m_hadUserInteraction(false) 50 , m_ contentsScale(1)50 , m_pageScaleFactor(1) 51 51 , m_pendingPositionChange(false) 52 52 , m_pendingScaleChange(false) … … 83 83 } 84 84 85 float PageViewportController::device PixelRatio() const85 float PageViewportController::deviceScaleFactor() const 86 86 { 87 87 return m_webPageProxy->deviceScaleFactor(); … … 96 96 { 97 97 #if PLATFORM(EFL) 98 if (!isIntegral(m_ contentsScale)) {98 if (!isIntegral(m_pageScaleFactor)) { 99 99 // To avoid blurryness, modify the position so that it maps into a discrete device position. 100 100 FloatPoint scaledPos(framePosition); 101 101 102 102 // Scale by the effective scale factor to compute the screen-relative position. 103 scaledPos.scale(m_ contentsScale, m_contentsScale);103 scaledPos.scale(m_pageScaleFactor, m_pageScaleFactor); 104 104 105 105 // Round to integer boundaries. … … 107 107 108 108 // Convert back to CSS coordinates. 109 alignedPos.scale(1 / m_ contentsScale, 1 / m_contentsScale);109 alignedPos.scale(1 / m_pageScaleFactor, 1 / m_pageScaleFactor); 110 110 111 111 return alignedPos; … … 134 134 FloatPoint PageViewportController::boundContentsPosition(const WebCore::FloatPoint& framePosition) 135 135 { 136 return boundContentsPositionAtScale(framePosition, m_ contentsScale);136 return boundContentsPositionAtScale(framePosition, m_pageScaleFactor); 137 137 } 138 138 … … 190 190 if (m_pendingScaleChange) { 191 191 m_pendingScaleChange = false; 192 m_client->setContentsScale(m_ contentsScale);192 m_client->setContentsScale(m_pageScaleFactor); 193 193 194 194 // The scale changed, we have to re-pixel align. … … 257 257 m_contentsPosition = position; 258 258 if (!m_pendingScaleChange) 259 m_ contentsScale= scale;259 m_pageScaleFactor = scale; 260 260 261 261 syncVisibleContents(trajectoryVector); … … 270 270 FloatRect visibleContentsRect(boundContentsPosition(m_contentsPosition), visibleContentsSize()); 271 271 visibleContentsRect.intersect(FloatRect(FloatPoint::zero(), m_contentsSize)); 272 drawingArea->setVisibleContentsRect(visibleContentsRect, m_ contentsScale, trajectoryVector);272 drawingArea->setVisibleContentsRect(visibleContentsRect, m_pageScaleFactor, trajectoryVector); 273 273 274 274 m_client->didChangeVisibleContents(); … … 300 300 FloatSize PageViewportController::visibleContentsSize() const 301 301 { 302 return FloatSize(m_viewportSize.width() / m_ contentsScale, m_viewportSize.height() / m_contentsScale);302 return FloatSize(m_viewportSize.width() / m_pageScaleFactor, m_viewportSize.height() / m_pageScaleFactor); 303 303 } 304 304 … … 325 325 void PageViewportController::applyScaleAfterRenderingContents(float scale) 326 326 { 327 m_ contentsScale= scale;327 m_pageScaleFactor = scale; 328 328 m_pendingScaleChange = true; 329 329 syncVisibleContents(); … … 342 342 return false; 343 343 344 bool currentlyScaledToFit = fuzzyCompare(m_ contentsScale, m_minimumScaleToFit, 0.0001);344 bool currentlyScaledToFit = fuzzyCompare(m_pageScaleFactor, m_minimumScaleToFit, 0.0001); 345 345 346 346 float minimumScale = WebCore::computeMinimumScaleFactorForContentContained(m_rawAttributes, WebCore::roundedIntSize(m_viewportSize), WebCore::roundedIntSize(m_contentsSize), 1); … … 357 357 else { 358 358 // Ensure the effective scale stays within bounds. 359 float boundedScale = innerBoundedViewportScale(m_ contentsScale);360 if (!fuzzyCompare(boundedScale, m_ contentsScale, 0.0001))359 float boundedScale = innerBoundedViewportScale(m_pageScaleFactor); 360 if (!fuzzyCompare(boundedScale, m_pageScaleFactor, 0.0001)) 361 361 applyScaleAfterRenderingContents(boundedScale); 362 362 } -
trunk/Source/WebKit2/UIProcess/PageViewportController.h
r139189 r139274 66 66 67 67 WebCore::FloatSize contentsLayoutSize() const { return m_rawAttributes.layoutSize; } 68 float device PixelRatio() const;68 float deviceScaleFactor() const; 69 69 float minimumContentsScale() const { return m_minimumScaleToFit; } 70 70 float maximumContentsScale() const { return m_rawAttributes.maximumScale; } 71 float currentContentsScale() const { return m_ contentsScale; }71 float currentContentsScale() const { return m_pageScaleFactor; } 72 72 73 73 void setHadUserInteraction(bool didUserInteract) { m_hadUserInteraction = didUserInteract; } … … 107 107 WebCore::FloatSize m_viewportSize; 108 108 WebCore::IntSize m_clientContentsSize; 109 float m_ contentsScale;109 float m_pageScaleFactor; 110 110 111 111 bool m_pendingPositionChange; -
trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp
r139189 r139274 65 65 FloatSize size = m_viewImpl->size(); 66 66 // The viewport controller expects sizes in UI units, and not raw device units. 67 size.scale(1 / m_controller->device PixelRatio());67 size.scale(1 / m_controller->deviceScaleFactor()); 68 68 m_controller->didChangeViewportSize(size); 69 69 }
Note: See TracChangeset
for help on using the changeset viewer.