Changeset 14126 in webkit

Timestamp:

May 1, 2006 1:34:40 AM (18 years ago)

Author:

eseidel

Message:

2006-04-30 Rob Buis <​buis@kde.org>

Reviewed by eseidel. Landed by eseidel.

Fix for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=8651:
CGContextSetLineDash: invalid dash array: emmited during WebKit tests

Properly discard invalid stroke-dasharray properties like in
invalid-css.svg. (Tests updated.)

• ksvg2/css/SVGCSSParser.cpp: (WebCore::CSSParser::parseSVGStrokeDasharray):

Location:

trunk

Files:

• LayoutTests/svg/custom/invalid-css-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bridge/mac/FrameMac.h (modified) (4 diffs)
• WebCore/ksvg2/css/SVGCSSParser.cpp (modified) (1 diff)

trunk/LayoutTests/svg/custom/invalid-css-expected.txt

@@ -14 +14 @@
         RenderText {#text} at (0,0) size 167x18
           text run at (0,0) width 167: "no markers and no dashes."
-      KCanvasItem {path} at (49.17,65.83) size 85x85 [stroke={[type=SOLID] [color=#000000] [dash array={10.00, 5.00, 10.00, -1.00}]}] [fill={[type=SOLID] [color=#008000]}] [data="M30.00,40.00L80.00,40.00L80.00,90.00L30.00,90.00"]
+      KCanvasItem {path} at (49.17,65.83) size 85x85 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#008000]}] [data="M30.00,40.00L80.00,40.00L80.00,90.00L30.00,90.00"]
       KCanvasItem {circle} at (265.83,65.83) size 68.33x68.33 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#008000)]] [start=(0,0)] [end=(100,0)]}] [data="M200.00,60.00L199.96,61.26L199.84,62.51L199.65,63.75L199.37,64.97L199.02,66.18L198.60,67.36L198.10,68.52L197.53,69.64L196.89,70.72L196.18,71.76L195.41,72.75L194.58,73.69L193.69,74.58L192.75,75.41L191.76,76.18L190.72,76.89L189.64,77.53L188.52,78.10L187.36,78.60L186.18,79.02L184.97,79.37L183.75,79.65L182.51,79.84L181.26,79.96L180.00,80.00L178.74,79.96L177.49,79.84L176.25,79.65L175.03,79.37L173.82,79.02L172.64,78.60L171.48,78.10L170.36,77.53L169.28,76.89L168.24,76.18L167.25,75.41L166.31,74.58L165.42,73.69L164.59,72.75L163.82,71.76L163.11,70.72L162.47,69.64L161.90,68.52L161.40,67.36L160.98,66.18L160.63,64.97L160.35,63.75L160.16,62.51L160.04,61.26L160.00,60.00L160.04,58.74L160.16,57.49L160.35,56.25L160.63,55.03L160.98,53.82L161.40,52.64L161.90,51.48L162.47,50.36L163.11,49.28L163.82,48.24L164.59,47.25L165.42,46.31L166.31,45.42L167.25,44.59L168.24,43.82L169.28,43.11L170.36,42.47L171.48,41.90L172.64,41.40L173.82,40.98L175.03,40.63L176.25,40.35L177.49,40.16L178.74,40.04L180.00,40.00L181.26,40.04L182.51,40.16L183.75,40.35L184.97,40.63L186.18,40.98L187.36,41.40L188.52,41.90L189.64,42.47L190.72,43.11L191.76,43.82L192.75,44.59L193.69,45.42L194.58,46.31L195.41,47.25L196.18,48.24L196.89,49.28L197.53,50.36L198.10,51.48L198.60,52.64L199.02,53.82L199.37,55.03L199.65,56.25L199.84,57.49L199.96,58.74"]
       RenderSVGText {text} at (0,0) size 785x18

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-04-30  Rob Buis  <buis@kde.org>
+
+        Reviewed by eseidel.  Landed by eseidel.
+
+        Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=8651:
+        CGContextSetLineDash: invalid dash array: emmited during WebKit tests
+
+        Properly discard invalid stroke-dasharray properties like in
+        invalid-css.svg.  (Tests updated.)
+
+        * ksvg2/css/SVGCSSParser.cpp:
+        (WebCore::CSSParser::parseSVGStrokeDasharray):
+
 2006-04-28  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/bridge/mac/FrameMac.h

@@ -143 +143 @@
     virtual void unfocusWindow();
     
-    void openURLFromPageCache(KWQPageState* state);
+    void openURLFromPageCache(KWQPageState*);
 
     virtual void saveDocumentState();
@@ -149 +149 @@
     
     virtual void addMessageToConsole(const String& message,  unsigned int lineNumber, const String& sourceID);
-    virtual void setDisplaysWithFocusAttributes(bool flag);
+    virtual void setDisplaysWithFocusAttributes(bool);
     
     NSView* nextKeyView(Node* startingPoint, KWQSelectionDirection);
@@ -162 +162 @@
     static bool currentEventIsMouseDownInWidget(Widget* candidate);
     
-    virtual void runJavaScriptAlert(const String& message);
-    virtual bool runJavaScriptConfirm(const String& message);
+    virtual void runJavaScriptAlert(const String&);
+    virtual bool runJavaScriptConfirm(const String&);
     virtual bool runJavaScriptPrompt(const String& message, const String& defaultValue, String& result);
     virtual bool locationbarVisible();
@@ -324 +324 @@
     bool dispatchCPPEvent(const AtomicString &eventType, ClipboardMac::AccessPolicy policy);
 
-    NSImage* imageFromRect(NSRect rect) const;
+    NSImage* imageFromRect(NSRect) const;
 
     void freeClipboard();

trunk/WebCore/ksvg2/css/SVGCSSParser.cpp

@@ -345 +345 @@
         if(value && value->unit == KDOMCSSValue::Operator && value->iValue == ',')
             value = valueList->next();
+    }
+    if(!valid_primitive) {
+        delete ret;
+        ret = 0;
     }