Changeset 128542 in webkit for trunk/Source/JavaScriptCore/parser/Lexer.cpp

Timestamp:

Sep 13, 2012, 6:50:17 PM (13 years ago)

Author:

[email protected]

Message:

Improve the SourceProvider hierarchy
​https://bugs.webkit.org/show_bug.cgi?id=95635

Patch by Benjamin Poulain <​[email protected]> on 2012-09-13
Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

SourceProvider was designed to have subclasses magically handling the data without
decoding all of it. The virtual methods length() and getRange() were based
on these assumptions.

In practice, the magic was in our head, there is no implementation that takes
advantage of that.

SourceProvider is modified to adopt WebCore's ScriptSourceProvider::source() and base
everything on it.
The code using SourceProvider is also simplified.

• interpreter/Interpreter.cpp:

(JSC::appendSourceToError): Keep a reference to the string instead of querying it for
each time it is used.

• parser/Lexer.cpp:

(JSC::::setCode):
(JSC::::sourceCode):

• parser/Parser.h:

(JSC::parse):

• parser/SourceCode.h:

(JSC::SourceCode::SourceCode):
(JSC::SourceCode::subExpression):

• parser/SourceProvider.h:

(SourceProvider):
(JSC::SourceProvider::getRange):

Source/WebCore:

Get rid of ScriptSourceProvider and StringSourceProvider, they have been made
useless by JavaScript updates.

On x86_64, this reduces the binary size by 6kb.

• GNUmakefile.list.am:
• Target.pri:
• WebCore.gypi:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• bindings/js/CachedScriptSourceProvider.h:

(WebCore::CachedScriptSourceProvider::CachedScriptSourceProvider):

• bindings/js/ScriptDebugServer.cpp:

(WebCore::ScriptDebugServer::updateCurrentStatementPosition):
(WebCore::ScriptDebugServer::dispatchDidParseSource):
(WebCore::ScriptDebugServer::dispatchFailedToParseSource):

• bindings/js/ScriptSourceCode.h:

(WebCore::ScriptSourceCode::ScriptSourceCode):
(ScriptSourceCode):

• bindings/js/ScriptSourceProvider.h: Removed.
• bindings/js/StringSourceProvider.h: Removed.
• bindings/js/WorkerScriptController.cpp:
• bindings/objc/WebScriptObject.mm:
• bridge/NP_jsobject.cpp:
• bridge/jni/jni_jsobject.mm:

Source/WebKit/mac:

• Plugins/Hosted/NetscapePluginInstanceProxy.mm: Fix a #include abuse.
• WebView/WebScriptDebugger.mm:

(toNSString): We can now use the (faster) implicit conversion
from String to NSString.

File:

• trunk/Source/JavaScriptCore/parser/Lexer.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -406 +406 @@
     m_lastToken = -1;
     
-    const StringImpl* sourceString = source.provider()->data();
-
-    if (sourceString)
-        setCodeStart(sourceString);
+    const String& sourceString = source.provider()->source();
+
+    if (!sourceString.isNull())
+        setCodeStart(sourceString.impl());
     else
         m_codeStart = 0;
@@ -1690 +1690 @@
 SourceCode Lexer<T>::sourceCode(int openBrace, int closeBrace, int firstLine)
 {
-    ASSERT((*m_source->provider()->data())[openBrace] == '{');
-    ASSERT((*m_source->provider()->data())[closeBrace] == '}');
+    ASSERT(m_source->provider()->source()[openBrace] == '{');
+    ASSERT(m_source->provider()->source()[closeBrace] == '}');
     return SourceCode(m_source->provider(), openBrace, closeBrace + 1, firstLine);
 }