Changeset 61326 in webkit

Timestamp:

Jun 17, 2010 8:11:42 AM (14 years ago)

Author:

Darin Adler

Message:

2010-06-17 Alex Milowski <​alex@milowski.com>

Reviewed by Darin Adler.

Fixed a compile error in the paint() methods by making them use the
new visitedDependentColor() method.
​https://bugs.webkit.org/show_bug.cgi?id=40327

• mathml/RenderMathMLRoot.cpp: (WebCore::RenderMathMLRoot::paint): (WebCore::RenderMathMLRoot::layout): Fixed a crash where every child was assumed to be a RenderMathMLBlock instance when that isn't the case. Also, layout() needed to mark the index for layout before calling layout() on the index.
• mathml/RenderMathMLSquareRoot.cpp: (WebCore::RenderMathMLSquareRoot::paint):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• mathml/RenderMathMLRoot.cpp (modified) (3 diffs)
• mathml/RenderMathMLSquareRoot.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-17  Alex Milowski  <alex@milowski.com>
+
+        Reviewed by Darin Adler.
+
+        Fixed a compile error in the paint() methods by making them use the
+        new visitedDependentColor() method.
+        https://bugs.webkit.org/show_bug.cgi?id=40327
+
+        * mathml/RenderMathMLRoot.cpp:
+        (WebCore::RenderMathMLRoot::paint):
+        (WebCore::RenderMathMLRoot::layout): Fixed a crash where every child 
+        was assumed to be a RenderMathMLBlock instance when that isn't the 
+        case.  Also, layout() needed to mark the index for layout before 
+        calling layout() on the index.
+        * mathml/RenderMathMLSquareRoot.cpp:
+        (WebCore::RenderMathMLSquareRoot::paint):
+
 2010-06-17  Darin Adler  <darin@apple.com>
 

trunk/WebCore/mathml/RenderMathMLRoot.cpp

@@ -146 +146 @@
     info.context->setStrokeThickness(gRadicalLineThickness * style()->fontSize());
     info.context->setStrokeStyle(SolidStroke);
-    info.context->setStrokeColor(style()->color(), sRGBColorSpace);
+    info.context->setStrokeColor(style()->visitedDependentColor(CSSPropertyColor), sRGBColorSpace);
     info.context->setLineJoin(MiterJoin);
     info.context->setMiterLimit(style()->fontSize());
@@ -205 +205 @@
     
     RenderObject* current = lastChild()->firstChild();
-    
-    toRenderMathMLBlock(current)->style()->setVerticalAlign(BASELINE);
+    current->style()->setVerticalAlign(BASELINE);
     
     if (!maxHeight)
@@ -239 +238 @@
     markContainingBlocksForLayout();
     RenderBlock::layout();
-    
+
     indexBox->style()->setBottom(Length(radicalHeight + style()->paddingBottom().value(), Fixed));
-    
+
+    // Now that we've potentially changed its position, we need layout the index again.
+    indexBox->setNeedsLayoutAndPrefWidthsRecalc();
     indexBox->layout();
 }

trunk/WebCore/mathml/RenderMathMLSquareRoot.cpp

@@ -115 +115 @@
     info.context->setStrokeThickness(gRadicalLineThickness * style()->fontSize());
     info.context->setStrokeStyle(SolidStroke);
-    info.context->setStrokeColor(style()->color(), sRGBColorSpace);
+    info.context->setStrokeColor(style()->visitedDependentColor(CSSPropertyColor), sRGBColorSpace);
     info.context->setLineJoin(MiterJoin);
     info.context->setMiterLimit(style()->fontSize());