Title: [163189] trunk/Source/WebCore
- Revision
- 163189
- Author
- [email protected]
- Date
- 2014-01-31 13:03:52 -0800 (Fri, 31 Jan 2014)
Log Message
Remove FrameLoader's reloadWithOverrideURL and reloadWithRequest
https://bugs.webkit.org/show_bug.cgi?id=128005
Reviewed by Darin Adler.
The former was used by chromium-android to implement the "request
desktop version" feature, but is no longer used. After removing it,
the latter is only invoked by reload(), so we can merge the method
with it.
No new tests, just removing dead code.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::reload):
* loader/FrameLoader.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163188 => 163189)
--- trunk/Source/WebCore/ChangeLog 2014-01-31 20:56:06 UTC (rev 163188)
+++ trunk/Source/WebCore/ChangeLog 2014-01-31 21:03:52 UTC (rev 163189)
@@ -1,3 +1,21 @@
+2014-01-31 Jochen Eisinger <[email protected]>
+
+ Remove FrameLoader's reloadWithOverrideURL and reloadWithRequest
+ https://bugs.webkit.org/show_bug.cgi?id=128005
+
+ Reviewed by Darin Adler.
+
+ The former was used by chromium-android to implement the "request
+ desktop version" feature, but is no longer used. After removing it,
+ the latter is only invoked by reload(), so we can merge the method
+ with it.
+
+ No new tests, just removing dead code.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::reload):
+ * loader/FrameLoader.h:
+
2014-01-31 Commit Queue <[email protected]>
Unreviewed, rolling out r163182.
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (163188 => 163189)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-01-31 20:56:06 UTC (rev 163188)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-01-31 21:03:52 UTC (rev 163189)
@@ -1560,19 +1560,6 @@
loadWithDocumentLoader(loader.get(), FrameLoadTypeReload, 0);
}
-void FrameLoader::reloadWithOverrideURL(const URL& overrideUrl, bool endToEndReload)
-{
- if (!m_documentLoader)
- return;
-
- if (overrideUrl.isEmpty())
- return;
-
- ResourceRequest request = m_documentLoader->request();
- request.setURL(overrideUrl);
- reloadWithRequest(request, endToEndReload);
-}
-
void FrameLoader::reload(bool endToEndReload)
{
if (!m_documentLoader)
@@ -1589,13 +1576,6 @@
if (!unreachableURL.isEmpty())
initialRequest.setURL(unreachableURL);
- reloadWithRequest(initialRequest, endToEndReload);
-}
-
-void FrameLoader::reloadWithRequest(const ResourceRequest& initialRequest, bool endToEndReload)
-{
- ASSERT(m_documentLoader);
-
// Create a new document loader for the reload, this will become m_documentLoader eventually,
// but first it has to be the "policy" document loader, and then the "provisional" document loader.
RefPtr<DocumentLoader> loader = m_client.createDocumentLoader(initialRequest, defaultSubstituteDataForURL(initialRequest.url()));
Modified: trunk/Source/WebCore/loader/FrameLoader.h (163188 => 163189)
--- trunk/Source/WebCore/loader/FrameLoader.h 2014-01-31 20:56:06 UTC (rev 163188)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2014-01-31 21:03:52 UTC (rev 163189)
@@ -123,7 +123,6 @@
void reload(bool endToEndReload = false);
void reloadWithOverrideEncoding(const String& overrideEncoding);
- void reloadWithOverrideURL(const URL& overrideUrl, bool endToEndReload = false);
void open(CachedFrameBase&);
void loadItem(HistoryItem*, FrameLoadType);
@@ -355,8 +354,6 @@
void loadURL(const URL&, const String& referrer, const String& frameName, // Called by loadFrameRequest, calls loadWithNavigationAction or dispatches to navigation policy delegate
bool lockHistory, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>);
- void reloadWithRequest(const ResourceRequest&, bool endToEndReload);
-
bool shouldReload(const URL& currentURL, const URL& destinationURL);
void requestFromDelegate(ResourceRequest&, unsigned long& identifier, ResourceError&);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
