summaryrefslogtreecommitdiffstats
path: root/webkit/data
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-11 22:31:11 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-11 22:31:11 +0000
commitbf4a54e5121229de82400d8c8bc58b4fad162caa (patch)
tree32855691eda982af5333b7db033fb8ac5d15a5be /webkit/data
parenta94fa37aeccca29e274fabf749317fa95b57f20b (diff)
downloadchromium_src-bf4a54e5121229de82400d8c8bc58b4fad162caa.zip
chromium_src-bf4a54e5121229de82400d8c8bc58b4fad162caa.tar.gz
chromium_src-bf4a54e5121229de82400d8c8bc58b4fad162caa.tar.bz2
Add a baseline from merge for mac.
TBR=dglazkov Review URL: http://codereview.chromium.org/115208 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15802 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/webarchive/test-link-rel-icon-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/webarchive/test-link-rel-icon-expected.pngbin0 -> 2787 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/webarchive/test-link-rel-icon-expected.txt6
3 files changed, 7 insertions, 0 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/webarchive/test-link-rel-icon-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/webarchive/test-link-rel-icon-expected.checksum
new file mode 100644
index 0000000..d69a371
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/webarchive/test-link-rel-icon-expected.checksum
@@ -0,0 +1 @@
+853de00567d121bea0b7bece66a5d61c \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/webarchive/test-link-rel-icon-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/webarchive/test-link-rel-icon-expected.png
new file mode 100644
index 0000000..d8c9f68
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/webarchive/test-link-rel-icon-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/webarchive/test-link-rel-icon-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/webarchive/test-link-rel-icon-expected.txt
new file mode 100644
index 0000000..24eb21c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/webarchive/test-link-rel-icon-expected.txt
@@ -0,0 +1,6 @@
+CONSOLE MESSAGE: line 7: Uncaught TypeError: Object [object Object] has no method 'setIconDatabaseEnabled'
+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