Roll WebKit to r49432

TBR=darin

Also provide stub method for GraphicsContext3D::getActiveAttrib()
and GraphicsContext3D::getActiveUniform().

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

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

2 files changed, 32 insertions, 2 deletions

diff --git a/webkit/api/src/GraphicsContext3D.cpp b/webkit/api/src/GraphicsContext3D.cpp
index 49819f5..1586a99 100644
--- a/webkit/api/src/GraphicsContext3D.cpp
+++ b/webkit/api/src/GraphicsContext3D.cpp
@@ -1299,6 +1299,20 @@ void GraphicsContext3D::generateMipmap(unsigned long target)
     // require a texture readback and re-upload.
 }
 
+bool GraphicsContext3D::getActiveAttrib(CanvasProgram*, unsigned long, ActiveInfo&)
+{
+  // FIXME: implement.
+  notImplemented();
+  return false;
+}
+
+bool GraphicsContext3D::getActiveUniform(CanvasProgram*, unsigned long, ActiveInfo&)
+{
+  // FIXME: implement.
+  notImplemented();
+  return false;
+}
+
 int GraphicsContext3D::getAttribLocation(CanvasProgram* program, const String& name)
 {
     if (!program)
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 4a8cc3e..6bcdc99 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1288,7 +1288,8 @@ BUG10324 WIN LINUX MAC : LayoutTests/editing/selection/caret-rtl-2.html = IMAGE
 // upstream
 // Expectations for this test changed upstream. We should fix this test, but
 // it doesn't need to block the current release
-BUG10325 WIN : LayoutTests/fast/dom/resource-locations-in-created-html-document.html = FAIL
+// Crashes after WebKit toll 49414:49427
+// BUG_HCLAM BUG10325 WIN : LayoutTests/fast/dom/resource-locations-in-created-html-document.html = FAIL
 
 BUG10326 DEBUG : LayoutTests/http/tests/messaging/cross-domain-message-event-dispatch.html = TIMEOUT FAIL PASS
 
@@ -3155,7 +3156,8 @@ BUG_HAMAJI : LayoutTests/fast/css/counters/t1204-increment-00-c-o.html = FAIL
 BUG_HAMAJI : LayoutTests/fast/css/counters/t1204-increment-01-c-o.html = FAIL
 
 // Failing after r28267
-BUG24116 SLOW : LayoutTests/http/tests/loading/gmail-assert-on-load.html = FAIL
+// Crashes after WebKit merge 49414:49427
+// BUG_HCLAM BUG24116 SLOW : LayoutTests/http/tests/loading/gmail-assert-on-load.html = FAIL
 
 // Failing at WebKit Linux (dbg)(3) build 7795
 BUG24119 LINUX DEBUG : LayoutTests/tables/mozilla/bugs/bug1220.html = PASS FAIL
@@ -3182,5 +3184,19 @@ BUG_JOHNNYG : LayoutTests/svg/custom/linking-a-03-b-transform.svg = FAIL
 BUG24454 : LayoutTests/http/tests/globalhistory/history-delegate-basic-visited-links.html = FAIL
 BUG_HCLAM WIN LINUX : LayoutTests/svg/carto.net/selectionlist.svg = CRASH
 BUG_HCLAM MAC : LayoutTests/svg/carto.net/scrollbar.svg = CRASH
+
 // WebKit roll 49405:49413
 BUG_HCLAM : LayoutTests/http/tests/xmlhttprequest/logout.html = FAIL
+
+// WebKit toll 49414:49427
+BUG_HCLAM : LayoutTests/editing/style/5228141.html = FAIL
+BUG_HCLAM : LayoutTests/editing/style/style-boundary-001.html = FAIL
+BUG_HCLAM : LayoutTests/fast/js/string-trim.html = FAIL
+BUG_HCLAM : LayoutTests/fast/dom/onload-open.html = CRASH
+BUG_HCLAM : LayoutTests/fast/dom/resource-locations-in-created-html-document.html = CRASH
+BUG_HCLAM : LayoutTests/fast/events/keypress-focus-change.html = CRASH
+BUG_HCLAM : LayoutTests/fast/events/mouseover-mouseout.html = CRASH
+BUG_HCLAM : LayoutTests/fast/events/mouseover-mouseout2.html = CRASH
+BUG_HCLAM : LayoutTests/http/tests/loading/gmail-assert-on-load.html = CRASH
+BUG_HCLAM : LayoutTests/http/tests/xmlhttprequest/frame-unload-abort-crash.html = CRASH
+BUG_HCLAM : LayoutTests/svg/custom/js-update-transform-changes.svg = CRASH