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

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 73beef6..3953157 100644 (file)
--- 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();