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

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

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase to master Created 5 years, 9 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
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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 HTMLDivElement::defaultEventHandler(event); 130 HTMLDivElement::defaultEventHandler(event);
131 } 131 }
132 132
133 LayoutObject* TextControlInnerEditorElement::createRenderer(const LayoutStyle&) 133 LayoutObject* TextControlInnerEditorElement::createRenderer(const LayoutStyle&)
134 { 134 {
135 return new LayoutTextControlInnerBlock(this); 135 return new LayoutTextControlInnerBlock(this);
136 } 136 }
137 137
138 PassRefPtr<LayoutStyle> TextControlInnerEditorElement::customStyleForRenderer() 138 PassRefPtr<LayoutStyle> TextControlInnerEditorElement::customStyleForRenderer()
139 { 139 {
140 LayoutObject* parentRenderer = shadowHost()->renderer(); 140 LayoutObject* parentRenderer = shadowHost()->layoutObject();
141 if (!parentRenderer || !parentRenderer->isTextControl()) 141 if (!parentRenderer || !parentRenderer->isTextControl())
142 return originalStyleForRenderer(); 142 return originalStyleForRenderer();
143 LayoutTextControl* textControlRenderer = toLayoutTextControl(parentRenderer) ; 143 LayoutTextControl* textControlRenderer = toLayoutTextControl(parentRenderer) ;
144 return textControlRenderer->createInnerEditorStyle(textControlRenderer->styl eRef()); 144 return textControlRenderer->createInnerEditorStyle(textControlRenderer->styl eRef());
145 } 145 }
146 146
147 // ---------------------------- 147 // ----------------------------
148 148
149 inline SearchFieldDecorationElement::SearchFieldDecorationElement(Document& docu ment) 149 inline SearchFieldDecorationElement::SearchFieldDecorationElement(Document& docu ment)
150 : HTMLDivElement(document) 150 : HTMLDivElement(document)
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents() 243 bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents()
244 { 244 {
245 const HTMLInputElement* input = toHTMLInputElement(shadowHost()); 245 const HTMLInputElement* input = toHTMLInputElement(shadowHost());
246 if (input && !input->isDisabledOrReadOnly()) 246 if (input && !input->isDisabledOrReadOnly())
247 return true; 247 return true;
248 248
249 return HTMLDivElement::willRespondToMouseClickEvents(); 249 return HTMLDivElement::willRespondToMouseClickEvents();
250 } 250 }
251 251
252 } 252 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698