Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Side by Side Diff: src/views/SkEvent.cpp

Issue 1214603003: Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/ports/SkTLS_win.cpp ('k') | src/views/SkEventSink.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "SkEvent.h" 10 #include "SkEvent.h"
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 SkDEBUGF(("%s\n", s)); 258 SkDEBUGF(("%s\n", s));
259 } 259 }
260 260
261 #define EVENT_LOG(s) event_log(s) 261 #define EVENT_LOG(s) event_log(s)
262 #define EVENT_LOGN(s, n) do { SkString str(s); str.append(" "); str.appen dS32(n); event_log(str.c_str()); } while (0) 262 #define EVENT_LOGN(s, n) do { SkString str(s); str.append(" "); str.appen dS32(n); event_log(str.c_str()); } while (0)
263 #else 263 #else
264 #define EVENT_LOG(s) 264 #define EVENT_LOG(s)
265 #define EVENT_LOGN(s, n) 265 #define EVENT_LOGN(s, n)
266 #endif 266 #endif
267 267
268 #include "SkMutex.h" 268 #include "SkThread.h"
269 #include "SkTime.h" 269 #include "SkTime.h"
270 270
271 class SkEvent_Globals { 271 class SkEvent_Globals {
272 public: 272 public:
273 SkEvent_Globals() { 273 SkEvent_Globals() {
274 fEventQHead = NULL; 274 fEventQHead = NULL;
275 fEventQTail = NULL; 275 fEventQTail = NULL;
276 fDelayQHead = NULL; 276 fDelayQHead = NULL;
277 SkDEBUGCODE(fEventCounter = 0;) 277 SkDEBUGCODE(fEventCounter = 0;)
278 } 278 }
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 evt = next; 499 evt = next;
500 } 500 }
501 501
502 evt = globals.fDelayQHead; 502 evt = globals.fDelayQHead;
503 while (evt) { 503 while (evt) {
504 SkEvent* next = evt->fNextEvent; 504 SkEvent* next = evt->fNextEvent;
505 delete evt; 505 delete evt;
506 evt = next; 506 evt = next;
507 } 507 }
508 } 508 }
OLDNEW
« no previous file with comments | « src/ports/SkTLS_win.cpp ('k') | src/views/SkEventSink.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698