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

Side by Side Diff: content/renderer/render_view_impl.h

Issue 1546603003: Ensure zoom level is not updated if main frame is WebRemoteFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move check into Blink. Created 4 years, 12 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 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndOffset); 560 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndOffset);
561 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ZoomLimit); 561 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ZoomLimit);
562 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame); 562 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame);
563 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame); 563 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame);
564 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, TextInputTypeWithPepper); 564 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, TextInputTypeWithPepper);
565 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, 565 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
566 MessageOrderInDidChangeSelection); 566 MessageOrderInDidChangeSelection);
567 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendCandidateWindowEvents); 567 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendCandidateWindowEvents);
568 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, RenderFrameClearedAfterClose); 568 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, RenderFrameClearedAfterClose);
569 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, PaintAfterSwapOut); 569 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, PaintAfterSwapOut);
570 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
571 SetZoomLevelAfterCrossProcessNavigation);
570 FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest, 572 FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest,
571 ConverViewportToScreenWithZoomForDSF); 573 ConverViewportToScreenWithZoomForDSF);
572 FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest, 574 FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest,
573 GetCompositionCharacterBoundsTest); 575 GetCompositionCharacterBoundsTest);
574 576
575 typedef std::map<GURL, double> HostZoomLevels; 577 typedef std::map<GURL, double> HostZoomLevels;
576 578
577 enum ErrorPageType { 579 enum ErrorPageType {
578 DNS_ERROR, 580 DNS_ERROR,
579 HTTP_404, 581 HTTP_404,
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 // use the Observer interface to filter IPC messages and receive frame change 1042 // use the Observer interface to filter IPC messages and receive frame change
1041 // notifications. 1043 // notifications.
1042 // --------------------------------------------------------------------------- 1044 // ---------------------------------------------------------------------------
1043 1045
1044 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1046 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1045 }; 1047 };
1046 1048
1047 } // namespace content 1049 } // namespace content
1048 1050
1049 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1051 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/shell/renderer/layout_test/leak_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698