Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Side by Side Diff: Source/WebCore/rendering/RenderLayer.cpp

Issue 14301003: Rename FeatureObserver to UseCounter to make clear that all it stores are usage counts. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Now with 20% more awesome Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "CSSPropertyNames.h" 48 #include "CSSPropertyNames.h"
49 #include "Chrome.h" 49 #include "Chrome.h"
50 #include "Document.h" 50 #include "Document.h"
51 #include "DocumentEventQueue.h" 51 #include "DocumentEventQueue.h"
52 #include "EventHandler.h" 52 #include "EventHandler.h"
53 #if ENABLE(CSS_FILTERS) 53 #if ENABLE(CSS_FILTERS)
54 #include "FEColorMatrix.h" 54 #include "FEColorMatrix.h"
55 #include "FEMerge.h" 55 #include "FEMerge.h"
56 #include "FilterEffectRenderer.h" 56 #include "FilterEffectRenderer.h"
57 #endif 57 #endif
58 #include "FeatureObserver.h" 58 #include "UseCounter.h"
59 #include "FloatConversion.h" 59 #include "FloatConversion.h"
60 #include "FloatPoint3D.h" 60 #include "FloatPoint3D.h"
61 #include "FloatRect.h" 61 #include "FloatRect.h"
62 #include "FocusController.h" 62 #include "FocusController.h"
63 #include "Frame.h" 63 #include "Frame.h"
64 #include "FrameLoader.h" 64 #include "FrameLoader.h"
65 #include "FrameLoaderClient.h" 65 #include "FrameLoaderClient.h"
66 #include "FrameSelection.h" 66 #include "FrameSelection.h"
67 #include "FrameTree.h" 67 #include "FrameTree.h"
68 #include "FrameView.h" 68 #include "FrameView.h"
(...skipping 5923 matching lines...) Expand 10 before | Expand all | Expand 10 after
5992 m_isNormalFlowOnly = isNormalFlowOnly; 5992 m_isNormalFlowOnly = isNormalFlowOnly;
5993 RenderLayer* p = parent(); 5993 RenderLayer* p = parent();
5994 if (p) 5994 if (p)
5995 p->dirtyNormalFlowList(); 5995 p->dirtyNormalFlowList();
5996 dirtyStackingContainerZOrderLists(); 5996 dirtyStackingContainerZOrderLists();
5997 } 5997 }
5998 5998
5999 if (renderer()->style()->overflowX() == OMARQUEE && renderer()->style()->mar queeBehavior() != MNONE && renderer()->isBox()) { 5999 if (renderer()->style()->overflowX() == OMARQUEE && renderer()->style()->mar queeBehavior() != MNONE && renderer()->isBox()) {
6000 if (!m_marquee) 6000 if (!m_marquee)
6001 m_marquee = adoptPtr(new RenderMarquee(this)); 6001 m_marquee = adoptPtr(new RenderMarquee(this));
6002 FeatureObserver::observe(renderer()->document(), renderer()->isHTMLMarqu ee() ? FeatureObserver::HTMLMarqueeElement : FeatureObserver::CSSOverflowMarquee ); 6002 UseCounter::observe(renderer()->document(), renderer()->isHTMLMarquee() ? UseCounter::HTMLMarqueeElement : UseCounter::CSSOverflowMarquee);
6003 m_marquee->updateMarqueeStyle(); 6003 m_marquee->updateMarqueeStyle();
6004 } 6004 }
6005 else if (m_marquee) { 6005 else if (m_marquee) {
6006 m_marquee.clear(); 6006 m_marquee.clear();
6007 } 6007 }
6008 6008
6009 updateScrollbarsAfterStyleChange(oldStyle); 6009 updateScrollbarsAfterStyleChange(oldStyle);
6010 updateStackingContextsAfterStyleChange(oldStyle); 6010 updateStackingContextsAfterStyleChange(oldStyle);
6011 // Overlay scrollbars can make this layer self-painting so we need 6011 // Overlay scrollbars can make this layer self-painting so we need
6012 // to recompute the bit once scrollbars have been updated. 6012 // to recompute the bit once scrollbars have been updated.
6013 updateSelfPaintingLayer(); 6013 updateSelfPaintingLayer();
6014 updateOutOfFlowPositioned(oldStyle); 6014 updateOutOfFlowPositioned(oldStyle);
6015 6015
6016 if (!hasReflection() && m_reflection) 6016 if (!hasReflection() && m_reflection)
6017 removeReflection(); 6017 removeReflection();
6018 else if (hasReflection()) { 6018 else if (hasReflection()) {
6019 if (!m_reflection) 6019 if (!m_reflection)
6020 createReflection(); 6020 createReflection();
6021 FeatureObserver::observe(renderer()->document(), FeatureObserver::Reflec tion); 6021 UseCounter::observe(renderer()->document(), UseCounter::Reflection);
6022 updateReflectionStyle(); 6022 updateReflectionStyle();
6023 } 6023 }
6024 6024
6025 // FIXME: Need to detect a swap from custom to native scrollbars (and vice v ersa). 6025 // FIXME: Need to detect a swap from custom to native scrollbars (and vice v ersa).
6026 if (m_hBar) 6026 if (m_hBar)
6027 m_hBar->styleChanged(); 6027 m_hBar->styleChanged();
6028 if (m_vBar) 6028 if (m_vBar)
6029 m_vBar->styleChanged(); 6029 m_vBar->styleChanged();
6030 6030
6031 updateScrollCornerStyle(); 6031 updateScrollCornerStyle();
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
6318 } 6318 }
6319 } 6319 }
6320 6320
6321 void showLayerTree(const WebCore::RenderObject* renderer) 6321 void showLayerTree(const WebCore::RenderObject* renderer)
6322 { 6322 {
6323 if (!renderer) 6323 if (!renderer)
6324 return; 6324 return;
6325 showLayerTree(renderer->enclosingLayer()); 6325 showLayerTree(renderer->enclosingLayer());
6326 } 6326 }
6327 #endif 6327 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698