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

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

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. Created 3 years, 11 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 PassRefPtr<ComputedStyle> EditingViewPortElement::customStyleForLayoutObject() { 76 PassRefPtr<ComputedStyle> EditingViewPortElement::customStyleForLayoutObject() {
77 // FXIME: Move these styles to html.css. 77 // FXIME: Move these styles to html.css.
78 78
79 RefPtr<ComputedStyle> style = ComputedStyle::create(); 79 RefPtr<ComputedStyle> style = ComputedStyle::create();
80 style->inheritFrom(ownerShadowHost()->computedStyleRef()); 80 style->inheritFrom(ownerShadowHost()->computedStyleRef());
81 81
82 style->setFlexGrow(1); 82 style->setFlexGrow(1);
83 style->setMinWidth(Length(0, Fixed)); 83 style->setMinWidth(Length(0, Fixed));
84 style->setDisplay(EDisplay::Block); 84 style->setDisplay(EDisplay::Block);
85 style->setDirection(TextDirection::Ltr); 85 style->setDirection(TextDirection::kLtr);
86 86
87 // We don't want the shadow dom to be editable, so we set this block to 87 // We don't want the shadow dom to be editable, so we set this block to
88 // read-only in case the input itself is editable. 88 // read-only in case the input itself is editable.
89 style->setUserModify(READ_ONLY); 89 style->setUserModify(READ_ONLY);
90 style->setUnique(); 90 style->setUnique();
91 91
92 if (const ComputedStyle* parentStyle = parentComputedStyle()) 92 if (const ComputedStyle* parentStyle = parentComputedStyle())
93 StyleAdjuster::adjustStyleForAlignment(*style, *parentStyle); 93 StyleAdjuster::adjustStyleForAlignment(*style, *parentStyle);
94 94
95 return style.release(); 95 return style.release();
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 202
203 bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents() { 203 bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents() {
204 const HTMLInputElement* input = toHTMLInputElement(ownerShadowHost()); 204 const HTMLInputElement* input = toHTMLInputElement(ownerShadowHost());
205 if (input && !input->isDisabledOrReadOnly()) 205 if (input && !input->isDisabledOrReadOnly())
206 return true; 206 return true;
207 207
208 return HTMLDivElement::willRespondToMouseClickEvents(); 208 return HTMLDivElement::willRespondToMouseClickEvents();
209 } 209 }
210 210
211 } // namespace blink 211 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/forms/RangeInputType.cpp ('k') | third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698