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

Side by Side Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 900063002: Fixes for two different HUD issues related to win32k lockdown (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: i am a plumber Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/gpu/render_widget_compositor.h" 5 #include "content/renderer/gpu/render_widget_compositor.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 22 matching lines...) Expand all
33 #include "content/common/gpu/client/context_provider_command_buffer.h" 33 #include "content/common/gpu/client/context_provider_command_buffer.h"
34 #include "content/public/common/content_switches.h" 34 #include "content/public/common/content_switches.h"
35 #include "content/renderer/input/input_handler_manager.h" 35 #include "content/renderer/input/input_handler_manager.h"
36 #include "content/renderer/scheduler/renderer_scheduler.h" 36 #include "content/renderer/scheduler/renderer_scheduler.h"
37 #include "gpu/command_buffer/client/gles2_interface.h" 37 #include "gpu/command_buffer/client/gles2_interface.h"
38 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallbac k.h" 38 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallbac k.h"
39 #include "third_party/WebKit/public/platform/WebSelectionBound.h" 39 #include "third_party/WebKit/public/platform/WebSelectionBound.h"
40 #include "third_party/WebKit/public/platform/WebSize.h" 40 #include "third_party/WebKit/public/platform/WebSize.h"
41 #include "third_party/WebKit/public/web/WebKit.h" 41 #include "third_party/WebKit/public/web/WebKit.h"
42 #include "third_party/WebKit/public/web/WebWidget.h" 42 #include "third_party/WebKit/public/web/WebWidget.h"
43 #include "ui/compositor/debug_utils.h"
43 #include "ui/gfx/frame_time.h" 44 #include "ui/gfx/frame_time.h"
44 #include "ui/gl/gl_switches.h" 45 #include "ui/gl/gl_switches.h"
45 #include "ui/native_theme/native_theme_switches.h" 46 #include "ui/native_theme/native_theme_switches.h"
46 47
47 #if defined(OS_ANDROID) 48 #if defined(OS_ANDROID)
48 #include "content/renderer/android/synchronous_compositor_factory.h" 49 #include "content/renderer/android/synchronous_compositor_factory.h"
49 #include "ui/gfx/android/device_display_info.h" 50 #include "ui/gfx/android/device_display_info.h"
50 #endif 51 #endif
51 52
52 namespace base { 53 namespace base {
(...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 void RenderWidgetCompositor::DidAbortSwapBuffers() { 877 void RenderWidgetCompositor::DidAbortSwapBuffers() {
877 widget_->OnSwapBuffersAborted(); 878 widget_->OnSwapBuffersAborted();
878 } 879 }
879 880
880 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { 881 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() {
881 cc::ContextProvider* provider = 882 cc::ContextProvider* provider =
882 compositor_deps_->GetSharedMainThreadContextProvider(); 883 compositor_deps_->GetSharedMainThreadContextProvider();
883 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); 884 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
884 } 885 }
885 886
887 SkTypeface* RenderWidgetCompositor::GetHudTypeface() {
888 return ui::GetHudTypeface();
889 }
890
886 } // namespace content 891 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698