Changeset 62410 in webkit for trunk/JavaScriptCore/parser/SourceProvider.h

Timestamp:

Jul 2, 2010, 3:31:40 PM (15 years ago)

Author:

[email protected]

Message:

2010-07-02 Oliver Hunt <​[email protected]>

Reviewed by Geoffrey Garen.

Move BOM handling out of the lexer and parser
​https://bugs.webkit.org/show_bug.cgi?id=41539

Doing the BOM stripping in the lexer meant that we could
end up having to strip the BOMs from a source multiple times.
To deal with this we now require all strings provided by
a SourceProvider to already have had the BOMs stripped.
This also simplifies some of the lexer logic.

• parser/Lexer.cpp: (JSC::Lexer::setCode): (JSC::Lexer::sourceCode):
• parser/SourceProvider.h: (JSC::SourceProvider::SourceProvider): (JSC::UStringSourceProvider::create): (JSC::UStringSourceProvider::getRange): (JSC::UStringSourceProvider::UStringSourceProvider):
• wtf/text/StringImpl.h: (WebCore::StringImpl::copyStringWithoutBOMs):

2010-07-02 Oliver Hunt <​[email protected]>

Reviewed by Geoffrey Garen.

Move BOM handling out of the lexer and parser
​https://bugs.webkit.org/show_bug.cgi?id=41539

Update WebCore to ensure that SourceProviders don't
produce strings with BOMs in them.

• bindings/js/ScriptSourceProvider.h: (WebCore::ScriptSourceProvider::ScriptSourceProvider):
• bindings/js/StringSourceProvider.h: (WebCore::StringSourceProvider::StringSourceProvider):
• loader/CachedScript.cpp: (WebCore::CachedScript::CachedScript): (WebCore::CachedScript::script):
• loader/CachedScript.h: (WebCore::CachedScript::): CachedScript now stores decoded data with the BOMs stripped, and caches the presence of BOMs across memory purges.

File:

• trunk/JavaScriptCore/parser/SourceProvider.h (modified) (2 diffs)

trunk/JavaScriptCore/parser/SourceProvider.h

@@ -35 +35 @@
 namespace JSC {
 
-    enum SourceBOMPresence { SourceHasNoBOMs, SourceCouldHaveBOMs };
-
     class SourceProvider : public RefCounted<SourceProvider> {
     public:
-        SourceProvider(const UString& url, SourceBOMPresence hasBOMs = SourceCouldHaveBOMs)
+        SourceProvider(const UString& url)
             : m_url(url)
-            , m_hasBOMs(hasBOMs)
         {
         }
@@ -53 +50 @@
         intptr_t asID() { return reinterpret_cast<intptr_t>(this); }
 
-        SourceBOMPresence hasBOMs() const { return m_hasBOMs; }
-
     private:
         UString m_url;
-        SourceBOMPresence m_hasBOMs;
     };
 
     class UStringSourceProvider : public SourceProvider {
     public:
-        static PassRefPtr<UStringSourceProvider> create(const UString& source, const UString& url)
+        static PassRefPtr<UStringSourceProvider> create(const UString& source, const UString& url, bool hasBOMs = true)
         {
-            return adoptRef(new UStringSourceProvider(source, url));
+            return adoptRef(new UStringSourceProvider(source, url, hasBOMs));
         }
 
-        UString getRange(int start, int end) const { return m_source.substr(start, end - start); }
+        UString getRange(int start, int end) const
+        {
+            return m_source.substr(start, end - start);
+        }
         const UChar* data() const { return m_source.data(); }
         int length() const { return m_source.size(); }
 
     private:
-        UStringSourceProvider(const UString& source, const UString& url)
+        UStringSourceProvider(const UString& source, const UString& url, bool hasBOMs)
             : SourceProvider(url)
             , m_source(source)
         {
+            if (hasBOMs && m_source.size()) {
+                bool scratch = false;
+                m_source = UString(m_source.rep()->copyStringWithoutBOMs(false, scratch));
+            }
         }