| Index: third_party/WebKit/Source/platform/ScriptForbiddenScope.cpp
|
| diff --git a/third_party/WebKit/Source/platform/ScriptForbiddenScope.cpp b/third_party/WebKit/Source/platform/ScriptForbiddenScope.cpp
|
| index 3274d0b1663e01d71559a2f0ce1c7bdb3c4b40a5..b9f234ca58bfb406d2de52a149d9192d8d152f59 100644
|
| --- a/third_party/WebKit/Source/platform/ScriptForbiddenScope.cpp
|
| +++ b/third_party/WebKit/Source/platform/ScriptForbiddenScope.cpp
|
| @@ -8,56 +8,6 @@
|
|
|
| namespace blink {
|
|
|
| -static unsigned s_scriptForbiddenCount = 0;
|
| +unsigned ScriptForbiddenScope::s_scriptForbiddenCount = 0;
|
|
|
| -ScriptForbiddenScope::ScriptForbiddenScope()
|
| -{
|
| - enter();
|
| -}
|
| -
|
| -ScriptForbiddenScope::~ScriptForbiddenScope()
|
| -{
|
| - exit();
|
| -}
|
| -
|
| -void ScriptForbiddenScope::enter()
|
| -{
|
| - ASSERT(isMainThread());
|
| - ++s_scriptForbiddenCount;
|
| -}
|
| -
|
| -void ScriptForbiddenScope::exit()
|
| -{
|
| - ASSERT(isMainThread());
|
| - ASSERT(s_scriptForbiddenCount);
|
| - --s_scriptForbiddenCount;
|
| -}
|
| -
|
| -bool ScriptForbiddenScope::isScriptForbidden()
|
| -{
|
| - return isMainThread() && s_scriptForbiddenCount;
|
| -}
|
| -
|
| -ScriptForbiddenScope::AllowUserAgentScript::AllowUserAgentScript()
|
| -{
|
| - if (isMainThread())
|
| - m_change.emplace(&s_scriptForbiddenCount, 0);
|
| -}
|
| -
|
| -ScriptForbiddenScope::AllowUserAgentScript::~AllowUserAgentScript()
|
| -{
|
| - ASSERT(!isMainThread() || !s_scriptForbiddenCount);
|
| -}
|
| -
|
| -ScriptForbiddenIfMainThreadScope::ScriptForbiddenIfMainThreadScope()
|
| -{
|
| - if (isMainThread())
|
| - ScriptForbiddenScope::enter();
|
| -}
|
| -
|
| -ScriptForbiddenIfMainThreadScope::~ScriptForbiddenIfMainThreadScope()
|
| -{
|
| - if (isMainThread())
|
| - ScriptForbiddenScope::exit();
|
| -}
|
| } // namespace blink
|
|
|