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

Unified Diff: content/renderer/render_widget_fullscreen_pepper.cc

Issue 7628023: Fix lost context race with fullscreen pepper widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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_widget_fullscreen_pepper.cc
diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc
index b8d144da46450341d419cad2ddbe2a4f4438ca5a..923cb487c66420caf1f46337ecb4ff4bbac75596 100644
--- a/content/renderer/render_widget_fullscreen_pepper.cc
+++ b/content/renderer/render_widget_fullscreen_pepper.cc
@@ -462,10 +462,10 @@ bool RenderWidgetFullscreenPepper::InitContext() {
}
bool RenderWidgetFullscreenPepper::CheckCompositing() {
- bool compositing = webwidget_->isAcceleratedCompositingActive();
- if (compositing != is_accelerated_compositing_active_) {
+ bool compositing =
+ webwidget_ && webwidget_->isAcceleratedCompositingActive();
+ if (compositing != is_accelerated_compositing_active_)
didActivateAcceleratedCompositing(compositing);
- }
return compositing;
}
@@ -489,6 +489,7 @@ void RenderWidgetFullscreenPepper::OnLostContext(
program_ = 0;
buffer_ = 0;
OnSwapBuffersAborted();
+ CheckCompositing();
}
void RenderWidgetFullscreenPepper::OnSwapBuffersCompleteByRendererGLContext() {
« 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