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

Move SkLeanWindows.h to src.

Browse Source 
This file pulls in Windows headers in a custom way, which is somewhat
awkward for a library header. The only use in include/ has been replaced
with a single forward declaration.

Change-Id: Ibef4cf7a2d1c9957a6a5b145b95aca1a6868cb5e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/214689
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
This commit is contained in:
Ben Wagner 2019-05-20 11:02:49 -04:00 committed by Skia Commit-Bot
parent 54fbe0f813
commit ab6eefe60e
24 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench/nanobench.cpp
View File

@ -28,10 +28,10 @@
#include "include/core/SkPictureRecorder.h"
#include "include/core/SkString.h"
#include "include/core/SkSurface.h"
#include "include/private/SkLeanWindows.h"
#include "src/core/SkAutoMalloc.h"
#include "src/core/SkBBoxHierarchy.h"
#include "src/core/SkColorSpacePriv.h"
#include "src/core/SkLeanWindows.h"
#include "src/core/SkOSFile.h"
#include "src/core/SkTaskGroup.h"
#include "src/core/SkTraceEvent.h"

2
dm/DM.cpp
View File

@ -18,11 +18,11 @@
#include "include/ports/SkTypeface_win.h"
#include "include/private/SkChecksum.h"
#include "include/private/SkHalf.h"
#include "include/private/SkLeanWindows.h"
#include "include/private/SkMutex.h"
#include "include/private/SkSpinlock.h"
#include "include/private/SkTHash.h"
#include "src/core/SkColorSpacePriv.h"
#include "src/core/SkLeanWindows.h"
#include "src/core/SkMD5.h"
#include "src/core/SkOSFile.h"
#include "src/core/SkTaskGroup.h"

10
include/ports/SkTypeface_win.h
View File

