Changeset 186134 in webkit

Timestamp:

Jun 30, 2015 3:00:36 PM (9 years ago)

Author:

Simon Fraser

Message:

Crash under _layoutForNodeHighlight: when inspecting espn.com
​https://bugs.webkit.org/show_bug.cgi?id=146422

Reviewed by Joseph Pecoraro.
Source/WebKit/mac:

When inspecting espn.com, MobileSafari sometimes crashes, because
highlight.quads is empty. I was not able to quickly determine why.

Fix by bailing in this case.

• WebInspector/WebNodeHighlightView.mm:

(-[WebNodeHighlightView _layoutForNodeHighlight:parent:]):

Source/WebKit2:

When inspecting espn.com, MobileSafari sometimes crashes, because
highlight.quads is empty. I was not able to quickly determine why.

Fix by bailing in this case.

• UIProcess/WKInspectorHighlightView.mm:

(-[WKInspectorHighlightView _layoutForNodeHighlight:]):

Location:

trunk/Source

Files:

• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebInspector/WebNodeHighlightView.mm (modified) (4 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/WKInspectorHighlightView.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2015-06-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Crash under _layoutForNodeHighlight: when inspecting espn.com
+        https://bugs.webkit.org/show_bug.cgi?id=146422
+
+        Reviewed by Joseph Pecoraro.
+
+        When inspecting espn.com, MobileSafari sometimes crashes, because
+        highlight.quads is empty. I was not able to quickly determine why.
+
+        Fix by bailing in this case.
+
+        * WebInspector/WebNodeHighlightView.mm:
+        (-[WebNodeHighlightView _layoutForNodeHighlight:parent:]):
+
 2015-06-30  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm

@@ -262 +262 @@
 }
 
-- (void)_layoutForNodeHighlight:(Highlight*)h parent:(CALayer *)parentLayer
-{
+- (void)_layoutForNodeHighlight:(Highlight*)highlight parent:(CALayer *)parentLayer
+{
+    if (!highlight->quads.size()) {
+        [self _removeAllLayers];
+        return;
+    }
+
     [self _attach:parentLayer numLayers:4];
 
@@ -271 +276 @@
     CAShapeLayer *contentLayer = [_layers objectAtIndex:3];
 
-    FloatQuad marginQuad = h->quads[0];
-    FloatQuad borderQuad = h->quads[1];
-    FloatQuad paddingQuad = h->quads[2];
-    FloatQuad contentQuad = h->quads[3];
-
-    marginLayer.fillColor = cachedCGColor(h->marginColor, ColorSpaceDeviceRGB);
-    borderLayer.fillColor = cachedCGColor(h->borderColor, ColorSpaceDeviceRGB);
-    paddingLayer.fillColor = cachedCGColor(h->paddingColor, ColorSpaceDeviceRGB);
-    contentLayer.fillColor = cachedCGColor(h->contentColor, ColorSpaceDeviceRGB);
+    FloatQuad marginQuad = highlight->quads[0];
+    FloatQuad borderQuad = highlight->quads[1];
+    FloatQuad paddingQuad = highlight->quads[2];
+    FloatQuad contentQuad = highlight->quads[3];
+
+    marginLayer.fillColor = cachedCGColor(highlight->marginColor, ColorSpaceDeviceRGB);
+    borderLayer.fillColor = cachedCGColor(highlight->borderColor, ColorSpaceDeviceRGB);
+    paddingLayer.fillColor = cachedCGColor(highlight->paddingColor, ColorSpaceDeviceRGB);
+    contentLayer.fillColor = cachedCGColor(highlight->contentColor, ColorSpaceDeviceRGB);
 
     layerPathWithHole(marginLayer, marginQuad, borderQuad);
@@ -287 +292 @@
 }
 
-- (void)_layoutForRectsHighlight:(Highlight*)h parent:(CALayer *)parentLayer
-{
-    NSUInteger numLayers = (NSUInteger)h->quads.size();
+- (void)_layoutForRectsHighlight:(Highlight*)highlight parent:(CALayer *)parentLayer
+{
+    NSUInteger numLayers = highlight->quads.size();
     if (!numLayers) {
         [self _removeAllLayers];
@@ -297 +302 @@
     [self _attach:parentLayer numLayers:numLayers];
 
-    CGColorRef contentColor = cachedCGColor(h->contentColor, ColorSpaceDeviceRGB);
+    CGColorRef contentColor = cachedCGColor(highlight->contentColor, ColorSpaceDeviceRGB);
     for (NSUInteger i = 0; i < numLayers; ++i) {
         CAShapeLayer *layer = [_layers objectAtIndex:i];
         layer.fillColor = contentColor;
-        layerPath(layer, h->quads[i]);
+        layerPath(layer, highlight->quads[i]);
     }
 }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Crash under _layoutForNodeHighlight: when inspecting espn.com
+        https://bugs.webkit.org/show_bug.cgi?id=146422
+
+        Reviewed by Joseph Pecoraro.
+        
+        When inspecting espn.com, MobileSafari sometimes crashes, because
+        highlight.quads is empty. I was not able to quickly determine why.
+
+        Fix by bailing in this case.
+
+        * UIProcess/WKInspectorHighlightView.mm:
+        (-[WKInspectorHighlightView _layoutForNodeHighlight:]):
+
 2015-06-30  Matt Baker  <mattbaker@apple.com>
 

trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm

@@ -215 +215 @@
 - (void)_layoutForNodeHighlight:(const Highlight&)highlight
 {
+    if (!highlight.quads.size()) {
+        [self _removeAllLayers];
+        return;
+    }
+
     [self _createLayers:4];
 
@@ -240 +245 @@
 - (void)_layoutForRectsHighlight:(const Highlight&)highlight
 {
-    NSUInteger numLayers = (NSUInteger)highlight.quads.size();
+    NSUInteger numLayers = highlight.quads.size();
     if (!numLayers) {
         [self _removeAllLayers];