Title: [175321] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175321
- Author
- [email protected]
- Date
- 2014-10-29 01:47:23 -0700 (Wed, 29 Oct 2014)
Log Message
Merged r175187. rdar://problem/18767859
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175320 => 175321)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:44:25 UTC (rev 175320)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:47:23 UTC (rev 175321)
@@ -1,5 +1,27 @@
2014-10-29 Lucas Forschler <[email protected]>
+ Merge r175187
+
+ 2014-10-24 Beth Dakin <[email protected]>
+
+ Very large images crash in action menu code
+ https://bugs.webkit.org/show_bug.cgi?id=138059
+ -and corresponding-
+ rdar://problem/18767859
+
+ Reviewed by Tim Horton.
+
+ If the HitTestResult failed to create and image, then don’t go for the image
+ action menu.
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _defaultMenuItems]):
+
+ ShareableBitmap::createShareable() can fail. The result needs to be null-checked.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::performActionMenuHitTestAtLocation):
+
+2014-10-29 Lucas Forschler <[email protected]>
+
Merge r175185
2014-10-24 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175320 => 175321)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:44:25 UTC (rev 175320)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:47:23 UTC (rev 175321)
@@ -362,7 +362,7 @@
- (NSArray *)_defaultMenuItems
{
if (WebHitTestResult* hitTestResult = _page->activeActionMenuHitTestResult()) {
- if (!hitTestResult->absoluteImageURL().isEmpty())
+ if (!hitTestResult->absoluteImageURL().isEmpty() && _hitTestResult.image)
return [self _defaultMenuItemsForImage];
if (!hitTestResult->absoluteLinkURL().isEmpty())
return [self _defaultMenuItemsForLink];
Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (175320 => 175321)
--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-29 08:44:25 UTC (rev 175320)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-29 08:47:23 UTC (rev 175321)
@@ -4798,7 +4798,8 @@
if (Image* image = hitTestResult.image()) {
actionMenuResult.image = ShareableBitmap::createShareable(IntSize(image->size()), ShareableBitmap::SupportsAlpha);
- actionMenuResult.image->createGraphicsContext()->drawImage(image, ColorSpaceDeviceRGB, IntPoint());
+ if (actionMenuResult.image)
+ actionMenuResult.image->createGraphicsContext()->drawImage(image, ColorSpaceDeviceRGB, IntPoint());
}
send(Messages::WebPageProxy::DidPerformActionMenuHitTest(actionMenuResult));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
