summaryrefslogtreecommitdiff
path: root/Source/WebCore/loader
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/loader')
-rw-r--r--Source/WebCore/loader/EmptyClients.h7
-rw-r--r--Source/WebCore/loader/FrameLoaderClient.h2
-rw-r--r--Source/WebCore/loader/MainResourceLoader.cpp22
-rw-r--r--Source/WebCore/loader/MainResourceLoader.h24
-rw-r--r--Source/WebCore/loader/cache/CachedImage.cpp4
-rw-r--r--Source/WebCore/loader/icon/IconLoader.cpp3
6 files changed, 31 insertions, 31 deletions
diff --git a/Source/WebCore/loader/EmptyClients.h b/Source/WebCore/loader/EmptyClients.h
index a308b36c0..b7759396e 100644
--- a/Source/WebCore/loader/EmptyClients.h
+++ b/Source/WebCore/loader/EmptyClients.h
@@ -428,7 +428,7 @@ public:
#endif
virtual void getGuessesForWord(const String&, const String&, Vector<String>&) { }
- virtual void requestCheckingOfString(SpellChecker*, const TextCheckingRequest&) { }
+ virtual void requestCheckingOfString(PassRefPtr<TextCheckingRequest>) { }
};
class EmptyEditorClient : public EditorClient {
@@ -499,10 +499,13 @@ public:
virtual NSURL* canonicalizeURL(NSURL*) { return 0; }
virtual NSURL* canonicalizeURLString(NSString*) { return 0; }
#endif
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
+
+#if PLATFORM(MAC)
virtual void uppercaseWord() { }
virtual void lowercaseWord() { }
virtual void capitalizeWord() { }
+#endif
+#if USE(AUTOMATIC_TEXT_REPLACEMENT)
virtual void showSubstitutionsPanel(bool) { }
virtual bool substitutionsPanelIsShowing() { return false; }
virtual void toggleSmartInsertDelete() { }
diff --git a/Source/WebCore/loader/FrameLoaderClient.h b/Source/WebCore/loader/FrameLoaderClient.h
index 15872efe3..f5c7a7266 100644
--- a/Source/WebCore/loader/FrameLoaderClient.h
+++ b/Source/WebCore/loader/FrameLoaderClient.h
@@ -311,7 +311,7 @@ namespace WebCore {
virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, SecurityOrigin*, const KURL&) { return enabledPerSettings; }
virtual bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, const KURL&) { return enabledPerSettings; }
- virtual bool shadowDOMAllowed(bool enabledAsRuntimeFeatures) { return enabledAsRuntimeFeatures; }
+ virtual bool allowShadowDOM(bool enabledAsRuntimeFeatures) { return enabledAsRuntimeFeatures; }
virtual bool allowStyleScoped(bool enabledAsRuntimeFeatures) { return enabledAsRuntimeFeatures; }
#if ENABLE(PAGE_POPUP)
virtual bool allowPagePopup() { return false; }
diff --git a/Source/WebCore/loader/MainResourceLoader.cpp b/Source/WebCore/loader/MainResourceLoader.cpp
index 05b4727f5..57d01134b 100644
--- a/Source/WebCore/loader/MainResourceLoader.cpp
+++ b/Source/WebCore/loader/MainResourceLoader.cpp
@@ -72,7 +72,7 @@ static bool shouldLoadAsEmptyDocument(const KURL& url)
MainResourceLoader::MainResourceLoader(Frame* frame)
: ResourceLoader(frame, ResourceLoaderOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForCrossOriginCredentials, SkipSecurityCheck))
- , m_dataLoadTimer(this, &MainResourceLoader::handleDataLoadNow)
+ , m_dataLoadTimer(this, &MainResourceLoader::handleSubstituteDataLoadNow)
, m_loadingMultipartContent(false)
, m_waitingForContentPolicy(false)
, m_timeOfLastDataReceived(0.0)
@@ -167,7 +167,7 @@ void MainResourceLoader::continueAfterNavigationPolicy(const ResourceRequest& re
// A redirect resulted in loading substitute data.
ASSERT(documentLoader()->timing()->redirectCount());
handle()->cancel();
- handleDataLoadSoon(request);
+ handleSubstituteDataLoadSoon(request);
}
deref(); // balances ref in willSendRequest
@@ -580,7 +580,7 @@ void MainResourceLoader::handleEmptyLoad(const KURL& url, bool forURLScheme)
didReceiveResponse(response);
}
-void MainResourceLoader::handleDataLoadNow(MainResourceLoaderTimer*)
+void MainResourceLoader::handleSubstituteDataLoadNow(MainResourceLoaderTimer*)
{
RefPtr<MainResourceLoader> protect(this);
@@ -606,14 +606,14 @@ void MainResourceLoader::startDataLoadTimer()
#endif
}
-void MainResourceLoader::handleDataLoadSoon(const ResourceRequest& r)
+void MainResourceLoader::handleSubstituteDataLoadSoon(const ResourceRequest& r)
{
m_initialRequest = r;
if (m_documentLoader->deferMainResourceDataLoad())
startDataLoadTimer();
else
- handleDataLoadNow(0);
+ handleSubstituteDataLoadNow(0);
}
bool MainResourceLoader::loadNow(ResourceRequest& r)
@@ -642,7 +642,7 @@ bool MainResourceLoader::loadNow(ResourceRequest& r)
resourceLoadScheduler()->addMainResourceLoad(this);
if (m_substituteData.isValid())
- handleDataLoadSoon(r);
+ handleSubstituteDataLoadSoon(r);
else if (shouldLoadEmpty || frameLoader()->client()->representationExistsForURLScheme(url.protocol()))
handleEmptyLoad(url, !shouldLoadEmpty);
else
@@ -696,13 +696,9 @@ void MainResourceLoader::setDefersLoading(bool defers)
if (m_initialRequest.isNull())
return;
- if (m_substituteData.isValid() && m_documentLoader->deferMainResourceDataLoad())
- startDataLoadTimer();
- else {
- ResourceRequest r(m_initialRequest);
- m_initialRequest = ResourceRequest();
- loadNow(r);
- }
+ ResourceRequest initialRequest(m_initialRequest);
+ m_initialRequest = ResourceRequest();
+ loadNow(initialRequest);
}
}
diff --git a/Source/WebCore/loader/MainResourceLoader.h b/Source/WebCore/loader/MainResourceLoader.h
index e3413cab9..f005ddc3a 100644
--- a/Source/WebCore/loader/MainResourceLoader.h
+++ b/Source/WebCore/loader/MainResourceLoader.h
@@ -55,15 +55,15 @@ namespace WebCore {
virtual ~MainResourceLoader();
void load(const ResourceRequest&, const SubstituteData&);
- virtual void addData(const char*, int, bool allAtOnce);
+ virtual void addData(const char*, int, bool allAtOnce) OVERRIDE;
- virtual void setDefersLoading(bool);
+ virtual void setDefersLoading(bool) OVERRIDE;
- virtual void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse);
- virtual void didReceiveResponse(const ResourceResponse&);
- virtual void didReceiveData(const char*, int, long long encodedDataLength, bool allAtOnce);
- virtual void didFinishLoading(double finishTime);
- virtual void didFail(const ResourceError&);
+ virtual void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse) OVERRIDE;
+ virtual void didReceiveResponse(const ResourceResponse&) OVERRIDE;
+ virtual void didReceiveData(const char*, int, long long encodedDataLength, bool allAtOnce) OVERRIDE;
+ virtual void didFinishLoading(double finishTime) OVERRIDE;
+ virtual void didFail(const ResourceError&) OVERRIDE;
#if HAVE(RUNLOOP_TIMER)
typedef RunLoopTimer<MainResourceLoader> MainResourceLoaderTimer;
@@ -71,23 +71,21 @@ namespace WebCore {
typedef Timer<MainResourceLoader> MainResourceLoaderTimer;
#endif
- void handleDataLoadNow(MainResourceLoaderTimer*);
-
bool isLoadingMultipartContent() const { return m_loadingMultipartContent; }
private:
MainResourceLoader(Frame*);
- virtual void willCancel(const ResourceError&);
- virtual void didCancel(const ResourceError&);
+ virtual void willCancel(const ResourceError&) OVERRIDE;
+ virtual void didCancel(const ResourceError&) OVERRIDE;
bool loadNow(ResourceRequest&);
void handleEmptyLoad(const KURL&, bool forURLScheme);
- void handleDataLoadSoon(const ResourceRequest& r);
+ void handleSubstituteDataLoadSoon(const ResourceRequest&);
+ void handleSubstituteDataLoadNow(MainResourceLoaderTimer*);
void startDataLoadTimer();
- void handleDataLoad(ResourceRequest&);
void receivedError(const ResourceError&);
ResourceError interruptedForPolicyChangeError() const;
diff --git a/Source/WebCore/loader/cache/CachedImage.cpp b/Source/WebCore/loader/cache/CachedImage.cpp
index 519ec6d73..5f4e2b106 100644
--- a/Source/WebCore/loader/cache/CachedImage.cpp
+++ b/Source/WebCore/loader/cache/CachedImage.cpp
@@ -131,11 +131,11 @@ pair<Image*, float> CachedImage::brokenImage(float deviceScaleFactor) const
{
if (deviceScaleFactor >= 2) {
DEFINE_STATIC_LOCAL(Image*, brokenImageHiRes, (Image::loadPlatformResource("missingImage@2x").leakRef()));
- return make_pair(brokenImageHiRes, 2);
+ return std::make_pair(brokenImageHiRes, 2);
}
DEFINE_STATIC_LOCAL(Image*, brokenImageLoRes, (Image::loadPlatformResource("missingImage").leakRef()));
- return make_pair(brokenImageLoRes, 1);
+ return std::make_pair(brokenImageLoRes, 1);
}
bool CachedImage::willPaintBrokenImage() const
diff --git a/Source/WebCore/loader/icon/IconLoader.cpp b/Source/WebCore/loader/icon/IconLoader.cpp
index 1b07c833c..9d733da4d 100644
--- a/Source/WebCore/loader/icon/IconLoader.cpp
+++ b/Source/WebCore/loader/icon/IconLoader.cpp
@@ -60,6 +60,9 @@ void IconLoader::startLoading()
return;
ResourceRequest resourceRequest(m_frame->loader()->icon()->url());
+#if PLATFORM(BLACKBERRY)
+ resourceRequest.setTargetType(ResourceRequest::TargetIsFavicon);
+#endif
resourceRequest.setPriority(ResourceLoadPriorityLow);
m_resource = m_frame->document()->cachedResourceLoader()->requestRawResource(resourceRequest,
View Lorry Controller Status