diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 10:01:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:01:16 -0800 |
| commit | 8f75286f8f97df46e2fb2411460a5efb3fc9b083 (patch) | |
| tree | eca591661d5d9fc0fc58e2d2a2d11dfc8c406ccc /WebCore/dom/Document.cpp | |
| parent | e4b2e0b8a34bdde6f219c2d755af174569fa728f (diff) | |
| parent | 4dd98cc27e25e6c3104672f50749132d2236461b (diff) | |
| download | external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.zip external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.tar.gz external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.tar.bz2 | |
am 4dd98cc2: am aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.
Merge commit '4dd98cc27e25e6c3104672f50749132d2236461b'
* commit '4dd98cc27e25e6c3104672f50749132d2236461b':
Merge webkit.org at r51976 : Fix general conflicts.
Diffstat (limited to 'WebCore/dom/Document.cpp')
| -rw-r--r-- | WebCore/dom/Document.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index ba6dc97..85966d7 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -387,14 +387,11 @@ Document::Document(Frame* frame, bool isXHTML) m_ignoreAutofocus = false; m_frame = frame; -<<<<<<< HEAD:WebCore/dom/Document.cpp - m_renderArena = 0; -#if !PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at r51976:WebCore/dom/Document.cpp +#if !PLATFORM(ANDROID) m_axObjectCache = 0; -#endif +#endif + m_docLoader = new DocLoader(this); visuallyOrdered = false; @@ -1439,6 +1436,7 @@ void Document::attach() #if !PLATFORM(ANDROID) ASSERT(!m_axObjectCache); #endif + if (!m_renderArena) m_renderArena = new RenderArena(); |