| Index: Source/core/platform/graphics/mac/FontComplexTextMac.cpp
|
| diff --git a/Source/core/platform/graphics/mac/FontComplexTextMac.cpp b/Source/core/platform/graphics/mac/FontComplexTextMac.cpp
|
| deleted file mode 100644
|
| index 5cf79f3377b74cc4992ebd85532f8d24acab555f..0000000000000000000000000000000000000000
|
| --- a/Source/core/platform/graphics/mac/FontComplexTextMac.cpp
|
| +++ /dev/null
|
| @@ -1,213 +0,0 @@
|
| -/*
|
| - * Copyright (C) 2006, 2007, 2008, 2009 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 INC. 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 INC. 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.
|
| - */
|
| -
|
| -#include "config.h"
|
| -#include "core/platform/graphics/Font.h"
|
| -
|
| -#include "core/platform/graphics/FontFallbackList.h"
|
| -#include "core/platform/graphics/GraphicsContext.h"
|
| -#include "core/platform/graphics/SimpleFontData.h"
|
| -#include "core/platform/graphics/mac/ComplexTextController.h"
|
| -#include "platform/fonts/GlyphBuffer.h"
|
| -#include "platform/geometry/IntRect.h"
|
| -#include "platform/graphics/TextRun.h"
|
| -#include "wtf/MathExtras.h"
|
| -
|
| -#include "core/platform/graphics/harfbuzz/HarfBuzzShaper.h"
|
| -
|
| -using namespace std;
|
| -
|
| -namespace WebCore {
|
| -
|
| -static bool preferHarfBuzz(const Font* font)
|
| -{
|
| - const FontDescription& description = font->fontDescription();
|
| - return description.featureSettings() && description.featureSettings()->size() > 0;
|
| -}
|
| -
|
| -FloatRect Font::selectionRectForComplexText(const TextRun& run, const FloatPoint& point, int h,
|
| - int from, int to) const
|
| -{
|
| - if (preferHarfBuzz(this)) {
|
| - HarfBuzzShaper shaper(this, run);
|
| - if (shaper.shape())
|
| - return shaper.selectionRect(point, h, from, to);
|
| - }
|
| - ComplexTextController controller(this, run);
|
| - controller.advance(from);
|
| - float beforeWidth = controller.runWidthSoFar();
|
| - controller.advance(to);
|
| - float afterWidth = controller.runWidthSoFar();
|
| -
|
| - // Using roundf() rather than ceilf() for the right edge as a compromise to ensure correct caret positioning
|
| - if (run.rtl()) {
|
| - float totalWidth = controller.totalWidth();
|
| - return FloatRect(floorf(point.x() + totalWidth - afterWidth), point.y(), roundf(point.x() + totalWidth - beforeWidth) - floorf(point.x() + totalWidth - afterWidth), h);
|
| - }
|
| -
|
| - return FloatRect(floorf(point.x() + beforeWidth), point.y(), roundf(point.x() + afterWidth) - floorf(point.x() + beforeWidth), h);
|
| -}
|
| -
|
| -float Font::getGlyphsAndAdvancesForComplexText(const TextRun& run, int from, int to, GlyphBuffer& glyphBuffer, ForTextEmphasisOrNot forTextEmphasis) const
|
| -{
|
| - float initialAdvance;
|
| -
|
| - ComplexTextController controller(this, run, false, 0, forTextEmphasis);
|
| - controller.advance(from);
|
| - float beforeWidth = controller.runWidthSoFar();
|
| - controller.advance(to, &glyphBuffer);
|
| -
|
| - if (glyphBuffer.isEmpty())
|
| - return 0;
|
| -
|
| - float afterWidth = controller.runWidthSoFar();
|
| -
|
| - if (run.rtl()) {
|
| - initialAdvance = controller.totalWidth() + controller.finalRoundingWidth() - afterWidth;
|
| - glyphBuffer.reverse(0, glyphBuffer.size());
|
| - } else
|
| - initialAdvance = beforeWidth;
|
| -
|
| - return initialAdvance;
|
| -}
|
| -
|
| -void Font::drawComplexText(GraphicsContext* context, const TextRunPaintInfo& runInfo, const FloatPoint& point) const
|
| -{
|
| - if (preferHarfBuzz(this)) {
|
| - GlyphBuffer glyphBuffer;
|
| - HarfBuzzShaper shaper(this, runInfo.run);
|
| - shaper.setDrawRange(runInfo.from, runInfo.to);
|
| - if (shaper.shape(&glyphBuffer)) {
|
| - drawGlyphBuffer(context, runInfo, glyphBuffer, point);
|
| - return;
|
| - }
|
| - }
|
| - // This glyph buffer holds our glyphs + advances + font data for each glyph.
|
| - GlyphBuffer glyphBuffer;
|
| -
|
| - float startX = point.x() + getGlyphsAndAdvancesForComplexText(runInfo.run, runInfo.from, runInfo.to, glyphBuffer);
|
| -
|
| - // We couldn't generate any glyphs for the run. Give up.
|
| - if (glyphBuffer.isEmpty())
|
| - return;
|
| -
|
| - // Draw the glyph buffer now at the starting point returned in startX.
|
| - FloatPoint startPoint(startX, point.y());
|
| - drawGlyphBuffer(context, runInfo, glyphBuffer, startPoint);
|
| -}
|
| -
|
| -void Font::drawEmphasisMarksForComplexText(GraphicsContext* context, const TextRunPaintInfo& runInfo, const AtomicString& mark, const FloatPoint& point) const
|
| -{
|
| - GlyphBuffer glyphBuffer;
|
| - float initialAdvance = getGlyphsAndAdvancesForComplexText(runInfo.run, runInfo.from, runInfo.to, glyphBuffer, ForTextEmphasis);
|
| -
|
| - if (glyphBuffer.isEmpty())
|
| - return;
|
| -
|
| - drawEmphasisMarks(context, runInfo, glyphBuffer, mark, FloatPoint(point.x() + initialAdvance, point.y()));
|
| -}
|
| -
|
| -float Font::floatWidthForComplexText(const TextRun& run, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
|
| -{
|
| - if (preferHarfBuzz(this)) {
|
| - HarfBuzzShaper shaper(this, run);
|
| - if (shaper.shape())
|
| - return shaper.totalWidth();
|
| - }
|
| - ComplexTextController controller(this, run, true, fallbackFonts);
|
| - if (glyphOverflow) {
|
| - glyphOverflow->top = max<int>(glyphOverflow->top, ceilf(-controller.minGlyphBoundingBoxY()) - (glyphOverflow->computeBounds ? 0 : fontMetrics().ascent()));
|
| - glyphOverflow->bottom = max<int>(glyphOverflow->bottom, ceilf(controller.maxGlyphBoundingBoxY()) - (glyphOverflow->computeBounds ? 0 : fontMetrics().descent()));
|
| - glyphOverflow->left = max<int>(0, ceilf(-controller.minGlyphBoundingBoxX()));
|
| - glyphOverflow->right = max<int>(0, ceilf(controller.maxGlyphBoundingBoxX() - controller.totalWidth()));
|
| - }
|
| - return controller.totalWidth();
|
| -}
|
| -
|
| -int Font::offsetForPositionForComplexText(const TextRun& run, float x, bool includePartialGlyphs) const
|
| -{
|
| - if (preferHarfBuzz(this)) {
|
| - HarfBuzzShaper shaper(this, run);
|
| - if (shaper.shape())
|
| - return shaper.offsetForPosition(x);
|
| - }
|
| - ComplexTextController controller(this, run);
|
| - return controller.offsetForPosition(x, includePartialGlyphs);
|
| -}
|
| -
|
| -const SimpleFontData* Font::fontDataForCombiningCharacterSequence(const UChar* characters, size_t length, FontDataVariant variant) const
|
| -{
|
| - UChar32 baseCharacter;
|
| - size_t baseCharacterLength = 0;
|
| - U16_NEXT(characters, baseCharacterLength, length, baseCharacter);
|
| -
|
| - GlyphData baseCharacterGlyphData = glyphDataForCharacter(baseCharacter, false, variant);
|
| -
|
| - if (!baseCharacterGlyphData.glyph)
|
| - return 0;
|
| -
|
| - if (length == baseCharacterLength)
|
| - return baseCharacterGlyphData.fontData;
|
| -
|
| - bool triedBaseCharacterFontData = false;
|
| -
|
| - unsigned i = 0;
|
| - for (const FontData* fontData = fontDataAt(0); fontData; fontData = fontDataAt(++i)) {
|
| - const SimpleFontData* simpleFontData = fontData->fontDataForCharacter(baseCharacter);
|
| - if (variant == NormalVariant) {
|
| - if (simpleFontData->platformData().orientation() == Vertical) {
|
| - if (isCJKIdeographOrSymbol(baseCharacter) && !simpleFontData->hasVerticalGlyphs()) {
|
| - variant = BrokenIdeographVariant;
|
| - simpleFontData = simpleFontData->brokenIdeographFontData().get();
|
| - } else if (m_fontDescription.nonCJKGlyphOrientation() == NonCJKGlyphOrientationVerticalRight) {
|
| - SimpleFontData* verticalRightFontData = simpleFontData->verticalRightOrientationFontData().get();
|
| - Glyph verticalRightGlyph = verticalRightFontData->glyphForCharacter(baseCharacter);
|
| - if (verticalRightGlyph == baseCharacterGlyphData.glyph)
|
| - simpleFontData = verticalRightFontData;
|
| - } else {
|
| - SimpleFontData* uprightFontData = simpleFontData->uprightOrientationFontData().get();
|
| - Glyph uprightGlyph = uprightFontData->glyphForCharacter(baseCharacter);
|
| - if (uprightGlyph != baseCharacterGlyphData.glyph)
|
| - simpleFontData = uprightFontData;
|
| - }
|
| - }
|
| - } else {
|
| - if (const SimpleFontData* variantFontData = simpleFontData->variantFontData(m_fontDescription, variant).get())
|
| - simpleFontData = variantFontData;
|
| - }
|
| -
|
| - if (simpleFontData == baseCharacterGlyphData.fontData)
|
| - triedBaseCharacterFontData = true;
|
| -
|
| - if (simpleFontData->canRenderCombiningCharacterSequence(characters, length))
|
| - return simpleFontData;
|
| - }
|
| -
|
| - if (!triedBaseCharacterFontData && baseCharacterGlyphData.fontData && baseCharacterGlyphData.fontData->canRenderCombiningCharacterSequence(characters, length))
|
| - return baseCharacterGlyphData.fontData;
|
| -
|
| - return SimpleFontData::systemFallback();
|
| -}
|
| -
|
| -} // namespace WebCore
|
|
|