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

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 23516012: Rename StyleSheetCollections to StyleEngine. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RootInlineBox.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 2830 matching lines...) Expand 10 before | Expand all | Expand 10 after
2841 return rendererForFirstLineStyle->getCachedPseudoStyle(FIRST_LIN E_INHERITED, parentStyle); 2841 return rendererForFirstLineStyle->getCachedPseudoStyle(FIRST_LIN E_INHERITED, parentStyle);
2842 } 2842 }
2843 return rendererForFirstLineStyle->getUncachedPseudoStyle(PseudoStyle Request(FIRST_LINE_INHERITED), parentStyle, style); 2843 return rendererForFirstLineStyle->getUncachedPseudoStyle(PseudoStyle Request(FIRST_LINE_INHERITED), parentStyle, style);
2844 } 2844 }
2845 } 2845 }
2846 return 0; 2846 return 0;
2847 } 2847 }
2848 2848
2849 PassRefPtr<RenderStyle> RenderObject::uncachedFirstLineStyle(RenderStyle* style) const 2849 PassRefPtr<RenderStyle> RenderObject::uncachedFirstLineStyle(RenderStyle* style) const
2850 { 2850 {
2851 if (!document().styleSheetCollections()->usesFirstLineRules()) 2851 if (!document().styleEngine()->usesFirstLineRules())
2852 return 0; 2852 return 0;
2853 2853
2854 ASSERT(!isText()); 2854 ASSERT(!isText());
2855 2855
2856 return firstLineStyleForCachedUncachedType(Uncached, this, style); 2856 return firstLineStyleForCachedUncachedType(Uncached, this, style);
2857 } 2857 }
2858 2858
2859 RenderStyle* RenderObject::cachedFirstLineStyle() const 2859 RenderStyle* RenderObject::cachedFirstLineStyle() const
2860 { 2860 {
2861 ASSERT(document().styleSheetCollections()->usesFirstLineRules()); 2861 ASSERT(document().styleEngine()->usesFirstLineRules());
2862 2862
2863 if (RefPtr<RenderStyle> style = firstLineStyleForCachedUncachedType(Cached, isText() ? parent() : this, m_style.get())) 2863 if (RefPtr<RenderStyle> style = firstLineStyleForCachedUncachedType(Cached, isText() ? parent() : this, m_style.get()))
2864 return style.get(); 2864 return style.get();
2865 2865
2866 return m_style.get(); 2866 return m_style.get();
2867 } 2867 }
2868 2868
2869 RenderStyle* RenderObject::getCachedPseudoStyle(PseudoId pseudo, RenderStyle* pa rentStyle) const 2869 RenderStyle* RenderObject::getCachedPseudoStyle(PseudoId pseudo, RenderStyle* pa rentStyle) const
2870 { 2870 {
2871 if (pseudo < FIRST_INTERNAL_PSEUDOID && !style()->hasPseudoStyle(pseudo)) 2871 if (pseudo < FIRST_INTERNAL_PSEUDOID && !style()->hasPseudoStyle(pseudo))
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
3322 { 3322 {
3323 if (object1) { 3323 if (object1) {
3324 const WebCore::RenderObject* root = object1; 3324 const WebCore::RenderObject* root = object1;
3325 while (root->parent()) 3325 while (root->parent())
3326 root = root->parent(); 3326 root = root->parent();
3327 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3327 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3328 } 3328 }
3329 } 3329 }
3330 3330
3331 #endif 3331 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RootInlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698