diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:22:31 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:57 +0000 |
| commit | 67da76711ae9175ec5a36f1f31c3bfeb602db071 (patch) | |
| tree | bc666c0bc2c7f7ffa84bb9c70ab0d10b504b1a93 /WebCore/dom/Document.cpp | |
| parent | 8761fdb52e725d81cca926454dae4a0e8e1fe1f5 (diff) | |
| download | external_webkit-67da76711ae9175ec5a36f1f31c3bfeb602db071.zip external_webkit-67da76711ae9175ec5a36f1f31c3bfeb602db071.tar.gz external_webkit-67da76711ae9175ec5a36f1f31c3bfeb602db071.tar.bz2 | |
Merge webkit.org at r54127 : Take theirs for extra layout delay.
See http://trac.webkit.org/changeset/52919 and http://trac.webkit.org/changeset/53027
Change-Id: I0a5d442520651184b23ac30cf78b3c0d220c619b
Diffstat (limited to 'WebCore/dom/Document.cpp')
| -rw-r--r-- | WebCore/dom/Document.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index 73beef6..3953157 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -469,12 +469,6 @@ Document::Document(Frame* frame, bool isXHTML, bool isHTML) resetActiveLinkColor(); m_processingLoadEvent = false; -<<<<<<< HEAD - m_startTime = currentTime(); - m_overMinimumLayoutThreshold = false; - m_extraLayoutDelay = 0; -======= ->>>>>>> webkit.org at r54127 initSecurityContext(); initDNSPrefetch(); |