| Index: content/browser/renderer_host/render_widget_host_view_mac.mm
|
| 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 469d159365e4f793f76774615b569f2547d4d779..e4cedac8d10118fa8ead4e6c535b661292125a6d 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| @@ -30,21 +30,20 @@
|
| #include "content/browser/accessibility/browser_accessibility_manager_mac.h"
|
| #import "content/browser/cocoa/system_hotkey_helper_mac.h"
|
| #import "content/browser/cocoa/system_hotkey_map.h"
|
| -#include "content/browser/compositor/io_surface_layer_mac.h"
|
| #include "content/browser/compositor/resize_lock.h"
|
| #include "content/browser/frame_host/frame_tree.h"
|
| #include "content/browser/frame_host/frame_tree_node.h"
|
| #include "content/browser/frame_host/render_frame_host_impl.h"
|
| #include "content/browser/gpu/compositor_util.h"
|
| -#include "content/browser/renderer_host/render_widget_helper.h"
|
| +#include "content/browser/gpu/gpu_data_manager_impl.h"
|
| #include "content/browser/renderer_host/render_view_host_impl.h"
|
| +#include "content/browser/renderer_host/render_widget_helper.h"
|
| #import "content/browser/renderer_host/render_widget_host_view_mac_dictionary_helper.h"
|
| #import "content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h"
|
| #import "content/browser/renderer_host/text_input_client_mac.h"
|
| #include "content/common/accessibility_messages.h"
|
| #include "content/common/edit_command.h"
|
| #include "content/common/gpu/gpu_messages.h"
|
| -#include "content/common/gpu/surface_handle_types_mac.h"
|
| #include "content/common/input_messages.h"
|
| #include "content/common/view_messages.h"
|
| #include "content/common/webplugin_geometry.h"
|
| @@ -56,6 +55,7 @@
|
| #import "content/public/browser/render_widget_host_view_mac_delegate.h"
|
| #include "content/public/browser/user_metrics.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "gpu/config/gpu_driver_bug_workaround_type.h"
|
| #include "skia/ext/platform_canvas.h"
|
| #include "skia/ext/skia_utils_mac.h"
|
| #include "third_party/WebKit/public/platform/WebScreenInfo.h"
|
| @@ -65,10 +65,12 @@
|
| #include "ui/base/cocoa/animation_utils.h"
|
| #import "ui/base/cocoa/fullscreen_window_manager.h"
|
| #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
|
| -#include "ui/events/keycodes/keyboard_codes.h"
|
| #include "ui/base/layout.h"
|
| #include "ui/compositor/compositor.h"
|
| #include "ui/compositor/layer.h"
|
| +#include "ui/compositor/mac/io_surface_layer_mac.h"
|
| +#include "ui/compositor/mac/surface_handle_types_mac.h"
|
| +#include "ui/events/keycodes/keyboard_codes.h"
|
| #include "ui/gfx/display.h"
|
| #include "ui/gfx/frame_time.h"
|
| #include "ui/gfx/point.h"
|
| @@ -487,6 +489,11 @@ bool RenderWidgetHostViewMac::AcceleratedWidgetShouldIgnoreBackpressure()
|
| return false;
|
| }
|
|
|
| +bool RenderWidgetHostViewMac::AcceleratedWidgetNeedsGLFinishWorkaround() const {
|
| + return GpuDataManagerImpl::GetInstance()->IsDriverBugWorkaroundActive(
|
| + gpu::FORCE_GL_FINISH_AFTER_COMPOSITING);
|
| +}
|
| +
|
| void RenderWidgetHostViewMac::AcceleratedWidgetSwapCompleted(
|
| const std::vector<ui::LatencyInfo>& all_latency_info) {
|
| if (!render_widget_host_)
|
|
|