content/renderer/browser_plugin/browser_plugin_browsertest.cc - Issue 21930006: <webview>: Allocate the view instance ID from the WebView shim

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: content/renderer/browser_plugin/browser_plugin_browsertest.cc

Issue 21930006: <webview>: Allocate the view instance ID from the WebView shim (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge with ToT Created 7 years, 4 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 | « content/renderer/browser_plugin/browser_plugin_bindings.cc ('k') | content/renderer/browser_plugin/browser_plugin_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/browser_plugin/browser_plugin_browsertest.cc

diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.cc b/content/renderer/browser_plugin/browser_plugin_browsertest.cc

index 46ccea65aa37d48842e3cae78006be553edae3f0..c8e5123ba1ad11a5cf603a575370390c24ad09f1 100644

--- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc

+++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc

@@ -192,7 +192,7 @@ TEST_F(BrowserPluginTest, InitialResize) {

EXPECT_EQ(480, params.resize_guest_params.view_rect.height());

ASSERT_TRUE(browser_plugin);

// Now the browser plugin is expecting a UpdateRect resize.

- int instance_id = browser_plugin->instance_id();

+ int instance_id = browser_plugin->guest_instance_id();

EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());

// Send the BrowserPlugin an UpdateRect equal to its container size with

@@ -289,7 +289,7 @@ TEST_F(BrowserPluginTest, ResizeFlowControl) {

LoadHTML(GetHTMLForBrowserPluginObject().c_str());

MockBrowserPlugin* browser_plugin = GetCurrentPlugin();

ASSERT_TRUE(browser_plugin);

- int instance_id = browser_plugin->instance_id();

+ int instance_id = browser_plugin->guest_instance_id();

EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());

// Send an UpdateRect to the BrowserPlugin to make it use the pending damage

// buffer.