Update WebKit to r46426.

TBR=levin
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/160204

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

3 files changed, 71 insertions, 26 deletions

diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc
index d61f3b7..3cbfca2 100644
--- a/webkit/glue/webdevtoolsagent_impl.cc
+++ b/webkit/glue/webdevtoolsagent_impl.cc
@@ -317,15 +317,10 @@ void WebDevToolsAgentImpl::InitDevToolsAgentHost() {
   v8::HandleScope scope;
   v8::Context::Scope utility_scope(utility_context_);
   InspectorController* ic = web_view_impl_->page()->inspectorController();
-  // There is a breaking change pending upstream. INSPECTORCONTROLLER was
-  // replaced with INSPECTORBACKEND. Following code should be replaced with:
-  // utility_context_->Global()->Set(
-  //     v8::String::New("InspectorController"),
-  //     V8DOMWrapper::convertToV8Object(V8ClassIndex::INSPECTORBACKEND,
-  //                                     ic->inspectorBackend()));
   utility_context_->Global()->Set(
       v8::String::New("InspectorController"),
-      V8DOMWrapper::convertToV8Object(V8ClassIndex::INSPECTORCONTROLLER, ic));
+      V8DOMWrapper::convertToV8Object(V8ClassIndex::INSPECTORBACKEND,
+                                      ic->inspectorBackend()));
 }
 
 // static
diff --git a/webkit/glue/webdevtoolsclient_impl.cc b/webkit/glue/webdevtoolsclient_impl.cc
index 4c25481..6095e61 100644
--- a/webkit/glue/webdevtoolsclient_impl.cc
+++ b/webkit/glue/webdevtoolsclient_impl.cc
@@ -9,6 +9,7 @@
 #include "Document.h"
 #include "DOMWindow.h"
 #include "Frame.h"
+#include "InspectorBackend.h"
 #include "InspectorController.h"
 #include "Node.h"
 #include "Page.h"
@@ -68,12 +69,9 @@ class ToolsAgentNativeDelegateImpl : public ToolsAgentNativeDelegate {
 
     InspectorController* ic = frame_->frame()->page()->inspectorController();
     if (request.frame && request.frame->attached()) {
-      // There is a breaking change pending upstream. addSourceToFrame now
-      // lives in InspectorBackend. Following code should be replaced with:
-      // ic->inspectorBackend()->addSourceToFrame(request.mime_type,
-      //                                          content,
-      //                                          request.frame.get());
-      ic->addSourceToFrame(request.mime_type, content, request.frame.get());
+      ic->inspectorBackend()->addSourceToFrame(request.mime_type,
+                                               content,
+                                               request.frame.get());
     }
   }
 
@@ -168,16 +166,9 @@ WebDevToolsClientImpl::WebDevToolsClientImpl(
   dev_tools_host_->AddProtoFunction(
       "loaded",
       WebDevToolsClientImpl::JsLoaded);
-  // There is a breaking change pending upstream.
-  // v8InspectorControllerSearchCallback is now
-  // v8InspectorBackendSearchCallback.
-  // Following code should be replaced with:
-  // dev_tools_host_->AddProtoFunction(
-  //     "search",
-  //     WebCore::V8Custom::v8InspectorBackendSearchCallback);
   dev_tools_host_->AddProtoFunction(
       "search",
-      WebCore::V8Custom::v8InspectorControllerSearchCallback);
+      WebCore::V8Custom::v8InspectorBackendSearchCallback);
   dev_tools_host_->AddProtoFunction(
       "getPlatform",
       WebDevToolsClientImpl::JsGetPlatform);
@@ -285,11 +276,7 @@ v8::Handle<v8::Value> WebDevToolsClientImpl::JsAddSourceToFrame(
 
   Page* page = V8Proxy::retrieveFrameForEnteredContext()->page();
   InspectorController* inspectorController = page->inspectorController();
-  // There is a breaking change pending upstream. Following code should be
-  // replaced with:
-  // return WebCore::v8Boolean(inspectorController->inspectorBackend()->
-  //    addSourceToFrame(mime_type, source_string, node));
-  return WebCore::v8Boolean(inspectorController->
+  return WebCore::v8Boolean(inspectorController->inspectorBackend()->
       addSourceToFrame(mime_type, source_string, node));
 }
 
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 6acd2e6..2e3dfdc 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3111,3 +3111,66 @@ BUG_DARIN WIN LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr
 BUG_DARIN WIN LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-column.html = FAIL
 BUG_DARIN WIN LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-row-group.html = FAIL
 BUG_DARIN WIN LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-row.html = FAIL
+
+// Test failures from WebKit merge 46369 to 46417
+BUG_PKASTING WIN LINUX : LayoutTests/editing/style/remove-underline-from-stylesheet.html = FAIL
+BUG_PKASTING MAC : LayoutTests/http/tests/misc/acid3.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b.svg = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/custom/baseval-animval-equality.svg = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/custom/dynamic-svg-document-creation.svg = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/custom/js-update-gradient.svg = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/custom/js-update-pattern.svg = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/custom/svg-xml-dom-sync.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/custom/text-dom-01-f.svg = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/custom/use-instanceRoot-event-bubbling.xhtml = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/custom/use-property-changes-through-svg-dom.svg = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/custom/viewport-update2.svg = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dom/animated-tearoff-equality.xhtml = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dom/animated-tearoff-lifespan.xhtml = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cx-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cy-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-r-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGCursorElement-svgdom-x-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGCursorElement-svgdom-y-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cx-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cy-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-rx-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-ry-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-height-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-width-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-x-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-y-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-height-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-width-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-x-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-y-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x1-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x2-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y1-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y2-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x1-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x2-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y1-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y2-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerHeight-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerWidth-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refX-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refY-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-height-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-width-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-x-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-y-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-height-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-width-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-x-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-y-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cx-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cy-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fx-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fy-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-r-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-height-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-width-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-x-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-y-prop.html = CRASH
+BUG_PKASTING MAC : LayoutTests/svg/hixie/dynamic/005.xml = CRASH
\ No newline at end of file