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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8
Patch Set: get-names-9: rebase Created 4 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
OLDNEW
1 /** 1 /**
2 * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2010 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 * Copyright (C) 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2010 Google Inc. All rights reserved.
5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
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 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 noScrollbarStyle->setStyleType(SCROLLBAR); 290 noScrollbarStyle->setStyleType(SCROLLBAR);
291 noScrollbarStyle->setDisplay(NONE); 291 noScrollbarStyle->setDisplay(NONE);
292 textBlockStyle->addCachedPseudoStyle(noScrollbarStyle); 292 textBlockStyle->addCachedPseudoStyle(noScrollbarStyle);
293 textBlockStyle->setHasPseudoStyle(SCROLLBAR); 293 textBlockStyle->setHasPseudoStyle(SCROLLBAR);
294 294
295 return textBlockStyle.release(); 295 return textBlockStyle.release();
296 } 296 }
297 297
298 bool LayoutTextControlSingleLine::textShouldBeTruncated() const 298 bool LayoutTextControlSingleLine::textShouldBeTruncated() const
299 { 299 {
300 return document().focusedElement() != node() && styleRef().textOverflow() == TextOverflowEllipsis; 300 return document().focusedElement() != node() && styleRef().getTextOverflow() == TextOverflowEllipsis;
301 } 301 }
302 302
303 void LayoutTextControlSingleLine::autoscroll(const IntPoint& position) 303 void LayoutTextControlSingleLine::autoscroll(const IntPoint& position)
304 { 304 {
305 LayoutBox* layoutObject = innerEditorElement()->layoutBox(); 305 LayoutBox* layoutObject = innerEditorElement()->layoutBox();
306 if (!layoutObject) 306 if (!layoutObject)
307 return; 307 return;
308 308
309 layoutObject->autoscroll(position); 309 layoutObject->autoscroll(position);
310 } 310 }
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 // inner-editor element overflows the INPUT box intentionally, however it 363 // inner-editor element overflows the INPUT box intentionally, however it
364 // shouldn't affect outside of the INPUT box. So we ignore child overflow. 364 // shouldn't affect outside of the INPUT box. So we ignore child overflow.
365 } 365 }
366 366
367 HTMLInputElement* LayoutTextControlSingleLine::inputElement() const 367 HTMLInputElement* LayoutTextControlSingleLine::inputElement() const
368 { 368 {
369 return toHTMLInputElement(node()); 369 return toHTMLInputElement(node());
370 } 370 }
371 371
372 } // namespace blink 372 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutText.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutVTTCue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698