Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Unified Diff: third_party/WebKit/Source/core/frame/FrameTestHelpers.h

Issue 2940863005: Move loading methods from WebFrame to WebLocalFrame. (Closed)
Patch Set: Fixing build problems introduced by rebasing... Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/frame/FrameTestHelpers.h
diff --git a/third_party/WebKit/Source/core/frame/FrameTestHelpers.h b/third_party/WebKit/Source/core/frame/FrameTestHelpers.h
index a3adb6d95182d570b9bf7210692ecf92675c74a6..179ce1652126271b99e0e22f7a88700ff56c3771 100644
--- a/third_party/WebKit/Source/core/frame/FrameTestHelpers.h
+++ b/third_party/WebKit/Source/core/frame/FrameTestHelpers.h
@@ -66,22 +66,22 @@ class TestWebRemoteFrameClient;
class TestWebWidgetClient;
class TestWebViewClient;
-// Loads a url into the specified WebFrame for testing purposes. Pumps any
+// Loads a url into the specified WebLocalFrame for testing purposes. Pumps any
// pending resource requests, as well as waiting for the threaded parser to
// finish, before returning.
-void LoadFrame(WebFrame*, const std::string& url);
+void LoadFrame(WebLocalFrame*, const std::string& url);
// Same as above, but for WebLocalFrame::LoadHTMLString().
void LoadHTMLString(WebLocalFrame*,
const std::string& html,
const WebURL& base_url);
-// Same as above, but for WebFrame::loadHistoryItem().
-void LoadHistoryItem(WebFrame*,
+// Same as above, but for WebLocalFrame::RequestFromHistoryItem/Load.
+void LoadHistoryItem(WebLocalFrame*,
const WebHistoryItem&,
WebHistoryLoadType,
WebCachePolicy);
-// Same as above, but for WebFrame::reload().
-void ReloadFrame(WebFrame*);
-void ReloadFrameBypassingCache(WebFrame*);
+// Same as above, but for WebLocalFrame::Reload().
+void ReloadFrame(WebLocalFrame*);
+void ReloadFrameBypassingCache(WebLocalFrame*);
// Pumps pending resource requests while waiting for a frame to load. Consider
// using one of the above helper methods whenever possible.

Powered by Google App Engine
This is Rietveld 408576698