Skip to content

GitLab

T
tangled
Commit f491e759 authored by eae@chromium.org's avatar eae@chromium.org
Browse files
Options

Remove SkiaFontWin as it is no longer used 

Remove the SkiaFontWin.cpp and SkiaFontWin.h files and all references
to them as the paintSkiaText method provided by SkiaFontWin.h is no
longer used now that the Uniscribe code path has been removed.

R=schenney@chromium.org
BUG=313423

Review URL: https://codereview.chromium.org/209383011

git-svn-id: svn://svn.chromium.org/blink/trunk@169888 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent f0fa2288
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 203 deletions
third_party/WebKit/Source/platform/blink_platform.gyp
View file @ f491e759
......@@ -324,7 +324,6 @@
['include', 'fonts/win/FontCacheSkiaWin\\.cpp$'],
['include', 'fonts/win/FontFallbackWin\\.(cpp|h)$'],
['include', 'fonts/win/FontPlatformDataWin\\.(cpp|h)$'],
['include', 'fonts/win/SkiaFontWin\\.(cpp|h)$'],
['exclude', 'fonts/harfbuzz/FontPlatformDataHarfBuzz\\.cpp$'],
# SystemInfo.cpp is useful and we don't want to copy it.
......
third_party/WebKit/Source/platform/blink_platform.gypi
View file @ f491e759
......@@ -407,8 +407,6 @@
'fonts/win/FontPlatformDataWin.cpp',
'fonts/win/FontPlatformDataWin.h',
'fonts/win/FontWin.cpp',
'fonts/win/SkiaFontWin.cpp',
'fonts/win/SkiaFontWin.h',
'fonts/win/UniscribeHelper.cpp',
'fonts/win/UniscribeHelper.h',
'fonts/win/UniscribeHelperTextRun.cpp',
......
third_party/WebKit/Source/platform/fonts/harfbuzz/FontHarfBuzz.cpp
View file @ f491e759
......@@ -85,9 +85,15 @@ static void paintGlyphs(GraphicsContext* gc, const SimpleFontData* font,
paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
if (textMode & TextModeFill) {
// If we also filled, we don't want to draw shadows twice.
// See comment in FontChromiumWin.cpp::paintSkiaText() for more details.
// Since we use the looper for shadows, we remove it (if any) now.
// If there is a shadow and we filled above, there will already be
// a shadow. We don't want to draw it again or it will be too dark
// and it will go on top of the fill.
//
// Note that this isn't strictly correct, since the stroke could be
// very thick and the shadow wouldn't account for this. The "right"
// thing would be to draw to a new layer and then draw that layer
// with a shadow. But this is a lot of extra work for something
// that isn't normally an issue.
paint.setLooper(0);
}
......
third_party/WebKit/Source/platform/fonts/mac/FontMac.cpp
View file @ f491e759
......@@ -163,7 +163,7 @@ void Font::drawGlyphs(GraphicsContext* gc, const SimpleFontData* font,
if (textMode & TextModeFill) {
// If we also filled, we don't want to draw shadows twice.
// See comment in FontChromiumWin.cpp::paintSkiaText() for more details.
// See comment in FontHarfBuzz.cpp::paintGlyphs() for more details.
paint.setLooper(0);
}
......
third_party/WebKit/Source/platform/fonts/win/FontPlatformDataWin.cpp
View file @ f491e759
......@@ -35,7 +35,6 @@
#include "platform/LayoutTestSupport.h"
#include "platform/fonts/FontCache.h"
#include "platform/fonts/harfbuzz/HarfBuzzFace.h"
#include "platform/fonts/win/SkiaFontWin.h"
#include "platform/graphics/GraphicsContext.h"
#include "public/platform/Platform.h"
#include "public/platform/win/WebSandboxSupport.h"
......
third_party/WebKit/Source/platform/fonts/win/SkiaFontWin.cpp deleted 100644 → 0
View file @ f0fa2288
/*
* Copyright (c) 2008, 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.
*/
#include "config.h"
#include "platform/fonts/win/SkiaFontWin.h"
#include "platform/fonts/SimpleFontData.h"
#include "platform/fonts/win/FontPlatformDataWin.h"
#include "platform/graphics/Gradient.h"
#include "platform/graphics/GraphicsContext.h"
#include "platform/graphics/Pattern.h"
#include "platform/transforms/AffineTransform.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkDevice.h"
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkShader.h"
#include "third_party/skia/include/core/SkTemplates.h"
#include "wtf/RefPtr.h"
namespace WebCore {
static void skiaDrawText(GraphicsContext* context,
const SkPoint& point,
const SkRect& textRect,
SkPaint* paint,
const WORD* glyphs,
const int* advances,
const GOFFSET* offsets,
unsigned numGlyphs)
{
// Reserve space for 64 SkPoints on the stack. If numGlyphs is larger, the array
// will dynamically allocate it space for numGlyph glyphs. This is used to store
// the computed x,y locations. In the case where offsets==null, then we use it
// to store (twice as many) SkScalars for x[]
static const size_t kLocalGlyphMax = 64;
SkScalar x = point.fX;
SkScalar y = point.fY;
if (offsets) {
SkAutoSTArray<kLocalGlyphMax, SkPoint> storage(numGlyphs);
SkPoint* pos = storage.get();
for (unsigned i = 0; i < numGlyphs; i++) {
// GDI has dv go up, so we negate it
pos[i].set(x + SkIntToScalar(offsets[i].du), y + -SkIntToScalar(offsets[i].dv));
x += SkIntToScalar(advances[i]);
}
context->drawPosText(glyphs, numGlyphs * sizeof(uint16_t), pos, textRect, *paint);
} else {
SkAutoSTArray<kLocalGlyphMax * 2, SkScalar> storage(numGlyphs);
SkScalar* xpos = storage.get();
for (unsigned i = 0; i < numGlyphs; i++) {
xpos[i] = x;
x += SkIntToScalar(advances[i]);
}
context->drawPosTextH(glyphs, numGlyphs * sizeof(uint16_t), xpos, y, textRect, *paint);
}
}
void paintSkiaText(GraphicsContext* context,
const FontPlatformData& data,
unsigned numGlyphs,
const WORD* glyphs,
const int* advances,
const GOFFSET* offsets,
const SkPoint& origin,
const SkRect& textRect)
{
TextDrawingModeFlags textMode = context->textDrawingMode();
// Filling (if necessary). This is the common case.
SkPaint paint;
context->setupPaintForFilling(&paint);
paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
data.setupPaint(&paint, context);
bool didFill = false;
if ((textMode & TextModeFill) && (SkColorGetA(paint.getColor()) || paint.getLooper())) {
skiaDrawText(context, origin, textRect, &paint, &glyphs[0], &advances[0], &offsets[0], numGlyphs);
didFill = true;
}
// Stroking on top (if necessary).
if ((textMode & TextModeStroke)
&& context->strokeStyle() != NoStroke
&& context->strokeThickness() > 0) {
paint.reset();
context->setupPaintForStroking(&paint);
paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
data.setupPaint(&paint, context);
if (didFill) {
// If there is a shadow and we filled above, there will already be
// a shadow. We don't want to draw it again or it will be too dark
// and it will go on top of the fill.
//
// Note that this isn't strictly correct, since the stroke could be
// very thick and the shadow wouldn't account for this. The "right"
// thing would be to draw to a new layer and then draw that layer
// with a shadow. But this is a lot of extra work for something
// that isn't normally an issue.
paint.setLooper(0);
}
skiaDrawText(context, origin, textRect, &paint, &glyphs[0], &advances[0], &offsets[0], numGlyphs);
}
}
} // namespace WebCore
third_party/WebKit/Source/platform/fonts/win/SkiaFontWin.h deleted 100644 → 0
View file @ f0fa2288
/*
* Copyright (c) 2008, 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 SkiaFontWin_h
#define SkiaFontWin_h
#include <usp10.h>
#include <windows.h>
struct SkPoint;
struct SkRect;
namespace WebCore {
class FontPlatformData;
class GraphicsContext;
// Note that the offsets parameter is optional. If not null it represents a
// per glyph offset (such as returned by ScriptPlace Windows API function).
void paintSkiaText(GraphicsContext*,
const FontPlatformData&,
unsigned numGlyphs,
const WORD* glyphs,
const int* advances,
const GOFFSET* offsets,
const SkPoint& origin,
const SkRect& textRect);
} // namespace WebCore
#endif // SkiaFontWin_h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment