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

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 2168 matching lines...) Expand 10 before | Expand all | Expand 10 after
2179 2179
2180 toLayoutCounter(layoutObject)->updateCounter(); 2180 toLayoutCounter(layoutObject)->updateCounter();
2181 } 2181 }
2182 } 2182 }
2183 2183
2184 IntRect FrameView::windowClipRect(IncludeScrollbarsInRect scrollbarInclusion) co nst 2184 IntRect FrameView::windowClipRect(IncludeScrollbarsInRect scrollbarInclusion) co nst
2185 { 2185 {
2186 ASSERT(m_frame->view() == this); 2186 ASSERT(m_frame->view() == this);
2187 2187
2188 LayoutRect clipRect(LayoutPoint(), LayoutSize(visibleContentSize(scrollbarIn clusion))); 2188 LayoutRect clipRect(LayoutPoint(), LayoutSize(visibleContentSize(scrollbarIn clusion)));
2189 layoutViewItem().mapToVisualRectInAncestorSpace(&layoutView()->containerForP aintInvalidation(), clipRect); 2189 const LayoutBoxModelObject* paintInvalidationContainer = &layoutView()->cont ainerForPaintInvalidation();
2190 layoutViewItem().mapToVisualRectInAncestorSpace(paintInvalidationContainer, clipRect);
2191 if (paintInvalidationContainer->isBox()) {
2192 const LayoutBox* box = toLayoutBox(paintInvalidationContainer);
2193 if (box->hasOverflowClip())
2194 clipRect.move(-box->scrolledContentOffset());
2195 }
2190 return enclosingIntRect(clipRect); 2196 return enclosingIntRect(clipRect);
2191 } 2197 }
2192 2198
2193 bool FrameView::shouldUseIntegerScrollOffset() const 2199 bool FrameView::shouldUseIntegerScrollOffset() const
2194 { 2200 {
2195 if (m_frame->settings() && !m_frame->settings()->preferCompositingToLCDTextE nabled()) 2201 if (m_frame->settings() && !m_frame->settings()->preferCompositingToLCDTextE nabled())
2196 return true; 2202 return true;
2197 2203
2198 return ScrollableArea::shouldUseIntegerScrollOffset(); 2204 return ScrollableArea::shouldUseIntegerScrollOffset();
2199 } 2205 }
(...skipping 2076 matching lines...) Expand 10 before | Expand all | Expand 10 after
4276 } 4282 }
4277 4283
4278 bool FrameView::canThrottleRendering() const 4284 bool FrameView::canThrottleRendering() const
4279 { 4285 {
4280 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled()) 4286 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())
4281 return false; 4287 return false;
4282 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); 4288 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling);
4283 } 4289 }
4284 4290
4285 } // namespace blink 4291 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698