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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 17 matching lines...) Expand all
28 #include "core/html/shadow/DateTimeEditElement.h" 28 #include "core/html/shadow/DateTimeEditElement.h"
29 29
30 #include "bindings/core/v8/ExceptionStatePlaceholder.h" 30 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
31 #include "core/HTMLNames.h" 31 #include "core/HTMLNames.h"
32 #include "core/dom/Document.h" 32 #include "core/dom/Document.h"
33 #include "core/dom/Text.h" 33 #include "core/dom/Text.h"
34 #include "core/events/MouseEvent.h" 34 #include "core/events/MouseEvent.h"
35 #include "core/html/forms/DateTimeFieldsState.h" 35 #include "core/html/forms/DateTimeFieldsState.h"
36 #include "core/html/shadow/DateTimeFieldElements.h" 36 #include "core/html/shadow/DateTimeFieldElements.h"
37 #include "core/html/shadow/ShadowElementNames.h" 37 #include "core/html/shadow/ShadowElementNames.h"
38 #include "core/layout/style/LayoutStyle.h" 38 #include "core/layout/style/ComputedStyle.h"
39 #include "core/layout/style/StyleInheritedData.h" 39 #include "core/layout/style/StyleInheritedData.h"
40 #include "platform/fonts/FontCache.h" 40 #include "platform/fonts/FontCache.h"
41 #include "platform/text/DateTimeFormat.h" 41 #include "platform/text/DateTimeFormat.h"
42 #include "platform/text/PlatformLocale.h" 42 #include "platform/text/PlatformLocale.h"
43 #include "wtf/DateMath.h" 43 #include "wtf/DateMath.h"
44 44
45 namespace blink { 45 namespace blink {
46 46
47 using namespace HTMLNames; 47 using namespace HTMLNames;
48 using namespace WTF::Unicode; 48 using namespace WTF::Unicode;
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 } 494 }
495 495
496 PassRefPtrWillBeRawPtr<DateTimeEditElement> DateTimeEditElement::create(Document & document, EditControlOwner& editControlOwner) 496 PassRefPtrWillBeRawPtr<DateTimeEditElement> DateTimeEditElement::create(Document & document, EditControlOwner& editControlOwner)
497 { 497 {
498 RefPtrWillBeRawPtr<DateTimeEditElement> container = adoptRefWillBeNoop(new D ateTimeEditElement(document, editControlOwner)); 498 RefPtrWillBeRawPtr<DateTimeEditElement> container = adoptRefWillBeNoop(new D ateTimeEditElement(document, editControlOwner));
499 container->setShadowPseudoId(AtomicString("-webkit-datetime-edit", AtomicStr ing::ConstructFromLiteral)); 499 container->setShadowPseudoId(AtomicString("-webkit-datetime-edit", AtomicStr ing::ConstructFromLiteral));
500 container->setAttribute(idAttr, ShadowElementNames::dateTimeEdit()); 500 container->setAttribute(idAttr, ShadowElementNames::dateTimeEdit());
501 return container.release(); 501 return container.release();
502 } 502 }
503 503
504 PassRefPtr<LayoutStyle> DateTimeEditElement::customStyleForLayoutObject() 504 PassRefPtr<ComputedStyle> DateTimeEditElement::customStyleForLayoutObject()
505 { 505 {
506 // FIXME: This is a kind of layout. We might want to introduce new renderer. 506 // FIXME: This is a kind of layout. We might want to introduce new renderer.
507 RefPtr<LayoutStyle> originalStyle = originalStyleForLayoutObject(); 507 RefPtr<ComputedStyle> originalStyle = originalStyleForLayoutObject();
508 RefPtr<LayoutStyle> style = LayoutStyle::clone(*originalStyle); 508 RefPtr<ComputedStyle> style = ComputedStyle::clone(*originalStyle);
509 float width = 0; 509 float width = 0;
510 for (Node* child = fieldsWrapperElement()->firstChild(); child; child = chil d->nextSibling()) { 510 for (Node* child = fieldsWrapperElement()->firstChild(); child; child = chil d->nextSibling()) {
511 if (!child->isElementNode()) 511 if (!child->isElementNode())
512 continue; 512 continue;
513 Element* childElement = toElement(child); 513 Element* childElement = toElement(child);
514 if (childElement->isDateTimeFieldElement()) { 514 if (childElement->isDateTimeFieldElement()) {
515 // We need to pass the Font of this element because child elements 515 // We need to pass the Font of this element because child elements
516 // can't resolve inherited style at this timing. 516 // can't resolve inherited style at this timing.
517 width += static_cast<DateTimeFieldElement*>(childElement)->maximumWi dth(style->font()); 517 width += static_cast<DateTimeFieldElement*>(childElement)->maximumWi dth(style->font());
518 } else { 518 } else {
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 { 807 {
808 DateTimeFieldsState dateTimeFieldsState; 808 DateTimeFieldsState dateTimeFieldsState;
809 for (size_t fieldIndex = 0; fieldIndex < m_fields.size(); ++fieldIndex) 809 for (size_t fieldIndex = 0; fieldIndex < m_fields.size(); ++fieldIndex)
810 m_fields[fieldIndex]->populateDateTimeFieldsState(dateTimeFieldsState); 810 m_fields[fieldIndex]->populateDateTimeFieldsState(dateTimeFieldsState);
811 return dateTimeFieldsState; 811 return dateTimeFieldsState;
812 } 812 }
813 813
814 } // namespace blink 814 } // namespace blink
815 815
816 #endif 816 #endif
OLDNEW
« no previous file with comments | « Source/core/html/shadow/DateTimeEditElement.h ('k') | Source/core/html/shadow/DetailsMarkerControl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698