WebKit Roll 56151:56165.

TBR=japhet
TEST=none
BUG=possibly

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

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

5 files changed, 32 insertions, 6 deletions

diff --git a/DEPS b/DEPS
index a554e09..25245ef 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "56151",
+  "webkit_revision": "56165",
   "ffmpeg_revision": "41907",
   "skia_revision": "504",
   "chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.checksum
new file mode 100644
index 0000000..1aea865
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.checksum
@@ -0,0 +1 @@
+e3133035298456c6bcc7bc9a7c1734cd
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.png
new file mode 100644
index 0000000..5d548ba
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt
new file mode 100644
index 0000000..bb0b6ec
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt
@@ -0,0 +1,26 @@
+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 784x20
+        RenderText {#text} at (0,0) size 156x19
+          text run at (0,0) width 156: "On Chromium Linux with "
+        RenderInline {TT} at (0,0) size 80x16
+          RenderText {#text} at (156,3) size 80x16
+            text run at (156,3) width 80: "test_shell"
+        RenderText {#text} at (236,0) size 18x19
+          text run at (236,0) width 18: " in "
+        RenderInline {TT} at (0,0) size 104x16
+          RenderText {#text} at (254,3) size 104x16
+            text run at (254,3) width 104: "--layout-test"
+        RenderText {#text} at (358,0) size 42x19
+          text run at (358,0) width 42: " mode "
+        RenderInline {I} at (0,0) size 27x19
+          RenderText {#text} at (400,0) size 27x19
+            text run at (400,0) width 27: "only"
+        RenderText {#text} at (427,0) size 317x19
+          text run at (427,0) width 317: " the following text should render without anti-aliasing:"
+      RenderBlock {P} at (0,36) size 784x19
+        RenderText {#text} at (0,0) size 262x18
+          text run at (0,0) width 262: "Testing fontconfig render preferences."
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 85dc8d0..adf308a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -209,6 +209,10 @@ BUG36681 DEFER SKIP : java = TEXT
 // Chrome does not support Java LiveConnect.
 WONTFIX SKIP : java/lc3 = TEXT
 
+// this test doesn't make sense on Win or Mac.
+// TODO: move to platform/chromium-linux/.
+WONTFIX SKIP MAC WIN : platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle.html = FAIL
+
 // -----------------------------------------------------------------
 // WONTFIX TESTS
 // -----------------------------------------------------------------
@@ -2797,8 +2801,6 @@ BUG_JIANLI MAC : fast/forms/select-style.html = IMAGE PASS
 BUG38375 : plugins/round-trip-npobject.html = TEXT
 BUG38376 WIN : editing/deleting/5390681-2.html = IMAGE+TEXT
 
-// Started failing after Chromium r41620. Need rebaseline.
-
 // WebKit roll 55940 -> 56004
 BUG38228 : fast/events/drag-and-drop.html = TEXT
 
@@ -2822,9 +2824,6 @@ BUG38347 WIN : fast/events/touch = TEXT PASS
 BUG38353 MAC LINUX : plugins/keyboard-events.html = TEXT
 BUG38353 MAC LINUX : http/tests/plugins/plugin-document-has-focus.html = TIMEOUT
 
-// will rebaseline
-BUG_DGLAZKOV WIN : svg/text/text-intro-05-t.svg = FAIL
-
 BUG38392 : plugins/resize-from-plugin.html = TEXT
 
 // Chromium r41818 makes these flaky.