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

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

Issue 225303014: [Pinch-to-zoom] Moved scale factor into PinchViewport (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 /* 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 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 WebRect computeBlockBounds(const WebRect&, bool ignoreClipping); 512 WebRect computeBlockBounds(const WebRect&, bool ignoreClipping);
513 513
514 WebCore::IntPoint clampOffsetAtScale(const WebCore::IntPoint& offset, float scale); 514 WebCore::IntPoint clampOffsetAtScale(const WebCore::IntPoint& offset, float scale);
515 515
516 // Exposed for tests. 516 // Exposed for tests.
517 WebVector<WebCompositionUnderline> compositionUnderlines() const; 517 WebVector<WebCompositionUnderline> compositionUnderlines() const;
518 518
519 WebLayerTreeView* layerTreeView() const { return m_layerTreeView; } 519 WebLayerTreeView* layerTreeView() const { return m_layerTreeView; }
520 520
521 private: 521 private:
522 void setPageScaleFactor(float);
522 float legibleScale() const; 523 float legibleScale() const;
523 void refreshPageScaleFactorAfterLayout(); 524 void refreshPageScaleFactorAfterLayout();
524 void resumeTreeViewCommits(); 525 void resumeTreeViewCommits();
525 void setUserAgentPageScaleConstraints(WebCore::PageScaleConstraints newConst raints); 526 void setUserAgentPageScaleConstraints(WebCore::PageScaleConstraints newConst raints);
526 float clampPageScaleFactorToLimits(float) const; 527 float clampPageScaleFactorToLimits(float) const;
527 WebCore::IntSize contentsSize() const; 528 WebCore::IntSize contentsSize() const;
528 529
529 void resetSavedScrollAndScaleState(); 530 void resetSavedScrollAndScaleState();
530 531
531 void updateMainFrameScrollPosition(const WebCore::IntPoint& scrollPosition, bool programmaticScroll); 532 void updateMainFrameScrollPosition(const WebCore::IntPoint& scrollPosition, bool programmaticScroll);
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 float m_zoomFactorOverride; 758 float m_zoomFactorOverride;
758 }; 759 };
759 760
760 // We have no ways to check if the specified WebView is an instance of 761 // We have no ways to check if the specified WebView is an instance of
761 // WebViewImpl because WebViewImpl is the only implementation of WebView. 762 // WebViewImpl because WebViewImpl is the only implementation of WebView.
762 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); 763 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
763 764
764 } // namespace blink 765 } // namespace blink
765 766
766 #endif 767 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698