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 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
244 // invalidate the rectangles to trigger repaints. | 244 // invalidate the rectangles to trigger repaints. |
245 box().invalidatePaintRectangleNotInvalidatingDisplayItemClients(LayoutRe
ct(intRect)); | 245 box().invalidatePaintRectangleNotInvalidatingDisplayItemClients(LayoutRe
ct(intRect)); |
246 } | 246 } |
247 } | 247 } |
248 | 248 |
249 void DeprecatedPaintLayerScrollableArea::invalidateScrollCornerRect(const IntRec
t& rect) | 249 void DeprecatedPaintLayerScrollableArea::invalidateScrollCornerRect(const IntRec
t& rect) |
250 { | 250 { |
251 ASSERT(!layerForScrollCorner()); | 251 ASSERT(!layerForScrollCorner()); |
252 | 252 |
253 if (m_scrollCorner) { | 253 if (m_scrollCorner) { |
| 254 // FIXME: We should not allow paint invalidation out of paint invalidati
on state. crbug.com/457415 |
| 255 DisablePaintInvalidationStateAsserts disabler; |
254 m_scrollCorner->invalidatePaintRectangle(LayoutRect(rect)); | 256 m_scrollCorner->invalidatePaintRectangle(LayoutRect(rect)); |
255 if (RuntimeEnabledFeatures::slimmingPaintEnabled()) | 257 if (RuntimeEnabledFeatures::slimmingPaintEnabled()) |
256 box().invalidateDisplayItemClientForNonCompositingDescendantsOf(*m_s
crollCorner); | 258 box().invalidateDisplayItemClientForNonCompositingDescendantsOf(*m_s
crollCorner); |
257 } else if (RuntimeEnabledFeatures::slimmingPaintEnabled()) { | 259 } else if (RuntimeEnabledFeatures::slimmingPaintEnabled()) { |
258 box().invalidateDisplayItemClient(box()); | 260 box().invalidateDisplayItemClient(box()); |
259 } | 261 } |
260 if (m_resizer) { | 262 if (m_resizer) { |
261 m_resizer->invalidatePaintRectangle(LayoutRect(rect)); | 263 m_resizer->invalidatePaintRectangle(LayoutRect(rect)); |
262 if (RuntimeEnabledFeatures::slimmingPaintEnabled()) | 264 if (RuntimeEnabledFeatures::slimmingPaintEnabled()) |
263 box().invalidateDisplayItemClientForNonCompositingDescendantsOf(*m_r
esizer); | 265 box().invalidateDisplayItemClientForNonCompositingDescendantsOf(*m_r
esizer); |
(...skipping 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1500 return false; | 1502 return false; |
1501 | 1503 |
1502 LocalFrame* frame = box().frame(); | 1504 LocalFrame* frame = box().frame(); |
1503 if (!frame || !frame->isMainFrame() || !frame->settings()) | 1505 if (!frame || !frame->isMainFrame() || !frame->settings()) |
1504 return false; | 1506 return false; |
1505 | 1507 |
1506 return frame->settings()->viewportMetaEnabled(); | 1508 return frame->settings()->viewportMetaEnabled(); |
1507 } | 1509 } |
1508 | 1510 |
1509 } // namespace blink | 1511 } // namespace blink |
OLD | NEW |