summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webdevtoolsagent_impl.cc9
-rw-r--r--webkit/glue/webdevtoolsclient_impl.cc25
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt63
3 files changed, 26 insertions, 71 deletions
diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc
index 3cbfca2..d61f3b7 100644
--- a/webkit/glue/webdevtoolsagent_impl.cc
+++ b/webkit/glue/webdevtoolsagent_impl.cc
@@ -317,10 +317,15 @@ 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::INSPECTORBACKEND,
- ic->inspectorBackend()));
+ V8DOMWrapper::convertToV8Object(V8ClassIndex::INSPECTORCONTROLLER, ic));
}
// static
diff --git a/webkit/glue/webdevtoolsclient_impl.cc b/webkit/glue/webdevtoolsclient_impl.cc
index 6095e61..4c25481 100644
--- a/webkit/glue/webdevtoolsclient_impl.cc
+++ b/webkit/glue/webdevtoolsclient_impl.cc
@@ -9,7 +9,6 @@
#include "Document.h"
#include "DOMWindow.h"
#include "Frame.h"
-#include "InspectorBackend.h"
#include "InspectorController.h"
#include "Node.h"
#include "Page.h"
@@ -69,9 +68,12 @@ class ToolsAgentNativeDelegateImpl : public ToolsAgentNativeDelegate {
InspectorController* ic = frame_->frame()->page()->inspectorController();
if (request.frame && request.frame->attached()) {
- ic->inspectorBackend()->addSourceToFrame(request.mime_type,
- content,
- request.frame.get());
+ // 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());
}
}
@@ -166,9 +168,16 @@ 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::v8InspectorBackendSearchCallback);
+ WebCore::V8Custom::v8InspectorControllerSearchCallback);
dev_tools_host_->AddProtoFunction(
"getPlatform",
WebDevToolsClientImpl::JsGetPlatform);
@@ -276,7 +285,11 @@ v8::Handle<v8::Value> WebDevToolsClientImpl::JsAddSourceToFrame(
Page* page = V8Proxy::retrieveFrameForEnteredContext()->page();
InspectorController* inspectorController = page->inspectorController();
- return WebCore::v8Boolean(inspectorController->inspectorBackend()->
+ // 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->
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 13e7b97..6acd2e6 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3111,66 +3111,3 @@ 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_DARIN WIN LINUX : LayoutTests/editing/style/remove-underline-from-stylesheet.html = FAIL
-BUG_DARIN MAC : LayoutTests/http/tests/misc/acid3.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b.svg = CRASH
-BUG_DARIN MAC : LayoutTests/svg/custom/baseval-animval-equality.svg = CRASH
-BUG_DARIN MAC : LayoutTests/svg/custom/dynamic-svg-document-creation.svg = CRASH
-BUG_DARIN MAC : LayoutTests/svg/custom/js-update-gradient.svg = CRASH
-BUG_DARIN MAC : LayoutTests/svg/custom/js-update-pattern.svg = CRASH
-BUG_DARIN MAC : LayoutTests/svg/custom/svg-xml-dom-sync.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/custom/text-dom-01-f.svg = CRASH
-BUG_DARIN MAC : LayoutTests/svg/custom/use-instanceRoot-event-bubbling.xhtml = CRASH
-BUG_DARIN MAC : LayoutTests/svg/custom/use-property-changes-through-svg-dom.svg = CRASH
-BUG_DARIN MAC : LayoutTests/svg/custom/viewport-update2.svg = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dom/animated-tearoff-equality.xhtml = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dom/animated-tearoff-lifespan.xhtml = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cx-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cy-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-r-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGCursorElement-svgdom-x-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGCursorElement-svgdom-y-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cx-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cy-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-rx-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-ry-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-height-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-width-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-x-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-y-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-height-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-width-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-x-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-y-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x1-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x2-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y1-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y2-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x1-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x2-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y1-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y2-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerHeight-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerWidth-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refX-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refY-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-height-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-width-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-x-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-y-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-height-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-width-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-x-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-y-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cx-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cy-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fx-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fy-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-r-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-height-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-width-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-x-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-y-prop.html = CRASH
-BUG_DARIN MAC : LayoutTests/svg/hixie/dynamic/005.xml = CRASH
generated by cgit v1.1 at 2025-01-21 05:08:02 +0000