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

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

Issue 23819007: Have Node::document() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master 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/FilterEffectRenderer.cpp ('k') | Source/core/rendering/HitTestResult.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) 2012 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2012 Adobe Systems Incorporated. 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 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 if (!m_renderNamedFlowThreadList) 60 if (!m_renderNamedFlowThreadList)
61 m_renderNamedFlowThreadList = adoptPtr(new RenderNamedFlowThreadList()); 61 m_renderNamedFlowThreadList = adoptPtr(new RenderNamedFlowThreadList());
62 else { 62 else {
63 for (RenderNamedFlowThreadList::iterator iter = m_renderNamedFlowThreadL ist->begin(); iter != m_renderNamedFlowThreadList->end(); ++iter) { 63 for (RenderNamedFlowThreadList::iterator iter = m_renderNamedFlowThreadL ist->begin(); iter != m_renderNamedFlowThreadList->end(); ++iter) {
64 RenderNamedFlowThread* flowRenderer = *iter; 64 RenderNamedFlowThread* flowRenderer = *iter;
65 if (flowRenderer->flowThreadName() == name) 65 if (flowRenderer->flowThreadName() == name)
66 return flowRenderer; 66 return flowRenderer;
67 } 67 }
68 } 68 }
69 69
70 NamedFlowCollection* namedFlows = m_view->document()->namedFlows(); 70 NamedFlowCollection* namedFlows = m_view->document().namedFlows();
71 71
72 // Sanity check for the absence of a named flow in the "CREATED" state with the same name. 72 // Sanity check for the absence of a named flow in the "CREATED" state with the same name.
73 ASSERT(!namedFlows->flowByName(name)); 73 ASSERT(!namedFlows->flowByName(name));
74 74
75 RenderNamedFlowThread* flowRenderer = RenderNamedFlowThread::createAnonymous (m_view->document(), namedFlows->ensureFlowWithName(name)); 75 RenderNamedFlowThread* flowRenderer = RenderNamedFlowThread::createAnonymous (&m_view->document(), namedFlows->ensureFlowWithName(name));
76 flowRenderer->setStyle(RenderFlowThread::createFlowThreadStyle(m_view->style ())); 76 flowRenderer->setStyle(RenderFlowThread::createFlowThreadStyle(m_view->style ()));
77 m_renderNamedFlowThreadList->add(flowRenderer); 77 m_renderNamedFlowThreadList->add(flowRenderer);
78 78
79 // Keep the flow renderer as a child of RenderView. 79 // Keep the flow renderer as a child of RenderView.
80 m_view->addChild(flowRenderer); 80 m_view->addChild(flowRenderer);
81 81
82 setIsRenderNamedFlowThreadOrderDirty(true); 82 setIsRenderNamedFlowThreadOrderDirty(true);
83 83
84 return flowRenderer; 84 return flowRenderer;
85 } 85 }
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 for (RenderNamedFlowThreadList::iterator iter = m_renderNamedFlowThreadList- >begin(); iter != m_renderNamedFlowThreadList->end(); ++iter) { 239 for (RenderNamedFlowThreadList::iterator iter = m_renderNamedFlowThreadList- >begin(); iter != m_renderNamedFlowThreadList->end(); ++iter) {
240 if (!(*iter)->isAutoLogicalHeightRegionsCountConsistent()) 240 if (!(*iter)->isAutoLogicalHeightRegionsCountConsistent())
241 return false; 241 return false;
242 } 242 }
243 243
244 return true; 244 return true;
245 } 245 }
246 #endif 246 #endif
247 247
248 } // namespace WebCore 248 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/FilterEffectRenderer.cpp ('k') | Source/core/rendering/HitTestResult.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698