Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 82 | 82 |
| 83 // Center in the block progression direction. | 83 // Center in the block progression direction. |
| 84 if (isHorizontalWritingMode()) | 84 if (isHorizontalWritingMode()) |
| 85 contentsRect.setY((size().height() - contentsRect.height()) / 2); | 85 contentsRect.setY((size().height() - contentsRect.height()) / 2); |
| 86 else | 86 else |
| 87 contentsRect.setX((size().width() - contentsRect.width()) / 2); | 87 contentsRect.setX((size().width() - contentsRect.width()) / 2); |
| 88 | 88 |
| 89 // Convert the rect into the coords used for painting the content | 89 // Convert the rect into the coords used for painting the content |
| 90 contentsRect.moveBy(paintOffset + location()); | 90 contentsRect.moveBy(paintOffset + location()); |
| 91 IntRect snappedRect = pixelSnappedIntRect(contentsRect); | 91 IntRect snappedRect = pixelSnappedIntRect(contentsRect); |
| 92 LayoutObjectDrawingRecorder recorder(*paintInfo.context, *this, paintInf o.phase, snappedRect); | 92 LayoutObjectDrawingRecorder recorder(*paintInfo.context, *this, paintInf o.phase, LayoutRect(snappedRect)); |
|
jbroman
2015/08/26 19:06:43
This is currently going via FloatRect(const IntRec
chrishtr
2015/08/26 20:53:51
Reverted.
| |
| 93 LayoutTheme::theme().painter().paintCapsLockIndicator(this, paintInfo, s nappedRect); | 93 LayoutTheme::theme().painter().paintCapsLockIndicator(this, paintInfo, s nappedRect); |
| 94 } | 94 } |
| 95 } | 95 } |
| 96 | 96 |
| 97 LayoutUnit LayoutTextControlSingleLine::computeLogicalHeightLimit() const | 97 LayoutUnit LayoutTextControlSingleLine::computeLogicalHeightLimit() const |
| 98 { | 98 { |
| 99 return containerElement() ? contentLogicalHeight() : logicalHeight(); | 99 return containerElement() ? contentLogicalHeight() : logicalHeight(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 void LayoutTextControlSingleLine::layout() | 102 void LayoutTextControlSingleLine::layout() |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 445 if (innerEditorElement()) | 445 if (innerEditorElement()) |
| 446 innerEditorElement()->setScrollTop(newTop); | 446 innerEditorElement()->setScrollTop(newTop); |
| 447 } | 447 } |
| 448 | 448 |
| 449 HTMLInputElement* LayoutTextControlSingleLine::inputElement() const | 449 HTMLInputElement* LayoutTextControlSingleLine::inputElement() const |
| 450 { | 450 { |
| 451 return toHTMLInputElement(node()); | 451 return toHTMLInputElement(node()); |
| 452 } | 452 } |
| 453 | 453 |
| 454 } | 454 } |
| OLD | NEW |