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

Side by Side Diff: src/views/SkOSMenu.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/views/SkEventSink.cpp ('k') | tests/AtomicTest.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 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 #include "SkAtomics.h" 7 #include <stdarg.h>
8 #include "SkOSMenu.h" 8 #include "SkOSMenu.h"
9 #include <stdarg.h> 9 #include "SkThread.h"
10 10
11 static int gOSMenuCmd = 7000; 11 static int gOSMenuCmd = 7000;
12 12
13 SkOSMenu::SkOSMenu(const char title[]) { 13 SkOSMenu::SkOSMenu(const char title[]) {
14 fTitle.set(title); 14 fTitle.set(title);
15 } 15 }
16 16
17 SkOSMenu::~SkOSMenu() { 17 SkOSMenu::~SkOSMenu() {
18 this->reset(); 18 this->reset();
19 } 19 }
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 const char* text = evt.findString(slotName); 254 const char* text = evt.findString(slotName);
255 if (!text || !*text) 255 if (!text || !*text)
256 return false; 256 return false;
257 else { 257 else {
258 value->set(text); 258 value->set(text);
259 return true; 259 return true;
260 } 260 }
261 } 261 }
262 return false; 262 return false;
263 } 263 }
OLDNEW
« no previous file with comments | « src/views/SkEventSink.cpp ('k') | tests/AtomicTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698