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

Side by Side Diff: Source/WebCore/rendering/RenderTextControl.cpp

Issue 12641003: Merge 144350 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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 | « Source/WebCore/rendering/RenderTextControl.h ('k') | Source/WebCore/rendering/RenderWidget.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) 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 } 286 }
287 287
288 LayoutUnit toAdd = borderAndPaddingWidth(); 288 LayoutUnit toAdd = borderAndPaddingWidth();
289 289
290 m_minPreferredLogicalWidth += toAdd; 290 m_minPreferredLogicalWidth += toAdd;
291 m_maxPreferredLogicalWidth += toAdd; 291 m_maxPreferredLogicalWidth += toAdd;
292 292
293 setPreferredLogicalWidthsDirty(false); 293 setPreferredLogicalWidthsDirty(false);
294 } 294 }
295 295
296 void RenderTextControl::addFocusRingRects(Vector<IntRect>& rects, const LayoutPo int& additionalOffset) 296 void RenderTextControl::addFocusRingRects(Vector<IntRect>& rects, const LayoutPo int& additionalOffset, const RenderLayerModelObject*)
297 { 297 {
298 if (!size().isEmpty()) 298 if (!size().isEmpty())
299 rects.append(pixelSnappedIntRect(additionalOffset, size())); 299 rects.append(pixelSnappedIntRect(additionalOffset, size()));
300 } 300 }
301 301
302 RenderObject* RenderTextControl::layoutSpecialExcludedChild(bool relayoutChildre n) 302 RenderObject* RenderTextControl::layoutSpecialExcludedChild(bool relayoutChildre n)
303 { 303 {
304 HTMLElement* placeholder = toHTMLTextFormControlElement(node())->placeholder Element(); 304 HTMLElement* placeholder = toHTMLTextFormControlElement(node())->placeholder Element();
305 RenderObject* placeholderRenderer = placeholder ? placeholder->renderer() : 0; 305 RenderObject* placeholderRenderer = placeholder ? placeholder->renderer() : 0;
306 if (!placeholderRenderer) 306 if (!placeholderRenderer)
307 return 0; 307 return 0;
308 if (relayoutChildren) { 308 if (relayoutChildren) {
309 // The markParents arguments should be false because this function is 309 // The markParents arguments should be false because this function is
310 // called from layout() of the parent and the placeholder layout doesn't 310 // called from layout() of the parent and the placeholder layout doesn't
311 // affect the parent layout. 311 // affect the parent layout.
312 placeholderRenderer->setChildNeedsLayout(true, MarkOnlyThis); 312 placeholderRenderer->setChildNeedsLayout(true, MarkOnlyThis);
313 } 313 }
314 return placeholderRenderer; 314 return placeholderRenderer;
315 } 315 }
316 316
317 bool RenderTextControl::canBeReplacedWithInlineRunIn() const 317 bool RenderTextControl::canBeReplacedWithInlineRunIn() const
318 { 318 {
319 return false; 319 return false;
320 } 320 }
321 321
322 } // namespace WebCore 322 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderTextControl.h ('k') | Source/WebCore/rendering/RenderWidget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698