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 <string> | 7 #include <string> |
8 | 8 |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/synchronization/waitable_event.h" | 12 #include "base/synchronization/waitable_event.h" |
13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
14 #include "ppapi/c/dev/ppb_font_dev.h" | 14 #include "ppapi/c/dev/ppb_font_dev.h" |
15 #include "ppapi/c/pp_point.h" | 15 #include "ppapi/c/pp_point.h" |
16 #include "ppapi/c/pp_rect.h" | 16 #include "ppapi/c/pp_rect.h" |
17 #include "ppapi/shared_impl/ppapi_preferences.h" | 17 #include "ppapi/shared_impl/ppapi_preferences.h" |
18 #include "skia/ext/platform_canvas.h" | 18 #include "skia/ext/platform_canvas.h" |
19 #include "third_party/skia/include/core/SkRect.h" | 19 #include "third_party/skia/include/core/SkRect.h" |
20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h" | 20 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h" |
21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFont.h" | 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFont.h" |
22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontDescription.h" | 22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontDescription.h" |
23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" | 23 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" |
24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFloatPoint.h" | 24 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFloatPoin
t.h" |
25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFloatRect.h" | 25 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFloatRect
.h" |
26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextRun.h" | 26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextRun.h" |
27 #include "webkit/glue/webkit_glue.h" | 27 #include "webkit/glue/webkit_glue.h" |
28 | 28 |
29 using ::ppapi::WebKitForwarding; | 29 using ::ppapi::WebKitForwarding; |
30 using WebKit::WebCanvas; | 30 using WebKit::WebCanvas; |
31 using WebKit::WebFloatPoint; | 31 using WebKit::WebFloatPoint; |
32 using WebKit::WebFloatRect; | 32 using WebKit::WebFloatRect; |
33 using WebKit::WebFont; | 33 using WebKit::WebFont; |
34 using WebKit::WebFontDescription; | 34 using WebKit::WebFontDescription; |
35 using WebKit::WebRect; | 35 using WebKit::WebRect; |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 Font** result) { | 291 Font** result) { |
292 TRACE_EVENT0("ppapi WebKit thread", | 292 TRACE_EVENT0("ppapi WebKit thread", |
293 "WebKitForwardingImpl::CreateFontForwarding"); | 293 "WebKitForwardingImpl::CreateFontForwarding"); |
294 *result = new FontImpl(desc, desc_face, prefs); | 294 *result = new FontImpl(desc, desc_face, prefs); |
295 if (event) | 295 if (event) |
296 event->Signal(); | 296 event->Signal(); |
297 } | 297 } |
298 | 298 |
299 } // namespace ppapi | 299 } // namespace ppapi |
300 } // namespace webkit | 300 } // namespace webkit |
OLD | NEW |