[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

pfeldman at chromium.org pfeldman at chromium.org
Thu Oct 29 20:42:33 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit ed773a35bd58412a3e7f684cccfd8e03e3e69079
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 9 19:12:17 2009 +0000

    2009-10-09  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Fix Chromium breakage.
    
            https://bugs.webkit.org/show_bug.cgi?id=30104
    
            * inspector/front-end/inspector.js:
            (WebInspector.addCookieDomain): check that Storage panel is present before calling its methods.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49399 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c9af55a..36b2b33 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-09  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Fix Chromium breakage.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30104
+
+        * inspector/front-end/inspector.js:
+        (WebInspector.addCookieDomain): check that Storage panel is present before calling its methods.
+
 2009-10-09  Joe Ligman  <joseph.ligman at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index f090d3a..76473ab 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1043,7 +1043,8 @@ WebInspector.addDatabase = function(payload)
 
 WebInspector.addCookieDomain = function(domain)
 {
-    this.panels.storage.addCookieDomain(domain);
+    if (this.panels.storage)
+        this.panels.storage.addCookieDomain(domain);
 }
 
 WebInspector.addDOMStorage = function(payload)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list