Title: [153530] trunk/Source/WebCore
- Revision
- 153530
- Author
- [email protected]
- Date
- 2013-07-31 11:44:21 -0700 (Wed, 31 Jul 2013)
Log Message
Avoid calling nextRenderer() in some cases
https://bugs.webkit.org/show_bug.cgi?id=119313
Reviewed by Andreas Kling.
Merge https://chromium.googlesource.com/chromium/blink/+/3207cfda52082f4fd6a04c7819c18a980de58beb.
* dom/Text.cpp:
(WebCore::Text::textRendererIsNeeded):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (153529 => 153530)
--- trunk/Source/WebCore/ChangeLog 2013-07-31 18:41:08 UTC (rev 153529)
+++ trunk/Source/WebCore/ChangeLog 2013-07-31 18:44:21 UTC (rev 153530)
@@ -1,5 +1,17 @@
2013-07-31 Ryosuke Niwa <[email protected]>
+ Avoid calling nextRenderer() in some cases
+ https://bugs.webkit.org/show_bug.cgi?id=119313
+
+ Reviewed by Andreas Kling.
+
+ Merge https://chromium.googlesource.com/chromium/blink/+/3207cfda52082f4fd6a04c7819c18a980de58beb.
+
+ * dom/Text.cpp:
+ (WebCore::Text::textRendererIsNeeded):
+
+2013-07-31 Ryosuke Niwa <[email protected]>
+
Convert most callers of setInlineStyleProperty passing strings to enums or doubles instead
https://bugs.webkit.org/show_bug.cgi?id=119304
Modified: trunk/Source/WebCore/dom/Text.cpp (153529 => 153530)
--- trunk/Source/WebCore/dom/Text.cpp 2013-07-31 18:41:08 UTC (rev 153529)
+++ trunk/Source/WebCore/dom/Text.cpp 2013-07-31 18:44:21 UTC (rev 153530)
@@ -236,11 +236,11 @@
RenderObject* first = parent->firstChild();
while (first && first->isFloatingOrOutOfFlowPositioned())
first = first->nextSibling();
- RenderObject* next = context.nextRenderer();
- if (!first || next == first)
+ if (!first || context.nextRenderer() == first) {
// Whitespace at the start of a block just goes away. Don't even
// make a render object for this text.
return false;
+ }
}
return true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
