diff options
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 4 | ||||
| -rw-r--r-- | JavaScriptCore/parser/Parser.cpp | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index 98f22df..f077738 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -172,12 +172,8 @@ LOCAL_SRC_FILES := \ wtf/HashTable.cpp \ wtf/MD5.cpp \ wtf/MainThread.cpp \ -<<<<<<< HEAD - wtf/PageAllocation.cpp \ -======= wtf/PageAllocationAligned.cpp\ wtf/PageBlock.cpp\ ->>>>>>> webkit.org at r74534 (trunk) wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ wtf/StackBounds.cpp \ diff --git a/JavaScriptCore/parser/Parser.cpp b/JavaScriptCore/parser/Parser.cpp index ffe3867..b203b21 100644 --- a/JavaScriptCore/parser/Parser.cpp +++ b/JavaScriptCore/parser/Parser.cpp @@ -35,14 +35,10 @@ namespace JSC { void Parser::parse(JSGlobalData* globalData, FunctionParameters* parameters, JSParserStrictness strictness, JSParserMode mode, int* errLine, UString* errMsg) { -<<<<<<< HEAD #ifdef ANDROID_INSTRUMENT android::TimeCounter::start(android::TimeCounter::JavaScriptParseTimeCounter); #endif - ASSERT(lexicalGlobalObject); -======= ASSERT(globalData); ->>>>>>> webkit.org at r74534 (trunk) m_sourceElements = 0; int defaultErrLine; |