From bc7b84de3fd863c500a8169fd00dca3811cadbb3 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 21 Oct 2009 14:12:09 +0100 Subject: Makes a number of changes to ease future merging with and upstreaming to webkit.org. - Fixes whitespace discrepancies between webkit.org and Android versions - Re-orders Android-specific changes to minimise the diff with webkit.org - Makes sure all Android-specific changes are appropriately guarded. - Fixes some Android-specific style problems None of these should introduce any functional changes for PLATFORM(ANDROID). Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1 --- WebCore/loader/Cache.cpp | 1 - WebCore/loader/DocLoader.cpp | 1 + WebCore/loader/FrameLoader.cpp | 2 +- WebCore/loader/FrameLoader.h | 1 - WebCore/loader/appcache/ApplicationCacheGroup.cpp | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) (limited to 'WebCore/loader') diff --git a/WebCore/loader/Cache.cpp b/WebCore/loader/Cache.cpp index 1f28709..391790f 100644 --- a/WebCore/loader/Cache.cpp +++ b/WebCore/loader/Cache.cpp @@ -38,7 +38,6 @@ #include #include - using namespace std; namespace WebCore { diff --git a/WebCore/loader/DocLoader.cpp b/WebCore/loader/DocLoader.cpp index b2d9cc8..fff8e59 100644 --- a/WebCore/loader/DocLoader.cpp +++ b/WebCore/loader/DocLoader.cpp @@ -255,6 +255,7 @@ CachedResource* DocLoader::requestResource(CachedResource::Type type, const Stri } checkForReload(fullURL); + CachedResource* resource = cache()->requestResource(this, type, fullURL, charset, isPreload); if (resource) { // Check final URL of resource to catch redirects. diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index fffd6ee..071c0a7 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -3091,7 +3091,7 @@ void FrameLoader::checkLoadCompleteForThisFrame() if (Page* page = m_frame->page()) page->progress()->progressCompleted(m_frame); - + #ifdef ANDROID_INSTRUMENT if (!m_frame->tree()->parent() && m_frame->document()->renderArena()) android::TimeCounter::report(m_URL, cache()->getLiveSize(), cache()->getDeadSize(), diff --git a/WebCore/loader/FrameLoader.h b/WebCore/loader/FrameLoader.h index 3a1d27f..9ea3775 100644 --- a/WebCore/loader/FrameLoader.h +++ b/WebCore/loader/FrameLoader.h @@ -100,7 +100,6 @@ namespace WebCore { void setupForReplace(); void setupForReplaceByMIMEType(const String& newMIMEType); - void loadURLIntoChildFrame(const KURL&, const String& referer, Frame*); void loadFrameRequest(const FrameLoadRequest&, bool lockHistory, bool lockBackForwardList, // Called by submitForm, calls loadPostRequest and loadURL. diff --git a/WebCore/loader/appcache/ApplicationCacheGroup.cpp b/WebCore/loader/appcache/ApplicationCacheGroup.cpp index a3d551b..1a223ce 100644 --- a/WebCore/loader/appcache/ApplicationCacheGroup.cpp +++ b/WebCore/loader/appcache/ApplicationCacheGroup.cpp @@ -777,7 +777,6 @@ void ApplicationCacheGroup::checkIfLoadIsComplete() RefPtr oldNewestCache = (m_newestCache == m_cacheBeingUpdated) ? 0 : m_newestCache; setNewestCache(m_cacheBeingUpdated.release()); - if (cacheStorage().storeNewestCache(this)) { // New cache stored, now remove the old cache. if (oldNewestCache) -- cgit v1.1