[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
podivilov at chromium.org
podivilov at chromium.org
Wed Dec 22 14:31:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0fb87a25a22c69033feb663b5c7f8319892f2743
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 12 11:55:50 2010 +0000
2010-10-12 Pavel Podivilov <podivilov at chromium.org>
Unreviewed, build fix.
Build fix for r69567.
* inspector/dom-breakpoints.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8acc457..ef6075b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-12 Pavel Podivilov <podivilov at chromium.org>
+
+ Unreviewed, build fix.
+
+ Build fix for r69567.
+
+ * inspector/dom-breakpoints.html:
+
2010-10-12 Nikolas Zimmermann <nzimmermann at rim.com>
Rubber-stamped by Dirk Schulze.
diff --git a/LayoutTests/inspector/dom-breakpoints.html b/LayoutTests/inspector/dom-breakpoints.html
index b66a151..076c404 100644
--- a/LayoutTests/inspector/dom-breakpoints.html
+++ b/LayoutTests/inspector/dom-breakpoints.html
@@ -25,6 +25,8 @@ function removeElement(elementId)
var test = function()
{
+ var subtreeModifiedBreakpoint;
+ var attributeModifiedBreakpoint;
testInsertChild = {};
testInsertChild.step1 = function()
{
@@ -33,7 +35,7 @@ var test = function()
};
testInsertChild.step2 = function(node)
{
- node.setBreakpoint(WebInspector.DOMBreakpoint.Types.SubtreeModified);
+ subtreeModifiedBreakpoint = WebInspector.breakpointManager.createDOMBreakpoint(node.id, WebInspector.DOMBreakpointTypes.SubtreeModified);
InspectorTest.addResult("Set 'Subtree Modified' DOM breakpoint on rootElement.");
InspectorTest.evaluateInPageWithTimeout("appendElement('rootElement', 'childElement')");
InspectorTest.addResult("Append childElement to rootElement.");
@@ -71,11 +73,7 @@ var test = function()
testRemoveChild.step2 = function(callFrames)
{
dumpStatus(callFrames);
- findDOMNodeById("rootElement", testRemoveChild.step3);
- }
- testRemoveChild.step3 = function(node)
- {
- node.removeBreakpoint(WebInspector.DOMBreakpoint.Types.SubtreeModified);
+ subtreeModifiedBreakpoint.remove();
InspectorTest.resumeExecution(testModifyAttribute.step1);
}
@@ -87,7 +85,7 @@ var test = function()
}
testModifyAttribute.step2 = function(node)
{
- node.setBreakpoint(WebInspector.DOMBreakpoint.Types.AttributeModified);
+ attributeModifiedBreakpoint = WebInspector.breakpointManager.createDOMBreakpoint(node.id, WebInspector.DOMBreakpointTypes.AttributeModified);
InspectorTest.addResult("Set 'Attribute Modified' DOM breakpoint on rootElement.");
InspectorTest.evaluateInPageWithTimeout("modifyAttribute('rootElement', 'className', 'foo')");
InspectorTest.addResult("Modify rootElement className.");
@@ -96,7 +94,7 @@ var test = function()
testModifyAttribute.step3 = function(node, callFrames)
{
dumpStatus(callFrames);
- node.removeBreakpoint(WebInspector.DOMBreakpoint.Types.AttributeModified);
+ attributeModifiedBreakpoint.remove();
InspectorTest.resumeExecution(testRemoveNode.step1);
}
@@ -113,7 +111,7 @@ var test = function()
}
testRemoveNode.step3 = function(node)
{
- node.setBreakpoint(WebInspector.DOMBreakpoint.Types.NodeRemoved);
+ WebInspector.breakpointManager.createDOMBreakpoint(node.id, WebInspector.DOMBreakpointTypes.NodeRemoved);
InspectorTest.addResult("Set 'Node Removed' DOM breakpoint on elementToRemove.");
InspectorTest.evaluateInPageWithTimeout("removeElement('elementToRemove')");
InspectorTest.addResult("Remove elementToRemove.");
@@ -133,7 +131,7 @@ var test = function()
}
testReload.step2 = function(node)
{
- node.setBreakpoint(WebInspector.DOMBreakpoint.Types.SubtreeModified);
+ WebInspector.breakpointManager.createDOMBreakpoint(node.id, WebInspector.DOMBreakpointTypes.SubtreeModified);
InspectorTest.addResult("Set 'Subtree Modified' DOM breakpoint on rootElement.");
InspectorTest.reloadPage(testReload.step3);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list