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

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

Issue 212223007: Add DisableCompositingQueryAsserts to FrameView::useSlowRepaints (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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) 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 1217 matching lines...) Expand 10 before | Expand all | Expand 10 after
1228 setMediaType("print"); 1228 setMediaType("print");
1229 } else { 1229 } else {
1230 if (!m_mediaTypeWhenNotPrinting.isNull()) 1230 if (!m_mediaTypeWhenNotPrinting.isNull())
1231 setMediaType(m_mediaTypeWhenNotPrinting); 1231 setMediaType(m_mediaTypeWhenNotPrinting);
1232 m_mediaTypeWhenNotPrinting = nullAtom; 1232 m_mediaTypeWhenNotPrinting = nullAtom;
1233 } 1233 }
1234 } 1234 }
1235 1235
1236 bool FrameView::useSlowRepaints(bool considerOverlap) const 1236 bool FrameView::useSlowRepaints(bool considerOverlap) const
1237 { 1237 {
1238 // FIXME: It is incorrect to determine blit-scrolling eligibility using dirt y compositing state.
1239 // https://code.google.com/p/chromium/issues/detail?id=357345
1240 DisableCompositingQueryAsserts disabler;
1241
1238 if (m_slowRepaintObjectCount > 0) 1242 if (m_slowRepaintObjectCount > 0)
1239 return true; 1243 return true;
1240 1244
1241 if (contentsInCompositedLayer()) 1245 if (contentsInCompositedLayer())
1242 return false; 1246 return false;
1243 1247
1244 // The chromium compositor does not support scrolling a non-composited frame within a composited page through 1248 // The chromium compositor does not support scrolling a non-composited frame within a composited page through
1245 // the fast scrolling path, so force slow scrolling in that case. 1249 // the fast scrolling path, so force slow scrolling in that case.
1246 if (m_frame->ownerElement() && !hasCompositedContent() && m_frame->page() && m_frame->page()->mainFrame()->view()->hasCompositedContent()) 1250 if (m_frame->ownerElement() && !hasCompositedContent() && m_frame->page() && m_frame->page()->mainFrame()->view()->hasCompositedContent())
1247 return true; 1251 return true;
(...skipping 2033 matching lines...) Expand 10 before | Expand all | Expand 10 after
3281 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3285 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3282 { 3286 {
3283 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3287 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3284 if (AXObjectCache* cache = axObjectCache()) { 3288 if (AXObjectCache* cache = axObjectCache()) {
3285 cache->remove(scrollbar); 3289 cache->remove(scrollbar);
3286 cache->handleScrollbarUpdate(this); 3290 cache->handleScrollbarUpdate(this);
3287 } 3291 }
3288 } 3292 }
3289 3293
3290 } // namespace WebCore 3294 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698