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

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2108803006: Fix inspector overlay when use-zoom-for-dsf is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: plumb through frameview instead Created 4 years, 5 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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 3716 matching lines...) Expand 10 before | Expand all | Expand 10 after
3727 } 3727 }
3728 3728
3729 IntRect FrameView::contentsToScreen(const IntRect& rect) const 3729 IntRect FrameView::contentsToScreen(const IntRect& rect) const
3730 { 3730 {
3731 HostWindow* window = getHostWindow(); 3731 HostWindow* window = getHostWindow();
3732 if (!window) 3732 if (!window)
3733 return IntRect(); 3733 return IntRect();
3734 return window->viewportToScreen(contentsToViewport(rect), this); 3734 return window->viewportToScreen(contentsToViewport(rect), this);
3735 } 3735 }
3736 3736
3737 float FrameView::viewportToWindowScale() const
3738 {
3739 return 1.f / getHostWindow()->windowToViewportScalar(1.f);
3740 }
3741
3737 IntRect FrameView::soonToBeRemovedContentsToUnscaledViewport(const IntRect& rect InContents) const 3742 IntRect FrameView::soonToBeRemovedContentsToUnscaledViewport(const IntRect& rect InContents) const
3738 { 3743 {
3739 IntRect rectInFrame = contentsToFrame(rectInContents); 3744 IntRect rectInFrame = contentsToFrame(rectInContents);
3740 IntRect rectInRootFrame = convertToRootFrame(rectInFrame); 3745 IntRect rectInRootFrame = convertToRootFrame(rectInFrame);
3741 return enclosingIntRect(m_frame->host()->visualViewport().mainViewToViewport CSSPixels(rectInRootFrame)); 3746 return enclosingIntRect(m_frame->host()->visualViewport().mainViewToViewport CSSPixels(rectInRootFrame));
3742 } 3747 }
3743 3748
3744 IntPoint FrameView::soonToBeRemovedUnscaledViewportToContents(const IntPoint& po intInViewport) const 3749 IntPoint FrameView::soonToBeRemovedUnscaledViewportToContents(const IntPoint& po intInViewport) const
3745 { 3750 {
3746 IntPoint pointInRootFrame = flooredIntPoint(m_frame->host()->visualViewport( ).viewportCSSPixelsToRootFrame(pointInViewport)); 3751 IntPoint pointInRootFrame = flooredIntPoint(m_frame->host()->visualViewport( ).viewportCSSPixelsToRootFrame(pointInViewport));
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
4229 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); 4234 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling);
4230 } 4235 }
4231 4236
4232 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4237 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4233 { 4238 {
4234 ASSERT(!layoutViewItem().isNull()); 4239 ASSERT(!layoutViewItem().isNull());
4235 return *layoutView(); 4240 return *layoutView();
4236 } 4241 }
4237 4242
4238 } // namespace blink 4243 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698