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

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

Issue 557613002: Remove a part of type checking predicates of HTMLInputElement. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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/RenderSlider.cpp ('k') | Source/core/rendering/RenderTheme.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, 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.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 * 21 *
22 */ 22 */
23 23
24 #include "config.h" 24 #include "config.h"
25 #include "core/rendering/RenderTextControlSingleLine.h" 25 #include "core/rendering/RenderTextControlSingleLine.h"
26 26
27 #include "core/CSSValueKeywords.h" 27 #include "core/CSSValueKeywords.h"
28 #include "core/InputTypeNames.h"
28 #include "core/dom/shadow/ShadowRoot.h" 29 #include "core/dom/shadow/ShadowRoot.h"
29 #include "core/editing/FrameSelection.h" 30 #include "core/editing/FrameSelection.h"
30 #include "core/frame/LocalFrame.h" 31 #include "core/frame/LocalFrame.h"
31 #include "core/html/shadow/ShadowElementNames.h" 32 #include "core/html/shadow/ShadowElementNames.h"
32 #include "core/rendering/HitTestResult.h" 33 #include "core/rendering/HitTestResult.h"
33 #include "core/rendering/RenderLayer.h" 34 #include "core/rendering/RenderLayer.h"
34 #include "core/rendering/RenderTheme.h" 35 #include "core/rendering/RenderTheme.h"
35 #include "platform/PlatformKeyboardEvent.h" 36 #include "platform/PlatformKeyboardEvent.h"
36 #include "platform/fonts/SimpleFontData.h" 37 #include "platform/fonts/SimpleFontData.h"
37 38
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 return; 247 return;
247 248
248 // Only draw the caps lock indicator if these things are true: 249 // Only draw the caps lock indicator if these things are true:
249 // 1) The field is a password field 250 // 1) The field is a password field
250 // 2) The frame is active 251 // 2) The frame is active
251 // 3) The element is focused 252 // 3) The element is focused
252 // 4) The caps lock is on 253 // 4) The caps lock is on
253 bool shouldDrawCapsLockIndicator = false; 254 bool shouldDrawCapsLockIndicator = false;
254 255
255 if (LocalFrame* frame = document().frame()) 256 if (LocalFrame* frame = document().frame())
256 shouldDrawCapsLockIndicator = inputElement()->isPasswordField() && frame ->selection().isFocusedAndActive() && document().focusedElement() == node() && P latformKeyboardEvent::currentCapsLockState(); 257 shouldDrawCapsLockIndicator = inputElement()->type() == InputTypeNames:: password && frame->selection().isFocusedAndActive() && document().focusedElement () == node() && PlatformKeyboardEvent::currentCapsLockState();
257 258
258 if (shouldDrawCapsLockIndicator != m_shouldDrawCapsLockIndicator) { 259 if (shouldDrawCapsLockIndicator != m_shouldDrawCapsLockIndicator) {
259 m_shouldDrawCapsLockIndicator = shouldDrawCapsLockIndicator; 260 m_shouldDrawCapsLockIndicator = shouldDrawCapsLockIndicator;
260 setShouldDoFullPaintInvalidation(true); 261 setShouldDoFullPaintInvalidation(true);
261 } 262 }
262 } 263 }
263 264
264 bool RenderTextControlSingleLine::hasControlClip() const 265 bool RenderTextControlSingleLine::hasControlClip() const
265 { 266 {
266 // Apply control clip for text fields with decorations. 267 // Apply control clip for text fields with decorations.
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 if (innerEditorElement()) 412 if (innerEditorElement())
412 innerEditorElement()->setScrollTop(newTop); 413 innerEditorElement()->setScrollTop(newTop);
413 } 414 }
414 415
415 HTMLInputElement* RenderTextControlSingleLine::inputElement() const 416 HTMLInputElement* RenderTextControlSingleLine::inputElement() const
416 { 417 {
417 return toHTMLInputElement(node()); 418 return toHTMLInputElement(node());
418 } 419 }
419 420
420 } 421 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderSlider.cpp ('k') | Source/core/rendering/RenderTheme.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698