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

Unified Diff: Source/core/platform/graphics/FontPlatformData.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/platform/graphics/FontPlatformData.h ('k') | Source/core/platform/graphics/FontTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/graphics/FontPlatformData.cpp
diff --git a/Source/core/platform/graphics/FontPlatformData.cpp b/Source/core/platform/graphics/FontPlatformData.cpp
deleted file mode 100644
index 9ebd49183b47ddab5df6ad038a9eff5ad2ff21f1..0000000000000000000000000000000000000000
--- a/Source/core/platform/graphics/FontPlatformData.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2011 Brent Fulgham
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "core/platform/graphics/FontPlatformData.h"
-
-#include "wtf/HashMap.h"
-#include "wtf/text/StringHash.h"
-#include "wtf/text/WTFString.h"
-#include "wtf/Vector.h"
-
-#if OS(MACOSX)
-#include "core/platform/graphics/harfbuzz/HarfBuzzFace.h"
-#endif
-
-using namespace std;
-
-namespace WebCore {
-
-FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType)
- : m_syntheticBold(false)
- , m_syntheticOblique(false)
- , m_orientation(Horizontal)
- , m_size(0)
- , m_widthVariant(RegularWidth)
-#if OS(MACOSX)
- , m_font(hashTableDeletedFontValue())
-#endif
- , m_isColorBitmapFont(false)
- , m_isCompositeFontReference(false)
-#if OS(MACOSX)
- , m_isPrinterFont(false)
-#endif
-{
-}
-
-FontPlatformData::FontPlatformData()
- : m_syntheticBold(false)
- , m_syntheticOblique(false)
- , m_orientation(Horizontal)
- , m_size(0)
- , m_widthVariant(RegularWidth)
-#if OS(MACOSX)
- , m_font(0)
-#endif
- , m_isColorBitmapFont(false)
- , m_isCompositeFontReference(false)
-#if OS(MACOSX)
- , m_isPrinterFont(false)
-#endif
-{
-}
-
-FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
- : m_syntheticBold(syntheticBold)
- , m_syntheticOblique(syntheticOblique)
- , m_orientation(orientation)
- , m_size(size)
- , m_widthVariant(widthVariant)
-#if OS(MACOSX)
- , m_font(0)
-#endif
- , m_isColorBitmapFont(false)
- , m_isCompositeFontReference(false)
-#if OS(MACOSX)
- , m_isPrinterFont(false)
-#endif
-{
-}
-
-#if OS(MACOSX)
-FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
- : m_syntheticBold(syntheticBold)
- , m_syntheticOblique(syntheticOblique)
- , m_orientation(orientation)
- , m_size(size)
- , m_widthVariant(widthVariant)
- , m_font(0)
- , m_cgFont(cgFont)
- , m_isColorBitmapFont(false)
- , m_isCompositeFontReference(false)
- , m_isPrinterFont(false)
-{
-}
-#endif
-
-FontPlatformData::FontPlatformData(const FontPlatformData& source)
- : m_syntheticBold(source.m_syntheticBold)
- , m_syntheticOblique(source.m_syntheticOblique)
- , m_orientation(source.m_orientation)
- , m_size(source.m_size)
- , m_widthVariant(source.m_widthVariant)
- , m_isColorBitmapFont(source.m_isColorBitmapFont)
- , m_isCompositeFontReference(source.m_isCompositeFontReference)
-#if OS(MACOSX)
- , m_isPrinterFont(source.m_isPrinterFont)
-#endif
-{
- platformDataInit(source);
-}
-
-const FontPlatformData& FontPlatformData::operator=(const FontPlatformData& other)
-{
- // Check for self-assignment.
- if (this == &other)
- return *this;
-
- m_syntheticBold = other.m_syntheticBold;
- m_syntheticOblique = other.m_syntheticOblique;
- m_orientation = other.m_orientation;
- m_size = other.m_size;
- m_widthVariant = other.m_widthVariant;
- m_isColorBitmapFont = other.m_isColorBitmapFont;
- m_isCompositeFontReference = other.m_isCompositeFontReference;
-#if OS(MACOSX)
- m_isPrinterFont = other.m_isPrinterFont;
-#endif
-
- return platformDataAssign(other);
-}
-
-}
« no previous file with comments | « Source/core/platform/graphics/FontPlatformData.h ('k') | Source/core/platform/graphics/FontTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698