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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.cc

Issue 1649483002: Revert of Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Merging android_non_aura_browser_sources into android_browser_sources rather than private_browser_s… Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/frame_host/render_widget_host_view_child_frame.h" 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 482
483 void RenderWidgetHostViewChildFrame::SetBeginFrameSource( 483 void RenderWidgetHostViewChildFrame::SetBeginFrameSource(
484 cc::SurfaceId surface_id, 484 cc::SurfaceId surface_id,
485 cc::BeginFrameSource* begin_frame_source) { 485 cc::BeginFrameSource* begin_frame_source) {
486 // TODO(tansell): Hook this up. 486 // TODO(tansell): Hook this up.
487 } 487 }
488 488
489 BrowserAccessibilityManager* 489 BrowserAccessibilityManager*
490 RenderWidgetHostViewChildFrame::CreateBrowserAccessibilityManager( 490 RenderWidgetHostViewChildFrame::CreateBrowserAccessibilityManager(
491 BrowserAccessibilityDelegate* delegate) { 491 BrowserAccessibilityDelegate* delegate) {
492 #if defined(OS_ANDROID) && defined(USE_AURA)
493 return nullptr;
494 #else
495 return BrowserAccessibilityManager::Create( 492 return BrowserAccessibilityManager::Create(
496 BrowserAccessibilityManager::GetEmptyDocument(), delegate); 493 BrowserAccessibilityManager::GetEmptyDocument(), delegate);
497 #endif
498 } 494 }
499 495
500 void RenderWidgetHostViewChildFrame::ClearCompositorSurfaceIfNecessary() { 496 void RenderWidgetHostViewChildFrame::ClearCompositorSurfaceIfNecessary() {
501 if (surface_factory_ && !surface_id_.is_null()) 497 if (surface_factory_ && !surface_id_.is_null())
502 surface_factory_->Destroy(surface_id_); 498 surface_factory_->Destroy(surface_id_);
503 surface_id_ = cc::SurfaceId(); 499 surface_id_ = cc::SurfaceId();
504 } 500 }
505 501
506 } // namespace content 502 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/devtools/render_frame_devtools_agent_host.cc ('k') | content/browser/media/media_web_contents_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698