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 6222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6233 // https://bugs.webkit.org/show_bug.cgi?id=114051 | 6233 // https://bugs.webkit.org/show_bug.cgi?id=114051 |
6234 if (shouldUpdateFilters && newStyle->filter().hasReferenceFilter()) | 6234 if (shouldUpdateFilters && newStyle->filter().hasReferenceFilter()) |
6235 backing()->updateFilters(renderer()->style()); | 6235 backing()->updateFilters(renderer()->style()); |
6236 } | 6236 } |
6237 | 6237 |
6238 void RenderLayer::styleChanged(StyleDifference, const RenderStyle* oldStyle) | 6238 void RenderLayer::styleChanged(StyleDifference, const RenderStyle* oldStyle) |
6239 { | 6239 { |
6240 if (renderer()->style()->overflowX() == OMARQUEE && renderer()->style()->mar
queeBehavior() != MNONE && renderer()->isBox()) { | 6240 if (renderer()->style()->overflowX() == OMARQUEE && renderer()->style()->mar
queeBehavior() != MNONE && renderer()->isBox()) { |
6241 if (!m_marquee) | 6241 if (!m_marquee) |
6242 m_marquee = adoptPtr(new RenderMarquee(this)); | 6242 m_marquee = adoptPtr(new RenderMarquee(this)); |
6243 UseCounter::observe(renderer()->document(), renderer()->isHTMLMarquee()
? UseCounter::HTMLMarqueeElement : UseCounter::CSSOverflowMarquee); | 6243 UseCounter::count(renderer()->document(), renderer()->isHTMLMarquee() ?
UseCounter::HTMLMarqueeElement : UseCounter::CSSOverflowMarquee); |
6244 m_marquee->updateMarqueeStyle(); | 6244 m_marquee->updateMarqueeStyle(); |
6245 } | 6245 } |
6246 else if (m_marquee) { | 6246 else if (m_marquee) { |
6247 m_marquee.clear(); | 6247 m_marquee.clear(); |
6248 } | 6248 } |
6249 | 6249 |
6250 updateScrollbarsAfterStyleChange(oldStyle); | 6250 updateScrollbarsAfterStyleChange(oldStyle); |
6251 updateStackingContextsAfterStyleChange(oldStyle); | 6251 updateStackingContextsAfterStyleChange(oldStyle); |
6252 updateVisibilityAfterStyleChange(oldStyle); | 6252 updateVisibilityAfterStyleChange(oldStyle); |
6253 // Overlay scrollbars can make this layer self-painting so we need | 6253 // Overlay scrollbars can make this layer self-painting so we need |
6254 // to recompute the bit once scrollbars have been updated. | 6254 // to recompute the bit once scrollbars have been updated. |
6255 updateSelfPaintingLayer(); | 6255 updateSelfPaintingLayer(); |
6256 updateOutOfFlowPositioned(oldStyle); | 6256 updateOutOfFlowPositioned(oldStyle); |
6257 | 6257 |
6258 if (!hasReflection() && m_reflection) | 6258 if (!hasReflection() && m_reflection) |
6259 removeReflection(); | 6259 removeReflection(); |
6260 else if (hasReflection()) { | 6260 else if (hasReflection()) { |
6261 if (!m_reflection) | 6261 if (!m_reflection) |
6262 createReflection(); | 6262 createReflection(); |
6263 UseCounter::observe(renderer()->document(), UseCounter::Reflection); | 6263 UseCounter::count(renderer()->document(), UseCounter::Reflection); |
6264 updateReflectionStyle(); | 6264 updateReflectionStyle(); |
6265 } | 6265 } |
6266 | 6266 |
6267 // FIXME: Need to detect a swap from custom to native scrollbars (and vice v
ersa). | 6267 // FIXME: Need to detect a swap from custom to native scrollbars (and vice v
ersa). |
6268 if (m_hBar) | 6268 if (m_hBar) |
6269 m_hBar->styleChanged(); | 6269 m_hBar->styleChanged(); |
6270 if (m_vBar) | 6270 if (m_vBar) |
6271 m_vBar->styleChanged(); | 6271 m_vBar->styleChanged(); |
6272 | 6272 |
6273 updateScrollCornerStyle(); | 6273 updateScrollCornerStyle(); |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6560 } | 6560 } |
6561 } | 6561 } |
6562 | 6562 |
6563 void showLayerTree(const WebCore::RenderObject* renderer) | 6563 void showLayerTree(const WebCore::RenderObject* renderer) |
6564 { | 6564 { |
6565 if (!renderer) | 6565 if (!renderer) |
6566 return; | 6566 return; |
6567 showLayerTree(renderer->enclosingLayer()); | 6567 showLayerTree(renderer->enclosingLayer()); |
6568 } | 6568 } |
6569 #endif | 6569 #endif |
OLD | NEW |