diff options
| author | Steve Block <steveblock@google.com> | 2010-05-26 10:20:32 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-27 11:15:58 +0100 |
| commit | 1e6338658628fcabd955cf65687a30976c7893ce (patch) | |
| tree | ce0c851dc5518f04ed6db843ba9dddc10c3fd7ce /WebCore/html/HTMLTokenizer.cpp | |
| parent | e78cbe89e6f337f2f1fe40315be88f742b547151 (diff) | |
| download | external_webkit-1e6338658628fcabd955cf65687a30976c7893ce.zip external_webkit-1e6338658628fcabd955cf65687a30976c7893ce.tar.gz external_webkit-1e6338658628fcabd955cf65687a30976c7893ce.tar.bz2 | |
Merge WebKit at r60074: Fix conflicts
DeviceOrientation
- WebCore/Android.derived.jscbindings.mk
- WebCore/Android.derived.v8bindings.mk
- WebCore/page/Page.cpp
Trivial
- WebCore/css/CSSParser.cpp
- WebCore/page/Settings.cpp
- WebCore/page/Settings.h
- WebCore/rendering/style/RenderStyle.h
Code deletion - See http://trac.webkit.org/changeset/59749
- WebCore/html/HTMLTokenizer.cpp
PluginView JSC guards uspstreaming
- WebCore/plugins/PluginView.cpp
- WebCore/plugins/PluginView.h
Refactoring, see http://trac.webkit.org/changeset/59784
- WebCore/rendering/RenderLayer.cpp
RenderBlock::columnGap() and columnRects() are now public, see http://trac.webkit.org/changeset/59784
- WebCore/rendering/RenderBlock.h
Change-Id: I409c68d334d60c3854b4b0365c18e6f63884afa6
Diffstat (limited to 'WebCore/html/HTMLTokenizer.cpp')
| -rw-r--r-- | WebCore/html/HTMLTokenizer.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebCore/html/HTMLTokenizer.cpp b/WebCore/html/HTMLTokenizer.cpp index 620913f..a0877ff 100644 --- a/WebCore/html/HTMLTokenizer.cpp +++ b/WebCore/html/HTMLTokenizer.cpp @@ -1812,15 +1812,11 @@ void HTMLTokenizer::write(const SegmentedString& str, bool appendData) bool wasInWrite = m_inWrite; m_inWrite = true; -<<<<<<< HEAD - int processedCount = 0; - double startTime = currentTime(); #ifdef ANDROID_INSTRUMENT android::TimeCounter::start(android::TimeCounter::ParsingTimeCounter); #endif -======= + willWriteHTML(source); ->>>>>>> webkit.org at r60074 Frame* frame = m_doc->frame(); State state = m_state; |