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

Unified Diff: Source/web/tests/WebFrameTest.cpp

Issue 319573008: Navigation transitions: Initiate navigation transition and send serialized markup to Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@transitions_editing
Patch Set: Rebase Created 6 years, 5 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
« no previous file with comments | « Source/web/FrameLoaderClientImpl.cpp ('k') | public/web/WebFrameClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index ca41c956a3022dfd0888293a101abff91e6af1d9..f606ef18d58ad4cc2844b14e71ef442d4080e2b4 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -2650,11 +2650,9 @@ TEST_F(WebFrameTest, DivScrollIntoEditableTest)
class TestReloadDoesntRedirectWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
public:
- virtual WebNavigationPolicy decidePolicyForNavigation(
- WebLocalFrame*, WebDataSource::ExtraData*, const WebURLRequest&, WebNavigationType,
- WebNavigationPolicy defaultPolicy, bool isRedirect) OVERRIDE
+ virtual WebNavigationPolicy decidePolicyForNavigation(const NavigationPolicyInfo& info) OVERRIDE
{
- EXPECT_FALSE(isRedirect);
+ EXPECT_FALSE(info.isRedirect);
return WebNavigationPolicyCurrentTab;
}
};
@@ -4944,11 +4942,10 @@ public:
{
}
- virtual WebNavigationPolicy decidePolicyForNavigation(WebLocalFrame*, WebDataSource::ExtraData*, const WebURLRequest&,
- WebNavigationType, WebNavigationPolicy policy, bool) OVERRIDE
+ virtual WebNavigationPolicy decidePolicyForNavigation(const NavigationPolicyInfo& info) OVERRIDE
{
m_decidePolicyCallCount++;
- return policy;
+ return info.defaultPolicy;
}
int decidePolicyCallCount() const { return m_decidePolicyCallCount; }
@@ -5298,7 +5295,8 @@ public:
m_replacesCurrentHistoryItem = false;
m_frame = 0;
}
- void didStartProvisionalLoad(WebLocalFrame* frame)
+
+ void didStartProvisionalLoad(WebLocalFrame* frame, bool isTransitionNavigation)
{
WebDataSource* ds = frame->provisionalDataSource();
m_replacesCurrentHistoryItem = ds->replacesCurrentHistoryItem();
« no previous file with comments | « Source/web/FrameLoaderClientImpl.cpp ('k') | public/web/WebFrameClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698