Changeset 151704 in webkit

Timestamp:

Jun 18, 2013, 3:44:24 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Infrequent uncaught exception with debugger popovers breaks inspector
​https://bugs.webkit.org/show_bug.cgi?id=117755

Create the ZERO_SIZE and ZERO_RECT objects after we've setup the Size
and Rect prototypes, so they get the expected methods. We then need to
handle the ZERO_RECT case better, and not attempt to draw a background
in a canvas with a 0 size, which would produce an exception.

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2013-06-18
Reviewed by Timothy Hatcher.

• UserInterface/Geometry.js:
• UserInterface/Popover.js:

(WebInspector.Popover.prototype._update):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Geometry.js (modified) (4 diffs)
• UserInterface/Popover.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2013-06-18  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Infrequent uncaught exception with debugger popovers breaks inspector
+        https://bugs.webkit.org/show_bug.cgi?id=117755
+
+        Create the ZERO_SIZE and ZERO_RECT objects after we've setup the Size
+        and Rect prototypes, so they get the expected methods. We then need to
+        handle the ZERO_RECT case better, and not attempt to draw a background
+        in a canvas with a 0 size, which would produce an exception.
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Geometry.js:
+        * UserInterface/Popover.js:
+        (WebInspector.Popover.prototype._update):
+
 2013-06-18  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Geometry.js

@@ -66 +66 @@
 };
 
-WebInspector.Size.ZERO_SIZE = new WebInspector.Size(0, 0);
-
 WebInspector.Size.prototype = {
     constructor: WebInspector.Size,
@@ -87 +85 @@
 };
 
+WebInspector.Size.ZERO_SIZE = new WebInspector.Size(0, 0);
+
+
 WebInspector.Rect = function(x, y, width, height)
 {
@@ -92 +93 @@
     this.size = new WebInspector.Size(width || 0, height || 0);
 };
-
-WebInspector.Rect.ZERO_RECT = new WebInspector.Rect(0, 0, 0, 0);
 
 WebInspector.Rect.rectFromClientRect = function(clientRect)
@@ -177 +176 @@
 };
 
+WebInspector.Rect.ZERO_RECT = new WebInspector.Rect(0, 0, 0, 0);
+
+
 WebInspector.EdgeInsets = function(top, right, bottom, left)
 {

trunk/Source/WebInspectorUI/UserInterface/Popover.js

@@ -218 +218 @@
         var anchorPoint;
         var bestFrame = bestMetrics.frame;
-        switch (bestEdge) {
-        case WebInspector.RectEdge.MIN_X: // Displayed on the left of the target, arrow points right.
-            anchorPoint = new WebInspector.Point(bestFrame.size.width - WebInspector.Popover.ShadowPadding, targetFrame.midY() - bestFrame.minY());
-            break;
-        case WebInspector.RectEdge.MAX_X: // Displayed on the right of the target, arrow points left.
-            anchorPoint = new WebInspector.Point(WebInspector.Popover.ShadowPadding, targetFrame.midY() - bestFrame.minY());
-            break;
-        case WebInspector.RectEdge.MIN_Y: // Displayed above the target, arrow points down.
-            anchorPoint = new WebInspector.Point(targetFrame.midX() - bestFrame.minX(), bestFrame.size.height - WebInspector.Popover.ShadowPadding);
-            break;
-        case WebInspector.RectEdge.MAX_Y: // Displayed below the target, arrow points up.
-            anchorPoint = new WebInspector.Point(targetFrame.midX() - bestFrame.minX(), WebInspector.Popover.ShadowPadding);
-            break;
-        }
 
         var needsToDrawBackground = !this._frame.size.equals(bestFrame.size) || this._edge !== bestEdge;
@@ -238 +224 @@
         this._edge = bestEdge;
 
-        this._element.classList.add(this._cssClassNameForEdge());
-
-        if (needsToDrawBackground)
-            this._drawBackground(bestEdge, anchorPoint);
-
-        // Make sure content is centered in case either of the dimension is smaller than the minimal bounds.
-        if (this._preferredSize.width < WebInspector.Popover.MinWidth || this._preferredSize.height < WebInspector.Popover.MinHeight)
-            this._container.classList.add("center");
-        else
-            this._container.classList.remove("center");
-        
+        if (this.frame === WebInspector.Rect.ZERO_RECT) {
+            // The target for the popover is offscreen.
+            this.dismiss();
+        } else {
+            switch (bestEdge) {
+            case WebInspector.RectEdge.MIN_X: // Displayed on the left of the target, arrow points right.
+                anchorPoint = new WebInspector.Point(bestFrame.size.width - WebInspector.Popover.ShadowPadding, targetFrame.midY() - bestFrame.minY());
+                break;
+            case WebInspector.RectEdge.MAX_X: // Displayed on the right of the target, arrow points left.
+                anchorPoint = new WebInspector.Point(WebInspector.Popover.ShadowPadding, targetFrame.midY() - bestFrame.minY());
+                break;
+            case WebInspector.RectEdge.MIN_Y: // Displayed above the target, arrow points down.
+                anchorPoint = new WebInspector.Point(targetFrame.midX() - bestFrame.minX(), bestFrame.size.height - WebInspector.Popover.ShadowPadding);
+                break;
+            case WebInspector.RectEdge.MAX_Y: // Displayed below the target, arrow points up.
+                anchorPoint = new WebInspector.Point(targetFrame.midX() - bestFrame.minX(), WebInspector.Popover.ShadowPadding);
+                break;
+            }
+
+            this._element.classList.add(this._cssClassNameForEdge());
+
+            if (needsToDrawBackground)
+                this._drawBackground(bestEdge, anchorPoint);
+
+            // Make sure content is centered in case either of the dimension is smaller than the minimal bounds.
+            if (this._preferredSize.width < WebInspector.Popover.MinWidth || this._preferredSize.height < WebInspector.Popover.MinHeight)
+                this._container.classList.add("center");
+            else
+                this._container.classList.remove("center");
+        }
+
         // Wrap the content in the container so that it's located correctly.
         if (this._contentNeedsUpdate) {