Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove even yet still more traces of v8
https://bugs.webkit.org/show_bug.cgi?id=114693

Reviewed by Anders Carlsson.

../WebCore:

No behavior change.

* bindings/generic/ActiveDOMCallback.h:
(WebCore::ActiveDOMCallback::isScriptControllerTerminating): Remove a V8-specific
method and the comment referencing it.
* bindings/generic/ActiveDOMCallback.cpp:
(WebCore::ActiveDOMCallback::isScriptControllerTerminating): ditto
* fileapi/File.cpp:
(WebCore::File::File): Remove a comment referencing v8
* inspector/InjectedScriptExterns.js: ditto

../WebKit2:

* Scripts/generate-forwarding-headers.pl: Remove v8 from list of platforms.


Canonical link: https://commits.webkit.org/133070@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148534 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
othermaciej committed Apr 16, 2013
1 parent a219394 commit 7e9cf3b
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 20 deletions.
18 changes: 18 additions & 0 deletions Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
2013-04-16 Maciej Stachowiak <mjs@apple.com>

Remove even yet still more traces of v8
https://bugs.webkit.org/show_bug.cgi?id=114693

Reviewed by Anders Carlsson.

No behavior change.

* bindings/generic/ActiveDOMCallback.h:
(WebCore::ActiveDOMCallback::isScriptControllerTerminating): Remove a V8-specific
method and the comment referencing it.
* bindings/generic/ActiveDOMCallback.cpp:
(WebCore::ActiveDOMCallback::isScriptControllerTerminating): ditto
* fileapi/File.cpp:
(WebCore::File::File): Remove a comment referencing v8
* inspector/InjectedScriptExterns.js: ditto

2013-04-16 Alexey Proskuryakov <ap@apple.com>

Remove unused AlternativeTextClient::dismissDictationAlternativeUI
Expand Down
13 changes: 0 additions & 13 deletions Source/WebCore/bindings/generic/ActiveDOMCallback.cpp
Expand Up @@ -55,17 +55,4 @@ bool ActiveDOMCallback::canInvokeCallback() const
return context && !context->activeDOMObjectsAreSuspended() && !context->activeDOMObjectsAreStopped();
}

bool ActiveDOMCallback::isScriptControllerTerminating() const
{
#if ENABLE(WORKERS)
ScriptExecutionContext* context = scriptExecutionContext();
if (context && context->isWorkerContext()) {
WorkerScriptController* scriptController = static_cast<WorkerContext*>(context)->script();
if (!scriptController || scriptController->isExecutionForbidden() || scriptController->isExecutionTerminating())
return true;
}
#endif
return false;
}

} // namespace WebCore
5 changes: 1 addition & 4 deletions Source/WebCore/bindings/generic/ActiveDOMCallback.h
Expand Up @@ -39,9 +39,7 @@ namespace WebCore {
class ScriptExecutionContext;

// A base class that prevents binding callbacks from executing when
// active dom objects are stopped or suspended, and is used by the
// generated callback v8 bindings code to avoid erroneously CRASH()'ing
// after script execution on a worker has been scheduled to terminate.
// active dom objects are stopped or suspended.
//
// Should only be created, used, and destroyed on the script execution
// context thread.
Expand All @@ -51,7 +49,6 @@ class ActiveDOMCallback : public ContextDestructionObserver {
virtual ~ActiveDOMCallback();

bool canInvokeCallback() const;
bool isScriptControllerTerminating() const;
};

} // namespace WebCore
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/fileapi/File.cpp
Expand Up @@ -118,7 +118,7 @@ File::File(const String& path, const KURL& url, const String& type)
m_name = pathGetFileName(path);
// FIXME: File object serialization/deserialization does not include
// newer file object data members: m_name and m_relativePath.
// See SerializedScriptValue.cpp for js and v8.
// See SerializedScriptValue.cpp
}

File::File(const String& path, const String& name, ContentTypeLookupPolicy policy)
Expand Down
1 change: 0 additions & 1 deletion Source/WebCore/inspector/InjectedScriptExterns.js
Expand Up @@ -139,7 +139,6 @@ function JavaScriptFunction()

var InspectorBackend = { };

// http://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
/**
* @constructor
*/
Expand Down
9 changes: 9 additions & 0 deletions Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
2013-04-16 Maciej Stachowiak <mjs@apple.com>

Remove even yet still more traces of v8
https://bugs.webkit.org/show_bug.cgi?id=114693

Reviewed by Anders Carlsson.

* Scripts/generate-forwarding-headers.pl: Remove v8 from list of platforms.

2013-04-16 Alexey Proskuryakov <ap@apple.com>

Remove unused AlternativeTextClient::dismissDictationAlternativeUI
Expand Down
2 changes: 1 addition & 1 deletion Source/WebKit2/Scripts/generate-forwarding-headers.pl
Expand Up @@ -35,7 +35,7 @@

my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), "../.."));
my $incFromRoot = abs_path($ARGV[0]);
my @platformPrefixes = ("blackberry", "cf", "chromium", "curl", "efl", "gtk", "mac", "qt", "soup", "v8", "win", "wx");
my @platformPrefixes = ("blackberry", "cf", "chromium", "curl", "efl", "gtk", "mac", "qt", "soup", "win", "wx");
my @frameworks = ("JavaScriptCore", "WebCore", "WebKit2");
my @skippedPrefixes;
my @frameworkHeaders;
Expand Down

0 comments on commit 7e9cf3b

Please sign in to comment.