OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. |
3 * | 3 * |
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
5 * | 5 * |
6 * Other contributors: | 6 * Other contributors: |
7 * Robert O'Callahan <roc+@cs.cmu.edu> | 7 * Robert O'Callahan <roc+@cs.cmu.edu> |
8 * David Baron <dbaron@fas.harvard.edu> | 8 * David Baron <dbaron@fas.harvard.edu> |
9 * Christian Biesinger <cbiesinger@web.de> | 9 * Christian Biesinger <cbiesinger@web.de> |
10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1237 gevt = static_cast<const PlatformGestureEvent*>(&evt); | 1237 gevt = static_cast<const PlatformGestureEvent*>(&evt); |
1238 pos = gevt->position(); | 1238 pos = gevt->position(); |
1239 pos.move(gevt->deltaX(), gevt->deltaY()); | 1239 pos.move(gevt->deltaX(), gevt->deltaY()); |
1240 break; | 1240 break; |
1241 default: | 1241 default: |
1242 ASSERT_NOT_REACHED(); | 1242 ASSERT_NOT_REACHED(); |
1243 } | 1243 } |
1244 | 1244 |
1245 float zoomFactor = box().style()->effectiveZoom(); | 1245 float zoomFactor = box().style()->effectiveZoom(); |
1246 | 1246 |
1247 IntSize newOffset = offsetFromResizeCorner(document.view()->windowToContents
(pos)); | 1247 IntSize newOffset = offsetFromResizeCorner(document.view()->rootFrameToConte
nts(pos)); |
1248 newOffset.setWidth(newOffset.width() / zoomFactor); | 1248 newOffset.setWidth(newOffset.width() / zoomFactor); |
1249 newOffset.setHeight(newOffset.height() / zoomFactor); | 1249 newOffset.setHeight(newOffset.height() / zoomFactor); |
1250 | 1250 |
1251 LayoutSize currentSize = box().size(); | 1251 LayoutSize currentSize = box().size(); |
1252 currentSize.scale(1 / zoomFactor); | 1252 currentSize.scale(1 / zoomFactor); |
1253 LayoutSize minimumSize = element->minimumSizeForResizing().shrunkTo(currentS
ize); | 1253 LayoutSize minimumSize = element->minimumSizeForResizing().shrunkTo(currentS
ize); |
1254 element->setMinimumSizeForResizing(minimumSize); | 1254 element->setMinimumSizeForResizing(minimumSize); |
1255 | 1255 |
1256 LayoutSize adjustedOldOffset = LayoutSize(oldOffset.width() / zoomFactor, ol
dOffset.height() / zoomFactor); | 1256 LayoutSize adjustedOldOffset = LayoutSize(oldOffset.width() / zoomFactor, ol
dOffset.height() / zoomFactor); |
1257 if (box().style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft()) { | 1257 if (box().style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft()) { |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1386 void DeprecatedPaintLayerScrollableArea::setTopmostScrollChild(DeprecatedPaintLa
yer* scrollChild) | 1386 void DeprecatedPaintLayerScrollableArea::setTopmostScrollChild(DeprecatedPaintLa
yer* scrollChild) |
1387 { | 1387 { |
1388 // We only want to track the topmost scroll child for scrollable areas with | 1388 // We only want to track the topmost scroll child for scrollable areas with |
1389 // overlay scrollbars. | 1389 // overlay scrollbars. |
1390 if (!hasOverlayScrollbars()) | 1390 if (!hasOverlayScrollbars()) |
1391 return; | 1391 return; |
1392 m_nextTopmostScrollChild = scrollChild; | 1392 m_nextTopmostScrollChild = scrollChild; |
1393 } | 1393 } |
1394 | 1394 |
1395 } // namespace blink | 1395 } // namespace blink |
OLD | NEW |