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

Side by Side Diff: Source/core/rendering/RenderEmbeddedObject.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
« no previous file with comments | « Source/core/rendering/RenderCounter.cpp ('k') | Source/core/rendering/RenderFlowThread.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> 3 * (C) 2000 Simon Hausmann <hausmann@kde.org>
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 169
170 FontDescription fontDescription; 170 FontDescription fontDescription;
171 RenderTheme::theme().systemFont(CSSValueWebkitSmallControl, fontDescription) ; 171 RenderTheme::theme().systemFont(CSSValueWebkitSmallControl, fontDescription) ;
172 fontDescription.setWeight(FontWeightBold); 172 fontDescription.setWeight(FontWeightBold);
173 Settings* settings = document().settings(); 173 Settings* settings = document().settings();
174 ASSERT(settings); 174 ASSERT(settings);
175 if (!settings) 175 if (!settings)
176 return false; 176 return false;
177 fontDescription.setComputedSize(fontDescription.specifiedSize()); 177 fontDescription.setComputedSize(fontDescription.specifiedSize());
178 font = Font(fontDescription); 178 font = Font(fontDescription);
179 font.update(0); 179 font.update(nullptr);
180 180
181 run = TextRun(m_unavailablePluginReplacementText); 181 run = TextRun(m_unavailablePluginReplacementText);
182 textWidth = font.width(run); 182 textWidth = font.width(run);
183 183
184 replacementTextRect.setSize(FloatSize(textWidth + replacementTextRoundedRect LeftRightTextMargin * 2, replacementTextRoundedRectHeight)); 184 replacementTextRect.setSize(FloatSize(textWidth + replacementTextRoundedRect LeftRightTextMargin * 2, replacementTextRoundedRectHeight));
185 float x = (contentRect.size().width() / 2 - replacementTextRect.size().width () / 2) + contentRect.location().x(); 185 float x = (contentRect.size().width() / 2 - replacementTextRect.size().width () / 2) + contentRect.location().x();
186 float y = (contentRect.size().height() / 2 - replacementTextRect.size().heig ht() / 2) + contentRect.location().y(); 186 float y = (contentRect.size().height() / 2 - replacementTextRect.size().heig ht() / 2) + contentRect.location().y();
187 replacementTextRect.setLocation(FloatPoint(x, y)); 187 replacementTextRect.setLocation(FloatPoint(x, y));
188 188
189 path.addRoundedRect(replacementTextRect, FloatSize(replacementTextRoundedRec tRadius, replacementTextRoundedRectRadius)); 189 path.addRoundedRect(replacementTextRect, FloatSize(replacementTextRoundedRec tRadius, replacementTextRoundedRectRadius));
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 { 249 {
250 return false; 250 return false;
251 } 251 }
252 252
253 bool RenderEmbeddedObject::canHaveChildren() const 253 bool RenderEmbeddedObject::canHaveChildren() const
254 { 254 {
255 return false; 255 return false;
256 } 256 }
257 257
258 } 258 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderCounter.cpp ('k') | Source/core/rendering/RenderFlowThread.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698