diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:51:35 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:31 +0100 |
| commit | e7bbc0900fd93114f04d2690ce8eab67b784b8c8 (patch) | |
| tree | 4ddccfbcd09cf67984060411d0af2f2da3ed9c67 /JavaScriptCore | |
| parent | f05b935882198ccf7d81675736e3aeb089c5113a (diff) | |
| download | external_webkit-e7bbc0900fd93114f04d2690ce8eab67b784b8c8.zip external_webkit-e7bbc0900fd93114f04d2690ce8eab67b784b8c8.tar.gz external_webkit-e7bbc0900fd93114f04d2690ce8eab67b784b8c8.tar.bz2 | |
Merge WebKit at r74534: Fix conflicts.
.gitignore - keep ours
Android.mk http://trac.webkit.org/changeset/74431
Parser.cpp http://trac.webkit.org/changeset/74377
ImageDecoder.cpp http://trac.webkit.org/changeset/73819
GraphicsContext.cpp http://trac.webkit.org/changeset/73729
ContextMenuItem.h http://trac.webkit.org/changeset/74028
SVGFontFaceUriElement.h http://trac.webkit.org/changeset/74493
RenderView.h http://trac.webkit.org/changeset/74524
RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926
InlineTextBox.cpp http://trac.webkit.org/changeset/73548
SliderThumbElement.cpp
RenderSlider.cpp http://trac.webkit.org/changeset/74044
StyleRareInheritedData.cpp|h
CSSStyleSelector.cpp
CSSParser.cpp http://trac.webkit.org/changeset/73219
RenderBox.h http://trac.webkit.org/changeset/73385
FrameLoader.cpp http://trac.webkit.org/changeset/73486 http://trac.webkit.org/changeset/74426
ResourceLoader.cpp http://trac.webkit.org/changeset/74453
DOMWindow.cpp|h http://trac.webkit.org/changeset/73829
HTMLLinkElement.cpp http://trac.webkit.org/changeset/74476
V8NPUtils.cpp: Do not undo http://trac.webkit.org/changeset/78994
RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926
Remove loader.cpp http://trac.webkit.org/changeset/74049
Change-Id: I8e97de5b2237d85310e1005e067f0b3a6b14432f
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; |