OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 18 matching lines...) Expand all Loading... |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "WebFontImpl.h" | 32 #include "WebFontImpl.h" |
33 | 33 |
34 #include <skia/ext/platform_canvas.h> | 34 #include <skia/ext/platform_canvas.h> |
35 #include "WebFontDescription.h" | 35 #include "WebFontDescription.h" |
36 #include "WebTextRun.h" | 36 #include "WebTextRun.h" |
37 #include "core/platform/graphics/Font.h" | 37 #include "core/platform/graphics/Font.h" |
38 #include "core/platform/graphics/FontCache.h" | 38 #include "core/platform/graphics/FontCache.h" |
39 #include "core/platform/graphics/FontDescription.h" | |
40 #include "core/platform/graphics/GraphicsContext.h" | 39 #include "core/platform/graphics/GraphicsContext.h" |
| 40 #include "platform/fonts/FontDescription.h" |
41 #include "platform/graphics/TextRun.h" | 41 #include "platform/graphics/TextRun.h" |
42 #include "public/platform/WebFloatPoint.h" | 42 #include "public/platform/WebFloatPoint.h" |
43 #include "public/platform/WebFloatRect.h" | 43 #include "public/platform/WebFloatRect.h" |
44 #include "public/platform/WebRect.h" | 44 #include "public/platform/WebRect.h" |
45 | 45 |
46 using namespace WebCore; | 46 using namespace WebCore; |
47 | 47 |
48 namespace WebKit { | 48 namespace WebKit { |
49 | 49 |
50 WebFont* WebFont::create(const WebFontDescription& desc) | 50 WebFont* WebFont::create(const WebFontDescription& desc) |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 return m_font.offsetForPosition(run, position, true); | 121 return m_font.offsetForPosition(run, position, true); |
122 } | 122 } |
123 | 123 |
124 WebFloatRect WebFontImpl::selectionRectForText(const WebTextRun& run, const WebF
loatPoint& leftBaseline, int height, int from, int to) const | 124 WebFloatRect WebFontImpl::selectionRectForText(const WebTextRun& run, const WebF
loatPoint& leftBaseline, int height, int from, int to) const |
125 { | 125 { |
126 FontCachePurgePreventer fontCachePurgePreventer; | 126 FontCachePurgePreventer fontCachePurgePreventer; |
127 return m_font.selectionRectForText(run, leftBaseline, height, from, to); | 127 return m_font.selectionRectForText(run, leftBaseline, height, from, to); |
128 } | 128 } |
129 | 129 |
130 } // namespace WebKit | 130 } // namespace WebKit |
OLD | NEW |