@ -9,10 +9,18 @@
#define SkTypeface_win_DEFINED
#include "include/core/SkTypeface.h"
#include "include/private/SkLeanWindows.h"
#include "include/core/SkTypes.h"
#ifdef SK_BUILD_FOR_WIN
#ifdef UNICODE
typedef struct tagLOGFONTW LOGFONTW;
typedef LOGFONTW LOGFONT;
#else
typedef struct tagLOGFONTA LOGFONTA;
typedef LOGFONTA LOGFONT;
#endif // UNICODE
/**
* Like the other Typeface create methods, this returns a new reference to the
* corresponding typeface for the specified logfont. The caller is responsible

2
src/core/SkExecutor.cpp
View File

@ -15,7 +15,7 @@
#include <thread>
#if defined(SK_BUILD_FOR_WIN)
#include "include/private/SkLeanWindows.h"
#include "src/core/SkLeanWindows.h"
static int num_cores() {
SYSTEM_INFO sysinfo;
GetNativeSystemInfo(&sysinfo);

0
include/private/SkLeanWindows.h → src/core/SkLeanWindows.h
View File

2
src/core/SkSemaphore.cpp
View File

@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
#include "include/private/SkLeanWindows.h"
#include "include/private/SkSemaphore.h"
#include "src/core/SkLeanWindows.h"
#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
#include <mach/mach.h>

2
src/core/SkThreadID.cpp
View File

@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
#include "include/private/SkLeanWindows.h"
#include "include/private/SkThreadID.h"
#ifdef SK_BUILD_FOR_WIN
#include "src/core/SkLeanWindows.h"
SkThreadID SkGetThreadID() { return GetCurrentThreadId(); }
#else
#include <pthread.h>

2
src/core/SkTime.cpp
View File

@ -9,8 +9,8 @@
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
#include "include/private/SkLeanWindows.h"
#include "include/private/SkTo.h"
#include "src/core/SkLeanWindows.h"
#include <chrono>

2
src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp
View File

@ -7,7 +7,7 @@
#include "include/core/SkTypes.h"
#if defined(SK_BUILD_FOR_WIN)
#include "include/private/SkLeanWindows.h"
#include "src/core/SkLeanWindows.h"
#include "include/gpu/gl/GrGLAssembleInterface.h"
#include "include/gpu/gl/GrGLInterface.h"

2
src/gpu/vk/GrVkGpu.cpp
View File

@ -54,7 +54,7 @@
#endif // !defined(SK_BUILD_FOR_WIN)
#if defined(SK_BUILD_FOR_WIN) && defined(SK_DEBUG)
#include "include/private/SkLeanWindows.h"
#include "src/core/SkLeanWindows.h"
#endif
#define VK_CALL(X) GR_VK_CALL(this->vkInterface(), X)

2
src/ports/SkDebug_win.cpp
View File

@ -9,7 +9,7 @@
#if defined(SK_BUILD_FOR_WIN)
#include "include/private/SkLeanWindows.h"
#include "src/core/SkLeanWindows.h"
#include <stdarg.h>
#include <stdio.h>

1
src/ports/SkFontHost_win.cpp
View File

@ -24,6 +24,7 @@
#include "src/core/SkDescriptor.h"
#include "src/core/SkFontDescriptor.h"
#include "src/core/SkGlyph.h"
#include "src/core/SkLeanWindows.h"
#include "src/core/SkMakeUnique.h"
#include "src/core/SkMaskGamma.h"
#include "src/core/SkTypefaceCache.h"

2
src/ports/SkOSFile_win.cpp
View File

@ -8,10 +8,10 @@
#include "include/core/SkTypes.h"
#if defined(SK_BUILD_FOR_WIN)
#include "include/private/SkLeanWindows.h"
#include "include/private/SkMalloc.h"
#include "include/private/SkNoncopyable.h"
#include "include/private/SkTFitsIn.h"
#include "src/core/SkLeanWindows.h"
#include "src/core/SkOSFile.h"
#include "src/core/SkStringUtils.h"

2
src/ports/SkOSLibrary_win.cpp
View File

@ -7,7 +7,7 @@
#include "include/core/SkTypes.h"
#if defined(SK_BUILD_FOR_WIN)
#include "include/private/SkLeanWindows.h"
#include "src/core/SkLeanWindows.h"
#include "src/ports/SkOSLibrary.h"
void* DynamicLoadLibrary(const char* libraryName) {

2
src/ports/SkTLS_win.cpp
View File

@ -7,8 +7,8 @@
#include "include/core/SkTypes.h"
#if defined(SK_BUILD_FOR_WIN)
#include "include/private/SkLeanWindows.h"
#include "include/private/SkMutex.h"
#include "src/core/SkLeanWindows.h"
#include "src/core/SkTLS.h"
static bool gOnce = false;

2
src/ports/SkTypeface_win_dw.h
View File

@ -9,8 +9,8 @@
#define SkTypeface_win_dw_DEFINED
#include "include/core/SkTypeface.h"
#include "include/private/SkLeanWindows.h"
#include "src/core/SkAdvancedTypefaceMetrics.h"
#include "src/core/SkLeanWindows.h"
#include "src/core/SkTypefaceCache.h"
#include "src/utils/win/SkDWrite.h"
#include "src/utils/win/SkHRESULT.h"

2
src/utils/win/SkAutoCoInitialize.h
View File

@ -12,8 +12,8 @@
#ifdef SK_BUILD_FOR_WIN
#include "include/private/SkLeanWindows.h"
#include "include/private/SkNoncopyable.h"
#include "src/core/SkLeanWindows.h"
/**
* An instance of this class initializes COM on creation

2
src/utils/win/SkHRESULT.h
View File

@ -11,7 +11,7 @@
#include "include/core/SkTypes.h"
#ifdef SK_BUILD_FOR_WIN
#include "include/private/SkLeanWindows.h"
#include "src/core/SkLeanWindows.h"
void SkTraceHR(const char* file, unsigned long line,
HRESULT hr, const char* msg);

2
src/utils/win/SkIStream.h
View File

@ -14,7 +14,7 @@
#ifdef SK_BUILD_FOR_WIN
#include "include/private/SkLeanWindows.h"
#include "src/core/SkLeanWindows.h"
#include <ole2.h>
class SkStream;

2
src/utils/win/SkTScopedComPtr.h
View File

@ -8,7 +8,7 @@
#ifndef SkTScopedComPtr_DEFINED
#define SkTScopedComPtr_DEFINED
#include "include/private/SkLeanWindows.h"
#include "src/core/SkLeanWindows.h"
#ifdef SK_BUILD_FOR_WIN

2
src/utils/win/SkWGL.h
View File

@ -10,7 +10,7 @@
#ifndef SkWGL_DEFINED
#define SkWGL_DEFINED
#include "include/private/SkLeanWindows.h"
#include "src/core/SkLeanWindows.h"
/**
* Working with WGL extensions can be a pain. Among the reasons is that You must

2
src/xps/SkXPSDevice.cpp
View File

@ -8,7 +8,7 @@
#include "include/core/SkTypes.h"
#if defined(SK_BUILD_FOR_WIN)
#include "include/private/SkLeanWindows.h"
#include "src/core/SkLeanWindows.h"
#ifndef UNICODE
#define UNICODE

2
tests/TracingTest.cpp
View File

@ -8,7 +8,7 @@
#include "include/core/SkImageInfo.h"
#include "include/core/SkPoint.h"
#include "include/core/SkRect.h"
#include "include/private/SkLeanWindows.h"
#include "src/core/SkLeanWindows.h"
#include "src/core/SkTraceEvent.h"
#include "tests/Test.h"
#include "tools/flags/CommandLineFlags.h"

2
tools/CrashHandler.cpp
View File

@ -7,7 +7,7 @@
#include "tools/CrashHandler.h"
#include "include/private/SkLeanWindows.h"
#include "src/core/SkLeanWindows.h"
#include <stdlib.h>