Cleanup: Remove unused/unimplemented SkTextLayout.h.

Nobody uses it in Skia, Chromium and Blink. And it does not have any
implementation either.

BUG=None
TEST=make all
R=mtklein@google.com, reed@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/385323002
This commit is contained in:
tfarina 2014-07-14 12:32:47 -07:00 коммит произвёл Commit bot
Родитель a189ccdb4d
Коммит 6599258a99
2 изменённых файлов: 220 добавлений и 281 удалений

Просмотреть файл

@ -7,106 +7,207 @@
{
'variables': {
'header_filenames': [
'pdf/SkPDFDevice.h',
'pdf/SkPDFDocument.h',
'svg/SkSVGTypes.h',
'svg/SkSVGBase.h',
'svg/SkSVGAttribute.h',
'svg/SkSVGParser.h',
'svg/SkSVGPaintState.h',
'animator/SkAnimator.h',
'animator/SkAnimatorView.h',
'gpu/GrTexture.h',
'gpu/SkGr.h',
'gpu/GrContext.h',
'gpu/gl/GrGLConfig_chrome.h',
'gpu/gl/SkNativeGLContext.h',
'gpu/gl/SkMesaGLContext.h',
'gpu/gl/SkDebugGLContext.h',
'gpu/gl/SkANGLEGLContext.h',
'gpu/gl/GrGLConfig.h',
'gpu/gl/GrGLInterface.h',
'gpu/gl/SkNullGLContext.h',
'gpu/gl/GrGLFunctions.h',
'gpu/gl/SkGLContextHelper.h',
'gpu/gl/GrGLExtensions.h',
'gpu/SkGpuDevice.h',
'gpu/GrTypes.h',
'gpu/GrFontScaler.h',
'gpu/GrResource.h',
'gpu/GrKey.h',
'gpu/GrOvalRenderer.h',
'gpu/GrEffectUnitTest.h',
'gpu/GrConfig.h',
'gpu/GrPaint.h',
'gpu/GrPathRendererChain.h',
'gpu/GrTBackendEffectFactory.h',
'gpu/GrDrawEffect.h',
'gpu/GrTextContext.h',
'gpu/GrEffect.h',
'gpu/SkGrTexturePixelRef.h',
'gpu/GrTextureAccess.h',
'gpu/GrRect.h',
'gpu/GrEffectStage.h',
'gpu/GrClipData.h',
'gpu/GrUserConfig.h',
'gpu/SkGrPixelRef.h',
'gpu/GrAARectRenderer.h',
'gpu/GrColor.h',
'gpu/GrGlyph.h',
'gpu/GrBackendEffectFactory.h',
'gpu/GrContextFactory.h',
'gpu/GrRenderTarget.h',
'gpu/GrSurface.h',
'gpu/GrTypesPriv.h',
'config/sk_stdint.h',
'config/SkUserConfig.h',
'pipe/SkGPipe.h',
'images/SkMovie.h',
'images/SkPageFlipper.h',
'images/SkForceLinking.h',
'effects/SkMorphologyImageFilter.h',
'config/sk_stdint.h',
'core/SkAdvancedTypefaceMetrics.h',
'core/SkAnnotation.h',
'core/SkBitmap.h',
'core/SkBlitRow.h',
'core/SkCanvas.h',
'core/SkChunkAlloc.h',
'core/SkClipStack.h',
'core/SkColor.h',
'core/SkColorFilter.h',
'core/SkColorPriv.h',
'core/SkColorShader.h',
'core/SkColorTable.h',
'core/SkComposeShader.h',
'core/SkData.h',
'core/SkDataTable.h',
'core/SkDeque.h',
'core/SkDevice.h',
'core/SkDeviceProperties.h',
'core/SkDither.h',
'core/SkDocument.h',
'core/SkDraw.h',
'core/SkDrawFilter.h',
'core/SkDrawLooper.h',
'core/SkEndian.h',
'core/SkError.h',
'core/SkFixed.h',
'core/SkFlate.h',
'core/SkFlattenable.h',
'core/SkFlattenableBuffers.h',
'core/SkFlattenableSerialization.h',
'core/SkFloatBits.h',
'core/SkFloatingPoint.h',
'core/SkFontHost.h',
'core/SkFontLCDConfig.h',
'core/SkGeometry.h',
'core/SkGraphics.h',
'core/SkImage.h',
'core/SkImageDecoder.h',
'core/SkImageEncoder.h',
'core/SkImageFilter.h',
'core/SkInstCnt.h',
'core/SkLineClipper.h',
'core/SkMallocPixelRef.h',
'core/SkMask.h',
'core/SkMaskFilter.h',
'core/SkMath.h',
'core/SkMatrix.h',
'core/SkMetaData.h',
'core/SkOSFile.h',
'core/SkPackBits.h',
'core/SkPaint.h',
'core/SkPaintOptionsAndroid.h',
'core/SkPath.h',
'core/SkPathEffect.h',
'core/SkPathMeasure.h',
'core/SkPicture.h',
'core/SkPixelRef.h',
'core/SkPoint.h',
'core/SkPostConfig.h',
'core/SkPreConfig.h',
'core/SkRRect.h',
'core/SkRasterizer.h',
'core/SkReader32.h',
'core/SkRect.h',
'core/SkRefCnt.h',
'core/SkRegion.h',
'core/SkScalar.h',
'core/SkShader.h',
'core/SkSize.h',
'core/SkStream.h',
'core/SkString.h',
'core/SkStringUtils.h',
'core/SkStrokeRec.h',
'core/SkSurface.h',
'core/SkTArray.h',
'core/SkTDArray.h',
'core/SkTDStack.h',
'core/SkTDict.h',
'core/SkTInternalLList.h',
'core/SkTLazy.h',
'core/SkTRegistry.h',
'core/SkTSearch.h',
'core/SkTemplates.h',
'core/SkThread.h',
'core/SkTime.h',
'core/SkTypeface.h',
'core/SkTypes.h',
'core/SkUnPreMultiply.h',
'core/SkUtils.h',
'core/SkWeakRefCnt.h',
'core/SkWriter32.h',
'core/SkXfermode.h',
'device/xps/SkConstexprMath.h',
'device/xps/SkXPSDevice.h',
'effects/Sk1DPathEffect.h',
'effects/Sk2DPathEffect.h',
'effects/SkXfermodeImageFilter.h',
'effects/SkAlphaThresholdFilter.h',
'effects/SkArithmeticMode.h',
'effects/SkMergeImageFilter.h',
'effects/SkPerlinNoiseShader.h',
'effects/SkLerpXfermode.h',
'effects/SkLumaColorFilter.h',
'effects/SkRectShaderImageFilter.h',
'effects/SkMagnifierImageFilter.h',
'effects/SkPorterDuff.h',
'effects/SkBlurImageFilter.h',
'effects/SkTableMaskFilter.h',
'effects/SkAvoidXfermode.h',
'effects/SkBitmapSource.h',
'effects/SkCornerPathEffect.h',
'effects/SkTransparentShader.h',
'effects/SkStippleMaskFilter.h',
'effects/SkPaintFlagsDrawFilter.h',
'effects/SkOffsetImageFilter.h',
'effects/SkDiscretePathEffect.h',
'effects/SkTableColorFilter.h',
'effects/SkGradientShader.h',
'effects/SkEmbossMaskFilter.h',
'effects/SkComposeImageFilter.h',
'effects/SkTestImageFilters.h',
'effects/SkLayerRasterizer.h',
'effects/SkDashPathEffect.h',
'effects/Sk1DPathEffect.h',
'effects/SkBlurMaskFilter.h',
'effects/SkDrawExtraPathEffect.h',
'effects/SkDisplacementMapEffect.h',
'effects/SkPixelXorXfermode.h',
'effects/SkColorMatrixFilter.h',
'effects/SkColorMatrix.h',
'effects/SkBlurDrawLooper.h',
'effects/SkBlurImageFilter.h',
'effects/SkBlurMaskFilter.h',
'effects/SkColorFilterImageFilter.h',
'effects/SkLayerDrawLooper.h',
'effects/SkLightingImageFilter.h',
'effects/SkColorMatrix.h',
'effects/SkColorMatrixFilter.h',
'effects/SkComposeImageFilter.h',
'effects/SkCornerPathEffect.h',
'effects/SkDashPathEffect.h',
'effects/SkDiscretePathEffect.h',
'effects/SkDisplacementMapEffect.h',
'effects/SkDrawExtraPathEffect.h',
'effects/SkDropShadowImageFilter.h',
'effects/SkEmbossMaskFilter.h',
'effects/SkGradientShader.h',
'effects/SkLayerDrawLooper.h',
'effects/SkLayerRasterizer.h',
'effects/SkLerpXfermode.h',
'effects/SkLightingImageFilter.h',
'effects/SkLumaColorFilter.h',
'effects/SkMagnifierImageFilter.h',
'effects/SkMatrixConvolutionImageFilter.h',
'effects/SkMergeImageFilter.h',
'effects/SkMorphologyImageFilter.h',
'effects/SkOffsetImageFilter.h',
'effects/SkPaintFlagsDrawFilter.h',
'effects/SkPerlinNoiseShader.h',
'effects/SkPixelXorXfermode.h',
'effects/SkPorterDuff.h',
'effects/SkRectShaderImageFilter.h',
'effects/SkStippleMaskFilter.h',
'effects/SkTableColorFilter.h',
'effects/SkTableMaskFilter.h',
'effects/SkTestImageFilters.h',
'effects/SkTransparentShader.h',
'effects/SkXfermodeImageFilter.h',
'gpu/GrAARectRenderer.h',
'gpu/GrBackendEffectFactory.h',
'gpu/GrClipData.h',
'gpu/GrColor.h',
'gpu/GrConfig.h',
'gpu/GrContext.h',
'gpu/GrContextFactory.h',
'gpu/GrDrawEffect.h',
'gpu/GrEffect.h',
'gpu/GrEffectStage.h',
'gpu/GrEffectUnitTest.h',
'gpu/GrFontScaler.h',
'gpu/GrGlyph.h',
'gpu/GrKey.h',
'gpu/GrOvalRenderer.h',
'gpu/GrPaint.h',
'gpu/GrPathRendererChain.h',
'gpu/GrRect.h',
'gpu/GrRenderTarget.h',
'gpu/GrResource.h',
'gpu/GrSurface.h',
'gpu/GrTBackendEffectFactory.h',
'gpu/GrTextContext.h',
'gpu/GrTexture.h',
'gpu/GrTextureAccess.h',
'gpu/GrTypes.h',
'gpu/GrTypesPriv.h',
'gpu/GrUserConfig.h',
'gpu/SkGpuDevice.h',
'gpu/SkGr.h',
'gpu/SkGrPixelRef.h',
'gpu/SkGrTexturePixelRef.h',
'gpu/gl/GrGLConfig.h',
'gpu/gl/GrGLConfig_chrome.h',
'gpu/gl/GrGLExtensions.h',
'gpu/gl/GrGLFunctions.h',
'gpu/gl/GrGLInterface.h',
'gpu/gl/SkANGLEGLContext.h',
'gpu/gl/SkDebugGLContext.h',
'gpu/gl/SkGLContextHelper.h',
'gpu/gl/SkMesaGLContext.h',
'gpu/gl/SkNativeGLContext.h',
'gpu/gl/SkNullGLContext.h',
'images/SkForceLinking.h',
'images/SkMovie.h',
'images/SkPageFlipper.h',
'pathops/SkPathOps.h',
'pdf/SkPDFDevice.h',
'pdf/SkPDFDocument.h',
'pipe/SkGPipe.h',
'ports/SkFontConfigInterface.h',
'ports/SkFontMgr.h',
'ports/SkFontStyle.h',
'ports/SkTypeface_android.h',
'ports/SkTypeface_mac.h',
'ports/SkTypeface_win.h',
'svg/SkSVGAttribute.h',
'svg/SkSVGBase.h',
'svg/SkSVGPaintState.h',
'svg/SkSVGParser.h',
'svg/SkSVGTypes.h',
'utils/SkBoundaryPatch.h',
'utils/SkCamera.h',
'utils/SkCubicInterval.h',
@ -150,143 +251,41 @@
'utils/win/SkHRESULT.h',
'utils/win/SkIStream.h',
'utils/win/SkTScopedComPtr.h',
'views/SkApplication.h',
'views/SkBGViewArtist.h',
'views/SkEvent.h',
'views/SkEventSink.h',
'views/SkKey.h',
'views/SkOSMenu.h',
'views/SkOSWindow_Android.h',
'views/SkOSWindow_Mac.h',
'views/SkOSWindow_NaCl.h',
'views/SkOSWindow_SDL.h',
'views/SkOSWindow_Unix.h',
'views/SkOSWindow_Win.h',
'views/SkOSWindow_iOS.h',
'views/SkStackViewLayout.h',
'views/SkSystemEventTypes.h',
'views/SkTextBox.h',
'views/SkTouchGesture.h',
'views/SkView.h',
'views/SkViewInflate.h',
'views/SkWidget.h',
'views/SkWindow.h',
'views/android/AndroidKeyToSkKey.h',
'views/animated/SkBorderView.h',
'views/animated/SkImageView.h',
'views/animated/SkProgressBarView.h',
'views/animated/SkScrollBarView.h',
'views/animated/SkWidgetViews.h',
'views/unix/XkeysToSkKeys.h',
'views/unix/keysym2ucs.h',
'xml/SkBML_WXMLParser.h',
'xml/SkBML_XMLParser.h',
'xml/SkDOM.h',
'xml/SkJS.h',
'xml/SkXMLParser.h',
'xml/SkBML_XMLParser.h',
'xml/SkBML_WXMLParser.h',
'xml/SkXMLWriter.h',
'device/xps/SkXPSDevice.h',
'device/xps/SkConstexprMath.h',
'ports/SkTypeface_win.h',
'ports/SkFontConfigInterface.h',
'ports/SkTypeface_mac.h',
'ports/SkTypeface_android.h',
'ports/SkFontStyle.h',
'ports/SkFontMgr.h',
'text/SkTextLayout.h',
'core/SkColor.h',
'core/SkFontHost.h',
'core/SkMetaData.h',
'core/SkRRect.h',
'core/SkMatrix.h',
'core/SkDataTable.h',
'core/SkScalar.h',
'core/SkFlattenableSerialization.h',
'core/SkTypeface.h',
'core/SkImageEncoder.h',
'core/SkDrawFilter.h',
'core/SkTDict.h',
'core/SkRasterizer.h',
'core/SkColorPriv.h',
'core/SkFloatingPoint.h',
'core/SkOSFile.h',
'core/SkPaint.h',
'core/SkTDStack.h',
'core/SkDither.h',
'core/SkFixed.h',
'core/SkDocument.h',
'core/SkInstCnt.h',
'core/SkEndian.h',
'core/SkColorTable.h',
'core/SkBitmap.h',
'core/SkDraw.h',
'core/SkPackBits.h',
'core/SkFloatBits.h',
'core/SkDeque.h',
'core/SkTRegistry.h',
'core/SkTLazy.h',
'core/SkComposeShader.h',
'core/SkUtils.h',
'core/SkImage.h',
'core/SkPaintOptionsAndroid.h',
'core/SkDeviceProperties.h',
'core/SkGraphics.h',
'core/SkCanvas.h',
'core/SkPicture.h',
'core/SkClipStack.h',
'core/SkXfermode.h',
'core/SkColorFilter.h',
'core/SkRegion.h',
'core/SkRefCnt.h',
'core/SkStream.h',
'core/SkFontLCDConfig.h',
'core/SkBlitRow.h',
'core/SkGeometry.h',
'core/SkStrokeRec.h',
'core/SkImageDecoder.h',
'core/SkTime.h',
'core/SkPathMeasure.h',
'core/SkMaskFilter.h',
'core/SkFlate.h',
'core/SkTDArray.h',
'core/SkAnnotation.h',
'core/SkMath.h',
'core/SkDrawLooper.h',
'core/SkFlattenableBuffers.h',
'core/SkTemplates.h',
'core/SkMask.h',
'core/SkMallocPixelRef.h',
'core/SkWeakRefCnt.h',
'core/SkTypes.h',
'core/SkThread.h',
'core/SkData.h',
'core/SkPoint.h',
'core/SkColorShader.h',
'core/SkChunkAlloc.h',
'core/SkUnPreMultiply.h',
'core/SkReader32.h',
'core/SkDevice.h',
'core/SkImageFilter.h',
'core/SkAdvancedTypefaceMetrics.h',
'core/SkTInternalLList.h',
'core/SkTArray.h',
'core/SkStringUtils.h',
'core/SkPreConfig.h',
'core/SkLineClipper.h',
'core/SkPathEffect.h',
'core/SkString.h',
'core/SkPixelRef.h',
'core/SkSize.h',
'core/SkSurface.h',
'core/SkPostConfig.h',
'core/SkShader.h',
'core/SkWriter32.h',
'core/SkError.h',
'core/SkPath.h',
'core/SkFlattenable.h',
'core/SkTSearch.h',
'core/SkRect.h',
'pathops/SkPathOps.h',
'views/SkTouchGesture.h',
'views/SkEvent.h',
'views/SkOSWindow_NaCl.h',
'views/SkTextBox.h',
'views/SkViewInflate.h',
'views/SkOSWindow_iOS.h',
'views/SkBGViewArtist.h',
'views/SkOSWindow_SDL.h',
'views/SkWindow.h',
'views/SkSystemEventTypes.h',
'views/SkOSWindow_Android.h',
'views/SkOSWindow_Mac.h',
'views/android/AndroidKeyToSkKey.h',
'views/SkEventSink.h',
'views/animated/SkImageView.h',
'views/animated/SkWidgetViews.h',
'views/animated/SkProgressBarView.h',
'views/animated/SkBorderView.h',
'views/animated/SkScrollBarView.h',
'views/SkStackViewLayout.h',
'views/SkApplication.h',
'views/unix/keysym2ucs.h',
'views/unix/XkeysToSkKeys.h',
'views/SkKey.h',
'views/SkView.h',
'views/SkOSMenu.h',
'views/SkOSWindow_Unix.h',
'views/SkWidget.h',
'views/SkOSWindow_Win.h',
],
},
}

