| 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 2107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2118 PP_Instance instance, | 2118 PP_Instance instance, |
| 2119 ::ppapi::SingletonResourceID id) { | 2119 ::ppapi::SingletonResourceID id) { |
| 2120 // Flash APIs and some others aren't implemented in-process. | 2120 // Flash APIs and some others aren't implemented in-process. |
| 2121 switch (id) { | 2121 switch (id) { |
| 2122 case ::ppapi::BROKER_SINGLETON_ID: | 2122 case ::ppapi::BROKER_SINGLETON_ID: |
| 2123 case ::ppapi::BROWSER_FONT_SINGLETON_ID: | 2123 case ::ppapi::BROWSER_FONT_SINGLETON_ID: |
| 2124 case ::ppapi::FLASH_CLIPBOARD_SINGLETON_ID: | 2124 case ::ppapi::FLASH_CLIPBOARD_SINGLETON_ID: |
| 2125 case ::ppapi::FLASH_FILE_SINGLETON_ID: | 2125 case ::ppapi::FLASH_FILE_SINGLETON_ID: |
| 2126 case ::ppapi::FLASH_FULLSCREEN_SINGLETON_ID: | 2126 case ::ppapi::FLASH_FULLSCREEN_SINGLETON_ID: |
| 2127 case ::ppapi::FLASH_SINGLETON_ID: | 2127 case ::ppapi::FLASH_SINGLETON_ID: |
| 2128 case ::ppapi::TRUETYPE_FONT_SINGLETON_ID: |
| 2128 NOTIMPLEMENTED(); | 2129 NOTIMPLEMENTED(); |
| 2129 return NULL; | 2130 return NULL; |
| 2130 case ::ppapi::GAMEPAD_SINGLETON_ID: | 2131 case ::ppapi::GAMEPAD_SINGLETON_ID: |
| 2131 return gamepad_impl_; | 2132 return gamepad_impl_; |
| 2132 } | 2133 } |
| 2133 | 2134 |
| 2134 NOTREACHED(); | 2135 NOTREACHED(); |
| 2135 return NULL; | 2136 return NULL; |
| 2136 } | 2137 } |
| 2137 | 2138 |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2488 screen_size_for_fullscreen_ = gfx::Size(); | 2489 screen_size_for_fullscreen_ = gfx::Size(); |
| 2489 WebElement element = container_->element(); | 2490 WebElement element = container_->element(); |
| 2490 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_); | 2491 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_); |
| 2491 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_); | 2492 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_); |
| 2492 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_); | 2493 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_); |
| 2493 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_); | 2494 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_); |
| 2494 } | 2495 } |
| 2495 | 2496 |
| 2496 } // namespace ppapi | 2497 } // namespace ppapi |
| 2497 } // namespace webkit | 2498 } // namespace webkit |
| OLD | NEW |