diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-10 18:17:16 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-17 13:35:59 -0800 |
| commit | a884348a07235d658b6337f68cf977cecba570f6 (patch) | |
| tree | 5dd8a3432270f24647498639c89ac6460688c450 /WebCore/html/HTMLLinkElement.cpp | |
| parent | 28040489d744e0c5d475a88663056c9040ed5320 (diff) | |
| download | external_webkit-a884348a07235d658b6337f68cf977cecba570f6.zip external_webkit-a884348a07235d658b6337f68cf977cecba570f6.tar.gz external_webkit-a884348a07235d658b6337f68cf977cecba570f6.tar.bz2 | |
Merge Webkit at r71558: Fix conflicts.
WebCore/loader/FrameLoader.cpp
http://trac.webkit.org/changeset/70960
http://trac.webkit.org/changeset/70971
WebCore/css/CSSStyleSelector.cpp
http://trac.webkit.org/changeset/71218
WebCore/css/CSSParser.cpp
http://trac.webkit.org/changeset/71218
WebCore/html/HTMLLinkElement.cpp
http://trac.webkit.org/changeset/71159
WebCore/platform/android/PlatformBridge.h
http://trac.webkit.org/changeset/71484
WebCore/platform/android/TemporaryLinkStubs.cpp
http://trac.webkit.org/changeset/71484
WebCore/rendering/RenderTableSection.cpp
http://trac.webkit.org/changeset/71382
http://trac.webkit.org/changeset/71251
WebCore/rendering/RenderLayer.cpp
http://trac.webkit.org/changeset/71536
WebCore/rendering/RenderTable.cpp
http://trac.webkit.org/changeset/71382
WebCore/Android.v8bindings.mk
http://trac.webkit.org/changeset/71515
WebCore/bindings/scripts/CodeGeneratorV8.pm
http://trac.webkit.org/changeset/71227
http://trac.webkit.org/changeset/71230
Change-Id: I3ad8c6bc6e36c90aedebedf915a8614b2c786550
Diffstat (limited to 'WebCore/html/HTMLLinkElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLLinkElement.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp index 9303076..bc7b99d 100644 --- a/WebCore/html/HTMLLinkElement.cpp +++ b/WebCore/html/HTMLLinkElement.cpp @@ -199,7 +199,6 @@ void HTMLLinkElement::process() if (m_relAttribute.m_isIcon && m_url.isValid() && !m_url.isEmpty()) document()->setIconURL(m_url.string(), type); -<<<<<<< HEAD #ifdef ANDROID_APPLE_TOUCH_ICON if ((m_relAttribute.m_isTouchIcon || m_relAttribute.m_isPrecomposedTouchIcon) && m_url.isValid() && !m_url.isEmpty() && document()->frame()) @@ -208,9 +207,6 @@ void HTMLLinkElement::process() m_relAttribute.m_isPrecomposedTouchIcon); #endif - if (m_relAttribute.m_isDNSPrefetch && document()->isDNSPrefetchEnabled() && m_url.isValid() && !m_url.isEmpty()) - ResourceHandle::prepareForURL(m_url); -======= if (m_relAttribute.m_isDNSPrefetch) { Settings* settings = document()->settings(); // FIXME: The href attribute of the link element can be in "//hostname" form, and we shouldn't attempt @@ -218,7 +214,6 @@ void HTMLLinkElement::process() if (settings && settings->dnsPrefetchingEnabled() && m_url.isValid() && !m_url.isEmpty()) ResourceHandle::prepareForURL(m_url); } ->>>>>>> webkit.org at r71558 #if ENABLE(LINK_PREFETCH) if (m_relAttribute.m_isLinkPrefetch && m_url.isValid() && document()->frame()) |