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

Side by Side Diff: webkit/plugins/ppapi/ppapi_plugin_instance.cc

Issue 12670009: cc: Chromify TextureLayerClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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 | Annotate | Revision Log
« no previous file with comments | « webkit/plugins/ppapi/ppapi_plugin_instance.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "webkit/plugins/ppapi/ppapi_plugin_instance.h" 5 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 2071 matching lines...) Expand 10 before | Expand all | Expand 10 after
2082 const PP_DecryptedFrameInfo* frame_info) { 2082 const PP_DecryptedFrameInfo* frame_info) {
2083 content_decryptor_delegate_->DeliverFrame(decrypted_frame, frame_info); 2083 content_decryptor_delegate_->DeliverFrame(decrypted_frame, frame_info);
2084 } 2084 }
2085 2085
2086 void PluginInstance::DeliverSamples(PP_Instance instance, 2086 void PluginInstance::DeliverSamples(PP_Instance instance,
2087 PP_Resource audio_frames, 2087 PP_Resource audio_frames,
2088 const PP_DecryptedBlockInfo* block_info) { 2088 const PP_DecryptedBlockInfo* block_info) {
2089 content_decryptor_delegate_->DeliverSamples(audio_frames, block_info); 2089 content_decryptor_delegate_->DeliverSamples(audio_frames, block_info);
2090 } 2090 }
2091 2091
2092 unsigned PluginInstance::prepareTexture(cc::ResourceUpdateQueue&) { 2092 unsigned PluginInstance::PrepareTexture(cc::ResourceUpdateQueue* queue) {
2093 return GetBackingTextureId(); 2093 return GetBackingTextureId();
2094 } 2094 }
2095 2095
2096 WebKit::WebGraphicsContext3D* PluginInstance::context() { 2096 WebKit::WebGraphicsContext3D* PluginInstance::Context3d() {
2097 DCHECK(bound_graphics_3d_.get()); 2097 DCHECK(bound_graphics_3d_.get());
2098 DCHECK(bound_graphics_3d_->platform_context()); 2098 DCHECK(bound_graphics_3d_->platform_context());
2099 return bound_graphics_3d_->platform_context()->GetParentContext(); 2099 return bound_graphics_3d_->platform_context()->GetParentContext();
2100 } 2100 }
2101 2101
2102 void PluginInstance::NumberOfFindResultsChanged(PP_Instance instance, 2102 void PluginInstance::NumberOfFindResultsChanged(PP_Instance instance,
2103 int32_t total, 2103 int32_t total,
2104 PP_Bool final_result) { 2104 PP_Bool final_result) {
2105 DCHECK_NE(find_identifier_, -1); 2105 DCHECK_NE(find_identifier_, -1);
2106 delegate_->NumberOfFindResultsChanged(find_identifier_, total, 2106 delegate_->NumberOfFindResultsChanged(find_identifier_, total,
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
2499 screen_size_for_fullscreen_ = gfx::Size(); 2499 screen_size_for_fullscreen_ = gfx::Size();
2500 WebElement element = container_->element(); 2500 WebElement element = container_->element();
2501 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_); 2501 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
2502 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_); 2502 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
2503 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_); 2503 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
2504 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_); 2504 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
2505 } 2505 }
2506 2506
2507 } // namespace ppapi 2507 } // namespace ppapi
2508 } // namespace webkit 2508 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/ppapi_plugin_instance.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698