summaryrefslogtreecommitdiffstats
path: root/WebCore/loader
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/loader')
-rw-r--r--WebCore/loader/Cache.cpp1
-rw-r--r--WebCore/loader/DocLoader.cpp1
-rw-r--r--WebCore/loader/FrameLoader.cpp2
-rw-r--r--WebCore/loader/FrameLoader.h1
-rw-r--r--WebCore/loader/appcache/ApplicationCacheGroup.cpp1
5 files changed, 2 insertions, 4 deletions
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 <stdio.h>
#include <wtf/CurrentTime.h>
-
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<ApplicationCache> 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)