Merge 120639

Source/WebCore/rendering/RenderBlock.cpp

Index: Source/WebCore/rendering/RenderBlock.cpp
===================================================================
--- Source/WebCore/rendering/RenderBlock.cpp	(revision 122239)
+++ Source/WebCore/rendering/RenderBlock.cpp	(working copy)
@@ -6086,13 +6086,12 @@
         firstLetter->destroy();
         firstLetter = newFirstLetter;
         firstLetterContainer->addChild(firstLetter, nextSibling);
-    }
+    } else
+        firstLetter->setStyle(pseudoStyle);
 
-    firstLetter->setAnimatableStyle(pseudoStyle);
-
     for (RenderObject* genChild = firstLetter->firstChild(); genChild; genChild = genChild->nextSibling()) {
         if (genChild->isText())
-            genChild->setStyle(firstLetter->style());
+            genChild->setStyle(pseudoStyle);
     }
 }
 
@@ -6105,13 +6104,8 @@
         firstLetter = new (renderArena()) RenderInline(document());
     else
         firstLetter = new (renderArena()) RenderBlock(document());
-
-    RefPtr<RenderStyle> temporaryStyle = RenderStyle::create();
-    temporaryStyle->inheritFrom(firstLetterBlock->style());
-    firstLetter->setStyle(temporaryStyle);  
+    firstLetter->setStyle(pseudoStyle);
     firstLetterContainer->addChild(firstLetter, currentChild);
-    
-    firstLetter->setAnimatableStyle(pseudoStyle);
 
     RenderText* textObj = toRenderText(currentChild);
 
@@ -6159,7 +6153,7 @@
         // construct text fragment for the first letter
         RenderTextFragment* letter = 
             new (renderArena()) RenderTextFragment(remainingText->node() ? remainingText->node() : remainingText->document(), oldText.get(), 0, length);
-        letter->setStyle(firstLetter->style());
+        letter->setStyle(pseudoStyle);
         firstLetter->addChild(letter);
 
         textObj->destroy();