[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[podivilov at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 0473087942fa38b67396e82f2d7dd654fbf20d49
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 15 12:43:02 2010 +0000

    2010-12-15  Pavel Podivilov  <podivilov at chromium.org>
    
            Unreviewed, fix for r74103.
    
            Fix dom-breakpoints test.
    
            * inspector/dom-breakpoints.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74109 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 354fb76..a6fe75a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-15  Pavel Podivilov  <podivilov at chromium.org>
+
+        Unreviewed, fix for r74103.
+
+        Fix dom-breakpoints test.
+
+        * inspector/dom-breakpoints.html:
+
 2010-12-14  Antti Koivisto  <antti at apple.com>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/LayoutTests/inspector/dom-breakpoints.html b/LayoutTests/inspector/dom-breakpoints.html
index 076c404..eedb689 100644
--- a/LayoutTests/inspector/dom-breakpoints.html
+++ b/LayoutTests/inspector/dom-breakpoints.html
@@ -25,8 +25,7 @@ function removeElement(elementId)
 
 var test = function()
 {
-    var subtreeModifiedBreakpoint;
-    var attributeModifiedBreakpoint;
+    var rootElement;
     testInsertChild = {};
     testInsertChild.step1 = function()
     {
@@ -35,7 +34,8 @@ var test = function()
     };
     testInsertChild.step2 = function(node)
     {
-        subtreeModifiedBreakpoint = WebInspector.breakpointManager.createDOMBreakpoint(node.id, WebInspector.DOMBreakpointTypes.SubtreeModified);
+        rootElement = node;
+        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.");
@@ -73,7 +73,7 @@ var test = function()
     testRemoveChild.step2 = function(callFrames)
     {
         dumpStatus(callFrames);
-        subtreeModifiedBreakpoint.remove();
+        rootElement.breakpoints[WebInspector.DOMBreakpointTypes.SubtreeModified].remove();
         InspectorTest.resumeExecution(testModifyAttribute.step1);
     }
 
@@ -81,20 +81,16 @@ var test = function()
     testModifyAttribute.step1 = function()
     {
         InspectorTest.addResult("Test that 'Attribute Modified' breakpoint is hit when modifying attribute.");
-        findDOMNodeById("rootElement", testModifyAttribute.step2);
-    }
-    testModifyAttribute.step2 = function(node)
-    {
-        attributeModifiedBreakpoint = WebInspector.breakpointManager.createDOMBreakpoint(node.id, WebInspector.DOMBreakpointTypes.AttributeModified);
+        WebInspector.breakpointManager.createDOMBreakpoint(rootElement.id, WebInspector.DOMBreakpointTypes.AttributeModified);
         InspectorTest.addResult("Set 'Attribute Modified' DOM breakpoint on rootElement.");
         InspectorTest.evaluateInPageWithTimeout("modifyAttribute('rootElement', 'className', 'foo')");
         InspectorTest.addResult("Modify rootElement className.");
-        InspectorTest.waitUntilPaused(testModifyAttribute.step3.bind(null, node));
+        InspectorTest.waitUntilPaused(testModifyAttribute.step2.bind(null));
     }
-    testModifyAttribute.step3 = function(node, callFrames)
+    testModifyAttribute.step2 = function(callFrames)
     {
         dumpStatus(callFrames);
-        attributeModifiedBreakpoint.remove();
+        rootElement.breakpoints[WebInspector.DOMBreakpointTypes.AttributeModified].remove();
         InspectorTest.resumeExecution(testRemoveNode.step1);
     }
 

-- 
WebKit Debian packaging