Attachment 222635 Details for Bug 127889 – Patch

[patch] Patch

bug-127889-20140130135043.patch (text/plain), 9.71 KB, created by gur.trio on 2014-01-30 00:21:18 PST

(hide)

Description:

Filename:

MIME Type:

Creator: gur.trio

Created: 2014-01-30 00:21:18 PST

Size: 9.71 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 163076)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,26 @@
>+2014-01-30 Gurpreet Kaur <k.gurpreet@samsung.com>
>+
>+ Menclose with no notation attribute doesnot display anything.
>+ https://bugs.webkit.org/show_bug.cgi?id=127889
>+
>+ Reviewed by NOBODY (OOPS!).
>+
>+ Menclose with no notation attribute should behave same as menclose with
>+ notation attribute with value as longdiv. By default the division
>+ symbol should be displayed. For empty and invalid notation attribute
>+ nothing should be displayed.
>+
>+ Tests: mathml/presentation/menclose-notation-default-longdiv.html
>+ mathml/presentation/menclose-notation-invalid-empty.html
>+
>+ * mathml/MathMLMencloseElement.h:
>+ * rendering/mathml/RenderMathMLMenclose.cpp:
>+ (WebCore::RenderMathMLMenclose::computePreferredLogicalWidths):
>+ (WebCore::RenderMathMLMenclose::paint):
>+ Added style for menclose with no notation attribute and handled this
>+ condition in paint also where for longdiv we are explicitly drawing
>+ the division symbol.
>+
> 2014-01-29 Commit Queue <commit-queue@webkit.org>
> 
> Unreviewed, rolling out r163048.
>Index: Source/WebCore/mathml/MathMLMencloseElement.h
>===================================================================
>--- Source/WebCore/mathml/MathMLMencloseElement.h	(revision 163071)
>+++ Source/WebCore/mathml/MathMLMencloseElement.h	(working copy)
>@@ -36,6 +36,7 @@ public:
> static PassRefPtr<MathMLMencloseElement> create(const QualifiedName& tagName, Document&);
> const Vector<String>& notationValues() const { return m_notationValues; }
> bool isRadical() const { return m_isRadicalValue; }
>+ String longDivLeftPadding() const;
> 
> private:
> MathMLMencloseElement(const QualifiedName&, Document&);
>@@ -43,7 +44,6 @@ private:
> virtual bool isPresentationAttribute(const QualifiedName&) const override;
> virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override;
> virtual void finishParsingChildren() override;
>- String longDivLeftPadding() const;
> 
> Vector<String> m_notationValues;
> bool m_isRadicalValue;
>Index: Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp
>===================================================================
>--- Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp	(revision 163071)
>+++ Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp	(working copy)
>@@ -65,6 +65,7 @@ void RenderMathMLMenclose::computePrefer
> ASSERT(preferredLogicalWidthsDirty());
> 
> RenderMathMLBlock::computePreferredLogicalWidths();
>+ const float paddingTop = 6.f;
> 
> MathMLMencloseElement* menclose = toMathMLMencloseElement(element());
> const Vector<String>& notationValues = menclose->notationValues();
>@@ -76,6 +77,10 @@ void RenderMathMLMenclose::computePrefer
> }
> }
> 
>+ if (!menclose->hasAttribute(notationAttr)) {
>+ style().setPaddingTop(Length(paddingTop, Fixed));
>+ style().setPaddingLeft(Length(menclose->longDivLeftPadding().toInt(), Fixed));
>+ }
> setPreferredLogicalWidthsDirty(false);
> }
> 
>@@ -99,8 +104,8 @@ void RenderMathMLMenclose::paint(PaintIn
> MathMLMencloseElement* menclose = toMathMLMencloseElement(element());
> const Vector<String>& notationValues = menclose->notationValues();
> size_t notationalValueSize = notationValues.size();
>- bool isDefaultLongDiv = !notationalValueSize;
>- if (notationalValueSize && checkNotationalValuesValidity(notationValues)) {
>+ bool isDefaultLongDiv = !menclose->hasAttribute(notationAttr);
>+ if ((notationalValueSize && checkNotationalValuesValidity(notationValues)) || isDefaultLongDiv) {
> IntRect rect = absoluteBoundingBoxRect();
> int left = rect.x();
> int top = rect.y();
>@@ -140,6 +145,8 @@ void RenderMathMLMenclose::paint(PaintIn
> midxPoint = style().paddingLeft().value();
> root.addBezierCurveTo(FloatPoint(left, top), FloatPoint(left + midxPoint, top + halfboxHeight), FloatPoint(left, top + boxHeight));
> info.context->strokePath(root);
>+ if (!menclose->hasAttribute(notationAttr))
>+ info.context->drawLine(IntPoint(left, top), IntPoint(left + boxWidth + midxPoint, top));
> }
> }
> }
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 163076)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2014-01-30 Gurpreet Kaur <k.gurpreet@samsung.com>
>+
>+ Menclose with no notation attribute doesnot display anything.
>+ https://bugs.webkit.org/show_bug.cgi?id=127889
>+
>+ Reviewed by NOBODY (OOPS!).
>+
>+ * mathml/presentation/menclose-notation-default-longdiv-expected.html: Added.
>+ * mathml/presentation/menclose-notation-default-longdiv.html: Added.
>+ * mathml/presentation/menclose-notation-invalid-empty-expected.html: Added.
>+ * mathml/presentation/menclose-notation-invalid-empty.html: Added.
>+ Added new test cases to test the functionality of menclose with no
>+ notation attribute, invalid and empty notation attribute.
>+
> 2014-01-29 Joseph Pecoraro <pecoraro@apple.com>
> 
> Web Inspector: Play Breakpoint Sound in Frontend
>Index: LayoutTests/mathml/presentation/menclose-notation-default-longdiv-expected.html
>===================================================================
>--- LayoutTests/mathml/presentation/menclose-notation-default-longdiv-expected.html	(revision 0)
>+++ LayoutTests/mathml/presentation/menclose-notation-default-longdiv-expected.html	(working copy)
>@@ -0,0 +1,11 @@
>+<!DOCTYPE html>
>+<html>
>+ <head>
>+ <title>expected test case for menclose default notation longdiv test</title>
>+ </head>
>+ <body>
>+ 
>+ <math><mrow><menclose notation="longdiv"><mspace width="100px" height="50px" mathbackground="red"/></menclose></mrow></math>
>+ 
>+ </body>
>+</html>
>\ No newline at end of file
>
>Property changes on: LayoutTests/mathml/presentation/menclose-notation-default-longdiv-expected.html
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:executable
>## -0,0 +1 ##
>+*
>\ No newline at end of property
>Index: LayoutTests/mathml/presentation/menclose-notation-default-longdiv.html
>===================================================================
>--- LayoutTests/mathml/presentation/menclose-notation-default-longdiv.html	(revision 0)
>+++ LayoutTests/mathml/presentation/menclose-notation-default-longdiv.html	(working copy)
>@@ -0,0 +1,11 @@
>+<!DOCTYPE html>
>+<html>
>+ <head>
>+ <title>menclose default notation longdiv test</title>
>+ </head>
>+ <body>
>+ 
>+ <math><mrow><menclose><mspace width="100px" height="50px" mathbackground="red"/></menclose></mrow></math>
>+ 
>+ </body>
>+</html>
>\ No newline at end of file
>
>Property changes on: LayoutTests/mathml/presentation/menclose-notation-default-longdiv.html
>___________________________________________________________________
>Added: svn:executable
>## -0,0 +1 ##
>+*
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: LayoutTests/mathml/presentation/menclose-notation-invalid-empty-expected.html
>===================================================================
>--- LayoutTests/mathml/presentation/menclose-notation-invalid-empty-expected.html	(revision 0)
>+++ LayoutTests/mathml/presentation/menclose-notation-invalid-empty-expected.html	(working copy)
>@@ -0,0 +1,16 @@
>+<!DOCTYPE html>
>+<html>
>+ <head>
>+ <title>expected test case for menclose with empty and invalid notation attribute</title>
>+ </head>
>+ <body>
>+ 
>+ <math>
>+ <mtable>
>+			 <mtr><mtd><mspace width="100px" height="50px" mathbackground="red"/></mtd></mtr>
>+ <mtr><mtd><mspace width="100px" height="50px" mathbackground="red"/></mtd></mtr>
>+				</mtable>
>+ </math>	
>+ 
>+ </body>
>+</html>
>\ No newline at end of file
>
>Property changes on: LayoutTests/mathml/presentation/menclose-notation-invalid-empty-expected.html
>___________________________________________________________________
>Added: svn:executable
>## -0,0 +1 ##
>+*
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: LayoutTests/mathml/presentation/menclose-notation-invalid-empty.html
>===================================================================
>--- LayoutTests/mathml/presentation/menclose-notation-invalid-empty.html	(revision 0)
>+++ LayoutTests/mathml/presentation/menclose-notation-invalid-empty.html	(working copy)
>@@ -0,0 +1,16 @@
>+<!DOCTYPE html>
>+<html>
>+ <head>
>+ <title>menclose with empty and invalid notation attribute</title>
>+ </head>
>+ <body>
>+ 
>+ <math>
>+ <mtable>
>+			 <mtr><mtd><menclose notation=""><mspace width="100px" height="50px" mathbackground="red"/></menclose></mtd></mtr>
>+ <mtr><mtd><menclose notation="triangle"><mspace width="100px" height="50px" mathbackground="red"/></menclose></mtd></mtr>
>+				</mtable>
>+ </math>				
>+ 
>+ </body>
>+</html>
>\ No newline at end of file
>
>Property changes on: LayoutTests/mathml/presentation/menclose-notation-invalid-empty.html
>___________________________________________________________________
>Added: svn:executable
>## -0,0 +1 ##
>+*
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Formatted Diff | Diff

Attachments on bug 127889: 222630 | 222634 | 222635 | 222650 | 222651 | 222652 | 222657 | 222963 | 222968 | 222972 | 222974 | 223080 | 223300