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

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

Issue 2737703002: Remove FrameHost::browserControls() (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
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 1841 matching lines...) Expand 10 before | Expand all | Expand 10 after
1852 ResizeViewportAnchor::ResizeScope resizeScope(*m_resizeViewportAnchor); 1852 ResizeViewportAnchor::ResizeScope resizeScope(*m_resizeViewportAnchor);
1853 1853
1854 float browserControlsViewportAdjustment = 1854 float browserControlsViewportAdjustment =
1855 browserControls().layoutHeight() - browserControls().contentOffset(); 1855 browserControls().layoutHeight() - browserControls().contentOffset();
1856 visualViewport.setBrowserControlsAdjustment( 1856 visualViewport.setBrowserControlsAdjustment(
1857 browserControlsViewportAdjustment); 1857 browserControlsViewportAdjustment);
1858 } 1858 }
1859 } 1859 }
1860 1860
1861 BrowserControls& WebViewImpl::browserControls() { 1861 BrowserControls& WebViewImpl::browserControls() {
1862 return page()->frameHost().browserControls(); 1862 return page()->browserControls();
1863 } 1863 }
1864 1864
1865 void WebViewImpl::resizeViewWhileAnchored(float browserControlsHeight, 1865 void WebViewImpl::resizeViewWhileAnchored(float browserControlsHeight,
1866 bool browserControlsShrinkLayout) { 1866 bool browserControlsShrinkLayout) {
1867 DCHECK(mainFrameImpl()); 1867 DCHECK(mainFrameImpl());
1868 1868
1869 browserControls().setHeight(browserControlsHeight, 1869 browserControls().setHeight(browserControlsHeight,
1870 browserControlsShrinkLayout); 1870 browserControlsShrinkLayout);
1871 1871
1872 { 1872 {
(...skipping 2301 matching lines...) Expand 10 before | Expand all | Expand 10 after
4174 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4174 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4175 return nullptr; 4175 return nullptr;
4176 return focusedFrame; 4176 return focusedFrame;
4177 } 4177 }
4178 4178
4179 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4179 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4180 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4180 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4181 } 4181 }
4182 4182
4183 } // namespace blink 4183 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698