| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/render_view.h" | 5 #include "content/renderer/render_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 3992 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4003 // Inform plugins that their container is now visible. | 4003 // Inform plugins that their container is now visible. |
| 4004 std::set<WebPluginDelegateProxy*>::iterator plugin_it; | 4004 std::set<WebPluginDelegateProxy*>::iterator plugin_it; |
| 4005 for (plugin_it = plugin_delegates_.begin(); | 4005 for (plugin_it = plugin_delegates_.begin(); |
| 4006 plugin_it != plugin_delegates_.end(); ++plugin_it) { | 4006 plugin_it != plugin_delegates_.end(); ++plugin_it) { |
| 4007 (*plugin_it)->SetContainerVisibility(true); | 4007 (*plugin_it)->SetContainerVisibility(true); |
| 4008 } | 4008 } |
| 4009 #endif // OS_MACOSX | 4009 #endif // OS_MACOSX |
| 4010 } | 4010 } |
| 4011 | 4011 |
| 4012 bool RenderView::SupportsAsynchronousSwapBuffers() { | 4012 bool RenderView::SupportsAsynchronousSwapBuffers() { |
| 4013 if (WebWidgetHandlesCompositorScheduling()) |
| 4014 return false; |
| 4015 |
| 4013 WebKit::WebGraphicsContext3D* context = webview()->graphicsContext3D(); | 4016 WebKit::WebGraphicsContext3D* context = webview()->graphicsContext3D(); |
| 4014 if (!context) | 4017 if (!context) |
| 4015 return false; | 4018 return false; |
| 4016 std::string extensions(context->getRequestableExtensionsCHROMIUM().utf8()); | 4019 std::string extensions(context->getRequestableExtensionsCHROMIUM().utf8()); |
| 4017 return extensions.find("GL_CHROMIUM_swapbuffers_complete_callback") != | 4020 return extensions.find("GL_CHROMIUM_swapbuffers_complete_callback") != |
| 4018 std::string::npos; | 4021 std::string::npos; |
| 4019 } | 4022 } |
| 4020 | 4023 |
| 4021 void RenderView::OnSetFocus(bool enable) { | 4024 void RenderView::OnSetFocus(bool enable) { |
| 4022 RenderWidget::OnSetFocus(enable); | 4025 RenderWidget::OnSetFocus(enable); |
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4463 pepper_delegate_.OnLockMouseACK(succeeded); | 4466 pepper_delegate_.OnLockMouseACK(succeeded); |
| 4464 } | 4467 } |
| 4465 | 4468 |
| 4466 void RenderView::OnMouseLockLost() { | 4469 void RenderView::OnMouseLockLost() { |
| 4467 pepper_delegate_.OnMouseLockLost(); | 4470 pepper_delegate_.OnMouseLockLost(); |
| 4468 } | 4471 } |
| 4469 | 4472 |
| 4470 bool RenderView::WebWidgetHandlesCompositorScheduling() const { | 4473 bool RenderView::WebWidgetHandlesCompositorScheduling() const { |
| 4471 return webview()->settings()->useThreadedCompositor(); | 4474 return webview()->settings()->useThreadedCompositor(); |
| 4472 } | 4475 } |
| OLD | NEW |