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

Side by Side Diff: content/renderer/pepper/pepper_plugin_instance_impl.cc

Issue 2270533002: cc: Remove the software compositing bool from PrepareTextureMailbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@softwarerendering
Patch Set: remove-prepare-mailbox-param: bad-merge Created 4 years, 4 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/renderer/pepper/pepper_plugin_instance_impl.h" 5 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bit_cast.h" 10 #include "base/bit_cast.h"
(...skipping 2114 matching lines...) Expand 10 before | Expand all | Expand 10 after
2125 } 2125 }
2126 } 2126 }
2127 2127
2128 layer_bound_to_fullscreen_ = !!fullscreen_container_; 2128 layer_bound_to_fullscreen_ = !!fullscreen_container_;
2129 layer_is_hardware_ = want_3d_layer; 2129 layer_is_hardware_ = want_3d_layer;
2130 UpdateLayerTransform(); 2130 UpdateLayerTransform();
2131 } 2131 }
2132 2132
2133 bool PepperPluginInstanceImpl::PrepareTextureMailbox( 2133 bool PepperPluginInstanceImpl::PrepareTextureMailbox(
2134 cc::TextureMailbox* mailbox, 2134 cc::TextureMailbox* mailbox,
2135 std::unique_ptr<cc::SingleReleaseCallback>* release_callback, 2135 std::unique_ptr<cc::SingleReleaseCallback>* release_callback) {
2136 bool use_shared_memory) {
2137 if (!bound_graphics_2d_platform_) 2136 if (!bound_graphics_2d_platform_)
2138 return false; 2137 return false;
2139 return bound_graphics_2d_platform_->PrepareTextureMailbox(mailbox, 2138 return bound_graphics_2d_platform_->PrepareTextureMailbox(mailbox,
2140 release_callback); 2139 release_callback);
2141 } 2140 }
2142 2141
2143 void PepperPluginInstanceImpl::AccessibilityModeChanged() { 2142 void PepperPluginInstanceImpl::AccessibilityModeChanged() {
2144 if (render_frame_->render_accessibility() && LoadPdfInterface()) 2143 if (render_frame_->render_accessibility() && LoadPdfInterface())
2145 plugin_pdf_interface_->EnableAccessibility(pp_instance()); 2144 plugin_pdf_interface_->EnableAccessibility(pp_instance());
2146 } 2145 }
(...skipping 1295 matching lines...) Expand 10 before | Expand all | Expand 10 after
3442 const cc::TextureMailbox& mailbox) const { 3441 const cc::TextureMailbox& mailbox) const {
3443 auto it = 3442 auto it =
3444 std::find_if(texture_ref_counts_.begin(), texture_ref_counts_.end(), 3443 std::find_if(texture_ref_counts_.begin(), texture_ref_counts_.end(),
3445 [&mailbox](const TextureMailboxRefCount& ref_count) { 3444 [&mailbox](const TextureMailboxRefCount& ref_count) {
3446 return ref_count.first.mailbox() == mailbox.mailbox(); 3445 return ref_count.first.mailbox() == mailbox.mailbox();
3447 }); 3446 });
3448 return it != texture_ref_counts_.end(); 3447 return it != texture_ref_counts_.end();
3449 } 3448 }
3450 3449
3451 } // namespace content 3450 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698