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

Side by Side Diff: Source/core/rendering/RenderLayerBacking.cpp

Issue 23728003: Return Frame&, not Frame* from RenderView::frame() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed PopupMenuTest build 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | Source/core/rendering/RenderLayerCompositor.cpp » ('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) 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 RenderLayerBacking::RenderLayerBacking(RenderLayer* layer) 152 RenderLayerBacking::RenderLayerBacking(RenderLayer* layer)
153 : m_owningLayer(layer) 153 : m_owningLayer(layer)
154 , m_artificiallyInflatedBounds(false) 154 , m_artificiallyInflatedBounds(false)
155 , m_boundsConstrainedByClipping(false) 155 , m_boundsConstrainedByClipping(false)
156 , m_isMainFrameRenderViewLayer(false) 156 , m_isMainFrameRenderViewLayer(false)
157 , m_requiresOwnBackingStore(true) 157 , m_requiresOwnBackingStore(true)
158 , m_canCompositeFilters(false) 158 , m_canCompositeFilters(false)
159 , m_backgroundLayerPaintsFixedRootBackground(false) 159 , m_backgroundLayerPaintsFixedRootBackground(false)
160 { 160 {
161 if (layer->isRootLayer()) { 161 if (layer->isRootLayer()) {
162 Frame* frame = toRenderView(renderer())->frameView()->frame(); 162 Frame& frame = toRenderView(renderer())->frameView()->frame();
163 Page* page = frame ? frame->page() : 0; 163 Page* page = frame.page();
164 if (page && frame && page->mainFrame() == frame) { 164 if (page && page->mainFrame() == &frame) {
165 m_isMainFrameRenderViewLayer = true; 165 m_isMainFrameRenderViewLayer = true;
166 } 166 }
167 } 167 }
168 168
169 createPrimaryGraphicsLayer(); 169 createPrimaryGraphicsLayer();
170 } 170 }
171 171
172 RenderLayerBacking::~RenderLayerBacking() 172 RenderLayerBacking::~RenderLayerBacking()
173 { 173 {
174 updateClippingLayers(false, false); 174 updateClippingLayers(false, false);
(...skipping 1754 matching lines...) Expand 10 before | Expand all | Expand 10 after
1929 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { 1929 } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
1930 name = "Scrolling Contents Layer"; 1930 name = "Scrolling Contents Layer";
1931 } else { 1931 } else {
1932 ASSERT_NOT_REACHED(); 1932 ASSERT_NOT_REACHED();
1933 } 1933 }
1934 1934
1935 return name; 1935 return name;
1936 } 1936 }
1937 1937
1938 } // namespace WebCore 1938 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | Source/core/rendering/RenderLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698