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

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

Issue 2203123004: Don't adjust for scrolling of the ancestor, rather than un-adjusting for it later. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: none Created 4 years, 4 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 2173 matching lines...) Expand 10 before | Expand all | Expand 10 after
2184 2184
2185 toLayoutCounter(layoutObject)->updateCounter(); 2185 toLayoutCounter(layoutObject)->updateCounter();
2186 } 2186 }
2187 } 2187 }
2188 2188
2189 IntRect FrameView::windowClipRect(IncludeScrollbarsInRect scrollbarInclusion) co nst 2189 IntRect FrameView::windowClipRect(IncludeScrollbarsInRect scrollbarInclusion) co nst
2190 { 2190 {
2191 ASSERT(m_frame->view() == this); 2191 ASSERT(m_frame->view() == this);
2192 2192
2193 LayoutRect clipRect(LayoutPoint(), LayoutSize(visibleContentSize(scrollbarIn clusion))); 2193 LayoutRect clipRect(LayoutPoint(), LayoutSize(visibleContentSize(scrollbarIn clusion)));
2194 layoutViewItem().mapToVisualRectInAncestorSpace(&layoutView()->containerForP aintInvalidation(), clipRect); 2194 const LayoutBoxModelObject* paintInvalidationContainer = &layoutView()->cont ainerForPaintInvalidation();
2195 layoutViewItem().mapToVisualRectInAncestorSpace(paintInvalidationContainer, clipRect);
2196 if (paintInvalidationContainer->isBox()) {
2197 const LayoutBox* box = toLayoutBox(paintInvalidationContainer);
2198 if (box->hasOverflowClip())
2199 clipRect.move(-box->scrolledContentOffset());
2200 }
2195 return enclosingIntRect(clipRect); 2201 return enclosingIntRect(clipRect);
2196 } 2202 }
2197 2203
2198 bool FrameView::shouldUseIntegerScrollOffset() const 2204 bool FrameView::shouldUseIntegerScrollOffset() const
2199 { 2205 {
2200 if (m_frame->settings() && !m_frame->settings()->preferCompositingToLCDTextE nabled()) 2206 if (m_frame->settings() && !m_frame->settings()->preferCompositingToLCDTextE nabled())
2201 return true; 2207 return true;
2202 2208
2203 return ScrollableArea::shouldUseIntegerScrollOffset(); 2209 return ScrollableArea::shouldUseIntegerScrollOffset();
2204 } 2210 }
(...skipping 2076 matching lines...) Expand 10 before | Expand all | Expand 10 after
4281 } 4287 }
4282 4288
4283 bool FrameView::canThrottleRendering() const 4289 bool FrameView::canThrottleRendering() const
4284 { 4290 {
4285 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled()) 4291 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())
4286 return false; 4292 return false;
4287 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); 4293 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling);
4288 } 4294 }
4289 4295
4290 } // namespace blink 4296 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698