Changeset 128542 in webkit for trunk/Source/JavaScriptCore/parser

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.

Location:

trunk/Source/JavaScriptCore/parser

Files:

• Lexer.cpp (modified) (2 diffs)
• Parser.h (modified) (1 diff)
• SourceCode.h (modified) (2 diffs)
• SourceProvider.h (modified) (3 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);
 }

trunk/Source/JavaScriptCore/parser/Parser.h

@@ -1030 +1030 @@
     SamplingRegion samplingRegion("Parsing");
 
-    ASSERT(source.provider()->data());
-
-    if (source.provider()->data()->is8Bit()) {
+    ASSERT(!source.provider()->source().isNull());
+
+    if (source.provider()->source().is8Bit()) {
         Parser< Lexer<LChar> > parser(globalData, source, parameters, name, strictness, parserMode);
         return parser.parse<ParsedNode>(lexicalGlobalObject, debugger, execState, exception);

trunk/Source/JavaScriptCore/parser/SourceCode.h

@@ -48 +48 @@
             : m_provider(provider)
             , m_startChar(0)
-            , m_endChar(m_provider->length())
+            , m_endChar(m_provider->source().length())
             , m_firstLine(std::max(firstLine, 1))
         {
@@ -98 +98 @@
     inline SourceCode SourceCode::subExpression(unsigned openBrace, unsigned closeBrace, int firstLine)
     {
-        ASSERT((*provider()->data())[openBrace] == '{');
-        ASSERT((*provider()->data())[closeBrace] == '}');
+        ASSERT(provider()->source()[openBrace] == '{');
+        ASSERT(provider()->source()[closeBrace] == '}');
         return SourceCode(provider(), openBrace, closeBrace + 1, firstLine);
     }

trunk/Source/JavaScriptCore/parser/SourceProvider.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009, 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57 +57 @@
         }
 
-        virtual String getRange(int start, int end) const = 0;
-        virtual const StringImpl* data() const = 0;
-        virtual int length() const = 0;
-        
+        virtual const String& source() const = 0;
+        String getRange(int start, int end) const
+        {
+            return source().substringSharingImpl(start, end - start);
+        }
+
         const String& url() { return m_url; }
         TextPosition startPosition() const { return m_startPosition; }
@@ -94 +96 @@
         }
 
-        virtual String getRange(int start, int end) const OVERRIDE
+        virtual const String& source() const OVERRIDE
         {
-            return m_source.substringSharingImpl(start, end - start);
+            return m_source;
         }
-        const StringImpl* data() const { return m_source.impl(); }
-        int length() const { return m_source.length(); }
 
     private: