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

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

Issue 2374863002: Remove usage of HostZoomMap from c/b/loader via ReadyToCommitNavigation (Closed)
Patch Set: init Created 4 years, 1 month 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
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest, 488 FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest,
489 ScreenMetricsEmulationWithOriginalDSF1); 489 ScreenMetricsEmulationWithOriginalDSF1);
490 FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest, 490 FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest,
491 ScreenMetricsEmulationWithOriginalDSF2); 491 ScreenMetricsEmulationWithOriginalDSF2);
492 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, 492 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
493 DecideNavigationPolicyHandlesAllTopLevel); 493 DecideNavigationPolicyHandlesAllTopLevel);
494 #if defined(OS_MACOSX) 494 #if defined(OS_MACOSX)
495 FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp); 495 FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp);
496 #endif 496 #endif
497 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndOffset); 497 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndOffset);
498 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ZoomLimit);
499 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame); 498 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, NavigateFrame);
500 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame); 499 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, BasicRenderFrame);
501 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, TextInputTypeWithPepper); 500 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, TextInputTypeWithPepper);
502 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, 501 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
503 MessageOrderInDidChangeSelection); 502 MessageOrderInDidChangeSelection);
504 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendCandidateWindowEvents); 503 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendCandidateWindowEvents);
505 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, RenderFrameClearedAfterClose); 504 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, RenderFrameClearedAfterClose);
506 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, PaintAfterSwapOut); 505 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, PaintAfterSwapOut);
507 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, 506 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
508 SetZoomLevelAfterCrossProcessNavigation); 507 SetZoomLevelAfterCrossProcessNavigation);
509 FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest, 508 FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest,
510 ConverViewportToScreenWithZoomForDSF); 509 ConverViewportToScreenWithZoomForDSF);
511 FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest, 510 FRIEND_TEST_ALL_PREFIXES(RenderViewImplScaleFactorTest,
512 GetCompositionCharacterBoundsTest); 511 GetCompositionCharacterBoundsTest);
513 512
514 typedef std::map<GURL, double> HostZoomLevels;
515
516 enum ErrorPageType { 513 enum ErrorPageType {
517 DNS_ERROR, 514 DNS_ERROR,
518 HTTP_404, 515 HTTP_404,
519 CONNECTION_ERROR, 516 CONNECTION_ERROR,
520 }; 517 };
521 518
522 // RenderWidgetOwnerDelegate implementation ---------------------------------- 519 // RenderWidgetOwnerDelegate implementation ----------------------------------
523 520
524 void RenderWidgetDidSetColorProfile( 521 void RenderWidgetDidSetColorProfile(
525 const std::vector<char>& color_profile) override; 522 const std::vector<char>& color_profile) override;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 const blink::WebPluginAction& action); 599 const blink::WebPluginAction& action);
603 void OnMoveOrResizeStarted(); 600 void OnMoveOrResizeStarted();
604 void OnReleaseDisambiguationPopupBitmap(const cc::SharedBitmapId& id); 601 void OnReleaseDisambiguationPopupBitmap(const cc::SharedBitmapId& id);
605 void OnSetActive(bool active); 602 void OnSetActive(bool active);
606 void OnSetBackgroundOpaque(bool opaque); 603 void OnSetBackgroundOpaque(bool opaque);
607 void OnExitFullscreen(); 604 void OnExitFullscreen();
608 void OnSetHistoryOffsetAndLength(int history_offset, int history_length); 605 void OnSetHistoryOffsetAndLength(int history_offset, int history_length);
609 void OnSetInitialFocus(bool reverse); 606 void OnSetInitialFocus(bool reverse);
610 void OnSetRendererPrefs(const RendererPreferences& renderer_prefs); 607 void OnSetRendererPrefs(const RendererPreferences& renderer_prefs);
611 void OnSetWebUIProperty(const std::string& name, const std::string& value); 608 void OnSetWebUIProperty(const std::string& name, const std::string& value);
612 void OnSetZoomLevelForLoadingURL(const GURL& url, double zoom_level);
613 void OnSuppressDialogsUntilSwapOut(); 609 void OnSuppressDialogsUntilSwapOut();
614 void OnUpdateTargetURLAck(); 610 void OnUpdateTargetURLAck();
615 void OnUpdateWebPreferences(const WebPreferences& prefs); 611 void OnUpdateWebPreferences(const WebPreferences& prefs);
616 void OnSetPageScale(float page_scale_factor); 612 void OnSetPageScale(float page_scale_factor);
617 void OnZoom(PageZoom zoom); 613 void OnZoom(PageZoom zoom);
618 void OnForceRedraw(const ui::LatencyInfo& latency_info); 614 void OnForceRedraw(const ui::LatencyInfo& latency_info);
619 void OnSelectWordAroundCaret(); 615 void OnSelectWordAroundCaret();
620 #if defined(OS_ANDROID) 616 #if defined(OS_ANDROID)
621 void OnUndoScrollFocusedEditableNodeIntoRect(); 617 void OnUndoScrollFocusedEditableNodeIntoRect();
622 void OnUpdateTopControlsState(bool enable_hiding, 618 void OnUpdateTopControlsState(bool enable_hiding,
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 // --------------------------------------------------------------------------- 694 // ---------------------------------------------------------------------------
699 // ADDING NEW FUNCTIONS? Please keep private functions alphabetized and put 695 // ADDING NEW FUNCTIONS? Please keep private functions alphabetized and put
700 // it in the same order in the .cc file as it was in the header. 696 // it in the same order in the .cc file as it was in the header.
701 // --------------------------------------------------------------------------- 697 // ---------------------------------------------------------------------------
702 698
703 // Settings ------------------------------------------------------------------ 699 // Settings ------------------------------------------------------------------
704 700
705 WebPreferences webkit_preferences_; 701 WebPreferences webkit_preferences_;
706 RendererPreferences renderer_preferences_; 702 RendererPreferences renderer_preferences_;
707 703
708 HostZoomLevels host_zoom_levels_;
709
710 // Whether content state (such as form state, scroll position and page 704 // Whether content state (such as form state, scroll position and page
711 // contents) should be sent to the browser immediately. This is normally 705 // contents) should be sent to the browser immediately. This is normally
712 // false, but set to true by some tests. 706 // false, but set to true by some tests.
713 bool send_content_state_immediately_; 707 bool send_content_state_immediately_;
714 708
715 // Bitwise-ORed set of extra bindings that have been enabled. See 709 // Bitwise-ORed set of extra bindings that have been enabled. See
716 // BindingsPolicy for details. 710 // BindingsPolicy for details.
717 int enabled_bindings_; 711 int enabled_bindings_;
718 712
719 // If true, we send IPC messages when |preferred_size_| changes. 713 // If true, we send IPC messages when |preferred_size_| changes.
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 // use the Observer interface to filter IPC messages and receive frame change 896 // use the Observer interface to filter IPC messages and receive frame change
903 // notifications. 897 // notifications.
904 // --------------------------------------------------------------------------- 898 // ---------------------------------------------------------------------------
905 899
906 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 900 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
907 }; 901 };
908 902
909 } // namespace content 903 } // namespace content
910 904
911 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 905 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698