Changeset 107019 in webkit


Ignore:
Timestamp:
Feb 7, 2012 5:49:27 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Remove extraneous MathML code before bug 52444 fix
​https://bugs.webkit.org/show_bug.cgi?id=78034

Source/WebCore:

Patch by David Barton <Dave Barton> on 2012-02-07
Reviewed by Eric Seidel.

Per Darin Adler, I am breaking up the patch fixing bug 52444 into smaller pieces.
This patch removes a couple unused functions, some extra blank lines, unused #include
directives, etc., and adds a very few WebKit-standard changes to these files.

No new tests.

  • rendering/mathml/RenderMathMLBlock.cpp:

(WebCore):

  • rendering/mathml/RenderMathMLBlock.h:

(WebCore::RenderMathMLBlock::getBoxModelObjectHeight):

  • changed to a static member function since 'this' is unused; removed redundant non-const version

(WebCore::RenderMathMLBlock::getBoxModelObjectWidth):

  • changed to a static member function since 'this' is unused; removed redundant non-const version

(WebCore):

  • rendering/mathml/RenderMathMLFraction.cpp:
  • rendering/mathml/RenderMathMLMath.cpp:
  • rendering/mathml/RenderMathMLMath.h:
  • rendering/mathml/RenderMathMLOperator.h:

(WebCore):

  • rendering/mathml/RenderMathMLRoot.cpp:
  • rendering/mathml/RenderMathMLRow.cpp:
  • rendering/mathml/RenderMathMLRow.h:
  • rendering/mathml/RenderMathMLSquareRoot.cpp:
  • rendering/mathml/RenderMathMLSquareRoot.h:
  • rendering/mathml/RenderMathMLSubSup.cpp:
  • rendering/mathml/RenderMathMLSubSup.h:
  • rendering/mathml/RenderMathMLUnderOver.cpp:
  • rendering/mathml/RenderMathMLUnderOver.h:

LayoutTests:

Patch by David Barton <Dave Barton> on 2012-02-07
Reviewed by Eric Seidel.

The rendering of the scrollbar in row-expected.png was flaky, presumably due to a test
environment timing issue, so I removed it.

  • mathml/presentation/row.xhtml:
  • platform/mac/mathml/presentation/row-expected.png:
  • platform/mac/mathml/presentation/row-expected.txt:
Location:
trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r107018 r107019  
     12012-02-07  David Barton  <dbarton@mathscribe.com>
     2
     3        Remove extraneous MathML code before bug 52444 fix
     4        https://bugs.webkit.org/show_bug.cgi?id=78034
     5
     6        Reviewed by Eric Seidel.
     7       
     8        The rendering of the scrollbar in row-expected.png was flaky, presumably due to a test
     9        environment timing issue, so I removed it.
     10
     11        * mathml/presentation/row.xhtml:
     12        * platform/mac/mathml/presentation/row-expected.png:
     13        * platform/mac/mathml/presentation/row-expected.txt:
     14
    1152012-02-07  Ami Fischman  <fischman@chromium.org>
    216

  • trunk/LayoutTests/mathml/presentation/row.xhtml

    r70221 r107019  
    55mo {
    66   background-color: rgb(200,200,200);
     7}
     8body {
     9   overflow: hidden;
    710}
    811</style>

  • trunk/LayoutTests/platform/mac/mathml/presentation/row-expected.txt

    r95566 r107019  
    1 layer at (0,0) size 785x614
    2   RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x614
    4   RenderBlock {html} at (0,0) size 785x614
    5     RenderBody {body} at (8,16) size 769x582
    6       RenderBlock {p} at (0,0) size 769x19
     1layer at (0,0) size 800x614
     2  RenderView at (0,0) size 800x600
     3layer at (0,0) size 800x614
     4  RenderBlock {html} at (0,0) size 800x614
     5    RenderBody {body} at (8,16) size 784x582
     6      RenderBlock {p} at (0,0) size 784x19
    77        RenderMathMLMath {math} at (0,3) size 27x16
    88          RenderInline {mi} at (0,0) size 7x16
    … …  
    1717              text run at (18,0) width 8: "1"
    1818        RenderText {#text} at (0,0) size 0x0
    19       RenderBlock {p} at (0,35) size 769x21
     19      RenderBlock {p} at (0,35) size 784x21
    2020        RenderText {#text} at (0,2) size 40x18
    2121          text run at (0,2) width 40: "16px: "
    … …  
    9595            RenderBlock {div} at (13,5) size 16x16 [bgcolor=#00FF00]
    9696        RenderText {#text} at (0,0) size 0x0
    97       RenderBlock {p} at (0,72) size 769x36
     97      RenderBlock {p} at (0,72) size 784x36
    9898        RenderText {#text} at (0,8) size 40x18
    9999          text run at (0,8) width 40: "24px: "
    … …  
    146146            RenderBlock {div} at (18,5) size 24x24 [bgcolor=#00FF00]
    147147        RenderText {#text} at (0,0) size 0x0
    148       RenderBlock {p} at (0,124) size 769x50
     148      RenderBlock {p} at (0,124) size 784x50
    149149        RenderText {#text} at (0,19) size 40x18
    150150          text run at (0,19) width 40: "32px: "
    … …  
    197197            RenderBlock {div} at (18,11) size 32x32 [bgcolor=#00FF00]
    198198        RenderText {#text} at (0,0) size 0x0
    199       RenderBlock {p} at (0,190) size 769x80
     199      RenderBlock {p} at (0,190) size 784x80
    200200        RenderText {#text} at (0,41) size 40x18
    201201          text run at (0,41) width 40: "48px: "
    … …  
    248248            RenderBlock {div} at (18,22) size 48x48 [bgcolor=#00FF00]
    249249        RenderText {#text} at (0,0) size 0x0
    250       RenderBlock {p} at (0,286) size 769x215
     250      RenderBlock {p} at (0,286) size 784x215
    251251        RenderText {#text} at (0,140) size 48x18
    252252          text run at (0,140) width 48: "120px: "
    … …  
    299299            RenderBlock {div} at (18,73) size 48x120 [bgcolor=#00FF00]
    300300        RenderText {#text} at (0,0) size 0x0
    301       RenderBlock {p} at (0,517) size 769x65
     301      RenderBlock {p} at (0,517) size 784x65
    302302        RenderMathMLMath {math} at (0,0) size 156x65
    303303          RenderMathMLRow {mrow} at (1,0) size 154x65

  • trunk/Source/WebCore/ChangeLog

    r107014 r107019  
     12012-02-07  David Barton  <dbarton@mathscribe.com>
     2
     3        Remove extraneous MathML code before bug 52444 fix
     4        https://bugs.webkit.org/show_bug.cgi?id=78034
     5
     6        Reviewed by Eric Seidel.
     7       
     8        Per Darin Adler, I am breaking up the patch fixing bug 52444 into smaller pieces.
     9        This patch removes a couple unused functions, some extra blank lines, unused #include
     10        directives, etc., and adds a very few WebKit-standard changes to these files.
     11
     12        No new tests.
     13
     14        * rendering/mathml/RenderMathMLBlock.cpp:
     15        (WebCore):
     16        * rendering/mathml/RenderMathMLBlock.h:
     17        (WebCore::RenderMathMLBlock::getBoxModelObjectHeight):
     18            - changed to a static member function since 'this' is unused;
     19              removed redundant non-const version
     20        (WebCore::RenderMathMLBlock::getBoxModelObjectWidth):
     21            - changed to a static member function since 'this' is unused;
     22              removed redundant non-const version
     23        (WebCore):
     24        * rendering/mathml/RenderMathMLFraction.cpp:
     25        * rendering/mathml/RenderMathMLMath.cpp:
     26        * rendering/mathml/RenderMathMLMath.h:
     27        * rendering/mathml/RenderMathMLOperator.h:
     28        (WebCore):
     29        * rendering/mathml/RenderMathMLRoot.cpp:
     30        * rendering/mathml/RenderMathMLRow.cpp:
     31        * rendering/mathml/RenderMathMLRow.h:
     32        * rendering/mathml/RenderMathMLSquareRoot.cpp:
     33        * rendering/mathml/RenderMathMLSquareRoot.h:
     34        * rendering/mathml/RenderMathMLSubSup.cpp:
     35        * rendering/mathml/RenderMathMLSubSup.h:
     36        * rendering/mathml/RenderMathMLUnderOver.cpp:
     37        * rendering/mathml/RenderMathMLUnderOver.h:
     38
    1392012-02-07  David Reveman  <reveman@chromium.org>
    240

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp

    r95901 r107019  
    110110#endif // ENABLE(DEBUG_MATH_LAYOUT)
    111111
    112 
    113112}   
    114113

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h

    r95901 r107019  
    5353   
    5454protected:
    55     int getBoxModelObjectHeight(RenderObject* object)
    56     {
    57         if (object && object->isBoxModelObject()) {
    58             RenderBoxModelObject* box = toRenderBoxModelObject(object);
    59             return box->offsetHeight();
    60         }
    61        
    62         return 0;
    63     }
    64     int getBoxModelObjectHeight(const RenderObject* object)
     55    static LayoutUnit getBoxModelObjectHeight(const RenderObject* object)
    6556    {
    6657        if (object && object->isBoxModelObject()) {
    … …  
    7162        return 0;
    7263    }
    73     int getBoxModelObjectWidth(RenderObject* object)
    74     {
    75         if (object && object->isBoxModelObject()) {
    76             RenderBoxModelObject* box = toRenderBoxModelObject(object);
    77             return box->offsetWidth();
    78         }
    79        
    80         return 0;
    81     }
    82     int getBoxModelObjectWidth(const RenderObject* object)
     64    static LayoutUnit getBoxModelObjectWidth(const RenderObject* object)
    8365    {
    8466        if (object && object->isBoxModelObject()) {
    … …  
    10789}
    10890
     91// This will catch anyone doing an unnecessary cast.
     92void toRenderMathMLBlock(const RenderMathMLBlock*);
     93
    10994}
    110 
    11195
    11296#endif // ENABLE(MATHML)

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp

    r106900 r107019  
    183183}
    184184
    185 
    186185#endif // ENABLE(MATHML)

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLMath.cpp

    r95901 r107019  
    4444
    4545#endif // ENABLE(MATHML)
    46 

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLMath.h

    r95901 r107019  
    4444}
    4545
    46 
    4746#endif // ENABLE(MATHML)
    4847#endif // RenderMathMLMath_h

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h

    r106900 r107019  
    6969}
    7070
     71// This will catch anyone doing an unnecessary cast.
     72void toRenderMathMLOperator(const RenderMathMLOperator*);
     73
    7174inline UChar convertHyphenMinusToMinusSign(UChar glyph)
    7275{

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp

    r103151 r107019  
    253253
    254254#endif // ENABLE(MATHML)
    255 
    256 

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp

    r106900 r107019  
    134134
    135135#endif // ENABLE(MATHML)
    136 

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h

    r106900 r107019  
    4949}
    5050
    51 
    5251#endif // ENABLE(MATHML)
    5352#endif // RenderMathMLRow_h

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.cpp

    r95901 r107019  
    190190
    191191#endif // ENABLE(MATHML)
    192 
    193        

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.h

    r95901 r107019  
    4949
    5050#endif // RenderMathMLSquareRoot_h
    51 
    52 
    53 

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLSubSup.cpp

    r106900 r107019  
    3030#include "RenderMathMLSubSup.h"
    3131
    32 #include "FontSelector.h"
    3332#include "MathMLNames.h"
    34 #include "RenderInline.h"
    35 #include "RenderTable.h"
    36 #include "RenderTableCell.h"
    37 #include "RenderTableRow.h"
    38 #include "RenderTableSection.h"
    39 #include "RenderText.h"
    4033
    4134namespace WebCore {

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLSubSup.h

    r106900 r107019  
    2424 */
    2525
    26 
    2726#ifndef RenderMathMLSubSup_h
    2827#define RenderMathMLSubSup_h
    … …  
    3130
    3231#include "RenderMathMLBlock.h"
    33 #include "RenderTable.h"
    3432
    3533namespace WebCore {

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp

    r106900 r107019  
    293293}
    294294
    295 
    296295#endif // ENABLE(MATHML)

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h

    r106900 r107019  
    2323 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    25 
    2625
    2726#ifndef RenderMathMLUnderOver_h
Note: See TracChangeset for help on using the changeset viewer.