ec3ed6a5eb
I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
65 lines
1.5 KiB
C++
65 lines
1.5 KiB
C++
|
|
/*
|
|
* 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_platform_DEFINED
|
|
#define SkThread_platform_DEFINED
|
|
|
|
#if defined(ANDROID) && !defined(SK_BUILD_FOR_ANDROID_NDK)
|
|
|
|
#include <utils/threads.h>
|
|
#include <utils/Atomic.h>
|
|
|
|
#define sk_atomic_inc(addr) android_atomic_inc(addr)
|
|
#define sk_atomic_dec(addr) android_atomic_dec(addr)
|
|
|
|
class SkMutex : android::Mutex {
|
|
public:
|
|
// if isGlobal is true, then ignore any errors in the platform-specific
|
|
// destructor
|
|
SkMutex(bool isGlobal = true) {}
|
|
~SkMutex() {}
|
|
|
|
void acquire() { this->lock(); }
|
|
void release() { this->unlock(); }
|
|
};
|
|
|
|
#else
|
|
|
|
/** Implemented by the porting layer, this function adds 1 to the int specified
|
|
by the address (in a thread-safe manner), and returns the previous value.
|
|
*/
|
|
SK_API int32_t sk_atomic_inc(int32_t* addr);
|
|
/** Implemented by the porting layer, this function subtracts 1 to the int
|
|
specified by the address (in a thread-safe manner), and returns the previous
|
|
value.
|
|
*/
|
|
SK_API int32_t sk_atomic_dec(int32_t* addr);
|
|
|
|
class SkMutex {
|
|
public:
|
|
// if isGlobal is true, then ignore any errors in the platform-specific
|
|
// destructor
|
|
SkMutex(bool isGlobal = true);
|
|
~SkMutex();
|
|
|
|
void acquire();
|
|
void release();
|
|
|
|
private:
|
|
bool fIsGlobal;
|
|
enum {
|
|
kStorageIntCount = 64
|
|
};
|
|
uint32_t fStorage[kStorageIntCount];
|
|
};
|
|
|
|
#endif
|
|
|
|
#endif
|