Просмотреть файл

@ -1,60 +0,0 @@
/*
* Copyright 2011 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef SkTextLayout_DEFINED
#define SkTextLayout_DEFINED
#include "SkPaint.h"
#include "SkRefCnt.h"
class SkTextStyle : public SkRefCnt {
public:
SK_DECLARE_INST_COUNT(SkTextStyle)
SkTextStyle();
SkTextStyle(const SkTextStyle&);
explicit SkTextStyle(const SkPaint&);
virtual ~SkTextStyle();
const SkPaint& paint() const { return fPaint; }
SkPaint& paint() { return fPaint; }
// todo: bidi-override, language
private:
SkPaint fPaint;
typedef SkRefCnt INHERITED;
};
class SkTextLayout {
public:
SkTextLayout();
~SkTextLayout();
void setText(const char text[], size_t length);
void setBounds(const SkRect& bounds);
SkTextStyle* getDefaultStyle() const { return fDefaultStyle; }
SkTextStyle* setDefaultStyle(SkTextStyle*);
// SkTextStyle* setStyle(SkTextStyle*, size_t offset, size_t length);
void draw(SkCanvas* canvas);
private:
SkTDArray<char> fText;
SkTextStyle* fDefaultStyle;
SkRect fBounds;
// cache
struct Line;
struct GlyphRun;
SkTDArray<Line*> fLines;
};
#endif