Merge 94543 - Style not propagated to anonymous boxes and anonymous

Source/WebCore/rendering/RenderRuby.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 101 matching lines @@
 
 RenderRubyAsInline::RenderRubyAsInline(Node* node)
     : RenderInline(node)
 {
 }
 
 RenderRubyAsInline::~RenderRubyAsInline()
 {
 }
 
+void RenderRubyAsInline::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
+{
+    RenderInline::styleDidChange(diff, oldStyle);
+    propagateStyleToAnonymousChildren();
+}
+
 void RenderRubyAsInline::addChild(RenderObject* child, RenderObject* beforeChild)
 {
     // Insert :before and :after content before/after the RenderRubyRun(s)
     if (child->isBeforeContent()) {
         if (child->isInline()) {
             // Add generated inline content normally
             RenderInline::addChild(child, firstChild());
         } else {
             // Wrap non-inline content with an anonymous inline-block.
             RenderBlock* beforeBlock = rubyBeforeBlock(this);
@@ skipping 81 matching lines @@
 
 RenderRubyAsBlock::RenderRubyAsBlock(Node* node)
     : RenderBlock(node)
 {
 }
 
 RenderRubyAsBlock::~RenderRubyAsBlock()
 {
 }
 
+void RenderRubyAsBlock::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
+{
+    RenderBlock::styleDidChange(diff, oldStyle);
+    propagateStyleToAnonymousChildren();
+}
+
 void RenderRubyAsBlock::addChild(RenderObject* child, RenderObject* beforeChild)
 {
     // Insert :before and :after content before/after the RenderRubyRun(s)
     if (child->isBeforeContent()) {
         if (child->isInline()) {
             // Add generated inline content normally
             RenderBlock::addChild(child, firstChild());
         } else {
             // Wrap non-inline content with an anonymous inline-block.
             RenderBlock* beforeBlock = rubyBeforeBlock(this);
@@ skipping 70 matching lines @@
         return;
     }
 
     // Otherwise find the containing run and remove it from there.
     RenderRubyRun* run = findRubyRunParent(child);
     ASSERT(run);
     run->removeChild(child);
 }
 
 } // namespace WebCore