| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 } | 344 } |
| 345 | 345 |
| 346 void BaseMultipleFieldsDateAndTimeInputType::createShadowSubtree() | 346 void BaseMultipleFieldsDateAndTimeInputType::createShadowSubtree() |
| 347 { | 347 { |
| 348 ASSERT(element().shadow()); | 348 ASSERT(element().shadow()); |
| 349 | 349 |
| 350 // Element must not have a renderer here, because if it did | 350 // Element must not have a renderer here, because if it did |
| 351 // DateTimeEditElement::customStyleForRenderer() is called in appendChild() | 351 // DateTimeEditElement::customStyleForRenderer() is called in appendChild() |
| 352 // before the field wrapper element is created. | 352 // before the field wrapper element is created. |
| 353 // FIXME: This code should not depend on such craziness. | 353 // FIXME: This code should not depend on such craziness. |
| 354 ASSERT(!element().renderer()); | 354 ASSERT(!element().layoutObject()); |
| 355 | 355 |
| 356 Document& document = element().document(); | 356 Document& document = element().document(); |
| 357 ContainerNode* container = element().closedShadowRoot(); | 357 ContainerNode* container = element().closedShadowRoot(); |
| 358 | 358 |
| 359 container->appendChild(DateTimeEditElement::create(document, *this)); | 359 container->appendChild(DateTimeEditElement::create(document, *this)); |
| 360 element().updateView(); | 360 element().updateView(); |
| 361 container->appendChild(ClearButtonElement::create(document, *this)); | 361 container->appendChild(ClearButtonElement::create(document, *this)); |
| 362 container->appendChild(SpinButtonElement::create(document, *this)); | 362 container->appendChild(SpinButtonElement::create(document, *this)); |
| 363 | 363 |
| 364 if (LayoutTheme::theme().supportsCalendarPicker(formControlType())) | 364 if (LayoutTheme::theme().supportsCalendarPicker(formControlType())) |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 620 AXObject* BaseMultipleFieldsDateAndTimeInputType::popupRootAXObject() | 620 AXObject* BaseMultipleFieldsDateAndTimeInputType::popupRootAXObject() |
| 621 { | 621 { |
| 622 if (PickerIndicatorElement* picker = pickerIndicatorElement()) | 622 if (PickerIndicatorElement* picker = pickerIndicatorElement()) |
| 623 return picker->popupRootAXObject(); | 623 return picker->popupRootAXObject(); |
| 624 return nullptr; | 624 return nullptr; |
| 625 } | 625 } |
| 626 | 626 |
| 627 } // namespace blink | 627 } // namespace blink |
| 628 | 628 |
| 629 #endif | 629 #endif |
| OLD | NEW |