third_party/WebKit/Source/web/tests/VisualViewportTest.cpp - Issue 1858533002: Introduce WebCachePolicy to merge cache policy enums

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

Issue 1858533002: Introduce WebCachePolicy to merge cache policy enums (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: self review, minor fixes Created 4 years, 9 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

« content/renderer/render_frame_impl.cc ('K') | « third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp ('k') | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('j') | third_party/WebKit/public/web/WebFrame.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

diff --git a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

index b400edc6827a10b9c60692b6e61f5a51fa869246..15df79c3bfcaffc07fcdab919ace21414f9811eb 100644

--- a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

+++ b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

@@ -20,6 +20,7 @@

#include "platform/geometry/DoubleRect.h"

#include "platform/testing/URLTestHelpers.h"

#include "public/platform/Platform.h"

+#include "public/platform/WebCachePolicy.h"

#include "public/platform/WebLayerTreeView.h"

#include "public/platform/WebUnitTestSupport.h"

#include "public/web/WebContextMenuData.h"

@@ -843,7 +844,7 @@ TEST_P(ParameterizedVisualViewportTest, TestRestoredFromHistoryItem)

item.setVisualViewportScrollOffset(WebFloatPoint(100, 120));

item.setPageScaleFactor(2);

- FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item, WebHistoryDifferentDocumentLoad, WebURLRequest::UseProtocolCachePolicy);

+ FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item, WebHistoryDifferentDocumentLoad, WebCachePolicy::UseProtocolCachePolicy);

VisualViewport& visualViewport = frame()->page()->frameHost().visualViewport();

EXPECT_EQ(2, visualViewport.scale());

@@ -870,7 +871,7 @@ TEST_F(VisualViewportTest, TestRestoredFromLegacyHistoryItem)

item.setScrollOffset(WebPoint(120, 180));

item.setPageScaleFactor(2);

- FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item, WebHistoryDifferentDocumentLoad, WebURLRequest::UseProtocolCachePolicy);

+ FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item, WebHistoryDifferentDocumentLoad, WebCachePolicy::UseProtocolCachePolicy);

VisualViewport& visualViewport = frame()->page()->frameHost().visualViewport();

EXPECT_EQ(2, visualViewport.scale());