aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkTaskGroup.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2014-11-03 17:25:54 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-11-03 17:25:54 -0800
commitdb8d0e5bb018594d0ced3bfa68484115d8cf76b8 (patch)
tree09f0a060d6e28107715e4800e8da440359ba1d41 /src/core/SkTaskGroup.cpp
parent7c11aadd8268a1b003771ebb2aa82d53a909fe86 (diff)
Manually load CONDITION_VARIABLE methods on Windows, checking for failure (XP).
Tested by running DM on XP. Before this patch, it fails at startup (even just out/Debug/dm --help). Now it asserts for other reasons later on in user code, which is just fine by me. The net effect is that SkTaskGroups will always be synchronous on XP. That's not ideal, but a step up from crashing. CQ_EXTRA_TRYBOTS=client.skia:Test-Win7-ShuttleA-HD2000-x86-Release-Trybot,Test-Win7-ShuttleA-HD2000-x86_64-Release-Trybot BUG=skia: Review URL: https://codereview.chromium.org/700683002
Diffstat (limited to 'src/core/SkTaskGroup.cpp')
-rw-r--r--src/core/SkTaskGroup.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkTaskGroup.cpp b/src/core/SkTaskGroup.cpp
index 6869f18235..345fd2fcb9 100644
--- a/src/core/SkTaskGroup.cpp
+++ b/src/core/SkTaskGroup.cpp
@@ -165,7 +165,7 @@ ThreadPool* ThreadPool::gGlobal = NULL;
SkTaskGroup::Enabler::Enabler(int threads) {
SkASSERT(ThreadPool::gGlobal == NULL);
- if (threads != 0) {
+ if (threads != 0 && SkCondVar::Supported()) {
ThreadPool::gGlobal = SkNEW_ARGS(ThreadPool, (threads));
}
}