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

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

Issue 1307203004: Revert "Reworks the clipping logic" and follow-up. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « no previous file | Source/core/layout/ClipRect.h » ('j') | 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 2462 matching lines...) Expand 10 before | Expand all | Expand 10 after
2473 } 2473 }
2474 2474
2475 if (RuntimeEnabledFeatures::frameTimingSupportEnabled()) 2475 if (RuntimeEnabledFeatures::frameTimingSupportEnabled())
2476 updateFrameTimingRequestsIfNeeded(); 2476 updateFrameTimingRequestsIfNeeded();
2477 2477
2478 ASSERT(!view->hasPendingSelection()); 2478 ASSERT(!view->hasPendingSelection());
2479 ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationCl ean 2479 ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationCl ean
2480 || (RuntimeEnabledFeatures::slimmingPaintV2Enabled() && lifecycl e().state() == DocumentLifecycle::CompositingForSlimmingPaintV2Clean)); 2480 || (RuntimeEnabledFeatures::slimmingPaintV2Enabled() && lifecycl e().state() == DocumentLifecycle::CompositingForSlimmingPaintV2Clean));
2481 } 2481 }
2482 } 2482 }
2483
2484 #ifndef NDEBUG
2485 // TODO(jchaffraix): We will want to clear the clip rects in release too
2486 // to reduce our long-term memory consumption. However this requires us
2487 // to migrate all of the clip rects to the state machine and evaluate
2488 // the performance impacts of this.
2489 layoutView()->layer()->clipper().clearClipRectsIncludingDescendants(Absolute ClipRects);
2490 #endif
2491 } 2483 }
2492 2484
2493 void FrameView::paintForSlimmingPaintV2() 2485 void FrameView::paintForSlimmingPaintV2()
2494 { 2486 {
2495 ASSERT(RuntimeEnabledFeatures::slimmingPaintV2Enabled()); 2487 ASSERT(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
2496 ASSERT(frame() == page()->mainFrame() || (!frame().tree().parent()->isLocalF rame())); 2488 ASSERT(frame() == page()->mainFrame() || (!frame().tree().parent()->isLocalF rame()));
2497 2489
2498 LayoutView* view = layoutView(); 2490 LayoutView* view = layoutView();
2499 ASSERT(view); 2491 ASSERT(view);
2500 GraphicsLayer* rootGraphicsLayer = view->layer()->graphicsLayerBacking(); 2492 GraphicsLayer* rootGraphicsLayer = view->layer()->graphicsLayerBacking();
(...skipping 1470 matching lines...) Expand 10 before | Expand all | Expand 10 after
3971 3963
3972 if (!graphicsLayer) 3964 if (!graphicsLayer)
3973 return; 3965 return;
3974 3966
3975 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect); 3967 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect);
3976 3968
3977 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); 3969 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect)));
3978 } 3970 }
3979 3971
3980 } // namespace blink 3972 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/layout/ClipRect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698