diff options
author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebCore/rendering/RenderBlock.cpp | |
parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebCore/rendering/RenderBlock.cpp')
-rw-r--r-- | Source/WebCore/rendering/RenderBlock.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp index 794bafc..7275461 100644 --- a/Source/WebCore/rendering/RenderBlock.cpp +++ b/Source/WebCore/rendering/RenderBlock.cpp @@ -48,6 +48,7 @@ #include "RenderView.h" #include "SelectionController.h" #include "Settings.h" +#include "TextRun.h" #include "TransformState.h" #include <wtf/StdLibExtras.h> @@ -5265,9 +5266,8 @@ void RenderBlock::updateFirstLetter() if (remainingText->node()) remainingText->node()->setRenderer(remainingText); - RenderObject* nextObj = textObj->nextSibling(); + firstLetterContainer->addChild(remainingText, textObj); firstLetterContainer->removeChild(textObj); - firstLetterContainer->addChild(remainingText, nextObj); remainingText->setFirstLetter(firstLetter); // construct text fragment for the first letter |