[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit da474693b403ae01f184848131f2a2783d5f0234
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 18:53:56 2010 +0000

    2010-02-18  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: multiple popovers on screen at the same time.
    
            https://bugs.webkit.org/show_bug.cgi?id=35105
    
            * inspector/front-end/Popover.js:
            (WebInspector.Popover.prototype.show):
            (WebInspector.Popover.prototype.hide):
            * inspector/front-end/SourceFrame.js:
            (WebInspector.SourceFrame.prototype._showPopup):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54974 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c6fa286..ceb53f7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Timothy Hatcher.
 
+        Web Inspector: multiple popovers on screen at the same time.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35105
+
+        * inspector/front-end/Popover.js:
+        (WebInspector.Popover.prototype.show):
+        (WebInspector.Popover.prototype.hide):
+        * inspector/front-end/SourceFrame.js:
+        (WebInspector.SourceFrame.prototype._showPopup):
+
+2010-02-18  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
         Web Inspector: Expand Object.__proto__ properly.
 
         https://bugs.webkit.org/show_bug.cgi?id=35113
diff --git a/WebCore/inspector/front-end/InjectedScript.js b/WebCore/inspector/front-end/InjectedScript.js
index 96c6428..8d8fa88 100644
--- a/WebCore/inspector/front-end/InjectedScript.js
+++ b/WebCore/inspector/front-end/InjectedScript.js
@@ -1148,7 +1148,8 @@ InjectedScript.createProxyObject = function(object, objectId, abbreviate)
         result.propertyLength = object.length;
 
     var type = typeof object;
-    result.hasChildren = (type === "object" && object !== null && Object.getOwnPropertyNames(object).length) || type === "function";
+    
+    result.hasChildren = (type === "object" && object !== null && (Object.getOwnPropertyNames(object).length || object.__proto__)) || type === "function";
     try {
         result.description = InjectedScript._describe(object, abbreviate);
     } catch (e) {
diff --git a/WebCore/inspector/front-end/Popover.js b/WebCore/inspector/front-end/Popover.js
index 8894b82..70e4ac9 100644
--- a/WebCore/inspector/front-end/Popover.js
+++ b/WebCore/inspector/front-end/Popover.js
@@ -43,6 +43,11 @@ WebInspector.Popover = function(contentElement)
 WebInspector.Popover.prototype = {
     show: function(anchor, preferredWidth, preferredHeight)
     {
+        // This should not happen, but we hide previous popup to be on the safe side.
+        if (WebInspector.Popover._popoverElement)
+            document.body.removeChild(WebInspector.Popover._popoverElement);
+        WebInspector.Popover._popoverElement = this.element;
+
         // Temporarily attach in order to measure preferred dimensions.
         this.contentElement.positionAt(0, 0);
         document.body.appendChild(this.contentElement);
@@ -57,6 +62,7 @@ WebInspector.Popover.prototype = {
 
     hide: function()
     {
+        delete WebInspector.Popover._popoverElement;
         document.body.removeChild(this.element);
     },
 
diff --git a/WebCore/inspector/front-end/SourceFrame.js b/WebCore/inspector/front-end/SourceFrame.js
index b5a68fe..799628e 100644
--- a/WebCore/inspector/front-end/SourceFrame.js
+++ b/WebCore/inspector/front-end/SourceFrame.js
@@ -542,6 +542,10 @@ WebInspector.SourceFrame.prototype = {
             if (this._hidePopupTimer) {
                 clearTimeout(this._hidePopupTimer);
                 delete this._hidePopupTimer;
+
+                // We know that we reached the popup, but we might have moved over other elements.
+                // Discard pending command.
+                this._resetHoverTimer();
             }
         }
 

-- 
WebKit Debian packaging