Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(599)

Unified Diff: content/renderer/render_view_impl.cc

Issue 879143002: Avoid crashing if multiple target popup is empty. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index dfb948d2ba5def0ba0f33140964d5ab449aefab8..d0015d55cb1b2ed4f5cc5998da5423f718b7029a 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3939,7 +3939,7 @@ bool RenderViewImpl::didTapMultipleTargets(
touch_rect, target_rects, GetSize(),
gfx::Rect(webview()->mainFrame()->visibleContentRect()).size(),
device_scale_factor_ * webview()->pageScaleFactor(), &zoom_rect);
- if (!new_total_scale)
+ if (!new_total_scale || zoom_rect.IsEmpty())
return false;
bool handled = false;
@@ -3954,6 +3954,7 @@ bool RenderViewImpl::didTapMultipleTargets(
RenderThreadImpl::current()->shared_bitmap_manager();
scoped_ptr<cc::SharedBitmap> shared_bitmap =
manager->AllocateSharedBitmap(canvas_size);
+ CHECK(!!shared_bitmap);
{
SkBitmap bitmap;
SkImageInfo info = SkImageInfo::MakeN32Premul(canvas_size.width(),
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698