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

Unified Diff: chrome/browser/apps/guest_view/web_view_browsertest.cc

Issue 1237343002: Fix nested GuestView's container bounds calculation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix type mismatch for win_x64 compile Created 5 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 | « no previous file | chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/guest_view/web_view_browsertest.cc
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index 379633d7a4eb0ef8736c4beb9143cbe934387403..2647ecf0fa56da52fd9f0b7c354879446454e95f 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/apps/app_browsertest_util.h"
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/pdf/pdf_extension_test_util.h"
#include "chrome/browser/prerender/prerender_link_manager.h"
#include "chrome/browser/prerender/prerender_link_manager_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -2460,6 +2461,29 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFocusWhileFocused) {
TestHelper("testFocusWhileFocused", "web_view/shim", NO_TEST_SERVER);
}
+IN_PROC_BROWSER_TEST_F(WebViewTest, NestedGuestContainerBounds) {
+ TestHelper("testPDFInWebview", "web_view/shim", NO_TEST_SERVER);
+
+ std::vector<content::WebContents*> guest_web_contents_list;
+ GetGuestViewManager()->WaitForNumGuestsCreated(2u);
+ GetGuestViewManager()->GetGuestWebContentsList(&guest_web_contents_list);
+ ASSERT_EQ(2u, guest_web_contents_list.size());
+
+ content::WebContents* web_view_contents = guest_web_contents_list[0];
+ content::WebContents* mime_handler_view_contents = guest_web_contents_list[1];
+
+ // Make sure we've completed loading |mime_handler_view_guest|.
+ bool load_success = pdf_extension_test_util::EnsurePDFHasLoaded(
+ web_view_contents);
+ EXPECT_TRUE(load_success);
+
+ gfx::Rect web_view_container_bounds = web_view_contents->GetContainerBounds();
+ gfx::Rect mime_handler_view_container_bounds =
+ mime_handler_view_contents->GetContainerBounds();
+ EXPECT_EQ(web_view_container_bounds.origin(),
+ mime_handler_view_container_bounds.origin());
+}
+
#if defined(USE_AURA)
// TODO(wjmaclean): when WebViewTest is re-enabled on the site-isolation
// bots, then re-enable this test class as well.
« no previous file with comments | « no previous file | chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698