summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-24 12:15:48 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-28 13:30:04 +0000
commitb014812705fc80bff0a5c120dfcef88f349816dc (patch)
tree25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc
parent9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff)
downloadqtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc14
1 files changed, 0 insertions, 14 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc b/chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc
index c068c735a98..1a71eb52b03 100644
--- a/chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc
+++ b/chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc
@@ -88,17 +88,6 @@ LayoutUnit LayoutTextControlMultiLine::BaselinePosition(
line_position_mode);
}
-scoped_refptr<ComputedStyle> LayoutTextControlMultiLine::CreateInnerEditorStyle(
- const ComputedStyle& start_style) const {
- scoped_refptr<ComputedStyle> text_block_style = ComputedStyle::Create();
- text_block_style->InheritFrom(start_style);
- AdjustInnerEditorStyle(*text_block_style);
- text_block_style->SetDisplay(EDisplay::kBlock);
- text_block_style->SetUnique();
-
- return text_block_style;
-}
-
LayoutObject* LayoutTextControlMultiLine::LayoutSpecialExcludedChild(
bool relayout_children,
SubtreeLayoutScope& layout_scope) {
@@ -110,9 +99,6 @@ LayoutObject* LayoutTextControlMultiLine::LayoutSpecialExcludedChild(
if (!placeholder_layout_object->IsBox())
return placeholder_layout_object;
LayoutBox* placeholder_box = ToLayoutBox(placeholder_layout_object);
- placeholder_box->MutableStyleRef().SetLogicalWidth(Length(
- ContentLogicalWidth() - placeholder_box->BorderAndPaddingLogicalWidth(),
- kFixed));
placeholder_box->LayoutIfNeeded();
placeholder_box->SetX(BorderLeft() + PaddingLeft());
placeholder_box->SetY(BorderTop() + PaddingTop());