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

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

Issue 1115353002: Update renderer to layoutObject in core/html. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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/html/shadow/SliderThumbElement.cpp ('k') | no next file » | 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, 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 HTMLDivElement::defaultEventHandler(event); 131 HTMLDivElement::defaultEventHandler(event);
132 } 132 }
133 133
134 LayoutObject* TextControlInnerEditorElement::createLayoutObject(const ComputedSt yle&) 134 LayoutObject* TextControlInnerEditorElement::createLayoutObject(const ComputedSt yle&)
135 { 135 {
136 return new LayoutTextControlInnerBlock(this); 136 return new LayoutTextControlInnerBlock(this);
137 } 137 }
138 138
139 PassRefPtr<ComputedStyle> TextControlInnerEditorElement::customStyleForLayoutObj ect() 139 PassRefPtr<ComputedStyle> TextControlInnerEditorElement::customStyleForLayoutObj ect()
140 { 140 {
141 LayoutObject* parentRenderer = shadowHost()->layoutObject(); 141 LayoutObject* parentLayoutObject = shadowHost()->layoutObject();
142 if (!parentRenderer || !parentRenderer->isTextControl()) 142 if (!parentLayoutObject || !parentLayoutObject->isTextControl())
143 return originalStyleForLayoutObject(); 143 return originalStyleForLayoutObject();
144 LayoutTextControl* textControlRenderer = toLayoutTextControl(parentRenderer) ; 144 LayoutTextControl* textControlLayoutObject = toLayoutTextControl(parentLayou tObject);
145 return textControlRenderer->createInnerEditorStyle(textControlRenderer->styl eRef()); 145 return textControlLayoutObject->createInnerEditorStyle(textControlLayoutObje ct->styleRef());
146 } 146 }
147 147
148 // ---------------------------- 148 // ----------------------------
149 149
150 inline SearchFieldDecorationElement::SearchFieldDecorationElement(Document& docu ment) 150 inline SearchFieldDecorationElement::SearchFieldDecorationElement(Document& docu ment)
151 : HTMLDivElement(document) 151 : HTMLDivElement(document)
152 { 152 {
153 } 153 }
154 154
155 PassRefPtrWillBeRawPtr<SearchFieldDecorationElement> SearchFieldDecorationElemen t::create(Document& document) 155 PassRefPtrWillBeRawPtr<SearchFieldDecorationElement> SearchFieldDecorationElemen t::create(Document& document)
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents() 244 bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents()
245 { 245 {
246 const HTMLInputElement* input = toHTMLInputElement(shadowHost()); 246 const HTMLInputElement* input = toHTMLInputElement(shadowHost());
247 if (input && !input->isDisabledOrReadOnly()) 247 if (input && !input->isDisabledOrReadOnly())
248 return true; 248 return true;
249 249
250 return HTMLDivElement::willRespondToMouseClickEvents(); 250 return HTMLDivElement::willRespondToMouseClickEvents();
251 } 251 }
252 252
253 } 253 }
OLDNEW
« no previous file with comments | « Source/core/html/shadow/SliderThumbElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698