From d48b2bd02b7de00448ca3d39ddd42354266b3c75 Mon Sep 17 00:00:00 2001 From: "sail@chromium.org" Date: Wed, 3 Jul 2013 00:05:24 +0000 Subject: Core Animation: Use CHECK() instead of DCHECK() in drawRect: Using a CHECK() will give us better crash logs if anything unexpected is happening. BUG=245900 Review URL: https://chromiumcodereview.appspot.com/18234003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209824 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/renderer_host/render_widget_host_view_mac.mm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'content/browser') diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm index 8ebf327..d25339c 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -2549,7 +2549,7 @@ void RenderWidgetHostViewMac::FrameSwapped() { - (void)drawRect:(NSRect)dirtyRect { TRACE_EVENT0("browser", "RenderWidgetHostViewCocoa::drawRect"); - DCHECK(!renderWidgetHostView_->use_core_animation_); + CHECK(!renderWidgetHostView_->use_core_animation_); if (!renderWidgetHostView_->render_widget_host_) { // TODO(shess): Consider using something more noticable? @@ -2573,6 +2573,8 @@ void RenderWidgetHostViewMac::FrameSwapped() { if (renderWidgetHostView_->last_frame_was_accelerated_ && renderWidgetHostView_->compositing_iosurface_) { if (renderWidgetHostView_->allow_overlapping_views_) { + CHECK_EQ(CORE_ANIMATION_DISABLED, GetCoreAnimationStatus()); + // If overlapping views need to be allowed, punch a hole in the window // to expose the GL underlay. TRACE_EVENT2("gpu", "NSRectFill clear", "w", damagedRect.width(), -- cgit v1.1