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

Side by Side Diff: content/renderer/render_view_browsertest.cc

Issue 1804023002: Fix page zoom to be frame-centric for out-of-process frames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to master@{#386187}. Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 void EnablePreferredSizeMode() { 362 void EnablePreferredSizeMode() {
363 view()->OnEnablePreferredSizeChangedMode(); 363 view()->OnEnablePreferredSizeChangedMode();
364 } 364 }
365 365
366 const gfx::Size& GetPreferredSize() { 366 const gfx::Size& GetPreferredSize() {
367 view()->CheckPreferredSize(); 367 view()->CheckPreferredSize();
368 return view()->preferred_size_; 368 return view()->preferred_size_;
369 } 369 }
370 370
371 void SetZoomLevel(double level) { 371 void SetZoomLevel(double level) {
372 view()->OnSetZoomLevelForView(false, level); 372 view()->OnSetZoomLevelForView(
373 PageMsg_SetZoomLevel_Command::ZOOM_USE_CURRENT_TEMPORARY_MODE, level);
373 } 374 }
374 375
375 private: 376 private:
376 scoped_ptr<MockKeyboard> mock_keyboard_; 377 scoped_ptr<MockKeyboard> mock_keyboard_;
377 }; 378 };
378 379
379 class DevToolsAgentTest : public RenderViewImplTest { 380 class DevToolsAgentTest : public RenderViewImplTest {
380 public: 381 public:
381 void Attach() { 382 void Attach() {
382 notifications_ = std::vector<std::string>(); 383 notifications_ = std::vector<std::string>();
(...skipping 2010 matching lines...) Expand 10 before | Expand all | Expand 10 after
2393 2394
2394 TEST_F(DevToolsAgentTest, RuntimeEnableForcesContextsAfterNavigation) { 2395 TEST_F(DevToolsAgentTest, RuntimeEnableForcesContextsAfterNavigation) {
2395 Attach(); 2396 Attach();
2396 DispatchDevToolsMessage("{\"id\":1,\"method\":\"Runtime.enable\"}"); 2397 DispatchDevToolsMessage("{\"id\":1,\"method\":\"Runtime.enable\"}");
2397 EXPECT_EQ(0, CountNotifications("Runtime.executionContextCreated")); 2398 EXPECT_EQ(0, CountNotifications("Runtime.executionContextCreated"));
2398 LoadHTML("<body>page<iframe></iframe></body>"); 2399 LoadHTML("<body>page<iframe></iframe></body>");
2399 EXPECT_EQ(2, CountNotifications("Runtime.executionContextCreated")); 2400 EXPECT_EQ(2, CountNotifications("Runtime.executionContextCreated"));
2400 } 2401 }
2401 2402
2402 } // namespace content 2403 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698