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

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: Fixed 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
« no previous file with comments | « ManualTests/drag-inline-block.html ('k') | 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 2917 matching lines...) Expand 10 before | Expand all | Expand 10 after
2928 2928
2929 // m_nodeToDraw is used to draw only one element (and its descendants) 2929 // m_nodeToDraw is used to draw only one element (and its descendants)
2930 RenderObject* eltRenderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0; 2930 RenderObject* eltRenderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0;
2931 RenderLayer* rootLayer = renderView->layer(); 2931 RenderLayer* rootLayer = renderView->layer();
2932 2932
2933 #ifndef NDEBUG 2933 #ifndef NDEBUG
2934 renderView->assertSubtreeIsLaidOut(); 2934 renderView->assertSubtreeIsLaidOut();
2935 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(rootLayer-> renderer()); 2935 RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(rootLayer-> renderer());
2936 #endif 2936 #endif
2937 2937
2938 rootLayer->paint(p, rect, m_paintBehavior, eltRenderer); 2938 RenderObject* enclosingLayerRenderer = eltRenderer->enclosingLayer() ? eltRe nderer->enclosingLayer()->renderer() : eltRenderer;
2939 rootLayer->paint(p, rect, m_paintBehavior, enclosingLayerRenderer);
2939 2940
2940 if (rootLayer->containsDirtyOverlayScrollbars()) 2941 if (rootLayer->containsDirtyOverlayScrollbars())
2941 rootLayer->paintOverlayScrollbars(p, rect, m_paintBehavior, eltRenderer) ; 2942 rootLayer->paintOverlayScrollbars(p, rect, m_paintBehavior, eltRenderer) ;
2942 2943
2943 m_isPainting = false; 2944 m_isPainting = false;
2944 2945
2945 m_paintBehavior = oldPaintBehavior; 2946 m_paintBehavior = oldPaintBehavior;
2946 m_lastPaintTime = currentTime(); 2947 m_lastPaintTime = currentTime();
2947 2948
2948 // Regions may have changed as a result of the visibility/z-index of element changing. 2949 // Regions may have changed as a result of the visibility/z-index of element changing.
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
3404 return frame().document()->existingAXObjectCache(); 3405 return frame().document()->existingAXObjectCache();
3405 return 0; 3406 return 0;
3406 } 3407 }
3407 3408
3408 bool FrameView::isMainFrame() const 3409 bool FrameView::isMainFrame() const
3409 { 3410 {
3410 return m_frame->page() && m_frame->page()->mainFrame() == m_frame; 3411 return m_frame->page() && m_frame->page()->mainFrame() == m_frame;
3411 } 3412 }
3412 3413
3413 } // namespace WebCore 3414 } // namespace WebCore
OLDNEW
« no previous file with comments | « ManualTests/drag-inline-block.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698