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

Side by Side Diff: Source/web/WebViewImpl.h

Issue 984023003: Avoid loosing of the display mode value (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « Source/web/WebLocalFrameImpl.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 virtual void setTopControlsHeight(float height, bool topControlsShrinkLayout Size) override; 523 virtual void setTopControlsHeight(float height, bool topControlsShrinkLayout Size) override;
524 virtual void updateTopControlsState(WebTopControlsState constraint, WebTopCo ntrolsState current, bool animate) override; 524 virtual void updateTopControlsState(WebTopControlsState constraint, WebTopCo ntrolsState current, bool animate) override;
525 525
526 TopControls& topControls(); 526 TopControls& topControls();
527 // Called anytime top controls layout height or content offset have changed. 527 // Called anytime top controls layout height or content offset have changed.
528 void didUpdateTopControls(); 528 void didUpdateTopControls();
529 529
530 virtual void forceNextWebGLContextCreationToFail() override; 530 virtual void forceNextWebGLContextCreationToFail() override;
531 531
532 IntSize mainFrameSize(); 532 IntSize mainFrameSize();
533 WebDisplayMode displayMode() const { return m_displayMode; }
533 534
534 private: 535 private:
535 // TODO(bokan): Remains for legacy pinch. Remove once it's gone. Made privat e to 536 // TODO(bokan): Remains for legacy pinch. Remove once it's gone. Made privat e to
536 // prevent external usage 537 // prevent external usage
537 virtual void setPageScaleFactor(float scaleFactor, const WebPoint& origin) o verride; 538 virtual void setPageScaleFactor(float scaleFactor, const WebPoint& origin) o verride;
538 void setPageScaleFactorAndLocation(float, const FloatPoint&); 539 void setPageScaleFactorAndLocation(float, const FloatPoint&);
539 540
540 void scrollAndRescaleViewports(float scaleFactor, const IntPoint& mainFrameO rigin, const FloatPoint& pinchViewportOrigin); 541 void scrollAndRescaleViewports(float scaleFactor, const IntPoint& mainFrameO rigin, const FloatPoint& pinchViewportOrigin);
541 542
542 IntRect visibleRectInDocument() const; 543 IntRect visibleRectInDocument() const;
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 bool m_showFPSCounter; 763 bool m_showFPSCounter;
763 bool m_showPaintRects; 764 bool m_showPaintRects;
764 bool m_showDebugBorders; 765 bool m_showDebugBorders;
765 bool m_continuousPaintingEnabled; 766 bool m_continuousPaintingEnabled;
766 bool m_showScrollBottleneckRects; 767 bool m_showScrollBottleneckRects;
767 WebColor m_baseBackgroundColor; 768 WebColor m_baseBackgroundColor;
768 WebColor m_backgroundColorOverride; 769 WebColor m_backgroundColorOverride;
769 float m_zoomFactorOverride; 770 float m_zoomFactorOverride;
770 771
771 bool m_userGestureObserved; 772 bool m_userGestureObserved;
773 WebDisplayMode m_displayMode;
772 774
773 RefPtr<EventListener> m_popupMouseWheelEventListener; 775 RefPtr<EventListener> m_popupMouseWheelEventListener;
774 }; 776 };
775 777
776 DEFINE_TYPE_CASTS(WebViewImpl, WebWidget, widget, widget->isWebView(), widget.is WebView()); 778 DEFINE_TYPE_CASTS(WebViewImpl, WebWidget, widget, widget->isWebView(), widget.is WebView());
777 // We have no ways to check if the specified WebView is an instance of 779 // We have no ways to check if the specified WebView is an instance of
778 // WebViewImpl because WebViewImpl is the only implementation of WebView. 780 // WebViewImpl because WebViewImpl is the only implementation of WebView.
779 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); 781 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
780 782
781 } // namespace blink 783 } // namespace blink
782 784
783 #endif 785 #endif
OLDNEW
« no previous file with comments | « Source/web/WebLocalFrameImpl.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698