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

Side by Side Diff: third_party/WebKit/Source/core/html/shadow/TextControlInnerElements.cpp

Issue 2370673002: Changed EDisplay to an enum class and renamed its members to be keywords (Closed)
Patch Set: Comment Created 4 years, 2 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, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Google Inc. All rights reserved. 3 * Copyright (C) 2010 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 PassRefPtr<ComputedStyle> EditingViewPortElement::customStyleForLayoutObject() 80 PassRefPtr<ComputedStyle> EditingViewPortElement::customStyleForLayoutObject()
81 { 81 {
82 // FXIME: Move these styles to html.css. 82 // FXIME: Move these styles to html.css.
83 83
84 RefPtr<ComputedStyle> style = ComputedStyle::create(); 84 RefPtr<ComputedStyle> style = ComputedStyle::create();
85 style->inheritFrom(ownerShadowHost()->computedStyleRef()); 85 style->inheritFrom(ownerShadowHost()->computedStyleRef());
86 86
87 style->setFlexGrow(1); 87 style->setFlexGrow(1);
88 style->setMinWidth(Length(0, Fixed)); 88 style->setMinWidth(Length(0, Fixed));
89 style->setDisplay(BLOCK); 89 style->setDisplay(EDisplay::Block);
90 style->setDirection(LTR); 90 style->setDirection(LTR);
91 91
92 // We don't want the shadow dom to be editable, so we set this block to 92 // We don't want the shadow dom to be editable, so we set this block to
93 // read-only in case the input itself is editable. 93 // read-only in case the input itself is editable.
94 style->setUserModify(READ_ONLY); 94 style->setUserModify(READ_ONLY);
95 style->setUnique(); 95 style->setUnique();
96 96
97 if (const ComputedStyle* parentStyle = parentComputedStyle()) 97 if (const ComputedStyle* parentStyle = parentComputedStyle())
98 StyleAdjuster::adjustStyleForAlignment(*style, *parentStyle); 98 StyleAdjuster::adjustStyleForAlignment(*style, *parentStyle);
99 99
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents() 205 bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents()
206 { 206 {
207 const HTMLInputElement* input = toHTMLInputElement(ownerShadowHost()); 207 const HTMLInputElement* input = toHTMLInputElement(ownerShadowHost());
208 if (input && !input->isDisabledOrReadOnly()) 208 if (input && !input->isDisabledOrReadOnly())
209 return true; 209 return true;
210 210
211 return HTMLDivElement::willRespondToMouseClickEvents(); 211 return HTMLDivElement::willRespondToMouseClickEvents();
212 } 212 }
213 213
214 } // namespace blink 214 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698