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

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

Issue 11443016: Revert 171080 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1349/src/
Patch Set: Created 8 years 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/plugin_delegate.h ('k') | webkit/plugins/ppapi/ppb_flash_impl.h » ('j') | 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 2115 matching lines...) Expand 10 before | Expand all | Expand 10 after
2126 ::ppapi::thunk::PPB_Flash_API* PluginInstance::GetFlashAPI() { 2126 ::ppapi::thunk::PPB_Flash_API* PluginInstance::GetFlashAPI() {
2127 return &flash_impl_; 2127 return &flash_impl_;
2128 } 2128 }
2129 2129
2130 ::ppapi::Resource* PluginInstance::GetSingletonResource( 2130 ::ppapi::Resource* PluginInstance::GetSingletonResource(
2131 PP_Instance instance, 2131 PP_Instance instance,
2132 ::ppapi::SingletonResourceID id) { 2132 ::ppapi::SingletonResourceID id) {
2133 // Flash APIs aren't implemented in-process. 2133 // Flash APIs aren't implemented in-process.
2134 switch (id) { 2134 switch (id) {
2135 case ::ppapi::FLASH_CLIPBOARD_SINGLETON_ID: 2135 case ::ppapi::FLASH_CLIPBOARD_SINGLETON_ID:
2136 case ::ppapi::FLASH_FILE_SINGLETON_ID:
2137 case ::ppapi::FLASH_FULLSCREEN_SINGLETON_ID: 2136 case ::ppapi::FLASH_FULLSCREEN_SINGLETON_ID:
2138 case ::ppapi::FLASH_SINGLETON_ID: 2137 case ::ppapi::FLASH_SINGLETON_ID:
2139 NOTIMPLEMENTED(); 2138 NOTIMPLEMENTED();
2140 return NULL; 2139 return NULL;
2141 case ::ppapi::GAMEPAD_SINGLETON_ID: 2140 case ::ppapi::GAMEPAD_SINGLETON_ID:
2142 return gamepad_impl_; 2141 return gamepad_impl_;
2143 } 2142 }
2144 2143
2145 NOTREACHED(); 2144 NOTREACHED();
2146 return NULL; 2145 return NULL;
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
2479 screen_size_for_fullscreen_ = gfx::Size(); 2478 screen_size_for_fullscreen_ = gfx::Size();
2480 WebElement element = container_->element(); 2479 WebElement element = container_->element();
2481 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_); 2480 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
2482 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_); 2481 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
2483 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_); 2482 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
2484 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_); 2483 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
2485 } 2484 }
2486 2485
2487 } // namespace ppapi 2486 } // namespace ppapi
2488 } // namespace webkit 2487 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/plugin_delegate.h ('k') | webkit/plugins/ppapi/ppb_flash_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698