Title: [171280] trunk/Source/WebKit2
- Revision
- 171280
- Author
- [email protected]
- Date
- 2014-07-20 09:48:35 -0700 (Sun, 20 Jul 2014)
Log Message
<rdar://problem/17739804> REGRESSION (r171057): Crash in WebPage::getPositionInformation()
https://bugs.webkit.org/show_bug.cgi?id=135099
Reviewed by David Kilzer.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getPositionInformation): Added a null check.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (171279 => 171280)
--- trunk/Source/WebKit2/ChangeLog 2014-07-20 16:45:34 UTC (rev 171279)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-20 16:48:35 UTC (rev 171280)
@@ -1,3 +1,13 @@
+2014-07-20 Dan Bernstein <[email protected]>
+
+ <rdar://problem/17739804> REGRESSION (r171057): Crash in WebPage::getPositionInformation()
+ https://bugs.webkit.org/show_bug.cgi?id=135099
+
+ Reviewed by David Kilzer.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPositionInformation): Added a null check.
+
2014-07-19 Zan Dobersek <[email protected]>
Consistently use uint64_t as the handle parameter type for the SetAcceleratedCompositingWindowId message
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (171279 => 171280)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-07-20 16:45:34 UTC (rev 171279)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-07-20 16:48:35 UTC (rev 171280)
@@ -1859,7 +1859,8 @@
if (elementIsLinkOrImage) {
// Ensure that the image contains at most 600K pixels, so that it is not too big.
- info.image = snapshotNode(*element, SnapshotOptionsShareable, 600 * 1024)->bitmap();
+ if (RefPtr<WebImage> snapshot = snapshotNode(*element, SnapshotOptionsShareable, 600 * 1024))
+ info.image = snapshot->bitmap();
}
if (linkElement)
info.url = "" *)linkElement->document().completeURL(stripLeadingAndTrailingHTMLSpaces(linkElement->getAttribute(HTMLNames::hrefAttr))) absoluteString];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
