[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[podivilov at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 4c0a19530eacd94ed456b62a39b433e398133d8e
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 20 12:31:57 2011 +0000

    2011-01-19  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Web Inspector: enable debugger-pause-on-breakpoint test (fixed by r76129).
            https://bugs.webkit.org/show_bug.cgi?id=45291
    
            * http/tests/inspector/debugger-test2.js:
            (initialize_DebuggerTest.InspectorTest.setBreakpointInVisibleView):
            * inspector/debugger-breakpoints-not-activated-on-reload.html:
            * inspector/debugger-pause-on-breakpoint.html:
            * platform/gtk/Skipped:
            * platform/mac-leopard/Skipped:
            * platform/win/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76225 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 371ae32..d5e85a8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-19  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Web Inspector: enable debugger-pause-on-breakpoint test (fixed by r76129).
+        https://bugs.webkit.org/show_bug.cgi?id=45291
+
+        * http/tests/inspector/debugger-test2.js:
+        (initialize_DebuggerTest.InspectorTest.setBreakpointInVisibleView):
+        * inspector/debugger-breakpoints-not-activated-on-reload.html:
+        * inspector/debugger-pause-on-breakpoint.html:
+        * platform/gtk/Skipped:
+        * platform/mac-leopard/Skipped:
+        * platform/win/Skipped:
+
 2011-01-20  Philippe Normand  <pnormand at igalia.com>
 
         Skip failing tests due to missing trailing white space
diff --git a/LayoutTests/http/tests/inspector/debugger-test2.js b/LayoutTests/http/tests/inspector/debugger-test2.js
index cd70cda..1792802 100644
--- a/LayoutTests/http/tests/inspector/debugger-test2.js
+++ b/LayoutTests/http/tests/inspector/debugger-test2.js
@@ -90,11 +90,9 @@ InspectorTest.captureStackTrace = function(callFrames)
     }
 };
 
-InspectorTest.setBreakpoint = function(url, lineNumber, enabled, condition, callback)
+InspectorTest.setBreakpointInVisibleView = function(lineNumber, enabled, condition)
 {
-    var scripts = WebInspector.debuggerModel.scriptsForURL(url);
-    for (var i = 0; i < scripts.length; ++i)
-        WebInspector.debuggerModel.setBreakpoint(scripts[i].sourceID, lineNumber, enabled, condition);
+    WebInspector.currentPanel.visibleView.sourceFrame._setBreakpoint(lineNumber, enabled, condition);
 }
 
 InspectorTest._pausedScript = function(details)
diff --git a/LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload.html b/LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload.html
index e70e71d..d828839 100644
--- a/LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload.html
+++ b/LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload.html
@@ -24,7 +24,7 @@ var test = function()
     function step2()
     {
         InspectorTest.addResult("Main resource was shown.");
-        InspectorTest.setBreakpoint(WebInspector.mainResource.url, 8, true, "");
+        InspectorTest.setBreakpointInVisibleView(8, true, "");
         WebInspector.panels.scripts.toggleBreakpointsButton.element.click();
         InspectorTest.reloadPage(step4);
     }
diff --git a/LayoutTests/inspector/debugger-pause-on-breakpoint.html b/LayoutTests/inspector/debugger-pause-on-breakpoint.html
index 43260b2..b3b871b 100644
--- a/LayoutTests/inspector/debugger-pause-on-breakpoint.html
+++ b/LayoutTests/inspector/debugger-pause-on-breakpoint.html
@@ -22,7 +22,7 @@ var test = function()
     function step2()
     {
         InspectorTest.addResult("Script source was shown.");
-        InspectorTest.setBreakpoint(WebInspector.mainResource.url, 9, true, "");
+        InspectorTest.setBreakpointInVisibleView(8, true, "");
         InspectorTest.runTestFunctionAndWaitUntilPaused(step3);
     }
 
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 246da30..100c677 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5371,10 +5371,6 @@ editing/selection/doubleclick-beside-cr-span.html
 # https://bugs.webkit.org/show_bug.cgi?id=43034
 inspector/debugger-breakpoints-not-activated-on-reload.html
 
-# Inlined scripts has wrong starting line (always 1).
-# https://bugs.webkit.org/show_bug.cgi?id=45291
-inspector/debugger-pause-on-breakpoint.html
-
 # Fails because multiple clicks in a row in the same place
 # register as a triple-click even though the mouse have moved
 # outside of the double-click distance.
diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index 365f8ba..7942c7a 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -192,6 +192,3 @@ svg/batik/text/smallFonts.svg
 # fast/text/font-size-zero.html failing on leopard debug bot
 # https://bugs.webkit.org/show_bug.cgi?id=50468
 fast/text/font-size-zero.html
-
-# inspector flake
-inspector/debugger-pause-on-breakpoint.html
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index a7456cb..536c2f9 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -321,9 +321,6 @@ http/tests/xmlhttprequest/xmlhttprequest-sync-vs-async-assertion-failure.html
 # Failing in Release builds http://webkit.org/b/46976
 fast/js/sputnik/Conformance/11_Expressions/11.7_Bitwise_Shift_Operators/11.7.3_The_Unsigned_Right_Shift_Operator/S11.7.3_A2.3_T1.html
 
-# Timing out http://webkit.org/b/46977
-inspector/debugger-pause-on-breakpoint.html
-
 # Sometimes fails https://webkit.org/b/49412
 inspector/timeline-network-resource.html
 

-- 
WebKit Debian packaging