| 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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 new_display = EDisplay::kFlex; | 343 new_display = EDisplay::kFlex; |
| 344 TextDirection content_direction = ComputedTextDirection(); | 344 TextDirection content_direction = ComputedTextDirection(); |
| 345 if (original_style->Direction() == content_direction && | 345 if (original_style->Direction() == content_direction && |
| 346 original_display == new_display) | 346 original_display == new_display) |
| 347 return original_style; | 347 return original_style; |
| 348 | 348 |
| 349 RefPtr<ComputedStyle> style = ComputedStyle::Clone(*original_style); | 349 RefPtr<ComputedStyle> style = ComputedStyle::Clone(*original_style); |
| 350 style->SetDirection(content_direction); | 350 style->SetDirection(content_direction); |
| 351 style->SetDisplay(new_display); | 351 style->SetDisplay(new_display); |
| 352 style->SetUnique(); | 352 style->SetUnique(); |
| 353 return style.Release(); | 353 return style; |
| 354 } | 354 } |
| 355 | 355 |
| 356 void MultipleFieldsTemporalInputTypeView::CreateShadowSubtree() { | 356 void MultipleFieldsTemporalInputTypeView::CreateShadowSubtree() { |
| 357 DCHECK(GetElement().Shadow()); | 357 DCHECK(GetElement().Shadow()); |
| 358 | 358 |
| 359 // Element must not have a layoutObject here, because if it did | 359 // Element must not have a layoutObject here, because if it did |
| 360 // DateTimeEditElement::customStyleForLayoutObject() is called in | 360 // DateTimeEditElement::customStyleForLayoutObject() is called in |
| 361 // appendChild() before the field wrapper element is created. | 361 // appendChild() before the field wrapper element is created. |
| 362 // FIXME: This code should not depend on such craziness. | 362 // FIXME: This code should not depend on such craziness. |
| 363 DCHECK(!GetElement().GetLayoutObject()); | 363 DCHECK(!GetElement().GetLayoutObject()); |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 635 : TextDirection::kLtr; | 635 : TextDirection::kLtr; |
| 636 } | 636 } |
| 637 | 637 |
| 638 AXObject* MultipleFieldsTemporalInputTypeView::PopupRootAXObject() { | 638 AXObject* MultipleFieldsTemporalInputTypeView::PopupRootAXObject() { |
| 639 if (PickerIndicatorElement* picker = GetPickerIndicatorElement()) | 639 if (PickerIndicatorElement* picker = GetPickerIndicatorElement()) |
| 640 return picker->PopupRootAXObject(); | 640 return picker->PopupRootAXObject(); |
| 641 return nullptr; | 641 return nullptr; |
| 642 } | 642 } |
| 643 | 643 |
| 644 } // namespace blink | 644 } // namespace blink |
| OLD | NEW |