Index: Source/WebKit/chromium/public/WebFontDescription.h |
diff --git a/Source/WebKit/chromium/public/WebFontDescription.h b/Source/WebKit/chromium/public/WebFontDescription.h |
index 272ba6926c20e12d2c68623ed952a82b5ef2c787..2712a1087a731f468c7a9ae9cb8f6063b1231759 100644 |
--- a/Source/WebKit/chromium/public/WebFontDescription.h |
+++ b/Source/WebKit/chromium/public/WebFontDescription.h |
@@ -1,106 +1 @@ |
-/* |
- * Copyright (C) 2010 Google 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: |
- * |
- * * Redistributions of source code must retain the above copyright |
- * notice, this list of conditions and the following disclaimer. |
- * * 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. |
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT |
- * OWNER 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 WebFontDescription_h |
-#define WebFontDescription_h |
- |
-#include "../../../../public/platform/WebString.h" |
- |
-#if WEBKIT_IMPLEMENTATION |
-namespace WebCore { class FontDescription; } |
-#endif |
- |
-namespace WebKit { |
- |
-struct WebFontDescription { |
- enum GenericFamily { |
- GenericFamilyNone, |
- GenericFamilyStandard, |
- GenericFamilySerif, |
- GenericFamilySansSerif, |
- GenericFamilyMonospace, |
- GenericFamilyCursive, |
- GenericFamilyFantasy |
- }; |
- |
- enum Smoothing { |
- SmoothingAuto, |
- SmoothingNone, |
- SmoothingGrayscale, |
- SmoothingSubpixel |
- }; |
- |
- enum Weight { |
- Weight100, |
- Weight200, |
- Weight300, |
- Weight400, |
- Weight500, |
- Weight600, |
- Weight700, |
- Weight800, |
- Weight900, |
- WeightNormal = Weight400, |
- WeightBold = Weight700 |
- }; |
- |
- WebFontDescription() |
- : genericFamily(GenericFamilyNone) |
- , size(0) |
- , italic(false) |
- , smallCaps(false) |
- , weight(WeightNormal) |
- , smoothing(SmoothingAuto) |
- , letterSpacing(0) |
- , wordSpacing(0) |
- { |
- } |
- |
- WebString family; |
- GenericFamily genericFamily; |
- float size; |
- bool italic; |
- bool smallCaps; |
- Weight weight; |
- Smoothing smoothing; |
- |
- short letterSpacing; |
- short wordSpacing; |
- |
-#if WEBKIT_IMPLEMENTATION |
- WebFontDescription(const WebCore::FontDescription&, short fontLetterSpacing, short fontWordSpacing); |
- |
- operator WebCore::FontDescription() const; |
-#endif |
-}; |
- |
-} // namespace WebKit |
- |
-#endif |
+#include "../../../../public/webview/WebFontDescription.h" |