diff options
| author | Andrei Popescu <andreip@google.com> | 2009-08-12 14:04:52 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-08-12 14:04:52 +0100 |
| commit | fd3864ec9aa8cde804c27b9381b4e8a73ccf6583 (patch) | |
| tree | b31d1ef0bbed97771d607da5afc5b7850f6fc8f9 /WebCore/dom/Document.cpp | |
| parent | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (diff) | |
| download | external_webkit-fd3864ec9aa8cde804c27b9381b4e8a73ccf6583.zip external_webkit-fd3864ec9aa8cde804c27b9381b4e8a73ccf6583.tar.gz external_webkit-fd3864ec9aa8cde804c27b9381b4e8a73ccf6583.tar.bz2 | |
dom, html and loader merges
Diffstat (limited to 'WebCore/dom/Document.cpp')
| -rw-r--r-- | WebCore/dom/Document.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index cd216bd..066cf46 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -354,15 +354,12 @@ Document::Document(Frame* frame, bool isXHTML) , m_hasOpenDatabases(false) #endif , m_usingGeolocation(false) -#ifdef MANUAL_MERGE_REQUIRED #ifdef ANDROID_MOBILE , mExtraLayoutDelay(0) #endif -#else // MANUAL_MERGE_REQUIRED #if ENABLE(WML) , m_containsWMLContent(false) #endif -#endif // MANUAL_MERGE_REQUIRED { m_document.resetSkippingRef(this); |