LayoutTests:
authorweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Dec 2006 23:25:44 +0000 (23:25 +0000)
committerweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Dec 2006 23:25:44 +0000 (23:25 +0000)
        Reviewed by Geoff.

        - pixel test for http://bugs.webkit.org/show_bug.cgi?id=11930
          Specifying border-radius makes the outline shrink

        * fast/css/border-radius-outline-offset-expected.checksum: Added.
        * fast/css/border-radius-outline-offset-expected.png: Added.
        * fast/css/border-radius-outline-offset-expected.txt: Added.
        * fast/css/border-radius-outline-offset.html: Added.

WebCore:

        Reviewed by Geoff.

        - fix http://bugs.webkit.org/show_bug.cgi?id=11930
          Specifying border-radius makes the outline shrink

        Test: fast/css/border-radius-outline-offset.html

        * css/cssstyleselector.cpp:
        (WebCore::CSSStyleSelector::applyProperty): Added missing return statement.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@18442 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/css/border-radius-outline-offset-expected.checksum [new file with mode: 0644]
LayoutTests/fast/css/border-radius-outline-offset-expected.png [new file with mode: 0644]
LayoutTests/fast/css/border-radius-outline-offset-expected.txt [new file with mode: 0644]
LayoutTests/fast/css/border-radius-outline-offset.html [new file with mode: 0644]
WebCore/ChangeLog
WebCore/css/cssstyleselector.cpp

index 018fbce..3f1be73 100644 (file)
@@ -1,3 +1,15 @@
+2006-12-27  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Geoff.
+
+        - pixel test for http://bugs.webkit.org/show_bug.cgi?id=11930
+          Specifying border-radius makes the outline shrink
+
+        * fast/css/border-radius-outline-offset-expected.checksum: Added.
+        * fast/css/border-radius-outline-offset-expected.png: Added.
+        * fast/css/border-radius-outline-offset-expected.txt: Added.
+        * fast/css/border-radius-outline-offset.html: Added.
+
 2006-12-27  Rob Buis  <buis@kde.org>
 
         Reviewed by Eric.
diff --git a/LayoutTests/fast/css/border-radius-outline-offset-expected.checksum b/LayoutTests/fast/css/border-radius-outline-offset-expected.checksum
new file mode 100644 (file)
index 0000000..ca0c122
--- /dev/null
@@ -0,0 +1 @@
+ef3f3351103ba790c162a11ad91866c0
\ No newline at end of file
diff --git a/LayoutTests/fast/css/border-radius-outline-offset-expected.png b/LayoutTests/fast/css/border-radius-outline-offset-expected.png
new file mode 100644 (file)
index 0000000..77cfa03
Binary files /dev/null and b/LayoutTests/fast/css/border-radius-outline-offset-expected.png differ
diff --git a/LayoutTests/fast/css/border-radius-outline-offset-expected.txt b/LayoutTests/fast/css/border-radius-outline-offset-expected.txt
new file mode 100644 (file)
index 0000000..ffbf046
--- /dev/null
@@ -0,0 +1,27 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 53x18
+          text run at (0,0) width 53: "Test for "
+        RenderInline {I} at (0,0) size 619x18
+          RenderInline {A} at (0,0) size 301x18 [color=#0000EE]
+            RenderText {#text} at (53,0) size 301x18
+              text run at (53,0) width 301: "http://bugs.webkit.org/show_bug.cgi?id=11930"
+          RenderText {#text} at (354,0) size 318x18
+            text run at (354,0) width 4: " "
+            text run at (358,0) width 314: "Specifying border-radius makes the outline shrink"
+        RenderText {#text} at (672,0) size 4x18
+          text run at (672,0) width 4: "."
+      RenderBlock {P} at (0,34) size 784x18
+        RenderText {#text} at (0,0) size 273x18
+          text run at (0,0) width 273: "These two squares should be the same size:"
+      RenderBlock (anonymous) at (0,68) size 784x18
+        RenderBlock {DIV} at (0,4) size 10x10
+        RenderText {#text} at (10,0) size 4x18
+          text run at (10,0) width 4: " "
+        RenderBlock {DIV} at (14,4) size 10x10
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,102) size 784x0
diff --git a/LayoutTests/fast/css/border-radius-outline-offset.html b/LayoutTests/fast/css/border-radius-outline-offset.html
new file mode 100644 (file)
index 0000000..0c116f5
--- /dev/null
@@ -0,0 +1,17 @@
+<html>
+<head>
+    <title></title>
+    <style>
+        div { width: 10px; height: 10px; outline: 2px solid green; display: inline-block; }
+    </style>
+</head>
+<body>
+    <p>
+        Test for <i><a href="http://bugs.webkit.org/show_bug.cgi?id=11930">http://bugs.webkit.org/show_bug.cgi?id=11930</a>
+        Specifying border-radius makes the outline shrink</i>.
+    </p>
+    <p>
+        These two squares should be the same size: <div></div> <div style="-webkit-border-radius: 2px;"></div>
+    </p>
+</body>
+</html>
index 7068838..9eed758 100644 (file)
@@ -1,3 +1,15 @@
+2006-12-27  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Geoff.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=11930
+          Specifying border-radius makes the outline shrink
+
+        Test: fast/css/border-radius-outline-offset.html
+
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty): Added missing return statement.
+
 2006-12-27  Rob Buis  <buis@kde.org>
 
         Reviewed by Eric.
index 6132b5f..7cd652d 100644 (file)
@@ -3747,6 +3747,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
                 style->setBorderRadius(size);
                 break;
         }
+        return;
     }
 
     case CSS_PROP_OUTLINE_OFFSET: