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

Side by Side 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 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 class WebRemoteFrameImpl; 59 class WebRemoteFrameImpl;
60 class WebSettings; 60 class WebSettings;
61 61
62 namespace FrameTestHelpers { 62 namespace FrameTestHelpers {
63 63
64 class TestWebFrameClient; 64 class TestWebFrameClient;
65 class TestWebRemoteFrameClient; 65 class TestWebRemoteFrameClient;
66 class TestWebWidgetClient; 66 class TestWebWidgetClient;
67 class TestWebViewClient; 67 class TestWebViewClient;
68 68
69 // Loads a url into the specified WebFrame for testing purposes. Pumps any 69 // Loads a url into the specified WebLocalFrame for testing purposes. Pumps any
70 // pending resource requests, as well as waiting for the threaded parser to 70 // pending resource requests, as well as waiting for the threaded parser to
71 // finish, before returning. 71 // finish, before returning.
72 void LoadFrame(WebFrame*, const std::string& url); 72 void LoadFrame(WebLocalFrame*, const std::string& url);
73 // Same as above, but for WebLocalFrame::LoadHTMLString(). 73 // Same as above, but for WebLocalFrame::LoadHTMLString().
74 void LoadHTMLString(WebLocalFrame*, 74 void LoadHTMLString(WebLocalFrame*,
75 const std::string& html, 75 const std::string& html,
76 const WebURL& base_url); 76 const WebURL& base_url);
77 // Same as above, but for WebFrame::loadHistoryItem(). 77 // Same as above, but for WebLocalFrame::RequestFromHistoryItem/Load.
78 void LoadHistoryItem(WebFrame*, 78 void LoadHistoryItem(WebLocalFrame*,
79 const WebHistoryItem&, 79 const WebHistoryItem&,
80 WebHistoryLoadType, 80 WebHistoryLoadType,
81 WebCachePolicy); 81 WebCachePolicy);
82 // Same as above, but for WebFrame::reload(). 82 // Same as above, but for WebLocalFrame::Reload().
83 void ReloadFrame(WebFrame*); 83 void ReloadFrame(WebLocalFrame*);
84 void ReloadFrameBypassingCache(WebFrame*); 84 void ReloadFrameBypassingCache(WebLocalFrame*);
85 85
86 // Pumps pending resource requests while waiting for a frame to load. Consider 86 // Pumps pending resource requests while waiting for a frame to load. Consider
87 // using one of the above helper methods whenever possible. 87 // using one of the above helper methods whenever possible.
88 void PumpPendingRequestsForFrameToLoad(WebFrame*); 88 void PumpPendingRequestsForFrameToLoad(WebFrame*);
89 89
90 WebMouseEvent CreateMouseEvent(WebInputEvent::Type, 90 WebMouseEvent CreateMouseEvent(WebInputEvent::Type,
91 WebMouseEvent::Button, 91 WebMouseEvent::Button,
92 const IntPoint&, 92 const IntPoint&,
93 int modifiers); 93 int modifiers);
94 94
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 356
357 // This is null from when the client is created until it is initialized with 357 // This is null from when the client is created until it is initialized with
358 // Bind(). 358 // Bind().
359 WebRemoteFrame* frame_ = nullptr; 359 WebRemoteFrame* frame_ = nullptr;
360 }; 360 };
361 361
362 } // namespace FrameTestHelpers 362 } // namespace FrameTestHelpers
363 } // namespace blink 363 } // namespace blink
364 364
365 #endif // FrameTestHelpers_h 365 #endif // FrameTestHelpers_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698