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

Side by Side Diff: mojo/public/cpp/bindings/sync_call_restrictions.h

Issue 2649963002: Enable mojo localstorage to actually store on disk. (Closed)
Patch Set: Remove Sync() method, and instead make sure browser test waits long enough. Created 3 years, 10 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 | « content/test/data/dom_storage/verify_data.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MOJO_PUBLIC_CPP_BINDINGS_SYNC_CALL_RESTRICTIONS_H_ 5 #ifndef MOJO_PUBLIC_CPP_BINDINGS_SYNC_CALL_RESTRICTIONS_H_
6 #define MOJO_PUBLIC_CPP_BINDINGS_SYNC_CALL_RESTRICTIONS_H_ 6 #define MOJO_PUBLIC_CPP_BINDINGS_SYNC_CALL_RESTRICTIONS_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/threading/thread_restrictions.h" 9 #include "base/threading/thread_restrictions.h"
10 #include "mojo/public/cpp/bindings/bindings_export.h" 10 #include "mojo/public/cpp/bindings/bindings_export.h"
11 11
12 #if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) 12 #if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
13 #define ENABLE_SYNC_CALL_RESTRICTIONS 1 13 #define ENABLE_SYNC_CALL_RESTRICTIONS 1
14 #else 14 #else
15 #define ENABLE_SYNC_CALL_RESTRICTIONS 0 15 #define ENABLE_SYNC_CALL_RESTRICTIONS 0
16 #endif 16 #endif
17 17
18 namespace leveldb {
19 class LevelDBMojoProxy;
20 }
21
18 namespace ui { 22 namespace ui {
19 class Gpu; 23 class Gpu;
20 } 24 }
21 25
22 namespace views { 26 namespace views {
23 class ClipboardMus; 27 class ClipboardMus;
24 } 28 }
25 29
26 namespace mojo { 30 namespace mojo {
27 31
(...skipping 17 matching lines...) Expand all
45 static void AssertSyncCallAllowed(); 49 static void AssertSyncCallAllowed();
46 #else 50 #else
47 // Inline the empty definitions of functions so that they can be compiled out. 51 // Inline the empty definitions of functions so that they can be compiled out.
48 static void AssertSyncCallAllowed() {} 52 static void AssertSyncCallAllowed() {}
49 #endif 53 #endif
50 54
51 private: 55 private:
52 // DO NOT ADD ANY OTHER FRIEND STATEMENTS, talk to mojo/OWNERS first. 56 // DO NOT ADD ANY OTHER FRIEND STATEMENTS, talk to mojo/OWNERS first.
53 // BEGIN ALLOWED USAGE. 57 // BEGIN ALLOWED USAGE.
54 friend class ui::Gpu; // http://crbug.com/620058 58 friend class ui::Gpu; // http://crbug.com/620058
59 // LevelDBMojoProxy makes same-process sync calls from the DB thread.
60 friend class leveldb::LevelDBMojoProxy;
55 // END ALLOWED USAGE. 61 // END ALLOWED USAGE.
56 62
57 // BEGIN USAGE THAT NEEDS TO BE FIXED. 63 // BEGIN USAGE THAT NEEDS TO BE FIXED.
58 // In the non-mus case, we called blocking OS functions in the ui::Clipboard 64 // In the non-mus case, we called blocking OS functions in the ui::Clipboard
59 // implementation which weren't caught by sync call restrictions. Our blocking 65 // implementation which weren't caught by sync call restrictions. Our blocking
60 // calls to mus, however, are. 66 // calls to mus, however, are.
61 friend class views::ClipboardMus; 67 friend class views::ClipboardMus;
62 // END USAGE THAT NEEDS TO BE FIXED. 68 // END USAGE THAT NEEDS TO BE FIXED.
63 69
64 #if ENABLE_SYNC_CALL_RESTRICTIONS 70 #if ENABLE_SYNC_CALL_RESTRICTIONS
(...skipping 21 matching lines...) Expand all
86 92
87 DISALLOW_COPY_AND_ASSIGN(ScopedAllowSyncCall); 93 DISALLOW_COPY_AND_ASSIGN(ScopedAllowSyncCall);
88 }; 94 };
89 95
90 DISALLOW_IMPLICIT_CONSTRUCTORS(SyncCallRestrictions); 96 DISALLOW_IMPLICIT_CONSTRUCTORS(SyncCallRestrictions);
91 }; 97 };
92 98
93 } // namespace mojo 99 } // namespace mojo
94 100
95 #endif // MOJO_PUBLIC_CPP_BINDINGS_SYNC_CALL_RESTRICTIONS_H_ 101 #endif // MOJO_PUBLIC_CPP_BINDINGS_SYNC_CALL_RESTRICTIONS_H_
OLDNEW
« no previous file with comments | « content/test/data/dom_storage/verify_data.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698