Changeset 156608 in webkit for trunk/Source/WebCore/rendering/RenderObject.h

Timestamp:

Sep 28, 2013, 11:30:16 AM (12 years ago)

Author:

Antti Koivisto

Message:

Clean up code for getting first line style
​https://bugs.webkit.org/show_bug.cgi?id=122037

Reviewed by Andreas Kling.

We have confusing RenderObject::style(bool firstLine). Get rid of it in favour of
just using RenderObject::firstLineStyle() where appropriate.

Also switch to RenderStyle references in many places and move first line style caching
code down to RenderElement.

File:

• trunk/Source/WebCore/rendering/RenderObject.h (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderObject.h

@@ -760 +760 @@
 
     RenderStyle* style() const;
-    RenderStyle* firstLineStyle() const { return document().styleSheetCollection().usesFirstLineRules() ? cachedFirstLineStyle() : style(); }
-    RenderStyle* style(bool firstLine) const { return firstLine ? firstLineStyle() : style(); }
-
-    // Used only by Element::pseudoStyleCacheIsInvalid to get a first line style based off of a
-    // given new style, without accessing the cache.
-    PassRefPtr<RenderStyle> uncachedFirstLineStyle(RenderStyle*) const;
+    RenderStyle* firstLineStyle() const;
 
     // Anonymous blocks that are part of of a continuation chain will return their inline continuation's outline style instead.
@@ -971 +966 @@
     void removeFromRenderFlowThread();
     void removeFromRenderFlowThreadRecursive(RenderFlowThread*);
-
-    RenderStyle* cachedFirstLineStyle() const;
 
     Color selectionColor(int colorProperty) const;