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

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

Issue 843683005: Fix a bit of C++11 in web/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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 | Annotate | Revision Log
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 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 438
439 // Called by a full frame plugin inside this view to inform it that its 439 // Called by a full frame plugin inside this view to inform it that its
440 // zoom level has been updated. The plugin should only call this function 440 // zoom level has been updated. The plugin should only call this function
441 // if the zoom change was triggered by the browser, it's only needed in case 441 // if the zoom change was triggered by the browser, it's only needed in case
442 // a plugin can update its own zoom, say because of its own UI. 442 // a plugin can update its own zoom, say because of its own UI.
443 void fullFramePluginZoomLevelChanged(double zoomLevel); 443 void fullFramePluginZoomLevelChanged(double zoomLevel);
444 444
445 void computeScaleAndScrollForBlockRect(const WebPoint& hitPoint, const WebRe ct& blockRect, float padding, float defaultScaleWhenAlreadyLegible, float& scale , WebPoint& scroll); 445 void computeScaleAndScrollForBlockRect(const WebPoint& hitPoint, const WebRe ct& blockRect, float padding, float defaultScaleWhenAlreadyLegible, float& scale , WebPoint& scroll);
446 Node* bestTapNode(const GestureEventWithHitTestResults& targetedTapEvent); 446 Node* bestTapNode(const GestureEventWithHitTestResults& targetedTapEvent);
447 void enableTapHighlightAtPoint(const GestureEventWithHitTestResults& targete dTapEvent); 447 void enableTapHighlightAtPoint(const GestureEventWithHitTestResults& targete dTapEvent);
448 void enableTapHighlights(WillBeHeapVector<RawPtrWillBeMember<Node> >&); 448 void enableTapHighlights(WillBeHeapVector<RawPtrWillBeMember<Node>>&);
449 void computeScaleAndScrollForFocusedNode(Node* focusedNode, float& scale, In tPoint& scroll, bool& needAnimation); 449 void computeScaleAndScrollForFocusedNode(Node* focusedNode, float& scale, In tPoint& scroll, bool& needAnimation);
450 450
451 void animateDoubleTapZoom(const IntPoint&); 451 void animateDoubleTapZoom(const IntPoint&);
452 452
453 void enableFakePageScaleAnimationForTesting(bool); 453 void enableFakePageScaleAnimationForTesting(bool);
454 bool fakeDoubleTapAnimationPendingForTesting() const { return m_doubleTapZoo mPending; } 454 bool fakeDoubleTapAnimationPendingForTesting() const { return m_doubleTapZoo mPending; }
455 IntPoint fakePageScaleAnimationTargetPositionForTesting() const { return m_f akePageScaleAnimationTargetPosition; } 455 IntPoint fakePageScaleAnimationTargetPositionForTesting() const { return m_f akePageScaleAnimationTargetPosition; }
456 float fakePageScaleAnimationPageScaleForTesting() const { return m_fakePageS caleAnimationPageScaleFactor; } 456 float fakePageScaleAnimationPageScaleForTesting() const { return m_fakePageS caleAnimationPageScaleFactor; }
457 bool fakePageScaleAnimationUseAnchorForTesting() const { return m_fakePageSc aleAnimationUseAnchor; } 457 bool fakePageScaleAnimationUseAnchorForTesting() const { return m_fakePageSc aleAnimationUseAnchor; }
458 458
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 // If true, the graphics context is being restored. 721 // If true, the graphics context is being restored.
722 bool m_recreatingGraphicsContext; 722 bool m_recreatingGraphicsContext;
723 static const WebInputEvent* m_currentInputEvent; 723 static const WebInputEvent* m_currentInputEvent;
724 724
725 MediaKeysClientImpl m_mediaKeysClientImpl; 725 MediaKeysClientImpl m_mediaKeysClientImpl;
726 OwnPtr<WebActiveGestureAnimation> m_gestureAnimation; 726 OwnPtr<WebActiveGestureAnimation> m_gestureAnimation;
727 WebPoint m_positionOnFlingStart; 727 WebPoint m_positionOnFlingStart;
728 WebPoint m_globalPositionOnFlingStart; 728 WebPoint m_globalPositionOnFlingStart;
729 int m_flingModifier; 729 int m_flingModifier;
730 bool m_flingSourceDevice; 730 bool m_flingSourceDevice;
731 Vector<OwnPtr<LinkHighlight> > m_linkHighlights; 731 Vector<OwnPtr<LinkHighlight>> m_linkHighlights;
732 OwnPtrWillBePersistent<FullscreenController> m_fullscreenController; 732 OwnPtrWillBePersistent<FullscreenController> m_fullscreenController;
733 733
734 bool m_showFPSCounter; 734 bool m_showFPSCounter;
735 bool m_showPaintRects; 735 bool m_showPaintRects;
736 bool m_showDebugBorders; 736 bool m_showDebugBorders;
737 bool m_continuousPaintingEnabled; 737 bool m_continuousPaintingEnabled;
738 bool m_showScrollBottleneckRects; 738 bool m_showScrollBottleneckRects;
739 WebColor m_baseBackgroundColor; 739 WebColor m_baseBackgroundColor;
740 WebColor m_backgroundColorOverride; 740 WebColor m_backgroundColorOverride;
741 float m_zoomFactorOverride; 741 float m_zoomFactorOverride;
742 742
743 bool m_userGestureObserved; 743 bool m_userGestureObserved;
744 744
745 // The top controls offset since the last compositor commit. 745 // The top controls offset since the last compositor commit.
746 float m_topControlsContentOffset; 746 float m_topControlsContentOffset;
747 747
748 // The top controls offset at the time of the last Resize event. This is the 748 // The top controls offset at the time of the last Resize event. This is the
749 // amount that the viewport was shrunk by to accomodate the top controls. 749 // amount that the viewport was shrunk by to accomodate the top controls.
750 float m_topControlsLayoutHeight; 750 float m_topControlsLayoutHeight;
751 }; 751 };
752 752
753 DEFINE_TYPE_CASTS(WebViewImpl, WebWidget, widget, widget->isWebView(), widget.is WebView()); 753 DEFINE_TYPE_CASTS(WebViewImpl, WebWidget, widget, widget->isWebView(), widget.is WebView());
754 // We have no ways to check if the specified WebView is an instance of 754 // We have no ways to check if the specified WebView is an instance of
755 // WebViewImpl because WebViewImpl is the only implementation of WebView. 755 // WebViewImpl because WebViewImpl is the only implementation of WebView.
756 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); 756 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
757 757
758 } // namespace blink 758 } // namespace blink
759 759
760 #endif 760 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698