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

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

Issue 23537039: paintingRoot of a renderobject should be the renderer of its enclosingLayer RenderLayer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Tests added Created 7 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
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 2899 matching lines...) Expand 10 before | Expand all | Expand 10 after
2910 m_isPainting = true; 2910 m_isPainting = true;
2911 2911
2912 // m_nodeToDraw is used to draw only one element (and its descendants) 2912 // m_nodeToDraw is used to draw only one element (and its descendants)
2913 RenderObject* eltRenderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0; 2913 RenderObject* eltRenderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0;
2914 RenderLayer* rootLayer = renderView->layer(); 2914 RenderLayer* rootLayer = renderView->layer();
2915 2915
2916 #ifndef NDEBUG 2916 #ifndef NDEBUG
2917 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(rootLayer-> renderer()); 2917 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(rootLayer-> renderer());
2918 #endif 2918 #endif
2919 2919
2920 rootLayer->paint(p, rect, m_paintBehavior, eltRenderer); 2920 RenderObject* enclosingLayerRenderer = eltRenderer->enclosingLayer() ? eltRe nderer->enclosingLayer()->renderer() : eltRenderer;
2921 rootLayer->paint(p, rect, m_paintBehavior, enclosingLayerRenderer);
2921 2922
2922 if (rootLayer->containsDirtyOverlayScrollbars()) 2923 if (rootLayer->containsDirtyOverlayScrollbars())
2923 rootLayer->paintOverlayScrollbars(p, rect, m_paintBehavior, eltRenderer) ; 2924 rootLayer->paintOverlayScrollbars(p, rect, m_paintBehavior, eltRenderer) ;
2924 2925
2925 m_isPainting = false; 2926 m_isPainting = false;
2926 2927
2927 m_paintBehavior = oldPaintBehavior; 2928 m_paintBehavior = oldPaintBehavior;
2928 m_lastPaintTime = currentTime(); 2929 m_lastPaintTime = currentTime();
2929 2930
2930 // Regions may have changed as a result of the visibility/z-index of element changing. 2931 // Regions may have changed as a result of the visibility/z-index of element changing.
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
3383 } 3384 }
3384 3385
3385 AXObjectCache* FrameView::axObjectCache() const 3386 AXObjectCache* FrameView::axObjectCache() const
3386 { 3387 {
3387 if (frame().document()) 3388 if (frame().document())
3388 return frame().document()->existingAXObjectCache(); 3389 return frame().document()->existingAXObjectCache();
3389 return 0; 3390 return 0;
3390 } 3391 }
3391 3392
3392 } // namespace WebCore 3393 } // namespace WebCore
OLDNEW
« ManualTests/drag-inline-block.html ('K') | « ManualTests/drag-inline-block.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698