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

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

Issue 1825253002: Revert of Remove a bunch of NPAPI quirks and related support code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_windowed_plugins
Patch Set: Created 4 years, 9 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 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 526
527 bool RenderWidgetHostViewChildFrame::HasAcceleratedSurface( 527 bool RenderWidgetHostViewChildFrame::HasAcceleratedSurface(
528 const gfx::Size& desired_size) { 528 const gfx::Size& desired_size) {
529 return false; 529 return false;
530 } 530 }
531 531
532 #if defined(OS_WIN) 532 #if defined(OS_WIN)
533 void RenderWidgetHostViewChildFrame::SetParentNativeViewAccessible( 533 void RenderWidgetHostViewChildFrame::SetParentNativeViewAccessible(
534 gfx::NativeViewAccessible accessible_parent) { 534 gfx::NativeViewAccessible accessible_parent) {
535 } 535 }
536
537 gfx::NativeViewId RenderWidgetHostViewChildFrame::GetParentForWindowlessPlugin()
538 const {
539 return NULL;
540 }
536 #endif // defined(OS_WIN) 541 #endif // defined(OS_WIN)
537 542
538 // cc::SurfaceFactoryClient implementation. 543 // cc::SurfaceFactoryClient implementation.
539 void RenderWidgetHostViewChildFrame::ReturnResources( 544 void RenderWidgetHostViewChildFrame::ReturnResources(
540 const cc::ReturnedResourceArray& resources) { 545 const cc::ReturnedResourceArray& resources) {
541 if (resources.empty()) 546 if (resources.empty())
542 return; 547 return;
543 548
544 if (!ack_pending_count_ && host_) { 549 if (!ack_pending_count_ && host_) {
545 cc::CompositorFrameAck ack; 550 cc::CompositorFrameAck ack;
(...skipping 24 matching lines...) Expand all
570 if (surface_factory_ && !surface_id_.is_null()) 575 if (surface_factory_ && !surface_id_.is_null())
571 surface_factory_->Destroy(surface_id_); 576 surface_factory_->Destroy(surface_id_);
572 surface_id_ = cc::SurfaceId(); 577 surface_id_ = cc::SurfaceId();
573 } 578 }
574 579
575 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { 580 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const {
576 return surface_id_; 581 return surface_id_;
577 }; 582 };
578 583
579 } // namespace content 584 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698