diff options
Diffstat (limited to 'WebCore/html/HTMLLinkElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLLinkElement.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp index b3a1c89..5ac39d9 100644 --- a/WebCore/html/HTMLLinkElement.cpp +++ b/WebCore/html/HTMLLinkElement.cpp @@ -54,11 +54,10 @@ inline HTMLLinkElement::HTMLLinkElement(const QualifiedName& tagName, Document* , m_disabledState(Unset) , m_loading(false) , m_createdByParser(createdByParser) -<<<<<<< HEAD - , m_timer(this, &HTMLLinkElement::timerFired) -======= , m_shouldProcessAfterAttach(false) ->>>>>>> webkit.org at r61871 +#if PLATFORM(ANDROID) && ENABLE(LINK_PREFETCH) + , m_timer(this, &HTMLLinkElement::timerFired) +#endif { ASSERT(hasTagName(linkTag)); } |