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

Unified Diff: content/renderer/render_view_impl.cc

Issue 9307043: Revert 120111 - Defer render_widget draw until host window is available (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
===================================================================
--- content/renderer/render_view_impl.cc (revision 120128)
+++ content/renderer/render_view_impl.cc (working copy)
@@ -397,8 +397,6 @@
cached_is_main_frame_pinned_to_right_(false),
cached_has_main_frame_horizontal_scrollbar_(false),
cached_has_main_frame_vertical_scrollbar_(false),
- context_has_swapbuffers_complete_callback_(false),
- queried_for_swapbuffers_complete_callback_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)),
geolocation_dispatcher_(NULL),
speech_input_dispatcher_(NULL),
@@ -4497,21 +4495,12 @@
if (WebWidgetHandlesCompositorScheduling())
return false;
- if (queried_for_swapbuffers_complete_callback_)
- return context_has_swapbuffers_complete_callback_;
-
- queried_for_swapbuffers_complete_callback_ = true;
-
WebKit::WebGraphicsContext3D* context = webview()->graphicsContext3D();
- if (context) {
- context->makeContextCurrent();
- std::string extensions(context->getRequestableExtensionsCHROMIUM().utf8());
- context_has_swapbuffers_complete_callback_ =
- extensions.find("GL_CHROMIUM_swapbuffers_complete_callback")
- != std::string::npos;
- }
-
- return context_has_swapbuffers_complete_callback_;
+ if (!context)
+ return false;
+ std::string extensions(context->getRequestableExtensionsCHROMIUM().utf8());
+ return extensions.find("GL_CHROMIUM_swapbuffers_complete_callback") !=
+ std::string::npos;
}
void RenderViewImpl::OnSetFocus(bool enable) {
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698