Title: [158476] trunk/Source/WebCore
- Revision
- 158476
- Author
- akl...@apple.com
- Date
- 2013-11-01 18:50:17 -0700 (Fri, 01 Nov 2013)
Log Message
Re-use existing RenderStyle local in textWidth().
<https://webkit.org/b/123392>
We already have the RenderStyle cached in a local here, so avoid
getting it from RenderText since that has to go via the parent.
Reviewed by Antti Koivisto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158475 => 158476)
--- trunk/Source/WebCore/ChangeLog 2013-11-02 01:49:26 UTC (rev 158475)
+++ trunk/Source/WebCore/ChangeLog 2013-11-02 01:50:17 UTC (rev 158476)
@@ -1,5 +1,15 @@
2013-11-01 Andreas Kling <akl...@apple.com>
+ Re-use existing RenderStyle local in textWidth().
+ <https://webkit.org/b/123392>
+
+ We already have the RenderStyle cached in a local here, so avoid
+ getting it from RenderText since that has to go via the parent.
+
+ Reviewed by Antti Koivisto.
+
+2013-11-01 Andreas Kling <akl...@apple.com>
+
Neuter WTF_MAKE_FAST_ALLOCATED in GLOBAL_FASTMALLOC_NEW builds.
<https://webkit.org/b/123639>
Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (158475 => 158476)
--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-11-02 01:49:26 UTC (rev 158475)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-11-02 01:50:17 UTC (rev 158476)
@@ -2400,7 +2400,7 @@
ASSERT(run.charactersLength() >= run.length());
run.setCharacterScanForCodePath(!text->canUseSimpleFontCodePath());
- run.setTabSize(!collapseWhiteSpace, text->style().tabSize());
+ run.setTabSize(!collapseWhiteSpace, style.tabSize());
run.setXPos(xPos);
return font.width(run, &fallbackFonts, &glyphOverflow);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
