AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate. (patchset #4 id:60001 of https://codereview.chromium.org/1215393002/)

Browse Source 
Reason for revert:
Breaking the roll.

E.g. on android_chromium_gn_compile_dbg:

FAILED: /b/build/goma/gomacc ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -MMD -MF obj/skia/ext/libskia.SkMemory_new_handler.o.d -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=1 -DENABLE_NOTIFICATIONS -DENABLE_BROWSER_CDMS -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DDONT_EMBED_BUILD_METADATA -DUSE_OPENSSL=1 -DUSE_OPENSSL_CERTS=1 -DNO_TCMALLOC -DDISABLE_NACL -DENABLE_CONFIGURATION_POLICY -DENABLE_SUPERVISED_USERS=1 -DENABLE_AUTOFILL_DIALOG=1 -DUSE_PROPRIETARY_CODECS -DV8_USE_EXTERNAL_STARTUP_DATA -DVIDEO_HOLE=1 -DMOBILE_SAFE_BROWSING -DSAFE_BROWSING_SERVICE -DCHROMIUM_BUILD -D_FILE_OFFSET_BITS=64 -DANDROID -DHAVE_SYS_UIO_H -DCOMPONENT_BUILD -D__GNU_SOURCE=1 -D_DEBUG -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -DSKIA_IMPLEMENTATION=1 -DSK_ARM_HAS_OPTIONAL_NEON -DSK_GAMMA_APPLY_TO_A8 -DSK_GAMMA_EXPONENT=1.4 -DSK_GAMMA_CONTRAST=0.0 -DSK_DEFAULT_FONT_CACHE_LIMIT=1048576 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSKIA_DLL -DGR_GL_IGNORE_ES3_MSAA=0 -DSK_SUPPORT_GPU=1 -DSK_BUILD_FOR_ANDROID -DUSE_CHROMIUM_SKIA -DXML_STATIC -I../.. -Igen -I../../third_party/skia/include/private -I../../third_party/skia/src/core -I../../third_party/skia/src/image -I../../third_party/skia/src/opts -I../../third_party/skia/src/pdf -I../../third_party/skia/src/ports -I../../third_party/skia/src/sfnt -I../../third_party/skia/src/utils -I../../third_party/skia/src/lazy -I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c -I../../third_party/skia/include/config -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/images -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pdf -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/include/gpu -I../../third_party/skia/src/gpu -I../../third_party/zlib -I../../third_party/expat/files/lib -I../../third_party/freetype-android/include -I../../third_party/freetype-android/src/include -I../../third_party/android_tools/ndk/sources/android/cpufeatures -fno-strict-aliasing -march=armv7-a -mfloat-abi=softfp -mtune=generic-armv7-a -mthumb -mthumb-interwork -fno-tree-sra -fno-caller-saves -funwind-tables -fPIC -pipe -ffunction-sections -funwind-tables -fno-short-enums -finline-limit=64 -mfpu=vfpv3-d16 -isystem../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libcxx/include -isystem../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++abi/libcxxabi/include -isystem../../third_party/android_tools/ndk/sources/android/support/include -fvisibility=hidden --sysroot=/b/build/slave/android_chromium_gn/build/src/third_party/android_tools/ndk/platforms/android-16/arch-arm -Os -fdata-sections -ffunction-sections -fomit-frame-pointer -g1 -Wno-format -Wendif-labels -Werror -Wno-missing-field-initializers -Wno-unused-parameter -Wno-psabi -Wno-extra -Wno-ignored-qualifiers -Wno-type-limits -Wno-unused-local-typedefs -fno-threadsafe-statics -fvisibility-inlines-hidden -std=gnu++11 -fno-rtti -fno-exceptions -Wno-deprecated -Wno-narrowing -Wno-literal-suffix -Wno-error=c++0x-compat -Wno-non-virtual-dtor -Wno-sign-promo -c ../../skia/ext/SkMemory_new_handler.cpp -o obj/skia/ext/libskia.SkMemory_new_handler.o
../../skia/ext/SkMemory_new_handler.cpp:12:52: fatal error: third_party/skia/include/core/SkThread.h: No such file or directory
 #include "third_party/skia/include/core/SkThread.h"

Original issue's description:
> Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate.
>
> SkThread.h doesn't do anything anymore execept include those two,
> and thankfully, it doesn't seem to be mentioned outside Skia.
>
> No public API changes.
> TBR=reed@google.com
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/c50acf2321d7a934c80d754e9cbe936dfb8eb4cc

TBR=mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1214603003
This commit is contained in:
jvanverth 2015-07-02 06:42:49 -07:00 committed by Commit bot
parent eeef46d181
commit 02802f64ea
56 changed files with 105 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench/MutexBench.cpp
View File

@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
#include "Benchmark.h"
#include "SkMutex.h"
#include "SkThread.h"
class MutexBench : public Benchmark {
public:

2
bench/RefCntBench.cpp
View File

@ -6,8 +6,8 @@
*/
#include <memory>
#include "Benchmark.h"
#include "SkAtomics.h"
#include "SkRefCnt.h"
#include "SkThread.h"
#include "SkWeakRefCnt.h"
enum {

1
dm/DM.cpp
View File

@ -18,7 +18,6 @@
#include "SkForceLinking.h"
#include "SkGraphics.h"
#include "SkMD5.h"
#include "SkMutex.h"
#include "SkOSFile.h"
#include "SkTHash.h"
#include "SkTaskGroup.h"

2
dm/DMJsonWriter.cpp
View File

@ -11,10 +11,10 @@
#include "SkCommonFlags.h"
#include "SkData.h"
#include "SkJSONCPP.h"
#include "SkMutex.h"
#include "SkOSFile.h"
#include "SkStream.h"
#include "SkTArray.h"
#include "SkThread.h"
namespace DM {

1
gyp/core.gypi
View File

@ -323,6 +323,7 @@
'<(skia_include_path)/core/SkTSearch.h',
'<(skia_include_path)/core/SkTemplates.h',
'<(skia_include_path)/core/SkTextBlob.h',
'<(skia_include_path)/core/SkThread.h',
'<(skia_include_path)/core/SkTime.h',
'<(skia_include_path)/core/SkTLazy.h',
'<(skia_include_path)/core/SkTypeface.h',

16
include/core/SkThread.h Normal file
View File

@ -0,0 +1,16 @@
/*
* Copyright 2006 The Android Open Source Project
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef SkThread_DEFINED
#define SkThread_DEFINED
// TODO: delete this file, or maybe move the definition of SkThread here.
#include "SkAtomics.h"
#include "SkMutex.h"
#endif

2
include/core/SkWeakRefCnt.h
View File

@ -9,7 +9,7 @@
#define SkWeakRefCnt_DEFINED
#include "SkRefCnt.h"
#include "SkAtomics.h"
#include "SkThread.h"
/** \class SkWeakRefCnt

1
include/ports/SkFontMgr_indirect.h
View File

@ -11,7 +11,6 @@
#include "SkDataTable.h"
#include "SkFontMgr.h"
#include "SkFontStyle.h"
#include "SkMutex.h"
#include "SkRemotableFontMgr.h"
#include "SkTArray.h"
#include "SkTypeface.h"

2
src/core/SkAAClip.cpp
View File

@ -7,11 +7,11 @@
*/
#include "SkAAClip.h"
#include "SkAtomics.h"
#include "SkBlitter.h"
#include "SkColorPriv.h"
#include "SkPath.h"
#include "SkScan.h"
#include "SkThread.h"
#include "SkUtils.h"
class AutoAAClipValidate {

8
src/core/SkBitmap.cpp
View File

@ -7,7 +7,6 @@
*/
#include "SkAtomics.h"
#include "SkBitmap.h"
#include "SkColorPriv.h"
#include "SkDither.h"
@ -15,13 +14,14 @@
#include "SkImagePriv.h"
#include "SkMallocPixelRef.h"
#include "SkMask.h"
#include "SkPackBits.h"
#include "SkPixelRef.h"
#include "SkReadBuffer.h"
#include "SkWriteBuffer.h"
#include "SkPixelRef.h"
#include "SkThread.h"
#include "SkUnPreMultiply.h"
#include "SkUtils.h"
#include "SkValidationUtils.h"
#include "SkWriteBuffer.h"
#include "SkPackBits.h"
#include <new>
static bool reset_return_false(SkBitmap* bm) {

6
src/core/SkBitmapHeap.h
View File

@ -12,7 +12,7 @@
#include "SkFlattenable.h"
#include "SkRefCnt.h"
#include "SkTDArray.h"
#include "SkAtomics.h"
#include "SkThread.h"
/**
* SkBitmapHeapEntry provides users of SkBitmapHeap (using internal storage) with a means to...
@ -52,7 +52,7 @@ private:
class SkBitmapHeapReader : public SkRefCnt {
public:
SkBitmapHeapReader() : INHERITED() {}
virtual SkBitmap* getBitmap(int32_t slot) const = 0;
@ -69,7 +69,7 @@ class SkBitmapHeap : public SkBitmapHeapReader {
public:
class ExternalStorage : public SkRefCnt {
public:
virtual bool insert(const SkBitmap& bitmap, int32_t slot) = 0;

4
src/core/SkCachedData.h
View File

@ -8,7 +8,7 @@
#ifndef SkCachedData_DEFINED
#define SkCachedData_DEFINED
#include "SkMutex.h"
#include "SkThread.h"
class SkDiscardableMemory;
@ -78,7 +78,7 @@ public:
#else
void validate() const {}
#endif
/*
* Attaching a data to to a SkResourceCache (only one at a time) enables the data to be
* unlocked when the cache is the only owner, thus freeing it to be purged (assuming the

2
src/core/SkClipStack.cpp
View File

@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
#include "SkAtomics.h"
#include "SkCanvas.h"
#include "SkClipStack.h"
#include "SkPath.h"
#include "SkPathOps.h"
#include "SkThread.h"
#include <new>

2
src/core/SkDeviceProfile.cpp
View File

@ -7,7 +7,7 @@
#include "SkDeviceProfile.h"
#include "SkMutex.h"
#include "SkThread.h"
#define DEFAULT_GAMMAEXP 2.2f
#define DEFAULT_CONTRASTSCALE 0.5f

2
src/core/SkDrawable.cpp
View File

@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
#include "SkAtomics.h"
#include "SkCanvas.h"
#include "SkDrawable.h"
#include "SkThread.h"
static int32_t next_generation_id() {
static int32_t gCanvasDrawableGenerationID;

5
src/core/SkGlyphCache.cpp
View File

@ -9,11 +9,10 @@
#include "SkGlyphCache_Globals.h"
#include "SkGraphics.h"
#include "SkLazyPtr.h"
#include "SkMutex.h"
#include "SkPaint.h"
#include "SkPath.h"
#include "SkTLS.h"
#include "SkTemplates.h"
#include "SkTLS.h"
#include "SkTypeface.h"
//#define SPEW_PURGE_STATUS
@ -418,6 +417,8 @@ void SkGlyphCache::invokeAndRemoveAuxProcs() {
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
#include "SkThread.h"
size_t SkGlyphCache_Globals::setCacheSizeLimit(size_t newLimit) {
static const size_t minLimit = 256 * 1024;
if (newLimit < minLimit) {

1
src/core/SkGlyphCache_Globals.h
View File

@ -9,7 +9,6 @@
#define SkGlyphCache_Globals_DEFINED
#include "SkGlyphCache.h"
#include "SkMutex.h"
#include "SkTLS.h"
#ifndef SK_DEFAULT_FONT_CACHE_COUNT_LIMIT

9
src/core/SkImageFilter.cpp
View File

@ -13,13 +13,12 @@
#include "SkDevice.h"
#include "SkLazyPtr.h"
#include "SkMatrixImageFilter.h"
#include "SkMutex.h"
#include "SkReadBuffer.h"
#include "SkWriteBuffer.h"
#include "SkRect.h"
#include "SkTDynamicHash.h"
#include "SkTInternalLList.h"
#include "SkValidationUtils.h"
#include "SkWriteBuffer.h"
#if SK_SUPPORT_GPU
#include "GrContext.h"
#include "GrDrawContext.h"
@ -29,9 +28,9 @@
#ifdef SK_BUILD_FOR_IOS
enum { kDefaultCacheSize = 2 * 1024 * 1024 };
#else
#else
enum { kDefaultCacheSize = 128 * 1024 * 1024 };
#endif
#endif
static int32_t next_image_filter_unique_id() {
static int32_t gImageFilterUniqueID;
@ -547,4 +546,4 @@ bool SkImageFilter::Proxy::filterImage(const SkImageFilter* filter, const SkBitm
SkBitmap* result, SkIPoint* offset) {
return fDevice->filterImage(filter, src, ctx, result, offset);
}

2
src/core/SkMessageBus.h
View File

@ -9,9 +9,9 @@
#define SkMessageBus_DEFINED
#include "SkLazyPtr.h"
#include "SkMutex.h"
#include "SkTArray.h"
#include "SkTDArray.h"
#include "SkThread.h"
#include "SkTypes.h"
template <typename Message>

1
src/core/SkPaint.cpp
View File

@ -17,7 +17,6 @@
#include "SkImageFilter.h"
#include "SkMaskFilter.h"
#include "SkMaskGamma.h"
#include "SkMutex.h"
#include "SkReadBuffer.h"
#include "SkWriteBuffer.h"
#include "SkPaintDefaults.h"

3
src/core/SkPath.cpp
View File

@ -12,6 +12,7 @@
#include "SkPathPriv.h"
#include "SkPathRef.h"
#include "SkRRect.h"
#include "SkThread.h"
////////////////////////////////////////////////////////////////////////////
@ -1880,7 +1881,7 @@ size_t SkPath::readFromMemory(const void* storage, size_t length) {
}
unsigned version = packed & 0xFF;
fConvexity = (packed >> kConvexity_SerializationShift) & 0xFF;
fFillType = (packed >> kFillType_SerializationShift) & 0xFF;
uint8_t dir = (packed >> kDirection_SerializationShift) & 0x3;

2
src/core/SkPixelRef.cpp
View File

@ -6,8 +6,8 @@
*/
#include "SkBitmapCache.h"
#include "SkMutex.h"
#include "SkPixelRef.h"
#include "SkThread.h"
#include "SkTraceEvent.h"
//#define SK_SUPPORT_LEGACY_UNBALANCED_PIXELREF_LOCKCOUNT

2
src/core/SkRegion.cpp
View File

@ -7,9 +7,9 @@
*/
#include "SkAtomics.h"
#include "SkRegionPriv.h"
#include "SkTemplates.h"
#include "SkThread.h"
#include "SkUtils.h"
/* Region Layout

2
src/core/SkRegionPriv.h
View File

@ -11,7 +11,7 @@
#define SkRegionPriv_DEFINED
#include "SkRegion.h"
#include "SkAtomics.h"
#include "SkThread.h"
#define assert_sentinel(value, isSentinel) \
SkASSERT(((value) == SkRegion::kRunTypeSentinel) == isSentinel)

11
src/core/SkResourceCache.cpp
View File

@ -8,7 +8,6 @@
#include "SkChecksum.h"
#include "SkMessageBus.h"
#include "SkMipMap.h"
#include "SkMutex.h"
#include "SkPixelRef.h"
#include "SkResourceCache.h"
@ -75,7 +74,7 @@ void SkResourceCache::init() {
class SkOneShotDiscardablePixelRef : public SkPixelRef {
public:
// Ownership of the discardablememory is transfered to the pixelref
SkOneShotDiscardablePixelRef(const SkImageInfo&, SkDiscardableMemory*, size_t rowBytes);
~SkOneShotDiscardablePixelRef();
@ -237,7 +236,7 @@ static bool gDumpCacheTransactions;
void SkResourceCache::add(Rec* rec) {
this->checkMessages();
SkASSERT(rec);
// See if we already have this key (racy inserts, etc.)
Rec* existing = fHash->find(rec->getKey());
@ -245,7 +244,7 @@ void SkResourceCache::add(Rec* rec) {
SkDELETE(rec);
return;
}
this->addToHead(rec);
fHash->add(rec);
@ -358,7 +357,7 @@ size_t SkResourceCache::setTotalByteLimit(size_t newLimit) {
SkCachedData* SkResourceCache::newCachedData(size_t bytes) {
this->checkMessages();
if (fDiscardableFactory) {
SkDiscardableMemory* dm = fDiscardableFactory(bytes);
return dm ? SkNEW_ARGS(SkCachedData, (bytes, dm)) : NULL;
@ -516,6 +515,8 @@ void SkResourceCache::checkMessages() {
///////////////////////////////////////////////////////////////////////////////
#include "SkThread.h"
SK_DECLARE_STATIC_MUTEX(gMutex);
static SkResourceCache* gResourceCache = NULL;
static void cleanup_gResourceCache() {

1
src/core/SkScalerContext.cpp
View File

@ -21,6 +21,7 @@
#include "SkRasterizer.h"
#include "SkRasterClip.h"
#include "SkStroke.h"
#include "SkThread.h"
#define ComputeBWRowBytes(width) (((unsigned)(width) + 7) >> 3)

4
src/core/SkShader.cpp
View File

@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
#include "SkAtomics.h"
#include "SkBitmapProcShader.h"
#include "SkColorShader.h"
#include "SkEmptyShader.h"
#include "SkReadBuffer.h"
#include "SkMallocPixelRef.h"
#include "SkPaint.h"
#include "SkPicture.h"
#include "SkPictureShader.h"
#include "SkReadBuffer.h"
#include "SkScalar.h"
#include "SkShader.h"
#include "SkThread.h"
#include "SkWriteBuffer.h"
//#define SK_TRACK_SHADER_LIFETIME

4
src/core/SkString.cpp
View File

@ -7,9 +7,9 @@
*/
#include "SkAtomics.h"
#include "SkFixed.h"
#include "SkString.h"
#include "SkFixed.h"
#include "SkThread.h"
#include "SkUtils.h"
#include <stdarg.h>
#include <stdio.h>

9
src/core/SkTLS.cpp
View File

@ -1,10 +1,3 @@
/*
* Copyright 2012 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "SkTLS.h"
// enable to help debug TLS storage
@ -12,7 +5,7 @@
#ifdef SK_TRACE_TLS_LIFETIME
#include "SkAtomics.h"
#include "SkThread.h"
static int32_t gTLSRecCount;
#endif

1
src/core/SkTypeface.cpp
View File

@ -10,7 +10,6 @@
#include "SkFontDescriptor.h"
#include "SkFontMgr.h"
#include "SkLazyPtr.h"
#include "SkMutex.h"
#include "SkOTTable_OS_2.h"
#include "SkStream.h"
#include "SkTypeface.h"

3
src/core/SkTypefaceCache.cpp
View File

@ -9,8 +9,7 @@
#include "SkTypefaceCache.h"
#include "SkAtomics.h"
#include "SkMutex.h"
#include "SkThread.h"
#define TYPEFACE_CACHE_LIMIT 1024

6
src/fonts/SkFontMgr_fontconfig.cpp
View File

@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
#include "SkFontConfigInterface.h"
#include "SkFontConfigTypeface.h"
#include "SkFontMgr.h"
#include "SkFontStyle.h"
#include "SkFontConfigInterface.h"
#include "SkFontConfigTypeface.h"
#include "SkMath.h"
#include "SkMutex.h"
#include "SkString.h"
#include "SkTDArray.h"
#include "SkThread.h"
// for now we pull these in directly. eventually we will solely rely on the
// SkFontConfigInterface instance.

2
src/fonts/SkTestScalerContext.cpp
View File

@ -42,7 +42,7 @@ SkTestFont::~SkTestFont() {
#ifdef SK_DEBUG
#include "SkMutex.h"
#include "SkThread.h"
SK_DECLARE_STATIC_MUTEX(gUsedCharsMutex);
#endif

4
src/gpu/GrBatch.h
View File

@ -12,8 +12,8 @@
#include "GrBatchTarget.h"
#include "GrGeometryProcessor.h"
#include "GrVertices.h"
#include "SkAtomics.h"
#include "SkRefCnt.h"
#include "SkThread.h"
#include "SkTypes.h"
class GrGpu;
@ -39,7 +39,7 @@ struct GrInitInvariantOutput;
class GrBatch : public SkRefCnt {
public:
GrBatch() : fClassID(kIllegalBatchClassID), fNumberOfDraws(0) { SkDEBUGCODE(fUsed = false;) }
virtual ~GrBatch() {}

2
src/gpu/gl/GrGLNoOpInterface.cpp
View File

@ -6,8 +6,8 @@
*/
#include "GrGLNoOpInterface.h"
#include "SkMutex.h"
#include "SkString.h"
#include "SkThread.h"
// the OpenGLES 2.0 spec says this must be >= 128
static const GrGLint kDefaultMaxVertexUniformVectors = 128;

2
src/lazy/SkDiscardableMemoryPool.cpp
View File

@ -9,8 +9,8 @@
#include "SkDiscardableMemoryPool.h"
#include "SkImageGenerator.h"
#include "SkLazyPtr.h"
#include "SkMutex.h"
#include "SkTInternalLList.h"
#include "SkThread.h"
// Note:
// A PoolDiscardableMemory is memory that is counted in a pool.

6
src/pathops/SkPathOpsDebug.cpp
View File

@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
#include "SkMutex.h"
#include "SkPath.h"
#include "SkPathOpsDebug.h"
#include "SkPath.h"
#include "SkString.h"
#include "SkThread.h"
#if DEBUG_VALIDATE
extern bool FLAGS_runFail;
@ -304,7 +304,7 @@ SkString SkOpAngle::debugPart() const {
break;
default:
SkASSERT(0);
}
}
return result;
}
#endif

1
src/ports/SkFontConfigInterface_direct.cpp
View File

@ -15,7 +15,6 @@
#include "SkBuffer.h"
#include "SkFontConfigInterface.h"
#include "SkLazyPtr.h"
#include "SkMutex.h"
#include "SkStream.h"
#include "SkString.h"

2
src/ports/SkFontHost_FreeType.cpp
View File

@ -17,12 +17,12 @@
#include "SkMask.h"
#include "SkMaskGamma.h"
#include "SkMatrix22.h"
#include "SkMutex.h"
#include "SkOTUtils.h"
#include "SkScalerContext.h"
#include "SkStream.h"
#include "SkString.h"
#include "SkTemplates.h"
#include "SkThread.h"
#include "SkTypes.h"
#if defined(SK_CAN_USE_DLOPEN)

1
src/ports/SkFontHost_FreeType_common.h
View File

@ -10,7 +10,6 @@
#define SKFONTHOST_FREETYPE_COMMON_H_
#include "SkGlyph.h"
#include "SkMutex.h"
#include "SkScalerContext.h"
#include "SkTypeface.h"
#include "SkTypes.h"

12
src/ports/SkFontHost_mac.cpp
View File

@ -24,13 +24,12 @@
#include "SkColorPriv.h"
#include "SkDescriptor.h"
#include "SkEndian.h"
#include "SkFloatingPoint.h"
#include "SkFontDescriptor.h"
#include "SkFontMgr.h"
#include "SkFloatingPoint.h"
#include "SkGlyph.h"
#include "SkLazyFnPtr.h"
#include "SkMaskGamma.h"
#include "SkMutex.h"
#include "SkSFNTHeader.h"
#include "SkOTTable_glyf.h"
#include "SkOTTable_head.h"
#include "SkOTTable_hhea.h"
@ -38,12 +37,13 @@
#include "SkOTUtils.h"
#include "SkPaint.h"
#include "SkPath.h"
#include "SkSFNTHeader.h"
#include "SkStream.h"
#include "SkString.h"
#include "SkTypefaceCache.h"
#include "SkStream.h"
#include "SkThread.h"
#include "SkTypeface_mac.h"
#include "SkUtils.h"
#include "SkTypefaceCache.h"
#include "SkFontMgr.h"
#include "SkUtils.h"
#include <dlfcn.h>

1
src/ports/SkFontHost_win.cpp
View File

@ -23,6 +23,7 @@
#include "SkStream.h"
#include "SkString.h"
#include "SkTemplates.h"
#include "SkThread.h"
#include "SkTypeface_win.h"
#include "SkTypefaceCache.h"
#include "SkUtils.h"

1
src/ports/SkFontMgr_custom.cpp
View File

@ -15,6 +15,7 @@
#include "SkRTConf.h"
#include "SkString.h"
#include "SkStream.h"
#include "SkThread.h"
#include "SkTSearch.h"
#include "SkTypefaceCache.h"
#include "SkTArray.h"

2
src/ports/SkFontMgr_fontconfig.cpp
View File

@ -11,10 +11,10 @@
#include "SkFontMgr.h"
#include "SkFontStyle.h"
#include "SkMath.h"
#include "SkMutex.h"
#include "SkString.h"
#include "SkStream.h"
#include "SkTDArray.h"
#include "SkThread.h"
#include "SkTypefaceCache.h"
#include "SkOSFile.h"

2
src/ports/SkFontMgr_win_dw.cpp
View File

@ -9,9 +9,9 @@
#include "SkDWriteFontFileStream.h"
#include "SkFontMgr.h"
#include "SkHRESULT.h"
#include "SkMutex.h"
#include "SkStream.h"
#include "SkTScopedComPtr.h"
#include "SkThread.h"
#include "SkTypeface.h"
#include "SkTypefaceCache.h"
#include "SkTypeface_win_dw.h"

6
src/ports/SkRemotableFontMgr_win_dw.cpp
View File

@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
#include "SkDataTable.h"
#include "SkDWrite.h"
#include "SkDWriteFontFileStream.h"
#include "SkDataTable.h"
#include "SkHRESULT.h"
#include "SkMutex.h"
#include "SkRemotableFontMgr.h"
#include "SkStream.h"
#include "SkString.h"
#include "SkTArray.h"
#include "SkThread.h"
#include "SkTScopedComPtr.h"
#include "SkTypeface_win.h"
#include "SkTypes.h"
@ -80,7 +80,7 @@ private:
}
public:
/** localeNameLength must include the null terminator. */
SkRemotableFontMgr_DirectWrite(IDWriteFontCollection* fontCollection,

2
src/ports/SkTLS_win.cpp
View File

@ -6,7 +6,7 @@
*/
#include "SkTLS.h"
#include "SkMutex.h"
#include "SkThread.h"
static bool gOnce = false;
static DWORD gTlsIndex;

2
src/views/SkEvent.cpp
View File

@ -265,7 +265,7 @@ void SkEvent::inflate(const SkDOM& dom, const SkDOM::Node* node)
#define EVENT_LOGN(s, n)
#endif
#include "SkMutex.h"
#include "SkThread.h"
#include "SkTime.h"
class SkEvent_Globals {

6
src/views/SkEventSink.cpp
View File

@ -8,8 +8,10 @@
#include "SkEventSink.h"
#include "SkMutex.h"
#include "SkTagList.h"
#include "SkThread.h"
#include "SkThread.h"
#include "SkTime.h"
class SkEventSink_Globals {
@ -254,7 +256,7 @@ SkEventSink* SkEventSink::FindSink(SkEventSinkID sinkID)
#if 0 // experimental, not tested
#include "SkMutex.h"
#include "SkThread.h"
#include "SkTDict.h"
#define kMinStringBufferSize 128

4
src/views/SkOSMenu.cpp
View File

@ -4,9 +4,9 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "SkAtomics.h"
#include "SkOSMenu.h"
#include <stdarg.h>
#include "SkOSMenu.h"
#include "SkThread.h"
static int gOSMenuCmd = 7000;

2
tests/AtomicTest.cpp
View File

@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
#include "SkAtomics.h"
#include "SkThread.h"
#include "SkThreadUtils.h"
#include "SkTypes.h"
#include "Test.h"

2
tests/PathOpsExtendedTest.cpp
View File

@ -11,10 +11,10 @@
#include "SkCanvas.h"
#include "SkForceLinking.h"
#include "SkMatrix.h"
#include "SkMutex.h"
#include "SkPaint.h"
#include "SkRTConf.h"
#include "SkStream.h"
#include "SkThread.h"
#ifdef SK_BUILD_FOR_MAC
#include <sys/sysctl.h>

2
tests/PathOpsExtendedTest.h
View File

@ -12,6 +12,8 @@
#include "SkPath.h"
#include "SkPathOpsTypes.h"
#include "SkStream.h"
#include "SkThread.h"
#include "SkThreadUtils.h"
#include "Test.h"
DECLARE_bool(runFail);

2
tests/skia_test.cpp
View File

@ -8,7 +8,6 @@
#include "CrashHandler.h"
#include "OverwriteLine.h"
#include "Resources.h"
#include "SkAtomics.h"
#include "SkCommonFlags.h"
#include "SkGraphics.h"
#include "SkOSFile.h"
@ -16,6 +15,7 @@
#include "SkTArray.h"
#include "SkTaskGroup.h"
#include "SkTemplates.h"
#include "SkThread.h"
#include "SkTime.h"
#include "Test.h"

2
tools/sk_tool_utils_font.cpp
View File

@ -7,9 +7,9 @@
#include "Resources.h"
#include "SkFontMgr.h"
#include "SkMutex.h"
#include "SkOSFile.h"
#include "SkTestScalerContext.h"
#include "SkThread.h"
#include "SkUtils.h"
#include "sk_tool_utils.h"

12
tools/skpdiff/SkDiffContext.h
View File

@ -9,11 +9,11 @@
#define SkDiffContext_DEFINED
#include "SkImageDiffer.h"
#include "SkMutex.h"
#include "SkString.h"
#include "SkTArray.h"
#include "SkTDArray.h"
#include "SkTLList.h"
#include "SkThread.h"
class SkWStream;
@ -52,7 +52,7 @@ public:
void setWhiteDiffDir(const SkString& directory);
/**
* Modify the pattern used to generate commonName (= the
* Modify the pattern used to generate commonName (= the
* basename of rgb/white diff files).
*
* - true: basename is a combination of the input file names.
@ -61,10 +61,10 @@ public:
* For example, for:
* baselinePath=/tmp/dir/image-before.png
* testPath=/tmp/dir/image-after.png
*
*
* If setLongNames(true), commonName would be:
* image-before-png-vs-image-after-png.png
*
*
* If setLongNames(false), commonName would be:
* image-.png
*/
@ -104,8 +104,8 @@ public:
*
* The format of the JSON document is one top level array named "records".
* Each record in the array is an object with the following values:
* "commonName" : string containing the output filename (basename)
* depending on the value of 'longNames'.
* "commonName" : string containing the output filename (basename)
* depending on the value of 'longNames'.
* (see 'setLongNames' for an explanation and example).
* "baselinePath" : string containing the path to the baseline image
* "testPath" : string containing the path to the test image