Chromium Code Reviews| Index: Source/bindings/core/v8/ScheduledAction.cpp |
| diff --git a/Source/bindings/core/v8/ScheduledAction.cpp b/Source/bindings/core/v8/ScheduledAction.cpp |
| index 6bf05b28483612ae10d66ee256af97b7912ee89d..f60a3cf73a734ac6043809d9b3d8e039f1c2fe5b 100644 |
| --- a/Source/bindings/core/v8/ScheduledAction.cpp |
| +++ b/Source/bindings/core/v8/ScheduledAction.cpp |
| @@ -1,32 +1,6 @@ |
| -/* |
| - * Copyright (C) 2007-2009 Google Inc. All rights reserved. |
| - * |
| - * Redistribution and use in source and binary forms, with or without |
| - * modification, are permitted provided that the following conditions are |
| - * met: |
| - * |
| - * * Redistributions of source code must retain the above copyright |
| - * notice, this list of conditions and the following disclaimer. |
| - * * Redistributions in binary form must reproduce the above |
| - * copyright notice, this list of conditions and the following disclaimer |
| - * in the documentation and/or other materials provided with the |
| - * distribution. |
| - * * Neither the name of Google Inc. nor the names of its |
| - * contributors may be used to endorse or promote products derived from |
| - * this software without specific prior written permission. |
| - * |
| - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| - */ |
| +// Copyright 2014 The Chromium Authors. All rights reserved. |
|
vsevik
2014/10/17 13:19:43
You should change the copyright header in new file
|
| +// Use of this source code is governed by a BSD-style license that can be |
| +// found in the LICENSE file. |
| #include "config.h" |
| #include "bindings/core/v8/ScheduledAction.h" |
| @@ -36,8 +10,6 @@ |
| #include "bindings/core/v8/V8Binding.h" |
| #include "bindings/core/v8/V8GCController.h" |
| #include "bindings/core/v8/V8ScriptRunner.h" |
| -#include "core/dom/Document.h" |
| -#include "core/dom/ExecutionContext.h" |
| #include "core/frame/LocalFrame.h" |
| #include "core/workers/WorkerGlobalScope.h" |
| #include "core/workers/WorkerThread.h" |
| @@ -68,25 +40,6 @@ ScheduledAction::~ScheduledAction() |
| { |
| } |
| -void ScheduledAction::execute(ExecutionContext* context) |
| -{ |
| - if (context->isDocument()) { |
| - LocalFrame* frame = toDocument(context)->frame(); |
| - if (!frame) { |
| - WTF_LOG(Timers, "ScheduledAction::execute %p: no frame", this); |
| - return; |
| - } |
| - if (!frame->script().canExecuteScripts(AboutToExecuteScript)) { |
| - WTF_LOG(Timers, "ScheduledAction::execute %p: frame can not execute scripts", this); |
| - return; |
| - } |
| - execute(frame); |
| - } else { |
| - WTF_LOG(Timers, "ScheduledAction::execute %p: worker scope", this); |
| - execute(toWorkerGlobalScope(context)); |
| - } |
| -} |
| - |
| void ScheduledAction::execute(LocalFrame* frame) |
| { |
| if (!m_scriptState->contextIsValid()) { |