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

Side by Side Diff: third_party/WebKit/Source/web/tests/FrameTestHelpers.h

Issue 2917343004: Move LoadHTMLString method from WebFrame to WebLocalFrame. (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 namespace FrameTestHelpers { 61 namespace FrameTestHelpers {
62 62
63 class TestWebFrameClient; 63 class TestWebFrameClient;
64 class TestWebWidgetClient; 64 class TestWebWidgetClient;
65 class TestWebViewClient; 65 class TestWebViewClient;
66 66
67 // Loads a url into the specified WebFrame for testing purposes. Pumps any 67 // Loads a url into the specified WebFrame for testing purposes. Pumps any
68 // pending resource requests, as well as waiting for the threaded parser to 68 // pending resource requests, as well as waiting for the threaded parser to
69 // finish, before returning. 69 // finish, before returning.
70 void LoadFrame(WebFrame*, const std::string& url); 70 void LoadFrame(WebFrame*, const std::string& url);
71 // Same as above, but for WebFrame::loadHTMLString(). 71 // Same as above, but for WebLocalFrame::LoadHTMLString().
72 void LoadHTMLString(WebFrame*, const std::string& html, const WebURL& base_url); 72 void LoadHTMLString(WebLocalFrame*,
73 const std::string& html,
74 const WebURL& base_url);
73 // Same as above, but for WebFrame::loadHistoryItem(). 75 // Same as above, but for WebFrame::loadHistoryItem().
74 void LoadHistoryItem(WebFrame*, 76 void LoadHistoryItem(WebFrame*,
75 const WebHistoryItem&, 77 const WebHistoryItem&,
76 WebHistoryLoadType, 78 WebHistoryLoadType,
77 WebCachePolicy); 79 WebCachePolicy);
78 // Same as above, but for WebFrame::reload(). 80 // Same as above, but for WebFrame::reload().
79 void ReloadFrame(WebFrame*); 81 void ReloadFrame(WebFrame*);
80 void ReloadFrameBypassingCache(WebFrame*); 82 void ReloadFrameBypassingCache(WebFrame*);
81 83
82 // Pumps pending resource requests while waiting for a frame to load. Consider 84 // Pumps pending resource requests while waiting for a frame to load. Consider
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 WebDOMMessageEvent) override {} 305 WebDOMMessageEvent) override {}
304 306
305 private: 307 private:
306 Persistent<WebRemoteFrameImpl> const frame_; 308 Persistent<WebRemoteFrameImpl> const frame_;
307 }; 309 };
308 310
309 } // namespace FrameTestHelpers 311 } // namespace FrameTestHelpers
310 } // namespace blink 312 } // namespace blink
311 313
312 #endif // FrameTestHelpers_h 314 #endif // FrameTestHelpers_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698