Source/web/tests/WebInputEventConversionTest.cpp - Issue 334283004: Rename DOMWindow to LocalDOMWindow

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: Source/web/tests/WebInputEventConversionTest.cpp

Issue 334283004: Rename DOMWindow to LocalDOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Rebase Created 6 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:

Index: Source/web/tests/WebInputEventConversionTest.cpp

diff --git a/Source/web/tests/WebInputEventConversionTest.cpp b/Source/web/tests/WebInputEventConversionTest.cpp

index faa8b6117ef1bb83745d7a8177af6526020bbb1f..42076433d880aac33c998b9eeab2639e62a19923 100644

--- a/Source/web/tests/WebInputEventConversionTest.cpp

+++ b/Source/web/tests/WebInputEventConversionTest.cpp

@@ -110,7 +110,7 @@ TEST(WebInputEventConversionTest, InputEventsScaling)

FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();

RefPtrWillBeRawPtr<Document> document = toLocalFrame(webViewImpl->page()->mainFrame())->document();

- DOMWindow* domWindow = document->domWindow();

+ LocalDOMWindow* domWindow = document->domWindow();

RenderView* documentRenderView = document->renderView();

{

@@ -460,9 +460,15 @@ TEST(WebInputEventConversionTest, InputEventsConversions)

webViewImpl->resize(WebSize(pageWidth, pageHeight));

webViewImpl->layout();

+<<<<<<< HEAD

FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();

RefPtrWillBeRawPtr<Document> document = toLocalFrame(webViewImpl->page()->mainFrame())->document();

DOMWindow* domWindow = document->domWindow();

+=======

+ FrameView* view = webViewImpl->page()->mainFrame()->view();

+ RefPtrWillBeRawPtr<Document> document = webViewImpl->page()->mainFrame()->document();

+ LocalDOMWindow* domWindow = document->domWindow();

+>>>>>>> First cut at the rename

RenderView* documentRenderView = document->renderView();

{