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/loader | |
| 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/loader')
| -rw-r--r-- | WebCore/loader/FrameLoader.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index e4a6513..8277338 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -37,12 +37,8 @@ #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size #include "Archive.h" #include "ArchiveFactory.h" -<<<<<<< HEAD #endif -#include "BackForwardList.h" -======= #include "BackForwardController.h" ->>>>>>> webkit.org at r71558 #include "BeforeUnloadEvent.h" #include "MemoryCache.h" #include "CachedPage.h" @@ -952,12 +948,8 @@ void FrameLoader::loadURLIntoChildFrame(const KURL& url, const String& referer, } } -<<<<<<< HEAD #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size - RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->name()); -======= RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->uniqueName()); ->>>>>>> webkit.org at r71558 if (subframeArchive) childFrame->loader()->loadArchive(subframeArchive.release()); |