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

pfeldman at chromium.org pfeldman at chromium.org
Wed Dec 22 11:31:59 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit b62285bddc58737bce701a29a2e20a40a90daccb
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 28 14:59:02 2010 +0000

    2010-07-28  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed: chromium tests fix.
            Chromium Dev Tools: [REGRESSION] Pause is not working.
    
            https://bugs.webkit.org/show_bug.cgi?id=43118
    
            * src/js/DevTools.js:
            (InspectorBackend.pause):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64204 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2f31dc3..d8c96e3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-28  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed: chromium tests fix.
+        Chromium Dev Tools: [REGRESSION] Pause is not working.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43118
+
+        * inspector/front-end/InspectorBackendStub.js:
+
 2010-07-28  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/inspector/front-end/InspectorBackendStub.js b/WebCore/inspector/front-end/InspectorBackendStub.js
index bc344f8..7cfc8a1 100644
--- a/WebCore/inspector/front-end/InspectorBackendStub.js
+++ b/WebCore/inspector/front-end/InspectorBackendStub.js
@@ -28,8 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-if (!window.InspectorBackend) {
-
 WebInspector.InspectorBackendStub = function()
 {
     this._registerDelegate("addInspectedNode");
@@ -129,5 +127,3 @@ WebInspector.InspectorBackendStub.prototype = {
 }
 
 InspectorBackend = new WebInspector.InspectorBackendStub();
-
-}
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 7627a88..d0b1792 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-28  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed: chromium tests fix.
+        Chromium Dev Tools: [REGRESSION] Pause is not working.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43118
+
+        * src/js/DevTools.js:
+        (InspectorBackend.pause):
+
 2010-07-27  Kinuko Yasuda  <kinuko at chromium.org>
 
         Reviewed by Ojan Vafai.
diff --git a/WebKit/chromium/src/js/DevTools.js b/WebKit/chromium/src/js/DevTools.js
index 53309ad..640474b 100644
--- a/WebKit/chromium/src/js/DevTools.js
+++ b/WebKit/chromium/src/js/DevTools.js
@@ -297,3 +297,10 @@ WebInspector.resetToolbarColors = function()
 if (window.RemoteDebuggerAgent) {
     RemoteDebuggerAgent.setContextId = function() {};
 }
+
+
+// Support for pause while renderer is busy (is dispatched on IO thread).
+InspectorBackend.pause = function()
+{
+    RemoteDebuggerCommandExecutor.DebuggerPauseScript();
+};

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list