WebKit roll 87266:87314.

Update test expectations to include suppressions that can
be removed in the next roll.

TBR=ukai@chromium.org

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

DEPS

@@ -4,7 +4,7 @@ vars = {
   "googlecode_url": "http://%s.googlecode.com/svn",
   "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
   "nacl_trunk": "http://src.chromium.org/native_client/trunk",
-  "webkit_revision": "87266",
+  "webkit_revision": "87314",
   "chromium_git": "http://git.chromium.org/git",
   "swig_revision": "69281",
   # These hashes need to be updated when nacl_revision is changed.

webkit/tools/layout_tests/test_expectations.txt

@@ -22,13 +22,14 @@ BUG_HCLAM WIN : svg/text/text-intro-05-t.svg = IMAGE
 // Failure introduced by Chromium r83848.
 BUG_HCLAM : fast/url/ipv6.html = TEXT
 
-// V8 now throws errors when trying to invoke native functions on null or
-// undefined with apply or call. Will fix this upstream and delete when
-// webkit has been rolled with these fixes.
-BUG_RICOW : ietestcenter/Javascript/15.4.4.14-5-28.html = TEXT
-BUG_RICOW : ietestcenter/Javascript/15.4.4.15-5-28.html = TEXT
-BUG_RICOW : ietestcenter/Javascript/15.5.4.20-1-1.html = TEXT
-BUG_RICOW : ietestcenter/Javascript/15.5.4.20-1-2.html = TEXT
-
 // Temporary until expectations are updated after execScript removal.
 BUGAGER : fast/dom/prototype-inheritance.html = PASS TEXT
+
+// Almost fixed upstream by WebKit r87291, but expectations were accidentally
+// emptied instead of removed.  Get rid of these lines in the next roll that
+// includes the properly deleted expectations.
+BUG_ADAMK : ietestcenter/Javascript/15.5.4.20-1-1.html = PASS TEXT MISSING
+BUG_ADAMK : ietestcenter/Javascript/15.5.4.20-1-2.html = PASS TEXT MISSING
+
+// Remove once we roll past r87318
+BUG_ADAMK : fast/canvas/canvas-composite.html = IMAGE