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

Side by Side Diff: Source/platform/fonts/harfbuzz/HarfBuzzFaceSkia.cpp

Issue 99103006: Moving GraphicsContext and dependencies from core to platform. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final patch - fixes Android Created 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 Google Inc. All rights reserved. 2 * Copyright (c) 2012 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 11 matching lines...) Expand all
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/platform/graphics/harfbuzz/HarfBuzzFace.h" 32 #include "platform/fonts/harfbuzz/HarfBuzzFace.h"
33 33
34 #include "SkPaint.h" 34 #include "SkPaint.h"
35 #include "SkPath.h" 35 #include "SkPath.h"
36 #include "SkPoint.h" 36 #include "SkPoint.h"
37 #include "SkRect.h" 37 #include "SkRect.h"
38 #include "SkTypeface.h" 38 #include "SkTypeface.h"
39 #include "SkUtils.h" 39 #include "SkUtils.h"
40 #include "core/platform/graphics/FontPlatformData.h" 40 #include "platform/fonts/FontPlatformData.h"
41 #include "core/platform/graphics/SimpleFontData.h" 41 #include "platform/fonts/SimpleFontData.h"
42 #include "core/platform/graphics/harfbuzz/HarfBuzzShaper.h"
43 #include "platform/fonts/GlyphBuffer.h" 42 #include "platform/fonts/GlyphBuffer.h"
43 #include "platform/fonts/harfbuzz/HarfBuzzShaper.h"
44 44
45 #include "hb.h" 45 #include "hb.h"
46 #include "wtf/HashMap.h" 46 #include "wtf/HashMap.h"
47 47
48 namespace WebCore { 48 namespace WebCore {
49 49
50 // Our implementation of the callbacks which HarfBuzz requires by using Skia 50 // Our implementation of the callbacks which HarfBuzz requires by using Skia
51 // calls. See the HarfBuzz source for references about what these callbacks do. 51 // calls. See the HarfBuzz source for references about what these callbacks do.
52 52
53 struct HarfBuzzFontData { 53 struct HarfBuzzFontData {
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 hb_font_make_immutable(font); 187 hb_font_make_immutable(font);
188 return font; 188 return font;
189 } 189 }
190 190
191 GlyphBufferAdvance HarfBuzzShaper::createGlyphBufferAdvance(float width, float h eight) 191 GlyphBufferAdvance HarfBuzzShaper::createGlyphBufferAdvance(float width, float h eight)
192 { 192 {
193 return GlyphBufferAdvance(width, height); 193 return GlyphBufferAdvance(width, height);
194 } 194 }
195 195
196 } // namespace WebCore 196 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/platform/fonts/harfbuzz/HarfBuzzFaceCoreText.cpp ('k') | Source/platform/fonts/harfbuzz/HarfBuzzShaper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698