diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-07-30 15:20:36 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:34 +0100 |
| commit | 12c3bcdf8b6154d6be87a0b8d88e6f8de9ff222a (patch) | |
| tree | c2f4111d7013e574cf066304fa856f1e4bf5d68f /JavaScriptCore | |
| parent | 0617145a89917ae7735fe1c9538688ab9a577df5 (diff) | |
| download | external_webkit-12c3bcdf8b6154d6be87a0b8d88e6f8de9ff222a.zip external_webkit-12c3bcdf8b6154d6be87a0b8d88e6f8de9ff222a.tar.gz external_webkit-12c3bcdf8b6154d6be87a0b8d88e6f8de9ff222a.tar.bz2 | |
Merge Webkit at r64264 : Fix conflicts.
Tracs of the changes:
WebCore/html/HTMLDocumentParser.cpp
http://trac.webkit.org/changeset/63998/trunk/WebCore/html/HTMLDocumentParser.cpp
WebCore/page/EventHandler.cpp
WebCore/page/EventHandler.h
http://trac.webkit.org/changeset/63888
WebCore/page/Page.cpp
http://trac.webkit.org/changeset/64208
WebCore/page/Settings.cpp
WebCore/page/Settings.h
http://trac.webkit.org/changeset/64110
WebCore/rendering/RenderLayerCompositor.h
http://trac.webkit.org/changeset/64054/trunk/WebCore/rendering/RenderLayerCompositor.h
WebCore/rendering/RenderTableSection.cpp
http://trac.webkit.org/changeset/63994/trunk/WebCore/rendering/RenderTableSection.cpp
WebCore/rendering/break_lines.cpp
http://trac.webkit.org/changeset/64207
Change-Id: I34167b43899ee5066e33b40867cd569ce53f9207
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index ed618b0..30948fa 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -645,13 +645,10 @@ This prevents unnecessary invals. */ #define ENABLE_TEXT_CARET 1 #define ENABLE_JAVASCRIPT_DEBUGGER 0 -<<<<<<< HEAD #define ENABLE_ORIENTATION_EVENTS 1 -======= #if !defined(ENABLE_JIT) && !ENABLE(ANDROID_JSC_JIT) #define ENABLE_JIT 0 #endif ->>>>>>> webkit.org at r64264 #endif #if PLATFORM(WIN) |