diff options
| author | Steve Block <steveblock@google.com> | 2010-07-08 13:18:23 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-07-09 15:33:40 +0100 |
| commit | 919eb425b73bb532c128aa974a43e3c959c5a10a (patch) | |
| tree | 8909107d3bed438c3fcf8bbc8f8ea6830f680198 /WebCore/html | |
| parent | ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24 (diff) | |
| download | external_webkit-919eb425b73bb532c128aa974a43e3c959c5a10a.zip external_webkit-919eb425b73bb532c128aa974a43e3c959c5a10a.tar.gz external_webkit-919eb425b73bb532c128aa974a43e3c959c5a10a.tar.bz2 | |
Merge WebKit at r62496: Fix conflicts
HTMLDocumentParser.cpp - Conflict due to Android instrumentation - http://trac.webkit.org/changeset/62033
FrameView.cpp - Conflict due to iframe flattening - http://trac.webkit.org/changeset/62135
Settings.cpp/h - Conflict due to Android plugins - http://trac.webkit.org/changeset/62284
DragData.h - Conflict due to Android special-case - http://trac.webkit.org/changeset/62124
RenderThemeAndroid.cpp/h - Conflict due to not-yet-upstreamed video - http://trac.webkit.org/changeset/62104
Change-Id: If5bd7bf0de525454166c3ccea050da55b29644c3
Diffstat (limited to 'WebCore/html')
| -rw-r--r-- | WebCore/html/HTMLDocumentParser.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/html/HTMLDocumentParser.cpp b/WebCore/html/HTMLDocumentParser.cpp index 55facbf..59b839d 100644 --- a/WebCore/html/HTMLDocumentParser.cpp +++ b/WebCore/html/HTMLDocumentParser.cpp @@ -222,12 +222,9 @@ void HTMLDocumentParser::insert(const SegmentedString& source) if (m_parserStopped) return; -<<<<<<< HEAD #ifdef ANDROID_INSTRUMENT android::TimeCounter::start(android::TimeCounter::ParsingTimeCounter); #endif - NestingLevelIncrementer nestingLevelIncrementer(m_writeNestingLevel); -======= { NestingLevelIncrementer nestingLevelIncrementer(m_writeNestingLevel); @@ -247,7 +244,6 @@ void HTMLDocumentParser::append(const SegmentedString& source) { NestingLevelIncrementer nestingLevelIncrementer(m_writeNestingLevel); ->>>>>>> webkit.org at r62496 m_input.appendToEnd(source); if (m_preloadScanner) |