WebKit Merge 41017:41057, Chromium Side

R=tony

Review URL: http://codereview.chromium.org/21460

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9966 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 24 insertions, 79 deletions

diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 161f7b5..0db8ffd 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -636,7 +636,6 @@ input_files = [
     '$WEBCORE_DIR/rendering/RenderImageGeneratedContent.cpp',
     '$WEBCORE_DIR/rendering/RenderInline.cpp',
     '$WEBCORE_DIR/rendering/RenderLayer.cpp',
-    '$WEBCORE_DIR/rendering/RenderLegend.cpp',
     '$WEBCORE_DIR/rendering/RenderLineBoxList.cpp',
     '$WEBCORE_DIR/rendering/RenderListBox.cpp',
     '$WEBCORE_DIR/rendering/RenderListItem.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 87a4149..859401f 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -3329,14 +3329,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderLegend.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderLegend.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderLineBoxList.cpp"
 				>
 			</File>
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5062376-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5062376-expected.checksum
deleted file mode 100644
index 7537270..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5062376-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-7ab73b4ea9b4a3288f449cc618ba534f
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5062376-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5062376-expected.png
deleted file mode 100644
index 1c182db..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5062376-expected.png
+++ /dev/null
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/insert-list-with-id-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/insert-list-with-id-expected.checksum
deleted file mode 100644
index 259e66a..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/insert-list-with-id-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-391f4deb42df00c37624122aac2d1ef2
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/insert-list-with-id-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/insert-list-with-id-expected.png
deleted file mode 100644
index 4e2df81..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/insert-list-with-id-expected.png
+++ /dev/null
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5062376-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5062376-expected.checksum
deleted file mode 100644
index 07770ccd..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5062376-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-297b59b87d91f309da29c50e267c4241
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5062376-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5062376-expected.png
deleted file mode 100644
index 6537116..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5062376-expected.png
+++ /dev/null
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5062376-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5062376-expected.txt
deleted file mode 100644
index e2c434a..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5062376-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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 784x584
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 757x39
-          text run at (0,0) width 566: "This tests for a bug where centering text would prevent it from being right or left aligned again. "
-          text run at (566,0) width 191: "The paragraph below should be"
-          text run at (0,20) width 76: "right aligned."
-      RenderBlock {DIV} at (0,56) size 784x20
-        RenderText {#text} at (764,0) size 20x19
-          text run at (764,0) width 20: "foo"
-selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
-selection end:   position 3 of child 0 {#text} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-with-id-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-with-id-expected.checksum
deleted file mode 100644
index 3c721c4..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-with-id-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-ce328738b3a7f14d3ae005aaeed021d1
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-with-id-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-with-id-expected.png
deleted file mode 100644
index 4c4bca8..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-with-id-expected.png
+++ /dev/null
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-with-id-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-with-id-expected.txt
deleted file mode 100644
index 221ab16..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-with-id-expected.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of LI > OL > DIV > BODY > HTML > #document to 0 of LI > OL > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldEndEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
-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 784x584
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 760x39
-          text run at (0,0) width 760: "This test makes sure Insert{Un}OrderedList properly adds an id to the inserted list when requested. The tests inserts a new list"
-          text run at (0,20) width 447: "using the command, then removes it programmatically from JS using the id."
-      RenderBlock (anonymous) at (0,56) size 784x20
-        RenderBR {BR} at (0,0) size 0x19
-      RenderBlock {DIV} at (0,76) size 784x20
-      RenderBlock (anonymous) at (0,96) size 784x20
-        RenderBR {BR} at (0,0) size 0x19
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/006-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/006-expected.txt
index cd85b616..4d0777fd 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/006-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/006-expected.txt
@@ -5,7 +5,7 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x75 [border: (5px solid #000000)]
         RenderFieldSet {FIELDSET} at (7,5) size 770x65 [border: (10px groove #FF0000)]
-          RenderLegend {LEGEND} at (42,0) size 116x20
+          RenderBlock {LEGEND} at (42,0) size 116x20
             RenderText {#text} at (2,0) size 112x19
               text run at (2,0) width 112: "Test without forms"
           RenderBlock {DIV} at (22,25) size 726x20
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/007-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/007-expected.txt
index c2e36da..99f60df 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/007-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/007-expected.txt
@@ -4,7 +4,7 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderFieldSet {FIELDSET} at (2,0) size 112x77 [border: (2px groove #C0C0C0)]
-        RenderLegend {LEGEND} at (14,0) size 84x20
+        RenderBlock {LEGEND} at (14,0) size 84x20
           RenderText {#text} at (2,0) size 80x19
             text run at (2,0) width 80: "Number One"
         RenderBlock (anonymous) at (14,25) size 84x40
@@ -16,7 +16,7 @@ layer at (0,0) size 800x600
       RenderText {#text} at (116,45) size 4x19
         text run at (116,45) width 4: " "
       RenderFieldSet {FIELDSET} at (122,20) size 114x57 [border: (2px groove #C0C0C0)]
-        RenderLegend {LEGEND} at (14,0) size 86x20
+        RenderBlock {LEGEND} at (14,0) size 86x20
           RenderText {#text} at (2,0) size 82x19
             text run at (2,0) width 82: "Number Two"
         RenderBlock (anonymous) at (14,25) size 86x20
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/fieldset-align-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/fieldset-align-expected.txt
index 002289f..3c96705 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/fieldset-align-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/fieldset-align-expected.txt
@@ -7,28 +7,28 @@ layer at (0,0) size 785x1406
         RenderText {#text} at (0,0) size 101x19
           text run at (0,0) width 101: "Legend align test"
       RenderFieldSet {FIELDSET} at (2,36) size 765x59 [border: (2px groove #C0C0C0)]
-        RenderLegend {LEGEND} at (14,0) size 96x20
+        RenderBlock {LEGEND} at (14,0) size 96x20
           RenderText {#text} at (2,0) size 92x19
             text run at (2,0) width 92: "My Legend left"
         RenderBlock (anonymous) at (14,25) size 737x22
           RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderText {#text} at (0,0) size 0x0
       RenderFieldSet {FIELDSET} at (2,95) size 765x59 [border: (2px groove #C0C0C0)]
-        RenderLegend {LEGEND} at (325,0) size 115x20
+        RenderBlock {LEGEND} at (325,0) size 115x20
           RenderText {#text} at (2,0) size 111x19
             text run at (2,0) width 111: "My Legend center"
         RenderBlock (anonymous) at (14,25) size 737x22
           RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderText {#text} at (0,0) size 0x0
       RenderFieldSet {FIELDSET} at (2,154) size 765x59 [border: (2px groove #C0C0C0)]
-        RenderLegend {LEGEND} at (647,0) size 104x20
+        RenderBlock {LEGEND} at (647,0) size 104x20
           RenderText {#text} at (2,0) size 100x19
             text run at (2,0) width 100: "My Legend right"
         RenderBlock (anonymous) at (14,25) size 737x22
           RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderText {#text} at (0,0) size 0x0
       RenderFieldSet {FIELDSET} at (2,213) size 765x59 [border: (2px groove #C0C0C0)]
-        RenderLegend {LEGEND} at (14,0) size 118x20
+        RenderBlock {LEGEND} at (14,0) size 118x20
           RenderText {#text} at (2,0) size 114x19
             text run at (2,0) width 114: "My Legend default"
         RenderBlock (anonymous) at (14,25) size 737x22
@@ -43,28 +43,28 @@ layer at (0,0) size 785x1406
           RenderText {#text} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,334) size 769x236
         RenderFieldSet {FIELDSET} at (2,0) size 765x59 [border: (2px groove #C0C0C0)]
-          RenderLegend {LEGEND} at (14,0) size 96x20
+          RenderBlock {LEGEND} at (14,0) size 96x20
             RenderText {#text} at (2,0) size 92x19
               text run at (2,0) width 92: "My Legend left"
           RenderBlock (anonymous) at (14,25) size 737x22
             RenderTextControl {INPUT} at (582,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
             RenderText {#text} at (0,0) size 0x0
         RenderFieldSet {FIELDSET} at (2,59) size 765x59 [border: (2px groove #C0C0C0)]
-          RenderLegend {LEGEND} at (325,0) size 115x20
+          RenderBlock {LEGEND} at (325,0) size 115x20
             RenderText {#text} at (2,0) size 111x19
               text run at (2,0) width 111: "My Legend center"
           RenderBlock (anonymous) at (14,25) size 737x22
             RenderTextControl {INPUT} at (582,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
             RenderText {#text} at (0,0) size 0x0
         RenderFieldSet {FIELDSET} at (2,118) size 765x59 [border: (2px groove #C0C0C0)]
-          RenderLegend {LEGEND} at (647,0) size 104x20
+          RenderBlock {LEGEND} at (647,0) size 104x20
             RenderText {#text} at (2,0) size 100x19
               text run at (2,0) width 100: "My Legend right"
           RenderBlock (anonymous) at (14,25) size 737x22
             RenderTextControl {INPUT} at (582,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
             RenderText {#text} at (0,0) size 0x0
         RenderFieldSet {FIELDSET} at (2,177) size 765x59 [border: (2px groove #C0C0C0)]
-          RenderLegend {LEGEND} at (633,0) size 118x20
+          RenderBlock {LEGEND} at (633,0) size 118x20
             RenderText {#text} at (2,0) size 114x19
               text run at (2,0) width 114: "My Legend default"
           RenderBlock (anonymous) at (14,25) size 737x22
@@ -78,28 +78,28 @@ layer at (0,0) size 785x1406
         RenderText {#text} at (0,0) size 252x19
           text run at (0,0) width 252: "Legend align test with margin and padding"
       RenderFieldSet {FIELDSET} at (15,632) size 739x74 [border: (2px groove #C0C0C0)]
-        RenderLegend {LEGEND} at (17,0) size 96x20
+        RenderBlock {LEGEND} at (17,0) size 96x20
           RenderText {#text} at (2,0) size 92x19
             text run at (2,0) width 92: "My Legend left"
         RenderBlock (anonymous) at (17,35) size 705x22
           RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderText {#text} at (0,0) size 0x0
       RenderFieldSet {FIELDSET} at (15,721) size 739x74 [border: (2px groove #C0C0C0)]
-        RenderLegend {LEGEND} at (312,0) size 115x20
+        RenderBlock {LEGEND} at (312,0) size 115x20
           RenderText {#text} at (2,0) size 111x19
             text run at (2,0) width 111: "My Legend center"
         RenderBlock (anonymous) at (17,35) size 705x22
           RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderText {#text} at (0,0) size 0x0
       RenderFieldSet {FIELDSET} at (15,810) size 739x74 [border: (2px groove #C0C0C0)]
-        RenderLegend {LEGEND} at (618,0) size 104x20
+        RenderBlock {LEGEND} at (618,0) size 104x20
           RenderText {#text} at (2,0) size 100x19
             text run at (2,0) width 100: "My Legend right"
         RenderBlock (anonymous) at (17,35) size 705x22
           RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderText {#text} at (0,0) size 0x0
       RenderFieldSet {FIELDSET} at (15,899) size 739x74 [border: (2px groove #C0C0C0)]
-        RenderLegend {LEGEND} at (17,0) size 118x20
+        RenderBlock {LEGEND} at (17,0) size 118x20
           RenderText {#text} at (2,0) size 114x19
             text run at (2,0) width 114: "My Legend default"
         RenderBlock (anonymous) at (17,35) size 705x22
@@ -114,28 +114,28 @@ layer at (0,0) size 785x1406
           RenderText {#text} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,1042) size 769x341
         RenderFieldSet {FIELDSET} at (15,0) size 739x74 [border: (2px groove #C0C0C0)]
-          RenderLegend {LEGEND} at (17,0) size 96x20
+          RenderBlock {LEGEND} at (17,0) size 96x20
             RenderText {#text} at (2,0) size 92x19
               text run at (2,0) width 92: "My Legend left"
           RenderBlock (anonymous) at (17,35) size 705x22
             RenderTextControl {INPUT} at (550,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
             RenderText {#text} at (0,0) size 0x0
         RenderFieldSet {FIELDSET} at (15,89) size 739x74 [border: (2px groove #C0C0C0)]
-          RenderLegend {LEGEND} at (312,0) size 115x20
+          RenderBlock {LEGEND} at (312,0) size 115x20
             RenderText {#text} at (2,0) size 111x19
               text run at (2,0) width 111: "My Legend center"
           RenderBlock (anonymous) at (17,35) size 705x22
             RenderTextControl {INPUT} at (550,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
             RenderText {#text} at (0,0) size 0x0
         RenderFieldSet {FIELDSET} at (15,178) size 739x74 [border: (2px groove #C0C0C0)]
-          RenderLegend {LEGEND} at (618,0) size 104x20
+          RenderBlock {LEGEND} at (618,0) size 104x20
             RenderText {#text} at (2,0) size 100x19
               text run at (2,0) width 100: "My Legend right"
           RenderBlock (anonymous) at (17,35) size 705x22
             RenderTextControl {INPUT} at (550,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
             RenderText {#text} at (0,0) size 0x0
         RenderFieldSet {FIELDSET} at (15,267) size 739x74 [border: (2px groove #C0C0C0)]
-          RenderLegend {LEGEND} at (604,0) size 118x20
+          RenderBlock {LEGEND} at (604,0) size 118x20
             RenderText {#text} at (2,0) size 114x19
               text run at (2,0) width 114: "My Legend default"
           RenderBlock (anonymous) at (17,35) size 705x22
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/float-before-fieldset-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/float-before-fieldset-expected.txt
index 2b867dc..54dfd7e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/float-before-fieldset-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/float-before-fieldset-expected.txt
@@ -5,7 +5,7 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock (floating) {DIV} at (0,0) size 50x400 [bgcolor=#008000]
       RenderFieldSet {FIELDSET} at (50,0) size 730x57 [border: (2px groove #C0C0C0)]
-        RenderLegend {LEGEND} at (14,0) size 75x20
+        RenderBlock {LEGEND} at (14,0) size 75x20
           RenderText {#text} at (2,0) size 71x19
             text run at (2,0) width 71: "Hello world"
         RenderBlock (anonymous) at (14,25) size 702x20
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/inline-svg-in-xhtml-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/inline-svg-in-xhtml-expected.txt
index d8700e6..40f4ea3 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/inline-svg-in-xhtml-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/inline-svg-in-xhtml-expected.txt
@@ -15,7 +15,7 @@ layer at (48,38) size 722x542 layerType: foreground only
   RenderBody {body} at (48,38) size 722x542 [border: (1px solid #000000)]
     RenderBlock {form} at (1,1) size 720x129
       RenderFieldSet {fieldset} at (2,0) size 716x129 [border: (2px groove #C0C0C0)]
-        RenderLegend {legend} at (14,0) size 84x20
+        RenderBlock {legend} at (14,0) size 84x20
           RenderText {#text} at (2,0) size 80x19
             text run at (2,0) width 80: "HTML Form"
         RenderBlock {p} at (14,41) size 688x22
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 861d141..20d5846 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1770,3 +1770,6 @@ MAC : LayoutTests/fast/lists/001.html = FAIL
 LINUX : LayoutTests/fast/clip/008.html = PASS CRASH
 LINUX : LayoutTests/fast/clip/014.html = PASS CRASH
 LINUX : LayoutTests/fast/compact/003.html = PASS CRASH
+
+// New test from WebKit merge 41017:41057
+LayoutTests/fast/js/function-toString-semicolon-insertion.html = FAIL
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 8c74440..08b5442 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -577,7 +577,6 @@
 		938445E10F16B0570075F4C5 /* RenderImageGeneratedContent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5442A860E9BDD600098766D /* RenderImageGeneratedContent.cpp */; };
 		938445E20F16B0570075F4C5 /* RenderInline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E95590D7F3E94001ECF42 /* RenderInline.cpp */; };
 		938445E30F16B0570075F4C5 /* RenderLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E955B0D7F3E94001ECF42 /* RenderLayer.cpp */; };
-		938445E40F16B0570075F4C5 /* RenderLegend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E955D0D7F3E94001ECF42 /* RenderLegend.cpp */; };
 		938445E50F16B0570075F4C5 /* RenderListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E955F0D7F3E94001ECF42 /* RenderListBox.cpp */; };
 		938445E60F16B0570075F4C5 /* RenderListItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E95610D7F3E94001ECF42 /* RenderListItem.cpp */; };
 		938445E70F16B0570075F4C5 /* RenderListMarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E95630D7F3E94001ECF42 /* RenderListMarker.cpp */; };
@@ -3427,8 +3426,6 @@
 		7B5E955A0D7F3E94001ECF42 /* RenderInline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderInline.h; sourceTree = "<group>"; };
 		7B5E955B0D7F3E94001ECF42 /* RenderLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayer.cpp; sourceTree = "<group>"; };
 		7B5E955C0D7F3E94001ECF42 /* RenderLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderLayer.h; sourceTree = "<group>"; };
-		7B5E955D0D7F3E94001ECF42 /* RenderLegend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLegend.cpp; sourceTree = "<group>"; };
-		7B5E955E0D7F3E94001ECF42 /* RenderLegend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderLegend.h; sourceTree = "<group>"; };
 		7B5E955F0D7F3E94001ECF42 /* RenderListBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderListBox.cpp; sourceTree = "<group>"; };
 		7B5E95600D7F3E94001ECF42 /* RenderListBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderListBox.h; sourceTree = "<group>"; };
 		7B5E95610D7F3E94001ECF42 /* RenderListItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderListItem.cpp; sourceTree = "<group>"; };
@@ -6294,8 +6291,6 @@
 				7B5E955A0D7F3E94001ECF42 /* RenderInline.h */,
 				7B5E955B0D7F3E94001ECF42 /* RenderLayer.cpp */,
 				7B5E955C0D7F3E94001ECF42 /* RenderLayer.h */,
-				7B5E955D0D7F3E94001ECF42 /* RenderLegend.cpp */,
-				7B5E955E0D7F3E94001ECF42 /* RenderLegend.h */,
 				7B5E955F0D7F3E94001ECF42 /* RenderListBox.cpp */,
 				7B5E95600D7F3E94001ECF42 /* RenderListBox.h */,
 				7B5E95610D7F3E94001ECF42 /* RenderListItem.cpp */,
@@ -9151,7 +9146,6 @@
 				938445E10F16B0570075F4C5 /* RenderImageGeneratedContent.cpp in Sources */,
 				938445E20F16B0570075F4C5 /* RenderInline.cpp in Sources */,
 				938445E30F16B0570075F4C5 /* RenderLayer.cpp in Sources */,
-				938445E40F16B0570075F4C5 /* RenderLegend.cpp in Sources */,
 				489B04B64226A8BC625C0DDB /* RenderLineBoxList.cpp in Sources */,
 				938445E50F16B0570075F4C5 /* RenderListBox.cpp in Sources */,
 				938445E60F16B0570075F4C5 /* RenderListItem.cpp in Sources */,