Title: [130694] trunk/Source/WebCore
- Revision
- 130694
- Author
- commit-qu...@webkit.org
- Date
- 2012-10-08 15:30:22 -0700 (Mon, 08 Oct 2012)
Log Message
Rename RenderObject::firstLineStyleSlowCase() to a more appropriate cachedFirstLineStyle()
https://bugs.webkit.org/show_bug.cgi?id=98631
Patch by Arpita Bahuguna <arpitabahug...@gmail.com> on 2012-10-08
Reviewed by Eric Seidel.
Renaming firstLineStyleSlowCase() to cachedFirstLineStyle().
The current name is confusing since the function actually gets the
the cached first-line styles.
It also makes the name more descriptive of its functionality
and in accordance with RenderObject::uncachedFirstLineStyle().
No new tests required for this change since no change in behavior is expected.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::cachedFirstLineStyle):
* rendering/RenderObject.h:
(WebCore::RenderObject::firstLineStyle):
(RenderObject):
Renamed RenderObject::firstLineStyleSlowCase() to cachedFirstLineStyle()
and made the associated changes.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (130693 => 130694)
--- trunk/Source/WebCore/ChangeLog 2012-10-08 22:22:43 UTC (rev 130693)
+++ trunk/Source/WebCore/ChangeLog 2012-10-08 22:30:22 UTC (rev 130694)
@@ -1,3 +1,27 @@
+2012-10-08 Arpita Bahuguna <arpitabahug...@gmail.com>
+
+ Rename RenderObject::firstLineStyleSlowCase() to a more appropriate cachedFirstLineStyle()
+ https://bugs.webkit.org/show_bug.cgi?id=98631
+
+ Reviewed by Eric Seidel.
+
+ Renaming firstLineStyleSlowCase() to cachedFirstLineStyle().
+
+ The current name is confusing since the function actually gets the
+ the cached first-line styles.
+ It also makes the name more descriptive of its functionality
+ and in accordance with RenderObject::uncachedFirstLineStyle().
+
+ No new tests required for this change since no change in behavior is expected.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::cachedFirstLineStyle):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::firstLineStyle):
+ (RenderObject):
+ Renamed RenderObject::firstLineStyleSlowCase() to cachedFirstLineStyle()
+ and made the associated changes.
+
2012-10-08 Sami Kyostila <skyos...@chromium.org>
Some non-scrollable elements are added to non-fast-scrollable region
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (130693 => 130694)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2012-10-08 22:22:43 UTC (rev 130693)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2012-10-08 22:30:22 UTC (rev 130694)
@@ -2643,7 +2643,7 @@
return firstLineStyleForCachedUncachedType(Uncached, this, style);
}
-RenderStyle* RenderObject::firstLineStyleSlowCase() const
+RenderStyle* RenderObject::cachedFirstLineStyle() const
{
ASSERT(document()->styleSheetCollection()->usesFirstLineRules());
Modified: trunk/Source/WebCore/rendering/RenderObject.h (130693 => 130694)
--- trunk/Source/WebCore/rendering/RenderObject.h 2012-10-08 22:22:43 UTC (rev 130693)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2012-10-08 22:30:22 UTC (rev 130694)
@@ -739,7 +739,7 @@
virtual LayoutUnit maxPreferredLogicalWidth() const { return 0; }
RenderStyle* style() const { return m_style.get(); }
- RenderStyle* firstLineStyle() const { return document()->styleSheetCollection()->usesFirstLineRules() ? firstLineStyleSlowCase() : style(); }
+ 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
@@ -966,7 +966,7 @@
virtual void willBeRemovedFromTree();
private:
- RenderStyle* firstLineStyleSlowCase() const;
+ RenderStyle* cachedFirstLineStyle() const;
StyleDifference adjustStyleDifference(StyleDifference, unsigned contextSensitiveProperties) const;
Color selectionColor(int colorProperty) const;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
