Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 2061 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2072 const PP_DecryptedFrameInfo* frame_info) { | 2072 const PP_DecryptedFrameInfo* frame_info) { |
| 2073 content_decryptor_delegate_->DeliverFrame(decrypted_frame, frame_info); | 2073 content_decryptor_delegate_->DeliverFrame(decrypted_frame, frame_info); |
| 2074 } | 2074 } |
| 2075 | 2075 |
| 2076 void PluginInstance::DeliverSamples(PP_Instance instance, | 2076 void PluginInstance::DeliverSamples(PP_Instance instance, |
| 2077 PP_Resource audio_frames, | 2077 PP_Resource audio_frames, |
| 2078 const PP_DecryptedBlockInfo* block_info) { | 2078 const PP_DecryptedBlockInfo* block_info) { |
| 2079 content_decryptor_delegate_->DeliverSamples(audio_frames, block_info); | 2079 content_decryptor_delegate_->DeliverSamples(audio_frames, block_info); |
| 2080 } | 2080 } |
| 2081 | 2081 |
| 2082 unsigned PluginInstance::prepareTexture(cc::ResourceUpdateQueue&) { | 2082 unsigned PluginInstance::PrepareTexture(cc::ResourceUpdateQueue*) { |
|
danakj
2013/03/17 16:15:10
variable name
enne (OOO)
2013/03/17 19:06:41
Done.
| |
| 2083 return GetBackingTextureId(); | 2083 return GetBackingTextureId(); |
| 2084 } | 2084 } |
| 2085 | 2085 |
| 2086 WebKit::WebGraphicsContext3D* PluginInstance::context() { | 2086 WebKit::WebGraphicsContext3D* PluginInstance::Context() { |
| 2087 DCHECK(bound_graphics_3d_.get()); | 2087 DCHECK(bound_graphics_3d_.get()); |
| 2088 DCHECK(bound_graphics_3d_->platform_context()); | 2088 DCHECK(bound_graphics_3d_->platform_context()); |
| 2089 return bound_graphics_3d_->platform_context()->GetParentContext(); | 2089 return bound_graphics_3d_->platform_context()->GetParentContext(); |
| 2090 } | 2090 } |
| 2091 | 2091 |
| 2092 void PluginInstance::NumberOfFindResultsChanged(PP_Instance instance, | 2092 void PluginInstance::NumberOfFindResultsChanged(PP_Instance instance, |
| 2093 int32_t total, | 2093 int32_t total, |
| 2094 PP_Bool final_result) { | 2094 PP_Bool final_result) { |
| 2095 DCHECK_NE(find_identifier_, -1); | 2095 DCHECK_NE(find_identifier_, -1); |
| 2096 delegate_->NumberOfFindResultsChanged(find_identifier_, total, | 2096 delegate_->NumberOfFindResultsChanged(find_identifier_, total, |
| (...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2489 screen_size_for_fullscreen_ = gfx::Size(); | 2489 screen_size_for_fullscreen_ = gfx::Size(); |
| 2490 WebElement element = container_->element(); | 2490 WebElement element = container_->element(); |
| 2491 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_); | 2491 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_); |
| 2492 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_); | 2492 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_); |
| 2493 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_); | 2493 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_); |
| 2494 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_); | 2494 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_); |
| 2495 } | 2495 } |
| 2496 | 2496 |
| 2497 } // namespace ppapi | 2497 } // namespace ppapi |
| 2498 } // namespace webkit | 2498 } // namespace webkit |
| OLD | NEW |