Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 117 deletions

diff --git a/WebCore/platform/graphics/FontCache.h b/WebCore/platform/graphics/FontCache.h
deleted file mode 100644
index e6845d9..0000000
--- a/WebCore/platform/graphics/FontCache.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2006, 2008 Apple Computer, Inc.  All rights reserved.
- * Copyright (C) 2007-2008 Torch Mobile, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer. 
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef FontCache_h
-#define FontCache_h
-
-#include <limits.h>
-#include <wtf/Forward.h>
-#include <wtf/Vector.h>
-#include <wtf/unicode/Unicode.h>
-
-#if PLATFORM(WIN)
-#include <objidl.h>
-#include <mlang.h>
-#endif
-
-namespace WebCore
-{
-
-class Font;
-class FontPlatformData;
-class FontData;
-class FontDescription;
-class FontSelector;
-class SimpleFontData;
-
-class FontCache : public Noncopyable {
-public:
-    friend FontCache* fontCache();
-
-    const FontData* getFontData(const Font&, int& familyIndex, FontSelector*);
-    void releaseFontData(const SimpleFontData*);
-    
-    // This method is implemented by the platform.
-    // FIXME: Font data returned by this method never go inactive because callers don't track and release them.
-    const SimpleFontData* getFontDataForCharacters(const Font&, const UChar* characters, int length);
-    
-    // Also implemented by the platform.
-    void platformInit();
-
-#if OS(WINCE) && !PLATFORM(QT)
-#if defined(IMLANG_FONT_LINK) && (IMLANG_FONT_LINK == 2)
-    IMLangFontLink2* getFontLinkInterface();
-#else
-    IMLangFontLink* getFontLinkInterface();
-#endif
-    static void comInitialize();
-    static void comUninitialize();
-    static IMultiLanguage* getMultiLanguageInterface();
-#elif PLATFORM(WIN)
-    IMLangFontLink2* getFontLinkInterface();
-#endif
-
-    void getTraitsInFamily(const AtomicString&, Vector<unsigned>&);
-
-    SimpleFontData* getCachedFontData(const FontDescription& fontDescription, const AtomicString& family, bool checkingAlternateName = false);
-    SimpleFontData* getLastResortFallbackFont(const FontDescription&);
-
-    void addClient(FontSelector*);
-    void removeClient(FontSelector*);
-
-    unsigned generation();
-    void invalidate();
-
-    size_t fontDataCount();
-    size_t inactiveFontDataCount();
-    void purgeInactiveFontData(int count = INT_MAX);
-
-private:
-    FontCache();
-    ~FontCache();
-
-    // FIXME: This method should eventually be removed.
-    FontPlatformData* getCachedFontPlatformData(const FontDescription&, const AtomicString& family, bool checkingAlternateName = false);
-
-    // These methods are implemented by each platform.
-    SimpleFontData* getSimilarFontPlatformData(const Font&);
-    FontPlatformData* createFontPlatformData(const FontDescription&, const AtomicString& family);
-
-    SimpleFontData* getCachedFontData(const FontPlatformData*);
-
-    friend class SimpleFontData; // For getCachedFontData(const FontPlatformData*)
-    friend class FontFallbackList;
-};
-
-// Get the global fontCache.
-FontCache* fontCache();
-
-}
-
-#endif