diff options
| author |  mtklein <mtklein@google.com> | 2014-10-31 11:30:22 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-31 11:30:22 -0700 |
| commit | e9f7fbfaeed73e36b1b6d0d55dbb2ad4f121e1b7 (patch) | |
| tree | 4e06c4d27bfd045a5736a728e6eeb6a24e55bb76 /src/core/SkMultiPictureDraw.cpp | |
| parent | 3bdd7dce5e8393aeed0a64b583e1077f5159d516 (diff) | |
Revert of Turn SkTaskGroups back on. (patchset #1 id:1 of https://codereview.chromium.org/687263007/)
Reason for revert:
precautionary revert. may have caused WinXP crashes on Chrome tree: https://code.google.com/p/chromium/issues/detail?id=429207
Original issue's description:
> Turn SkTaskGroups back on.
>
> Revert "Disable SkTaskGroup in SkMultiPictureDraw temporarily."
> Revert "Revert harder, removing SkTaskGroup.cpp from core temporarily."
>
> NOTREECHECKS=true
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/2100c5ed7a5e5470a04e7af7309d8bd3fc4249f7
TBR=reed@google.com,mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/693993002
Diffstat (limited to 'src/core/SkMultiPictureDraw.cpp')
| -rw-r--r-- | src/core/SkMultiPictureDraw.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/SkMultiPictureDraw.cpp b/src/core/SkMultiPictureDraw.cpp index 8d2deebb93..4e9c0f4338 100644 --- a/src/core/SkMultiPictureDraw.cpp +++ b/src/core/SkMultiPictureDraw.cpp @@ -86,10 +86,16 @@ void SkMultiPictureDraw::draw() { // we place the taskgroup after the MPDReset, to ensure that we don't delete the DrawData // objects until after we're finished the tasks (which have pointers to the data). +#if 0 SkTaskGroup group; group.batch(DrawData::Draw, fThreadSafeDrawData.begin(), fThreadSafeDrawData.count()); // we deliberately don't call wait() here, since the destructor will do that, this allows us // to continue processing gpu-data without having to wait on the cpu tasks. +#else + for (int i = 0; i < fThreadSafeDrawData.count(); i++) { + DrawData::Draw(&fThreadSafeDrawData[i]); + } +#endif const int count = fGPUDrawData.count(); if (0 == count) { |