Webkit merge from 44668 to 44682.

Fix a the compile by renaming JSONObject to InspectorJSONObject
(upstream r44682) and add a test expection for a new test.  The
windows expectation is just a copy of the linux one, I need to
rebaseline it on windows.

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


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

9 files changed, 183 insertions, 3 deletions

diff --git a/DEPS b/DEPS
index e390f94..1cbbbf0 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "44668",
+  "webkit_revision": "44682",
 }
 
 
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/nth-child-dynamic-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/nth-child-dynamic-expected.checksum
new file mode 100644
index 0000000..554a333
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/nth-child-dynamic-expected.checksum
@@ -0,0 +1 @@
+408346a8903b361ef608c7ba14363f12
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/nth-child-dynamic-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/nth-child-dynamic-expected.png
new file mode 100644
index 0000000..feeddde8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/nth-child-dynamic-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/nth-child-dynamic-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/nth-child-dynamic-expected.txt
new file mode 100644
index 0000000..c278f0c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/nth-child-dynamic-expected.txt
@@ -0,0 +1,88 @@
+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 784x582
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 300x19
+          text run at (0,0) width 300: "Test :nth-child() when dynamically adding siblings."
+      RenderBlock {P} at (0,36) size 784x20
+        RenderInline {A} at (0,0) size 291x19 [color=#0000EE]
+          RenderText {#text} at (0,0) size 291x19
+            text run at (0,0) width 291: "https://bugs.webkit.org/show_bug.cgi?id=26362"
+      RenderBlock {DIV} at (10,72) size 764x232 [border: (1px solid #000000)]
+        RenderBlock {P} at (11,6) size 747x20 [color=#FF0000]
+          RenderText {#text} at (0,0) size 59x19
+            text run at (0,0) width 13: "P "
+            text run at (13,0) width 46: "red text"
+        RenderBlock {DIV} at (6,26) size 752x20
+          RenderText {#text} at (0,0) size 27x19
+            text run at (0,0) width 27: "DIV"
+        RenderBlock {P} at (11,46) size 747x20
+          RenderText {#text} at (0,0) size 9x19
+            text run at (0,0) width 9: "P"
+        RenderBlock {DIV} at (6,66) size 752x20 [color=#FF0000] [bgcolor=#9999FF]
+          RenderText {#text} at (0,0) size 125x19
+            text run at (0,0) width 31: "DIV "
+            text run at (31,0) width 50: "red text "
+            text run at (81,0) width 44: "blue bg"
+        RenderBlock {P} at (11,86) size 747x20
+          RenderText {#text} at (0,0) size 9x19
+            text run at (0,0) width 9: "P"
+        RenderBlock {DIV} at (6,106) size 752x20
+          RenderText {#text} at (0,0) size 27x19
+            text run at (0,0) width 27: "DIV"
+        RenderBlock {P} at (11,126) size 747x20 [color=#FF0000]
+          RenderText {#text} at (0,0) size 59x19
+            text run at (0,0) width 13: "P "
+            text run at (13,0) width 46: "red text"
+        RenderBlock {DIV} at (6,146) size 752x20
+          RenderText {#text} at (0,0) size 27x19
+            text run at (0,0) width 27: "DIV"
+        RenderBlock {P} at (11,166) size 747x20
+          RenderText {#text} at (0,0) size 9x19
+            text run at (0,0) width 9: "P"
+        RenderBlock {DIV} at (6,186) size 752x20 [color=#FF0000]
+          RenderText {#text} at (0,0) size 77x19
+            text run at (0,0) width 31: "DIV "
+            text run at (31,0) width 46: "red text"
+        RenderBlock {P} at (11,206) size 747x20
+          RenderText {#text} at (0,0) size 9x19
+            text run at (0,0) width 9: "P"
+      RenderBlock {DIV} at (10,314) size 764x252 [border: (1px solid #000000)]
+        RenderText {#text} at (6,6) size 251x19
+          text run at (6,6) width 251: "child 0: PASS: found color rgb(255, 0, 0)"
+        RenderBR {BR} at (257,21) size 0x0
+        RenderText {#text} at (6,26) size 235x19
+          text run at (6,26) width 235: "child 1: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (241,41) size 0x0
+        RenderText {#text} at (6,46) size 235x19
+          text run at (6,46) width 235: "child 2: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (241,61) size 0x0
+        RenderText {#text} at (6,66) size 251x19
+          text run at (6,66) width 251: "child 3: PASS: found color rgb(255, 0, 0)"
+        RenderBR {BR} at (257,81) size 0x0
+        RenderText {#text} at (6,86) size 235x19
+          text run at (6,86) width 235: "child 4: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (241,101) size 0x0
+        RenderText {#text} at (6,106) size 235x19
+          text run at (6,106) width 235: "child 5: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (241,121) size 0x0
+        RenderText {#text} at (6,126) size 251x19
+          text run at (6,126) width 251: "child 6: PASS: found color rgb(255, 0, 0)"
+        RenderBR {BR} at (257,141) size 0x0
+        RenderText {#text} at (6,146) size 235x19
+          text run at (6,146) width 235: "child 7: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (241,161) size 0x0
+        RenderText {#text} at (6,166) size 235x19
+          text run at (6,166) width 235: "child 8: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (241,181) size 0x0
+        RenderText {#text} at (6,186) size 251x19
+          text run at (6,186) width 251: "child 9: PASS: found color rgb(255, 0, 0)"
+        RenderBR {BR} at (257,201) size 0x0
+        RenderText {#text} at (6,206) size 243x19
+          text run at (6,206) width 243: "child 10: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (249,221) size 0x0
+        RenderText {#text} at (6,226) size 273x19
+          text run at (6,226) width 273: "div 1: PASS: found color rgb(153, 153, 255)"
+        RenderBR {BR} at (279,241) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.checksum
new file mode 100644
index 0000000..554a333
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.checksum
@@ -0,0 +1 @@
+408346a8903b361ef608c7ba14363f12
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.png
new file mode 100644
index 0000000..feeddde8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.txt
new file mode 100644
index 0000000..c278f0c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.txt
@@ -0,0 +1,88 @@
+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 784x582
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 300x19
+          text run at (0,0) width 300: "Test :nth-child() when dynamically adding siblings."
+      RenderBlock {P} at (0,36) size 784x20
+        RenderInline {A} at (0,0) size 291x19 [color=#0000EE]
+          RenderText {#text} at (0,0) size 291x19
+            text run at (0,0) width 291: "https://bugs.webkit.org/show_bug.cgi?id=26362"
+      RenderBlock {DIV} at (10,72) size 764x232 [border: (1px solid #000000)]
+        RenderBlock {P} at (11,6) size 747x20 [color=#FF0000]
+          RenderText {#text} at (0,0) size 59x19
+            text run at (0,0) width 13: "P "
+            text run at (13,0) width 46: "red text"
+        RenderBlock {DIV} at (6,26) size 752x20
+          RenderText {#text} at (0,0) size 27x19
+            text run at (0,0) width 27: "DIV"
+        RenderBlock {P} at (11,46) size 747x20
+          RenderText {#text} at (0,0) size 9x19
+            text run at (0,0) width 9: "P"
+        RenderBlock {DIV} at (6,66) size 752x20 [color=#FF0000] [bgcolor=#9999FF]
+          RenderText {#text} at (0,0) size 125x19
+            text run at (0,0) width 31: "DIV "
+            text run at (31,0) width 50: "red text "
+            text run at (81,0) width 44: "blue bg"
+        RenderBlock {P} at (11,86) size 747x20
+          RenderText {#text} at (0,0) size 9x19
+            text run at (0,0) width 9: "P"
+        RenderBlock {DIV} at (6,106) size 752x20
+          RenderText {#text} at (0,0) size 27x19
+            text run at (0,0) width 27: "DIV"
+        RenderBlock {P} at (11,126) size 747x20 [color=#FF0000]
+          RenderText {#text} at (0,0) size 59x19
+            text run at (0,0) width 13: "P "
+            text run at (13,0) width 46: "red text"
+        RenderBlock {DIV} at (6,146) size 752x20
+          RenderText {#text} at (0,0) size 27x19
+            text run at (0,0) width 27: "DIV"
+        RenderBlock {P} at (11,166) size 747x20
+          RenderText {#text} at (0,0) size 9x19
+            text run at (0,0) width 9: "P"
+        RenderBlock {DIV} at (6,186) size 752x20 [color=#FF0000]
+          RenderText {#text} at (0,0) size 77x19
+            text run at (0,0) width 31: "DIV "
+            text run at (31,0) width 46: "red text"
+        RenderBlock {P} at (11,206) size 747x20
+          RenderText {#text} at (0,0) size 9x19
+            text run at (0,0) width 9: "P"
+      RenderBlock {DIV} at (10,314) size 764x252 [border: (1px solid #000000)]
+        RenderText {#text} at (6,6) size 251x19
+          text run at (6,6) width 251: "child 0: PASS: found color rgb(255, 0, 0)"
+        RenderBR {BR} at (257,21) size 0x0
+        RenderText {#text} at (6,26) size 235x19
+          text run at (6,26) width 235: "child 1: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (241,41) size 0x0
+        RenderText {#text} at (6,46) size 235x19
+          text run at (6,46) width 235: "child 2: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (241,61) size 0x0
+        RenderText {#text} at (6,66) size 251x19
+          text run at (6,66) width 251: "child 3: PASS: found color rgb(255, 0, 0)"
+        RenderBR {BR} at (257,81) size 0x0
+        RenderText {#text} at (6,86) size 235x19
+          text run at (6,86) width 235: "child 4: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (241,101) size 0x0
+        RenderText {#text} at (6,106) size 235x19
+          text run at (6,106) width 235: "child 5: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (241,121) size 0x0
+        RenderText {#text} at (6,126) size 251x19
+          text run at (6,126) width 251: "child 6: PASS: found color rgb(255, 0, 0)"
+        RenderBR {BR} at (257,141) size 0x0
+        RenderText {#text} at (6,146) size 235x19
+          text run at (6,146) width 235: "child 7: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (241,161) size 0x0
+        RenderText {#text} at (6,166) size 235x19
+          text run at (6,166) width 235: "child 8: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (241,181) size 0x0
+        RenderText {#text} at (6,186) size 251x19
+          text run at (6,186) width 251: "child 9: PASS: found color rgb(255, 0, 0)"
+        RenderBR {BR} at (257,201) size 0x0
+        RenderText {#text} at (6,206) size 243x19
+          text run at (6,206) width 243: "child 10: PASS: found color rgb(0, 0, 0)"
+        RenderBR {BR} at (249,221) size 0x0
+        RenderText {#text} at (6,226) size 273x19
+          text run at (6,226) width 273: "div 1: PASS: found color rgb(153, 153, 255)"
+        RenderBR {BR} at (279,241) size 0x0
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index f87eeaa..aa30adf2 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2794,3 +2794,5 @@ BUG14014 DEBUG : LayoutTests/fast/events/tabindex-focus-chain.html = FAIL
 BUG14061 : LayoutTests/svg/filters/subRegion-one-effect.svg = FAIL
 BUG14061 : LayoutTests/svg/filters/subRegion-two-effects.svg = FAIL
 
+// Webkit 44668:44682
+BUGMERGE REBASELINE WIN : LayoutTests/fast/css/nth-child-dynamic.html = FAIL
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index ce82a5f..c5e8f18 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1837,6 +1837,8 @@
         '../third_party/WebKit/WebCore/inspector/InspectorDOMStorageResource.h',
         '../third_party/WebKit/WebCore/inspector/InspectorFrontend.cpp',
         '../third_party/WebKit/WebCore/inspector/InspectorFrontend.h',
+        '../third_party/WebKit/WebCore/inspector/InspectorJSONObject.cpp',
+        '../third_party/WebKit/WebCore/inspector/InspectorJSONObject.h',
         '../third_party/WebKit/WebCore/inspector/InspectorResource.cpp',
         '../third_party/WebKit/WebCore/inspector/InspectorResource.h',
         '../third_party/WebKit/WebCore/inspector/JavaScriptCallFrame.cpp',
@@ -1848,8 +1850,6 @@
         '../third_party/WebKit/WebCore/inspector/JavaScriptProfile.h',
         '../third_party/WebKit/WebCore/inspector/JavaScriptProfileNode.cpp',
         '../third_party/WebKit/WebCore/inspector/JavaScriptProfileNode.h',
-        '../third_party/WebKit/WebCore/inspector/JSONObject.cpp',
-        '../third_party/WebKit/WebCore/inspector/JSONObject.h',
         '../third_party/WebKit/WebCore/loader/appcache/ApplicationCache.cpp',
         '../third_party/WebKit/WebCore/loader/appcache/ApplicationCache.h',
         '../third_party/WebKit/WebCore/loader/appcache/ApplicationCacheGroup.cpp',