OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "config.h" | 5 #include "config.h" |
6 #include "platform/ScriptForbiddenScope.h" | 6 #include "platform/ScriptForbiddenScope.h" |
7 | 7 |
8 #include "wtf/Assertions.h" | 8 #include "wtf/Assertions.h" |
9 #include "wtf/MainThread.h" | 9 #include "wtf/MainThread.h" |
10 | 10 |
(...skipping 26 matching lines...) Expand all Loading... |
37 ASSERT(s_scriptForbiddenCount); | 37 ASSERT(s_scriptForbiddenCount); |
38 --s_scriptForbiddenCount; | 38 --s_scriptForbiddenCount; |
39 } | 39 } |
40 | 40 |
41 bool ScriptForbiddenScope::isScriptForbidden() | 41 bool ScriptForbiddenScope::isScriptForbidden() |
42 { | 42 { |
43 return isMainThread() && s_scriptForbiddenCount; | 43 return isMainThread() && s_scriptForbiddenCount; |
44 } | 44 } |
45 | 45 |
46 ScriptForbiddenScope::AllowUserAgentScript::AllowUserAgentScript() | 46 ScriptForbiddenScope::AllowUserAgentScript::AllowUserAgentScript() |
47 : m_change(s_scriptForbiddenCount, 0) | |
48 { | 47 { |
49 ASSERT(isMainThread()); | 48 if (isMainThread()) |
| 49 m_change.emplace(s_scriptForbiddenCount, 0); |
50 } | 50 } |
51 | 51 |
52 ScriptForbiddenScope::AllowUserAgentScript::~AllowUserAgentScript() | 52 ScriptForbiddenScope::AllowUserAgentScript::~AllowUserAgentScript() |
53 { | 53 { |
54 ASSERT(!s_scriptForbiddenCount); | 54 ASSERT(!isMainThread() || !s_scriptForbiddenCount); |
55 } | 55 } |
56 | 56 |
57 } // namespace blink | 57 } // namespace blink |
OLD | NEW |