Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 89 deletions

diff --git a/WebCore/loader/cache/CachedFont.h b/WebCore/loader/cache/CachedFont.h
deleted file mode 100644
index 5814087..0000000
--- a/WebCore/loader/cache/CachedFont.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
- * 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 CachedFont_h
-#define CachedFont_h
-
-#include "CachedResource.h"
-#include "FontOrientation.h"
-#include "FontRenderingMode.h"
-#include <wtf/Vector.h>
-
-#if ENABLE(SVG_FONTS)
-#include "SVGElement.h"
-#include "SVGDocument.h"
-#endif
-
-namespace WebCore {
-
-class CachedResourceLoader;
-class MemoryCache;
-class FontPlatformData;
-class SVGFontElement;
-
-struct FontCustomPlatformData;
-
-class CachedFont : public CachedResource {
-public:
-    CachedFont(const String& url);
-    virtual ~CachedFont();
-    
-    virtual void load(CachedResourceLoader* cachedResourceLoader);
-
-    virtual void didAddClient(CachedResourceClient*);
-    virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
-    virtual void error(CachedResource::Status);
-
-    virtual void allClientsRemoved();
-
-    void checkNotify();
-
-    void beginLoadIfNeeded(CachedResourceLoader* dl);
-
-    bool ensureCustomFontData();
-    FontPlatformData platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation = Horizontal, FontRenderingMode = NormalRenderingMode);
-
-#if ENABLE(SVG_FONTS)
-    bool isSVGFont() const { return m_isSVGFont; }
-    void setSVGFont(bool isSVG) { m_isSVGFont = isSVG; }
-    bool ensureSVGFontData();
-    SVGFontElement* getSVGFontById(const String&) const;
-#endif
-
-private:
-    FontCustomPlatformData* m_fontData;
-    bool m_loadInitiated;
-
-#if ENABLE(SVG_FONTS)
-    bool m_isSVGFont;
-    RefPtr<SVGDocument> m_externalSVGDocument;
-#endif
-
-    friend class MemoryCache;
-};
-
-}
-
-#endif