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

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2718313002: Removed FrameHost::pageScaleConstraintsSet() (Closed)
Patch Set: Rebase Created 3 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 | « third_party/WebKit/Source/core/page/scrolling/TopDocumentRootScrollerController.cpp ('k') | no next file » | 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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 3069 matching lines...) Expand 10 before | Expand all | Expand 10 after
3080 3080
3081 IntSize WebViewImpl::mainFrameSize() { 3081 IntSize WebViewImpl::mainFrameSize() {
3082 // The frame size should match the viewport size at minimum scale, since the 3082 // The frame size should match the viewport size at minimum scale, since the
3083 // viewport must always be contained by the frame. 3083 // viewport must always be contained by the frame.
3084 FloatSize frameSize(m_size); 3084 FloatSize frameSize(m_size);
3085 frameSize.scale(1 / minimumPageScaleFactor()); 3085 frameSize.scale(1 / minimumPageScaleFactor());
3086 return expandedIntSize(frameSize); 3086 return expandedIntSize(frameSize);
3087 } 3087 }
3088 3088
3089 PageScaleConstraintsSet& WebViewImpl::pageScaleConstraintsSet() const { 3089 PageScaleConstraintsSet& WebViewImpl::pageScaleConstraintsSet() const {
3090 return page()->frameHost().pageScaleConstraintsSet(); 3090 return page()->pageScaleConstraintsSet();
3091 } 3091 }
3092 3092
3093 void WebViewImpl::refreshPageScaleFactorAfterLayout() { 3093 void WebViewImpl::refreshPageScaleFactorAfterLayout() {
3094 if (!mainFrame() || !page() || !page()->mainFrame() || 3094 if (!mainFrame() || !page() || !page()->mainFrame() ||
3095 !page()->mainFrame()->isLocalFrame() || 3095 !page()->mainFrame()->isLocalFrame() ||
3096 !page()->deprecatedLocalMainFrame()->view()) 3096 !page()->deprecatedLocalMainFrame()->view())
3097 return; 3097 return;
3098 FrameView* view = page()->deprecatedLocalMainFrame()->view(); 3098 FrameView* view = page()->deprecatedLocalMainFrame()->view();
3099 3099
3100 updatePageDefinedViewportConstraints( 3100 updatePageDefinedViewportConstraints(
(...skipping 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after
4166 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4166 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4167 return nullptr; 4167 return nullptr;
4168 return focusedFrame; 4168 return focusedFrame;
4169 } 4169 }
4170 4170
4171 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4171 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4172 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4172 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4173 } 4173 }
4174 4174
4175 } // namespace blink 4175 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/page/scrolling/TopDocumentRootScrollerController.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698