Changeset 57316 in webkit


Ignore:
Timestamp:
Apr 9, 2010 12:59:04 AM (14 years ago)
Author:
abecsi@webkit.org
Message:

[Qt] User agent style sheets are crippled by moc -E in make-css-file-arrays.pl
​https://bugs.webkit.org/show_bug.cgi?id=37296

Reviewed by Simon Hausmann.
Patch by Andras Becsi <​abecsi@inf.u-szeged.hu>

WebCore:

Do not use moc to preprocess user agent style sheets because it removes at-symbols
and hexadecimal colours from declarations.
Remove unneeded preprocessor usage from make-css-file-arrays.pl since the script
processes default css files using regular expressions therefore preprocessing is redundant.

  • WebCore.pri: remove --preprocessor usage
  • css/make-css-file-arrays.pl: remove gcc dependency

LayoutTests:

Update expected files after removal of moc preprocessing of default css sheets.
These test results now only differ in metrics from Mac ones.

  • platform/qt/editing/execCommand/insert-list-xml-expected.txt:
  • platform/qt/svg/custom/createImageElement2-expected.txt:
  • platform/qt/svg/custom/use-on-symbol-inside-pattern-expected.txt:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r57313 r57316  
     12010-04-09  Andras Becsi  <abecsi@webkit.org>
     2
     3        Reviewed by Simon Hausmann.
     4
     5        [Qt] User agent style sheets are crippled by moc -E in make-css-file-arrays.pl
     6        https://bugs.webkit.org/show_bug.cgi?id=37296
     7
     8        Update expected files after removal of moc preprocessing of default css sheets.
     9        These test results now only differ in metrics from Mac ones.
     10
     11        * platform/qt/editing/execCommand/insert-list-xml-expected.txt:
     12        * platform/qt/svg/custom/createImageElement2-expected.txt:
     13        * platform/qt/svg/custom/use-on-symbol-inside-pattern-expected.txt:
     14
    1152010-04-08  Chris Evans  <cevans@chromium.org>
    216

  • trunk/LayoutTests/platform/qt/editing/execCommand/insert-list-xml-expected.txt

    r55183 r57316  
    22<div xmlns="http://www.w3.org/1999/xhtml" contenteditable="true" id="insertlisthere"><ol><li><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Arial; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; font-size: medium; ">.</span><br /></li></ol></div>
    33PASS
    4 

  • trunk/LayoutTests/platform/qt/svg/custom/createImageElement2-expected.txt

    r54484 r57316  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x120
    4   RenderBlock {html} at (0,0) size 800x120
    5     RenderBlock {body} at (8,8) size 784x104
    6       RenderSVGRoot {svg} at (8,8) size 600x100
    7         RenderSVGImage {image} at (18,18) size 100x60
     3layer at (0,0) size 800x104
     4  RenderBlock {html} at (0,0) size 800x104
     5    RenderInline {head} at (0,0) size 86x20
    86      RenderText {#text} at (0,0) size 0x0
     7      RenderInline {title} at (0,0) size 82x20
     8        RenderText {#text} at (0,84) size 82x20
     9          text run at (0,84) width 82: "SVG Image"
     10      RenderText {#text} at (82,84) size 4x20
     11        text run at (82,84) width 4: " "
     12    RenderText {#text} at (0,0) size 0x0
     13    RenderInline {body} at (0,0) size 600x20
     14      RenderText {#text} at (0,0) size 0x0
     15      RenderSVGRoot {svg} at (86,0) size 600x100
     16        RenderSVGImage {image} at (96,10) size 100x60
     17      RenderText {#text} at (0,0) size 0x0
     18    RenderText {#text} at (0,0) size 0x0

  • trunk/LayoutTests/platform/qt/svg/custom/use-on-symbol-inside-pattern-expected.txt

    r54572 r57316  
    1 KRenderingPaintServer {id="pat00" [type=PATTERN] [bbox=at (-10,-15) size 30x45]}
    2 KRenderingPaintServer {id="pat01" [type=PATTERN] [bbox=at (-11.38,-16.87) size 30x45]}
     1KRenderingPaintServer {id="pat00" [type=PATTERN] [bbox=at (0,0) size 30x45]}
     2KRenderingPaintServer {id="pat01" [type=PATTERN] [bbox=at (0,0) size 30x45]}
    33layer at (0,0) size 800x600
    44  RenderView at (0,0) size 800x600
    … …  
    3030      RenderSVGContainer {use} at (8,8) size 205x94
    3131        RenderSVGContainer {g} at (8,8) size 205x94
    32           RenderPath {path} at (8,8) size 205x94 [stroke={[type=SOLID] [color=#B42D25] [stroke width=2.00]}] [fill={[type=PATTERN] [bbox=at (-10,-15) size 30x45]}] [data="M0.00,50.00 L100.00,0.00 L200.00,20.00 L150.00,70.00 L50.00,90.00 L0.00,50.00"]
     32          RenderPath {path} at (8,8) size 205x94 [stroke={[type=SOLID] [color=#B42D25] [stroke width=2.00]}] [fill={[type=PATTERN] [bbox=at (0,0) size 30x45]}] [data="M0.00,50.00 L100.00,0.00 L200.00,20.00 L150.00,70.00 L50.00,90.00 L0.00,50.00"]
    3333    RenderSVGContainer {g} at (8,104) size 205x98 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,110.00)}]
    3434      RenderSVGText {text} at (0,10) size 85x20 contains 1 chunk(s)
    … …  
    3737      RenderSVGContainer {use} at (8,108) size 205x94
    3838        RenderSVGContainer {g} at (8,108) size 205x94
    39           RenderPath {path} at (8,108) size 205x94 [stroke={[type=SOLID] [color=#B42D25] [stroke width=2.00]}] [fill={[type=PATTERN] [bbox=at (-11.38,-16.87) size 30x45]}] [data="M0.00,50.00 L100.00,0.00 L200.00,20.00 L150.00,70.00 L50.00,90.00 L0.00,50.00"]
     39          RenderPath {path} at (8,108) size 205x94 [stroke={[type=SOLID] [color=#B42D25] [stroke width=2.00]}] [fill={[type=PATTERN] [bbox=at (0,0) size 30x45]}] [data="M0.00,50.00 L100.00,0.00 L200.00,20.00 L150.00,70.00 L50.00,90.00 L0.00,50.00"]

  • trunk/WebCore/ChangeLog

    r57313 r57316  
     12010-04-09  Andras Becsi  <abecsi@webkit.org>
     2
     3        Reviewed by Simon Hausmann.
     4
     5        [Qt] User agent style sheets are crippled by moc -E in make-css-file-arrays.pl
     6        https://bugs.webkit.org/show_bug.cgi?id=37296
     7
     8        Do not use moc to preprocess user agent style sheets because it removes at-symbols
     9        and hexadecimal colours from declarations.
     10        Remove unneeded preprocessor usage from make-css-file-arrays.pl since the script
     11        processes default css files using regular expressions therefore preprocessing is redundant.
     12
     13        * WebCore.pri: remove --preprocessor usage
     14        * css/make-css-file-arrays.pl: remove gcc dependency
     15
    1162010-04-08  Chris Evans  <cevans@chromium.org>
    217

  • trunk/WebCore/WebCore.pri

    r56860 r57316  
    699699stylesheets.output = $${WC_GENERATED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp
    700700stylesheets.input = stylesheets.wkScript
    701 stylesheets.commands = perl $$stylesheets.wkScript --preprocessor \"$${QMAKE_MOC} -E\" $${WC_GENERATED_SOURCES_DIR}/UserAgentStyleSheets.h ${QMAKE_FILE_OUT} $$STYLESHEETS_EMBED
     701stylesheets.commands = perl $$stylesheets.wkScript $${WC_GENERATED_SOURCES_DIR}/UserAgentStyleSheets.h ${QMAKE_FILE_OUT} $$STYLESHEETS_EMBED
    702702stylesheets.depends = $$STYLESHEETS_EMBED
    703703stylesheets.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_WC_GENERATED_SOURCES_DIR}/UserAgentStyleSheets.h

  • trunk/WebCore/css/make-css-file-arrays.pl

    r55240 r57316  
    2424use Getopt::Long;
    2525
    26 my $preprocessor;
    27 
    28 GetOptions('preprocessor=s' => \$preprocessor);
    29 
    30 if (!$preprocessor) {
    31     require Config;
    32     my $gccLocation = "";
    33     if (($Config::Config{'osname'}) =~ /solaris/i) {
    34         $gccLocation = "/usr/sfw/bin/gcc";
    35     } else {
    36         $gccLocation = "/usr/bin/gcc";
    37     }
    38     $preprocessor = $gccLocation . " -E -P -x c++";
    39 }
    40 
    4126my $header = $ARGV[0];
    4227shift;
    … …  
    5641
    5742    # Slurp in the CSS file.
    58     open IN, $preprocessor . " " . $in . "|" or die;
     43    open IN, "<", $in or die;
    5944    my $text; { local $/; $text = <IN>; }
    6045    close IN;
Note: See TracChangeset for help on using the changeset viewer.