From: commit-queue@webkit.org Date: Fri, 24 Feb 2012 13:03:50 +0000 (+0000) Subject: [BlackBerry] Upstream helper classes for skia X-Git-Tag: 070512121124~11905 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b813b01ca1ce3c184a2403775c3e34fd171e012;p=profile%2Fivi%2Fwebkit-efl.git [BlackBerry] Upstream helper classes for skia https://bugs.webkit.org/show_bug.cgi?id=79216 Patch by Robin Cao on 2012-02-24 Reviewed by Antonio Gomes. Initial upstreaming, no new tests. * platform/graphics/blackberry/skia/ImageBufferData.h: Added. (WebCore): (ImageBufferData): * platform/graphics/blackberry/skia/PlatformSupport.cpp: Added. (WebCore): (WebCore::setFontRenderStyleDefaults): (WebCore::PlatformSupport::getRenderStyleForStrike): (WebCore::PlatformSupport::getFontFamilyForCharacters): * platform/graphics/blackberry/skia/PlatformSupport.h: Added. (WebCore): (PlatformSupport): (FontFamily): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108775 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index b8239f6..fb495bb 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,5 +1,27 @@ 2012-02-24 Robin Cao + [BlackBerry] Upstream helper classes for skia + https://bugs.webkit.org/show_bug.cgi?id=79216 + + Reviewed by Antonio Gomes. + + Initial upstreaming, no new tests. + + * platform/graphics/blackberry/skia/ImageBufferData.h: Added. + (WebCore): + (ImageBufferData): + * platform/graphics/blackberry/skia/PlatformSupport.cpp: Added. + (WebCore): + (WebCore::setFontRenderStyleDefaults): + (WebCore::PlatformSupport::getRenderStyleForStrike): + (WebCore::PlatformSupport::getFontFamilyForCharacters): + * platform/graphics/blackberry/skia/PlatformSupport.h: Added. + (WebCore): + (PlatformSupport): + (FontFamily): + +2012-02-24 Robin Cao + [BlackBerry] Upstream ImageBlackBerry in platform/graphics/blackberry https://bugs.webkit.org/show_bug.cgi?id=79212 diff --git a/Source/WebCore/platform/graphics/blackberry/skia/ImageBufferData.h b/Source/WebCore/platform/graphics/blackberry/skia/ImageBufferData.h new file mode 100644 index 0000000..409197e --- /dev/null +++ b/Source/WebCore/platform/graphics/blackberry/skia/ImageBufferData.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2008, 2009, Google Inc. All rights reserved. + * Copyright (c) 2011, Research In Motion. 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 ImageBufferData_h +#define ImageBufferData_h + +#include "BlackBerryPlatformGraphics.h" +#include "PlatformContextSkia.h" + +#include "skia/ext/platform_canvas.h" + +namespace WebCore { + +class ImageBufferData { +public: + ImageBufferData(const IntSize&); + + OwnPtr m_canvas; + PlatformContextSkia m_platformContext; + BlackBerry::Platform::Graphics::Buffer* m_buffer; +}; + +} // namespace WebCore + +#endif // ImageBufferData_h diff --git a/Source/WebCore/platform/graphics/blackberry/skia/PlatformSupport.cpp b/Source/WebCore/platform/graphics/blackberry/skia/PlatformSupport.cpp new file mode 100644 index 0000000..408fe45 --- /dev/null +++ b/Source/WebCore/platform/graphics/blackberry/skia/PlatformSupport.cpp @@ -0,0 +1,214 @@ +/* + * Copyright (c) 2009-2010, Google Inc. All rights reserved. + * Copyright (c) 2011, Research In Motion. 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. + */ + +#include "config.h" +#include "PlatformSupport.h" + +#include "FontRenderStyle.h" + +#include +#include +#include +#include + +namespace WebCore { + +static void setFontRenderStyleDefaults(FontRenderStyle* style) +{ + style->useBitmaps = 2; + style->useAutoHint = 2; + style->useHinting = 2; + style->hintStyle = 0; + style->useAntiAlias = 2; + style->useSubpixel = 2; +} + +void PlatformSupport::getRenderStyleForStrike(const char* family, int sizeAndStyle, FontRenderStyle* out) +{ + bool isBold = sizeAndStyle & 1; + bool isItalic = sizeAndStyle & 2; + int pixelSize = sizeAndStyle >> 2; + + FcPattern* pattern = FcPatternCreate(); + FcValue fcvalue; + + fcvalue.type = FcTypeString; + fcvalue.u.s = reinterpret_cast(family); + FcPatternAdd(pattern, FC_FAMILY, fcvalue, FcFalse); + + fcvalue.type = FcTypeInteger; + fcvalue.u.i = isBold ? FC_WEIGHT_BOLD : FC_WEIGHT_NORMAL; + FcPatternAdd(pattern, FC_WEIGHT, fcvalue, FcFalse); + + fcvalue.type = FcTypeInteger; + fcvalue.u.i = isItalic ? FC_SLANT_ITALIC : FC_SLANT_ROMAN; + FcPatternAdd(pattern, FC_SLANT, fcvalue, FcFalse); + + fcvalue.type = FcTypeBool; + fcvalue.u.b = FcTrue; + FcPatternAdd(pattern, FC_SCALABLE, fcvalue, FcFalse); + + fcvalue.type = FcTypeDouble; + fcvalue.u.d = pixelSize; + FcPatternAdd(pattern, FC_SIZE, fcvalue, FcFalse); + + FcConfigSubstitute(0, pattern, FcMatchPattern); + FcDefaultSubstitute(pattern); + + FcResult result; + // Some versions of fontconfig don't actually write a value into result. + // However, it's not clear from the documentation if result should be a + // non-0 pointer: future versions might expect to be able to write to + // it. So we pass in a valid pointer and ignore it. + FcPattern* match = FcFontMatch(0, pattern, &result); + FcPatternDestroy(pattern); + + setFontRenderStyleDefaults(out); + + if (!match) + return; + + FcBool boolValue; + int intValue; + + if (FcPatternGetBool(match, FC_ANTIALIAS, 0, &boolValue) == FcResultMatch) + out->useAntiAlias = boolValue; + if (FcPatternGetBool(match, FC_EMBEDDED_BITMAP, 0, &boolValue) == FcResultMatch) + out->useBitmaps = boolValue; + if (FcPatternGetBool(match, FC_AUTOHINT, 0, &boolValue) == FcResultMatch) + out->useAutoHint = boolValue; + if (FcPatternGetBool(match, FC_HINTING, 0, &boolValue) == FcResultMatch) + out->useHinting = boolValue; + + if (FcPatternGetInteger(match, FC_RGBA, 0, &intValue) == FcResultMatch) { + switch (intValue) { + case FC_RGBA_NONE: + out->useSubpixel = 0; + break; + case FC_RGBA_RGB: + case FC_RGBA_BGR: + case FC_RGBA_VRGB: + case FC_RGBA_VBGR: + out->useSubpixel = 1; + break; + default: + // This includes FC_RGBA_UNKNOWN. + out->useSubpixel = 2; + break; + } + } + + FcPatternDestroy(match); +} + +void PlatformSupport::getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char*, FontFamily* family) +{ + FcCharSet* cset = FcCharSetCreate(); + for (size_t i = 0; i < numCharacters; ++i) { + if (U16_IS_SURROGATE(characters[i]) + && U16_IS_SURROGATE_LEAD(characters[i]) + && i != numCharacters - 1 + && U16_IS_TRAIL(characters[i + 1])) { + FcCharSetAddChar(cset, U16_GET_SUPPLEMENTARY(characters[i], characters[i+1])); + i++; + } else + FcCharSetAddChar(cset, characters[i]); + } + FcPattern* pattern = FcPatternCreate(); + + FcValue fcvalue; + fcvalue.type = FcTypeCharSet; + fcvalue.u.c = cset; + FcPatternAdd(pattern, FC_CHARSET, fcvalue, FcFalse); + + fcvalue.type = FcTypeBool; + fcvalue.u.b = FcTrue; + FcPatternAdd(pattern, FC_SCALABLE, fcvalue, FcFalse); + + FcConfigSubstitute(0, pattern, FcMatchPattern); + FcDefaultSubstitute(pattern); + + FcResult result; + FcFontSet* fontSet = FcFontSort(0, pattern, 0, 0, &result); + FcPatternDestroy(pattern); + FcCharSetDestroy(cset); + + if (!fontSet) { + family->name = String(); + family->isBold = false; + family->isItalic = false; + return; + } + + // Older versions of fontconfig have a bug where they cannot select + // only scalable fonts so we have to manually filter the results. + for (int i = 0; i < fontSet->nfont; ++i) { + FcPattern* current = fontSet->fonts[i]; + FcBool isScalable; + + if (FcPatternGetBool(current, FC_SCALABLE, 0, &isScalable) != FcResultMatch + || !isScalable) + continue; + + // fontconfig can also return fonts which are unreadable + FcChar8* cFilename; + if (FcPatternGetString(current, FC_FILE, 0, &cFilename) != FcResultMatch) + continue; + + if (access(reinterpret_cast(cFilename), R_OK)) + continue; + + FcChar8* familyName; + if (FcPatternGetString(current, FC_FAMILY, 0, &familyName) == FcResultMatch) { + const char* charFamily = reinterpret_cast(familyName); + family->name = String::fromUTF8(charFamily, strlen(charFamily)); + } + + int weight; + if (FcPatternGetInteger(current, FC_WEIGHT, 0, &weight) == FcResultMatch) + family->isBold = weight >= FC_WEIGHT_BOLD; + else + family->isBold = false; + + int slant; + if (FcPatternGetInteger(current, FC_SLANT, 0, &slant) == FcResultMatch) + family->isItalic = slant != FC_SLANT_ROMAN; + else + family->isItalic = false; + + FcFontSetDestroy(fontSet); + return; + } + + FcFontSetDestroy(fontSet); +} + +}; // namespace WebCore diff --git a/Source/WebCore/platform/graphics/blackberry/skia/PlatformSupport.h b/Source/WebCore/platform/graphics/blackberry/skia/PlatformSupport.h new file mode 100644 index 0000000..bd22d86 --- /dev/null +++ b/Source/WebCore/platform/graphics/blackberry/skia/PlatformSupport.h @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2010, Google Inc. All rights reserved. + * Copyright (c) 2011, Research In Motion. 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 PlatformSupport_h +#define PlatformSupport_h + +#include "PlatformString.h" + +namespace WebCore { + +struct FontRenderStyle; + +// This is a minimal version of the Chromium PlatformSupport/WebFontInfo classes used for font support. +class PlatformSupport { +public: + static void getRenderStyleForStrike(const char* family, int sizeAndStyle, FontRenderStyle* result); + struct FontFamily { + String name; + bool isBold; + bool isItalic; + }; + static void getFontFamilyForCharacters(const UChar*, size_t numCharacters, const char* preferredLocale, FontFamily*); +}; + +} // namespace WebCore + +#endif