From d0424a769059c84ae20beb3c217812792ea6726b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 14 Sep 2012 16:29:47 +0200 Subject: Imported WebKit commit 37c5e5041d39a14ea0d429a77ebd352e4bd26516 (http://svn.webkit.org/repository/webkit/trunk@128608) New snapshot that enables WebKit2 build on Windows (still some bugs) and allows for WebKit to be built with qmake && make --- Source/JavaScriptCore/parser/Lexer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/JavaScriptCore/parser/Lexer.cpp') diff --git a/Source/JavaScriptCore/parser/Lexer.cpp b/Source/JavaScriptCore/parser/Lexer.cpp index 063168be1..8c9eaa12c 100644 --- a/Source/JavaScriptCore/parser/Lexer.cpp +++ b/Source/JavaScriptCore/parser/Lexer.cpp @@ -405,10 +405,10 @@ void Lexer::setCode(const SourceCode& source, ParserArena* arena) m_lineNumber = source.firstLine(); m_lastToken = -1; - const StringImpl* sourceString = source.provider()->data(); + const String& sourceString = source.provider()->source(); - if (sourceString) - setCodeStart(sourceString); + if (!sourceString.isNull()) + setCodeStart(sourceString.impl()); else m_codeStart = 0; @@ -1689,8 +1689,8 @@ void Lexer::clear() template SourceCode Lexer::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); } -- cgit v1.2.1