OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8761fdb
)
Merge webkit.org at r54127 : Take theirs for extra layout delay.
author
Steve Block
<steveblock@google.com>
Tue, 2 Feb 2010 18:22:31 +0000
(18:22 +0000)
committer
Steve Block
<steveblock@google.com>
Thu, 4 Feb 2010 15:06:57 +0000
(15:06 +0000)
See http://trac.webkit.org/changeset/52919 and http://trac.webkit.org/changeset/53027
Change-Id: I0a5d442520651184b23ac30cf78b3c0d220c619b
WebCore/dom/Document.cpp
patch
|
blob
|
history
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();