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

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

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2011 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 { 60 {
61 RefPtr<RenderStyle> newStyle(RenderStyle::create()); 61 RefPtr<RenderStyle> newStyle(RenderStyle::create());
62 newStyle->inheritFrom(parentStyle); 62 newStyle->inheritFrom(parentStyle);
63 newStyle->setDisplay(BLOCK); 63 newStyle->setDisplay(BLOCK);
64 newStyle->setPosition(AbsolutePosition); 64 newStyle->setPosition(AbsolutePosition);
65 newStyle->setZIndex(0); 65 newStyle->setZIndex(0);
66 newStyle->setLeft(Length(0, Fixed)); 66 newStyle->setLeft(Length(0, Fixed));
67 newStyle->setTop(Length(0, Fixed)); 67 newStyle->setTop(Length(0, Fixed));
68 newStyle->setWidth(Length(100, Percent)); 68 newStyle->setWidth(Length(100, Percent));
69 newStyle->setHeight(Length(100, Percent)); 69 newStyle->setHeight(Length(100, Percent));
70 newStyle->font().update(0); 70 newStyle->font().update(nullptr);
71 71
72 return newStyle.release(); 72 return newStyle.release();
73 } 73 }
74 74
75 void RenderFlowThread::addRegionToThread(RenderRegion* renderRegion) 75 void RenderFlowThread::addRegionToThread(RenderRegion* renderRegion)
76 { 76 {
77 ASSERT(renderRegion); 77 ASSERT(renderRegion);
78 m_regionList.add(renderRegion); 78 m_regionList.add(renderRegion);
79 renderRegion->setIsValid(true); 79 renderRegion->setIsValid(true);
80 } 80 }
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 { 670 {
671 if (!m_renderFlowThread) 671 if (!m_renderFlowThread)
672 return; 672 return;
673 RenderView* view = m_renderFlowThread->view(); 673 RenderView* view = m_renderFlowThread->view();
674 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl owThread); 674 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl owThread);
675 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo wThread); 675 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo wThread);
676 } 676 }
677 677
678 678
679 } // namespace WebCore 679 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderEmbeddedObject.cpp ('k') | Source/core/rendering/RenderFullScreen.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698