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

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

Issue 717053002: Revert "Use expected main frame size from WebViewImpl when creating a new FrameView." (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« 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 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 WebVector<WebCompositionUnderline> compositionUnderlines() const; 501 WebVector<WebCompositionUnderline> compositionUnderlines() const;
502 502
503 WebLayerTreeView* layerTreeView() const { return m_layerTreeView; } 503 WebLayerTreeView* layerTreeView() const { return m_layerTreeView; }
504 504
505 bool pinchVirtualViewportEnabled() const; 505 bool pinchVirtualViewportEnabled() const;
506 506
507 bool matchesHeuristicsForGpuRasterizationForTesting() const { return m_match esHeuristicsForGpuRasterization; } 507 bool matchesHeuristicsForGpuRasterizationForTesting() const { return m_match esHeuristicsForGpuRasterization; }
508 508
509 virtual void setTopControlsLayoutHeight(float) override; 509 virtual void setTopControlsLayoutHeight(float) override;
510 510
511 IntSize mainFrameSize() const;
512
513 private: 511 private:
514 void didUpdateTopControls(); 512 void didUpdateTopControls();
515 void setTopControlsContentOffset(float); 513 void setTopControlsContentOffset(float);
516 514
517 // TODO(bokan): Remains for legacy pinch. Remove once it's gone. Made privat e to 515 // TODO(bokan): Remains for legacy pinch. Remove once it's gone. Made privat e to
518 // prevent external usage 516 // prevent external usage
519 virtual void setPageScaleFactor(float scaleFactor, const WebPoint& origin) o verride; 517 virtual void setPageScaleFactor(float scaleFactor, const WebPoint& origin) o verride;
520 void setPageScaleFactorAndLocation(float, const FloatPoint&); 518 void setPageScaleFactorAndLocation(float, const FloatPoint&);
521 519
522 void scrollAndRescaleViewports(float scaleFactor, const IntPoint& mainFrameO rigin, const FloatPoint& pinchViewportOrigin); 520 void scrollAndRescaleViewports(float scaleFactor, const IntPoint& mainFrameO rigin, const FloatPoint& pinchViewportOrigin);
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 float m_topControlsLayoutHeight; 751 float m_topControlsLayoutHeight;
754 }; 752 };
755 753
756 // 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
757 // WebViewImpl because WebViewImpl is the only implementation of WebView. 755 // WebViewImpl because WebViewImpl is the only implementation of WebView.
758 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); 756 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
759 757
760 } // namespace blink 758 } // namespace blink
761 759
762 #endif 760 #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