| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/webkit_forwarding_impl.h" | 5 #include "webkit/plugins/ppapi/webkit_forwarding_impl.h" |
| 6 | 6 |
| 7 #include "base/scoped_ptr.h" | 7 #include <string> |
| 8 |
| 9 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 9 #include "base/synchronization/waitable_event.h" | 11 #include "base/synchronization/waitable_event.h" |
| 10 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 11 #include "ppapi/c/dev/ppb_font_dev.h" | 13 #include "ppapi/c/dev/ppb_font_dev.h" |
| 12 #include "ppapi/c/pp_point.h" | 14 #include "ppapi/c/pp_point.h" |
| 13 #include "ppapi/c/pp_rect.h" | 15 #include "ppapi/c/pp_rect.h" |
| 14 #include "ppapi/shared_impl/ppapi_preferences.h" | 16 #include "ppapi/shared_impl/ppapi_preferences.h" |
| 15 #include "skia/ext/platform_canvas.h" | 17 #include "skia/ext/platform_canvas.h" |
| 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h" | 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h" |
| 17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFont.h" | 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFont.h" |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 const std::string& desc_face, | 280 const std::string& desc_face, |
| 279 const ::ppapi::Preferences& prefs, | 281 const ::ppapi::Preferences& prefs, |
| 280 Font** result) { | 282 Font** result) { |
| 281 *result = new FontImpl(desc, desc_face, prefs); | 283 *result = new FontImpl(desc, desc_face, prefs); |
| 282 if (event) | 284 if (event) |
| 283 event->Signal(); | 285 event->Signal(); |
| 284 } | 286 } |
| 285 | 287 |
| 286 } // namespace ppapi | 288 } // namespace ppapi |
| 287 } // namespace webkit | 289 } // namespace webkit |
| OLD | NEW |