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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 1365563002: Make channel preemption not require view contexts for hookup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wakeup_gpu
Patch Set: rebase Created 5 years, 2 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 1382 matching lines...) Expand 10 before | Expand all | Expand 10 after
1393 1393
1394 gfx::NativeViewAccessible 1394 gfx::NativeViewAccessible
1395 RenderWidgetHostViewAura::AccessibilityGetNativeViewAccessible() { 1395 RenderWidgetHostViewAura::AccessibilityGetNativeViewAccessible() {
1396 #if defined(OS_WIN) 1396 #if defined(OS_WIN)
1397 if (legacy_render_widget_host_HWND_) 1397 if (legacy_render_widget_host_HWND_)
1398 return legacy_render_widget_host_HWND_->window_accessible(); 1398 return legacy_render_widget_host_HWND_->window_accessible();
1399 #endif 1399 #endif
1400 return NULL; 1400 return NULL;
1401 } 1401 }
1402 1402
1403 gfx::GLSurfaceHandle RenderWidgetHostViewAura::GetCompositingSurface() {
1404 return ImageTransportFactory::GetInstance()->GetSharedSurfaceHandle();
1405 }
1406
1407 void RenderWidgetHostViewAura::ShowDisambiguationPopup( 1403 void RenderWidgetHostViewAura::ShowDisambiguationPopup(
1408 const gfx::Rect& rect_pixels, 1404 const gfx::Rect& rect_pixels,
1409 const SkBitmap& zoomed_bitmap) { 1405 const SkBitmap& zoomed_bitmap) {
1410 RenderViewHostDelegate* delegate = NULL; 1406 RenderViewHostDelegate* delegate = NULL;
1411 if (host_->IsRenderView()) 1407 if (host_->IsRenderView())
1412 delegate = RenderViewHost::From(host_)->GetDelegate(); 1408 delegate = RenderViewHost::From(host_)->GetDelegate();
1413 // Suppress the link disambiguation popup if the virtual keyboard is currently 1409 // Suppress the link disambiguation popup if the virtual keyboard is currently
1414 // requested, as it doesn't interact well with the keyboard. 1410 // requested, as it doesn't interact well with the keyboard.
1415 if (delegate && delegate->IsVirtualKeyboardRequested()) 1411 if (delegate && delegate->IsVirtualKeyboardRequested())
1416 return; 1412 return;
(...skipping 1467 matching lines...) Expand 10 before | Expand all | Expand 10 after
2884 2880
2885 //////////////////////////////////////////////////////////////////////////////// 2881 ////////////////////////////////////////////////////////////////////////////////
2886 // RenderWidgetHostViewBase, public: 2882 // RenderWidgetHostViewBase, public:
2887 2883
2888 // static 2884 // static
2889 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2885 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2890 GetScreenInfoForWindow(results, NULL); 2886 GetScreenInfoForWindow(results, NULL);
2891 } 2887 }
2892 2888
2893 } // namespace content 2889 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698