Attachment #81971 for bug #51071

View Details Raw Unified Return to Bug 51071

| Differences between



2011-02-08  Luiz Agostini  <luiz.agostini@openbossa.org>

        Reviewed by NOBODY (OOPS!).

        RenderDetails: layout the first <summary> element child of a <details> element
        https://bugs.webkit.org/show_bug.cgi?id=51071

        http://www.w3.org/TR/html5/interactive-elements.html#the-details-element

        The main <summary> element is the first <summary> element of a <details> element.
        All other childs of the <details> element are rendered only if the attribute 'open' is set.
        Click event toggles the 'open' attribute.

        * html/HTMLDetailsElement.cpp:
        (WebCore::HTMLDetailsElement::HTMLDetailsElement):
        (WebCore::HTMLDetailsElement::createRenderer):
        (WebCore::HTMLDetailsElement::createSummaryRenderer):
        (WebCore::HTMLDetailsElement::findMainSummary):
        (WebCore::HTMLDetailsElement::childrenChanged):
        (WebCore::HTMLDetailsElement::finishParsingChildren):
        (WebCore::HTMLDetailsElement::parseMappedAttribute):
        (WebCore::HTMLDetailsElement::childShouldCreateRenderer):
        (WebCore::HTMLDetailsElement::defaultEventHandler):
        * html/HTMLDetailsElement.h:
        (WebCore::HTMLDetailsElement::mainSummary):

        The method summaryDefaultLabel was added to LocalizationStrategy class and to
        platform/LocalizedStrings. It is used to provide the default label to be used by a 
        <details> tag that has no <summary> child.

        * platform/LocalizationStrategy.h:
        * platform/LocalizedStrings.cpp:
        (WebCore::summaryDefaultLabel):
        * platform/LocalizedStrings.h:
        * platform/android/LocalizedStringsAndroid.cpp:
        (WebCore::summaryDefaultLabel):
        * platform/brew/LocalizedStringsBrew.cpp:
        (WebCore::summaryDefaultLabel):
        * platform/efl/LocalizedStringsEfl.cpp:
        (WebCore::summaryDefaultLabel):
        * platform/gtk/LocalizedStringsGtk.cpp:
        (WebCore::summaryDefaultLabel):
        * platform/haiku/LocalizedStringsHaiku.cpp:
        (WebCore::summaryDefaultLabel):
        * platform/wx/LocalizedStringsWx.cpp:
        (WebCore::summaryDefaultLabel):

        The first <summary> element is positioned at the top of its <details> parent.
        The area occupied by this main <summary> element is the interactive area of the
        <details> element.
        If the <details> tag has no <summary> child an OwnedSummaryRenderer is created and
        added to the corresponding RenderDetails object.

        * rendering/RenderDetails.cpp:
        (WebCore::OwnedSummaryRenderer::OwnedSummaryRenderer):
        (WebCore::OwnedSummaryRenderer::renderName):
        (WebCore::OwnedSummaryRenderer::styleDidChange):
        (WebCore::RenderDetails::RenderDetails):
        (WebCore::RenderDetails::createSummaryStyle):
        (WebCore::RenderDetails::styleDidChange):
        (WebCore::RenderDetails::layoutSpecialExcludedChild):
        (WebCore::RenderDetails::findMainSummary):
        (WebCore::RenderDetails::layout):
        (WebCore::RenderDetails::isOpen):
        * rendering/RenderDetails.h:
        (WebCore::RenderDetails::interactiveArea):
        (WebCore::RenderDetails::avoidsFloats):

        A marker is added to the main <summary> element to indicate the current value of the 'open'
        attribute of the <details> element.

        * rendering/RenderDetailsMarker.cpp:
        (WebCore::RenderDetailsMarker::RenderDetailsMarker):
        (WebCore::RenderDetailsMarker::lineHeight):
        (WebCore::RenderDetailsMarker::baselinePosition):
        (WebCore::RenderDetailsMarker::computePreferredLogicalWidths):
        (WebCore::RenderDetailsMarker::layout):
        (WebCore::RenderDetailsMarker::getRelativeMarkerRect):
        (WebCore::RenderDetailsMarker::isOpen):
        (WebCore::getCanonicalPath):
        (WebCore::RenderDetailsMarker::getPath):
        (WebCore::RenderDetailsMarker::paint):
        (WebCore::ArrowPath::createPath):
        * rendering/RenderDetailsMarker.h:

        RenderSummary objects are created to be the renderers of <summary> elements.

        * rendering/RenderObject.cpp:
        (WebCore::RenderObject::createObject):

        RenderSummary objects are responsible for positioning the marker when the <summary>
        element is the first <summary> child of a <details> element.

        * rendering/RenderSummary.cpp:
        (WebCore::RenderSummary::RenderSummary):
        (WebCore::RenderSummary::destroy):
        (WebCore::RenderSummary::styleDidChange):
        (WebCore::RenderSummary::layout):
        (WebCore::RenderSummary::getParentOfFirstLineBox):
        (WebCore::RenderSummary::firstNonMarkerChild):
        (WebCore::RenderSummary::updateMarkerLocation):
        * rendering/RenderSummary.h:
        (WebCore::RenderSummary::markerIsVisible):

2011-02-08  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

Lines 21-28 a/Source/WebCore/html/HTMLDetailsElement.cpp_sec1
- a/Source/WebCore/html/HTMLDetailsElement.cpp -1 / +85 lines
21	#include "config.h"	21	#include "config.h"
22	#include "HTMLDetailsElement.h"	22	#include "HTMLDetailsElement.h"
23		23
		24	#include "ContainerNode.h"
		25	#include "Event.h"
		26	#include "Frame.h"
24	#include "HTMLNames.h"	27	#include "HTMLNames.h"
		28	#include "MouseEvent.h"
		29	#include "Node.h"
		30	#include "PlatformMouseEvent.h"
25	#include "RenderDetails.h"	31	#include "RenderDetails.h"
		32	#include "RenderSummary.h"
26		33
27	namespace WebCore {	34	namespace WebCore {
28		35
Lines 35-47 PassRefPtr<HTMLDetailsElement> HTMLDetailsElement::create(const QualifiedName& t a/Source/WebCore/html/HTMLDetailsElement.cpp_sec2
35		42
36	HTMLDetailsElement::HTMLDetailsElement(const QualifiedName& tagName, Document* document)	43	HTMLDetailsElement::HTMLDetailsElement(const QualifiedName& tagName, Document* document)
37	: HTMLElement(tagName, document)	44	: HTMLElement(tagName, document)
		45	, m_mainSummary(0)
		46	, m_isOpen(false)
38	{	47	{
39	ASSERT(hasTagName(detailsTag));	48	ASSERT(hasTagName(detailsTag));
40	}	49	}
41		50
42	RenderObject* HTMLDetailsElement::createRenderer(RenderArena* arena, RenderStyle*)	51	RenderObject* HTMLDetailsElement::createRenderer(RenderArena* arena, RenderStyle*)
43	{	52	{
44	return new (arena) RenderDetails(this);	53	return new (arena) RenderDetails(this, !m_mainSummary);
		54	}
		55
		56	RenderObject* HTMLDetailsElement::createSummaryRenderer(RenderArena* arena, Node* node)
		57	{
		58	bool isMainSummary = false;
		59	if (node && node->hasTagName(summaryTag) && node->parentNode() && node->parentNode()->hasTagName(detailsTag))
		60	isMainSummary = node == static_cast<HTMLDetailsElement*>(node->parentNode())->m_mainSummary;
		61	return new (arena) RenderSummary(node, isMainSummary);
		62	}
		63
		64	void HTMLDetailsElement::findMainSummary()
		65	{
		66	Node* oldSummary = m_mainSummary;
		67	m_mainSummary = 0;
		68
		69	for (Node* child = firstChild(); !m_mainSummary && child; child = child->nextSibling()) {
		70	if (child->hasTagName(summaryTag))
		71	m_mainSummary = child;
		72	}
		73
		74	if (oldSummary != m_mainSummary && attached()) {
		75	detach();
		76	attach();
		77	}
		78	}
		79
		80	void HTMLDetailsElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
		81	{
		82	HTMLElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
		83	if (!changedByParser)
		84	findMainSummary();
		85	}
		86
		87	void HTMLDetailsElement::finishParsingChildren()
		88	{
		89	HTMLElement::finishParsingChildren();
		90	findMainSummary();
		91	}
		92
		93	void HTMLDetailsElement::parseMappedAttribute(Attribute* attr)
		94	{
		95	if (attr->name() == openAttr) {
		96	bool oldValue = m_isOpen;
		97	m_isOpen = !attr->value().isNull();
		98	if (attached() && oldValue != m_isOpen) {
		99	detach();
		100	attach();
		101	}
		102	} else
		103	HTMLElement::parseMappedAttribute(attr);
		104	}
		105
		106	bool HTMLDetailsElement::childShouldCreateRenderer(Node* child) const
		107	{
		108	return m_isOpen \|\| child == m_mainSummary;
		109	}
		110
		111	void HTMLDetailsElement::defaultEventHandler(Event* event)
		112	{
		113	HTMLElement::defaultEventHandler(event);
		114
		115	if (!renderer() \|\| !renderer()->isDetails() \|\| !event->isMouseEvent() \|\| event->type() != eventNames().clickEvent \|\| event->defaultHandled())
		116	return;
		117
118	MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
119	if (mouseEvent->button() != LeftButton)
120	return;
121
122	RenderDetails* renderDetails = static_cast<RenderDetails*>(renderer());
123
124	float factor = document() && document()->frame() ? document()->frame()->pageZoomFactor() : 1.0;
125	FloatPoint absolutePosition = renderDetails->absoluteToLocal(FloatPoint(mouseEvent->pageX() * factor, mouseEvent->pageY() * factor));
126
127	if (renderDetails->interactiveArea().contains(absolutePosition.x(), absolutePosition.y()))
128	setAttribute(openAttr, m_isOpen ? String() : String(""));
45	}	129	}
46		130
47	}	131	}

Lines 29-38 class HTMLDetailsElement : public HTMLElement { a/Source/WebCore/html/HTMLDetailsElement.h_sec1
- a/Source/WebCore/html/HTMLDetailsElement.h +13 lines
29	public:	29	public:
30	static PassRefPtr<HTMLDetailsElement> create(const QualifiedName& tagName, Document* document);	30	static PassRefPtr<HTMLDetailsElement> create(const QualifiedName& tagName, Document* document);
31		31
		32	static RenderObject* createSummaryRenderer(RenderArena, Node);
		33	Node* mainSummary() { return m_mainSummary; }
		34
32	private:	35	private:
33	HTMLDetailsElement(const QualifiedName&, Document*);	36	HTMLDetailsElement(const QualifiedName&, Document*);
34		37
35	virtual RenderObject* createRenderer(RenderArena, RenderStyle);	38	virtual RenderObject* createRenderer(RenderArena, RenderStyle);
		39	virtual void parseMappedAttribute(Attribute*);
		40	virtual bool childShouldCreateRenderer(Node*) const;
		41	virtual void childrenChanged(bool = false, Node* = 0, Node* = 0, int = 0);
		42	virtual void finishParsingChildren();
		43	virtual void defaultEventHandler(Event*);
		44
		45	void findMainSummary();
		46
		47	Node* m_mainSummary;
		48	bool m_isOpen;
36		49
37	};	50	};
38		51

Lines 43-48 public: a/Source/WebCore/platform/LocalizationStrategy.h_sec1
- a/Source/WebCore/platform/LocalizationStrategy.h +1 lines
43	virtual String submitButtonDefaultLabel() = 0;	43	virtual String submitButtonDefaultLabel() = 0;
44	virtual String fileButtonChooseFileLabel() = 0;	44	virtual String fileButtonChooseFileLabel() = 0;
45	virtual String fileButtonNoFileSelectedLabel() = 0;	45	virtual String fileButtonNoFileSelectedLabel() = 0;
		46	virtual String summaryDefaultLabel() = 0;
46		47
47	#if PLATFORM(MAC)	48	#if PLATFORM(MAC)
48	virtual String copyImageUnknownFileLabel() = 0;	49	virtual String copyImageUnknownFileLabel() = 0;

Lines 66-71 String fileButtonNoFileSelectedLabel() a/Source/WebCore/platform/LocalizedStrings.cpp_sec1
- a/Source/WebCore/platform/LocalizedStrings.cpp +5 lines
66	return platformStrategies()->localizationStrategy()->fileButtonNoFileSelectedLabel();	66	return platformStrategies()->localizationStrategy()->fileButtonNoFileSelectedLabel();
67	}	67	}
68		68
		69	String summaryDefaultLabel()
		70	{
		71	return platformStrategies()->localizationStrategy()->summaryDefaultLabel();
		72	}
		73
69	#if PLATFORM(MAC)	74	#if PLATFORM(MAC)
70	String copyImageUnknownFileLabel()	75	String copyImageUnknownFileLabel()
71	{	76	{

Lines 39-44 namespace WebCore { a/Source/WebCore/platform/LocalizedStrings.h_sec1
- a/Source/WebCore/platform/LocalizedStrings.h +1 lines
39	String submitButtonDefaultLabel();	39	String submitButtonDefaultLabel();
40	String fileButtonChooseFileLabel();	40	String fileButtonChooseFileLabel();
41	String fileButtonNoFileSelectedLabel();	41	String fileButtonNoFileSelectedLabel();
		42	String summaryDefaultLabel();
42		43
43	#if PLATFORM(MAC)	44	#if PLATFORM(MAC)
44	String copyImageUnknownFileLabel();	45	String copyImageUnknownFileLabel();

Lines 368-373 String resetButtonDefaultLabel() a/Source/WebCore/platform/android/LocalizedStringsAndroid.cpp_sec1
- a/Source/WebCore/platform/android/LocalizedStringsAndroid.cpp +5 lines
368	return String("Reset");	368	return String("Reset");
369	}	369	}
370		370
		371	String summaryDefaultLabel()
		372	{
		373	return String("Details");
		374	}
		375
371	String submitButtonDefaultLabel()	376	String submitButtonDefaultLabel()
372	{	377	{
373	return String("Submit");	378	return String("Submit");

Lines 46-51 String resetButtonDefaultLabel() a/Source/WebCore/platform/brew/LocalizedStringsBrew.cpp_sec1
- a/Source/WebCore/platform/brew/LocalizedStringsBrew.cpp +5 lines
46	return "Reset";	46	return "Reset";
47	}	47	}
48		48
		49	String summaryDefaultLabel()
		50	{
		51	return "Details";
		52	}
		53
49	String searchableIndexIntroduction()	54	String searchableIndexIntroduction()
50	{	55	{
51	return "Searchable Index";	56	return "Searchable Index";

Lines 53-58 String resetButtonDefaultLabel() a/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp_sec1
- a/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp +5 lines
53	return String::fromUTF8("Reset");	53	return String::fromUTF8("Reset");
54	}	54	}
55		55
		56	String summaryDefaultLabel()
		57	{
		58	return String::fromUTF8("Details");
		59	}
		60
56	String searchableIndexIntroduction()	61	String searchableIndexIntroduction()
57	{	62	{
58	return String::fromUTF8("_Searchable Index");	63	return String::fromUTF8("_Searchable Index");

Lines 66-71 String resetButtonDefaultLabel() a/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp_sec1
- a/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp +5 lines
66	return String::fromUTF8(_("Reset"));	66	return String::fromUTF8(_("Reset"));
67	}	67	}
68		68
		69	String summaryDefaultLabel()
		70	{
		71	return String::fromUTF8(_("Details"));
		72	}
		73
69	String searchableIndexIntroduction()	74	String searchableIndexIntroduction()
70	{	75	{
71	return String::fromUTF8(_("This is a searchable index. Enter search keywords: "));	76	return String::fromUTF8(_("This is a searchable index. Enter search keywords: "));

Lines 48-53 String resetButtonDefaultLabel() a/Source/WebCore/platform/haiku/LocalizedStringsHaiku.cpp_sec1
- a/Source/WebCore/platform/haiku/LocalizedStringsHaiku.cpp +5 lines
48	return "Reset";	48	return "Reset";
49	}	49	}
50		50
		51	String summaryDefaultLabel()
		52	{
		53	return "Details";
		54	}
		55
51	String defaultLanguage()	56	String defaultLanguage()
52	{	57	{
53	return "en";	58	return "en";

Lines 47-52 String resetButtonDefaultLabel() a/Source/WebCore/platform/wx/LocalizedStringsWx.cpp_sec1
- a/Source/WebCore/platform/wx/LocalizedStringsWx.cpp +5 lines
47	return String("Reset");	47	return String("Reset");
48	}	48	}
49		49
		50	String summaryDefaultLabel()
		51	{
		52	return String("Details");
		53	}
		54
50	String platformDefaultLanguage()	55	String platformDefaultLanguage()
51	{	56	{
52	return String("en");	57	return String("en");



#include "config.h"
#include "RenderDetails.h"

#include "CSSStyleSelector.h"
#include "HTMLDetailsElement.h"
#include "HTMLNames.h"
#include "LocalizedStrings.h"
#include "PaintInfo.h"
#include "RenderSummary.h"
#include "RenderText.h"

namespace WebCore {

using namespace HTMLNames;

class OwnedSummaryRenderer : public RenderSummary {
public:
    OwnedSummaryRenderer(Node* node) : RenderSummary(node, true), m_text(0) {}
    virtual const char* renderName() const { return "OwnedSummaryRenderer"; }

private:
    virtual void styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
    {
        RenderSummary::styleDidChange(diff, oldStyle);

        if (!m_text) {
            RenderObject* child = firstChild();

            static String text = summaryDefaultLabel();
            m_text = new (renderArena()) RenderText(document(), text.impl());
            m_text->setStyle(style());
            addChild(m_text, child);

        } else
            m_text->setStyle(style());
    }

    RenderText* m_text;
};

RenderDetails::RenderDetails(Node* element, bool createOwnedSummary)
    : RenderBlock(element)
    , m_ownedSummary(0)
    , m_createOwnedSummary(createOwnedSummary)
{
}

PassRefPtr<RenderStyle> RenderDetails::createSummaryStyle()
{
    RefPtr<HTMLElement> summary(HTMLElement::create(summaryTag, document()));
    return document()->styleSelector()->styleForElement(summary.get(), style(), true);
}

void RenderDetails::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
{
    RenderBlock::styleDidChange(diff, oldStyle);

    if (m_createOwnedSummary) {
        if (!m_ownedSummary) {
            m_ownedSummary = new (renderArena()) OwnedSummaryRenderer(document());
            m_ownedSummary->setStyle(createSummaryStyle());
            addChild(m_ownedSummary);
            addChild(createAnonymousBlock());

        } else
            m_ownedSummary->setStyle(createSummaryStyle());
    }

    // Ensure that if we ended up being inline that we set our replaced flag
    // so that we're treated like an inline-block.
    setReplaced(isInline());
}

RenderObject* RenderDetails::layoutSpecialExcludedChild(bool relayoutChildren)
{
    RenderSummary* mainSummary = findMainSummary();
    if (!mainSummary) {
        m_interactiveArea = IntRect(0, 0, 0, 0);
        return 0;
    }

    if (relayoutChildren)
        mainSummary->setNeedsLayout(true);
    mainSummary->layoutIfNeeded();

    const int childWidth = logicalWidthForChild(mainSummary);
    const int start = borderStart() + paddingStart() + mainSummary->marginStart();
    const int end = borderEnd() + paddingEnd() + mainSummary->marginEnd();
    const int width = logicalWidth();
    const int contentWidth = width - (start + end);
    const bool ltr = style()->isLeftToRightDirection();

    ETextAlign align = mainSummary->style()->textAlign();

    if (align != LEFT && align != CENTER && align != RIGHT)
        align = ltr ? LEFT : RIGHT;

    if (align != CENTER && !ltr)
        align = align == LEFT ? RIGHT : LEFT;

    int left = 0;
    switch (align) {
    case LEFT:
        left = start;
        break;
    case CENTER:
        left = start + (contentWidth - childWidth) / 2;
        break;
    case RIGHT:
        left = width - end - childWidth;
        break;
    default:
        ASSERT_NOT_REACHED();
    }

    setLogicalLeftForChild(mainSummary, ltr ? left : width - (left + childWidth));
    setLogicalTopForChild(mainSummary, borderBefore() + paddingBefore() + mainSummary->marginBefore());
    setLogicalHeight(borderBefore() + paddingBefore() + mainSummary->marginBefore() + logicalHeightForChild(mainSummary) + mainSummary->marginAfter());

    m_interactiveArea = mainSummary->frameRect();
    return mainSummary;
}

RenderSummary* RenderDetails::findMainSummary()
{
    if (m_ownedSummary)
        return m_ownedSummary;

    if (!node() || !node()->hasTagName(detailsTag))
        return 0;

    HTMLDetailsElement* details = static_cast<HTMLDetailsElement*>(node());

    if (!details->mainSummary() || !details->mainSummary()->renderer() || !details->mainSummary()->renderer()->isSummary())
        return 0;

    return static_cast<RenderSummary*>(details->mainSummary()->renderer());
}

void RenderDetails::layout()
{
    RenderBlock::layout();

    switch (style()->writingMode()) {
    case TopToBottomWritingMode:
    case LeftToRightWritingMode:
        break;
    case RightToLeftWritingMode: {
        IntPoint pos = m_interactiveArea.location();
        pos.setX(width() - m_interactiveArea.x() - m_interactiveArea.width());
        m_interactiveArea.setLocation(pos);
        break;
    }
    case BottomToTopWritingMode: {
        IntPoint pos = m_interactiveArea.location();
        pos.setY(height() - m_interactiveArea.y() - m_interactiveArea.height());
        m_interactiveArea.setLocation(pos);
        break;
    }
    }
}

bool RenderDetails::isOpen() const
{
    return node() && node()->isElementNode() ? !static_cast<Element*>(node())->getAttribute(openAttr).isNull() : false;
}

}

Lines 25-38 a/Source/WebCore/rendering/RenderDetails.h_sec1
- a/Source/WebCore/rendering/RenderDetails.h -1 / +17 lines
25		25
26	namespace WebCore {	26	namespace WebCore {
27		27
		28	class RenderSummary;
		29
28	class RenderDetails : public RenderBlock {	30	class RenderDetails : public RenderBlock {
29	public:	31	public:
30	explicit RenderDetails(Node*);	32	explicit RenderDetails(Node*, bool createOwnedSummary);
		33
		34	bool isOpen() const;
		35	IntRect interactiveArea() const { return m_interactiveArea; }
31		36
32	private:	37	private:
33	virtual const char* renderName() const { return "RenderDetails"; }	38	virtual const char* renderName() const { return "RenderDetails"; }
34	virtual bool isDetails() const { return true; }	39	virtual bool isDetails() const { return true; }
35	virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);	40	virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
		41	virtual void layout();
		42
		43	virtual bool avoidsFloats() const { return true; }
		44	virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren);
		45
		46	RenderSummary* findMainSummary();
		47	PassRefPtr<RenderStyle> createSummaryStyle();
		48
		49	RenderSummary* m_ownedSummary;
		50	IntRect m_interactiveArea;
		51	bool m_createOwnedSummary;
36	};	52	};
37		53
38	inline RenderDetails* toRenderDetails(RenderObject* object)	54	inline RenderDetails* toRenderDetails(RenderObject* object)

Lines 21-31 a/Source/WebCore/rendering/RenderDetailsMarker.cpp_sec1
- a/Source/WebCore/rendering/RenderDetailsMarker.cpp -2 / +171 lines
21	#include "config.h"	21	#include "config.h"
22	#include "RenderDetailsMarker.h"	22	#include "RenderDetailsMarker.h"
23		23
		24	#include "GraphicsContext.h"
		25	#include "HTMLNames.h"
		26	#include "PaintInfo.h"
		27	#include "RenderDetails.h"
		28	#include "RenderSummary.h"
		29
24	namespace WebCore {	30	namespace WebCore {
25		31
26	RenderDetailsMarker::RenderDetailsMarker(Node* element)	32	using namespace HTMLNames;
27	: RenderBlock(element)	33
		34	RenderDetailsMarker::RenderDetailsMarker(RenderSummary* item)
		35	: RenderBox(item->document())
		36	, m_summary(item)
28	{	37	{
		38	setInline(true);
		39	setReplaced(true);
		40	}
		41
		42	int RenderDetailsMarker::lineHeight(bool firstLine, LineDirectionMode direction, LinePositionMode) const
		43	{
		44	return m_summary->lineHeight(firstLine, direction, PositionOfInteriorLineBoxes);
		45	}
		46
		47	int RenderDetailsMarker::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode) const
		48	{
		49	return m_summary->baselinePosition(baselineType, firstLine, direction, PositionOfInteriorLineBoxes);
		50	}
		51
		52	void RenderDetailsMarker::computePreferredLogicalWidths()
		53	{
		54	ASSERT(preferredLogicalWidthsDirty());
		55
		56	m_minPreferredLogicalWidth = 2 * style()->fontMetrics().ascent() / 3;
		57	m_maxPreferredLogicalWidth = m_minPreferredLogicalWidth;
		58
		59	setPreferredLogicalWidthsDirty(false);
		60	}
		61
		62	void RenderDetailsMarker::layout()
		63	{
		64	ASSERT(needsLayout());
		65
		66	setLogicalWidth(minPreferredLogicalWidth());
		67	setLogicalHeight(style()->fontMetrics().height());
		68
		69	setMarginStart(0);
		70	setMarginEnd(style()->fontMetrics().ascent() - minPreferredLogicalWidth() + 1);
		71
		72	setNeedsLayout(false);
		73	}
		74
		75	IntRect RenderDetailsMarker::getRelativeMarkerRect() const
		76	{
		77	IntRect relativeRect;
		78
		79	int bulletWidth = minPreferredLogicalWidth();
		80	relativeRect = IntRect((logicalWidth() - bulletWidth) / 2, (logicalHeight() - bulletWidth) / 2, bulletWidth, bulletWidth);
		81
		82	if (!style()->isHorizontalWritingMode()) {
		83	relativeRect = relativeRect.transposedRect();
		84	relativeRect.setX(width() - relativeRect.x() - relativeRect.width());
		85	}
		86
		87	return relativeRect;
		88	}
		89
		90	bool RenderDetailsMarker::isOpen() const
		91	{
		92	if (!parent() \|\| !parent()->isSummary() \|\| !parent()->containingBlock() \|\| !parent()->containingBlock()->isDetails())
		93	return false;
		94
		95	return static_cast<RenderDetails*>(parent()->containingBlock())->isOpen();
		96	}
		97
		98	namespace ArrowPath {
		99
		100	enum Direction { right, left, up, down };
		101
102	static Path createPath(const FloatPoint* path)
103	{
104	Path result;
105	result.moveTo(FloatPoint(path[0].x(), path[0].y()));
106	for (int i = 1; i < 4; ++i)
107	result.addLineTo(FloatPoint(path[i].x(), path[i].y()));
108	return result;
109	}
110
111	static Path createPath(Direction direction)
112	{
113	switch (direction) {
114	case right: {
115	FloatPoint points[4] = { FloatPoint(0.0, 0.0), FloatPoint(0.86, 0.5), FloatPoint(0.0, 1.0), FloatPoint(0.0, 0.0) };
116	return createPath(points);
117	}
118	case left: {
119	FloatPoint points[4] = { FloatPoint(1.0, 0.0), FloatPoint(0.14, 0.5), FloatPoint(1.0, 1.0), FloatPoint(1.0, 0.0) };
120	return createPath(points);
121	}
122	case up: {
123	FloatPoint points[4] = { FloatPoint(0.0, 0.93), FloatPoint(0.5, 0.07), FloatPoint(1.0, 0.93), FloatPoint(0.0, 0.93) };
124	return createPath(points);
125	}
126	case down: {
127	FloatPoint points[4] = { FloatPoint(0.0, 0.07), FloatPoint(0.5, 0.93), FloatPoint(1.0, 0.07), FloatPoint(0.0, 0.07) };
128	return createPath(points);
129	}
130	}
131
132	return Path();
133	}
134	};
135
136	static Path getCanonicalPath(bool isOpen, WritingMode writingMode, TextDirection textDirection)
137	{
138	static Path down = ArrowPath::createPath(ArrowPath::down);
139	static Path up = ArrowPath::createPath(ArrowPath::up);
140	static Path left = ArrowPath::createPath(ArrowPath::left);
141	static Path right = ArrowPath::createPath(ArrowPath::right);
142
143	switch (writingMode) {
144	case TopToBottomWritingMode:
145	switch (textDirection) {
146	case LTR: return isOpen ? down : right;
147	case RTL: return isOpen ? down : left;
148	}
149	case RightToLeftWritingMode:
150	switch (textDirection) {
151	case LTR: return isOpen ? left : down;
152	case RTL: return isOpen ? left : up;
153	}
154	case LeftToRightWritingMode:
155	switch (textDirection) {
156	case LTR: return isOpen ? right : down;
157	case RTL: return isOpen ? right : up;
158	}
159	case BottomToTopWritingMode:
160	switch (textDirection) {
161	case LTR: return isOpen ? up : right;
162	case RTL: return isOpen ? up : left;
163	}
164	}
165
166	return Path();
167	}
168
169	Path RenderDetailsMarker::getPath(const IntPoint& origin) const
170	{
171	IntRect rect = getRelativeMarkerRect();
172	Path result = getCanonicalPath(isOpen(), style()->writingMode(), style()->direction());
173	result.transform(AffineTransform().scale(rect.width()));
174	result.translate(FloatSize(origin.x() + rect.x(), origin.y() + rect.y()));
175	return result;
176	}
177
178	void RenderDetailsMarker::paint(PaintInfo& paintInfo, int tx, int ty)
179	{
180	if (paintInfo.phase != PaintPhaseForeground \|\| style()->visibility() != VISIBLE)
181	return;
182
183	IntPoint boxOrigin(tx + x(), ty + y());
184	IntRect overflowRect(visualOverflowRect());
185	overflowRect.move(boxOrigin.x(), boxOrigin.y());
186	overflowRect.inflate(maximalOutlineSize(paintInfo.phase));
187
188	if (!paintInfo.rect.intersects(overflowRect))
189	return;
190
191	const Color color(style()->visitedDependentColor(CSSPropertyColor));
192	paintInfo.context->setStrokeColor(color, style()->colorSpace());
193	paintInfo.context->setStrokeStyle(SolidStroke);
194	paintInfo.context->setStrokeThickness(1.0f);
195	paintInfo.context->setFillColor(color, style()->colorSpace());
196
197	paintInfo.context->fillPath(getPath(boxOrigin));
29	}	198	}
30		199
31	}	200	}

Lines 21-37 a/Source/WebCore/rendering/RenderDetailsMarker.h_sec1
- a/Source/WebCore/rendering/RenderDetailsMarker.h -3 / +18 lines
21	#ifndef RenderDetailsMarker_h	21	#ifndef RenderDetailsMarker_h
22	#define RenderDetailsMarker_h	22	#define RenderDetailsMarker_h
23		23
24	#include "RenderBlock.h"	24	#include "RenderBox.h"
25		25
26	namespace WebCore {	26	namespace WebCore {
27		27
28	class RenderDetailsMarker : public RenderBlock {	28	class RenderSummary;
		29
		30	class RenderDetailsMarker : public RenderBox {
29	public:	31	public:
30	explicit RenderDetailsMarker(Node*);	32	RenderDetailsMarker(RenderSummary*);
		33
		34	virtual void computePreferredLogicalWidths();
31		35
32	private:	36	private:
33	virtual const char* renderName() const { return "RenderDetailsMarker"; }	37	virtual const char* renderName() const { return "RenderDetailsMarker"; }
34	virtual bool isDetailsMarker() const { return true; }	38	virtual bool isDetailsMarker() const { return true; }
		39	virtual void paint(PaintInfo&, int tx, int ty);
		40	virtual void layout();
		41	virtual int lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
		42	virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
		43
		44	IntRect getRelativeMarkerRect() const;
		45
		46	bool isOpen() const;
		47	Path getPath(const IntPoint& origin) const;
		48
		49	RenderSummary* m_summary;
35	};	50	};
36		51
37	inline RenderDetailsMarker* toRenderDetailsMarker(RenderObject* object)	52	inline RenderDetailsMarker* toRenderDetailsMarker(RenderObject* object)

Lines 38-43 a/Source/WebCore/rendering/RenderObject.cpp_sec1
- a/Source/WebCore/rendering/RenderObject.cpp +4 lines
38	#include "Frame.h"	38	#include "Frame.h"
39	#include "FrameView.h"	39	#include "FrameView.h"
40	#include "GraphicsContext.h"	40	#include "GraphicsContext.h"
		41	#include "HTMLDetailsElement.h"
41	#include "HTMLNames.h"	42	#include "HTMLNames.h"
42	#include "HitTestResult.h"	43	#include "HitTestResult.h"
43	#include "Page.h"	44	#include "Page.h"
Lines 130-135 RenderObject* RenderObject::createObject(Node* node, RenderStyle* style) a/Source/WebCore/rendering/RenderObject.cpp_sec2
130	if (node->hasTagName(rtTag) && style->display() == BLOCK)	131	if (node->hasTagName(rtTag) && style->display() == BLOCK)
131	return new (arena) RenderRubyText(node);	132	return new (arena) RenderRubyText(node);
132		133
		134	if (node->hasTagName(summaryTag))
		135	return HTMLDetailsElement::createSummaryRenderer(arena, node);
		136
133	switch (style->display()) {	137	switch (style->display()) {
134	case NONE:	138	case NONE:
135	return 0;	139	return 0;



#include "config.h"
#include "RenderSummary.h"

#include "HTMLNames.h"
#include "RenderDetailsMarker.h"
#include "RenderView.h"

namespace WebCore {

using namespace HTMLNames;

RenderSummary::RenderSummary(Node* node, bool markerIsVisible)
    : RenderBlock(node)
    , m_marker(0)
    , m_markerIsVisible(markerIsVisible)
{
}

void RenderSummary::destroy()
{
    if (m_marker) {
        m_marker->destroy();
        m_marker = 0;
    }
    RenderBlock::destroy();
}

void RenderSummary::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
{
    RenderBlock::styleDidChange(diff, oldStyle);

    if (m_markerIsVisible && !m_marker) {
        m_marker = new (renderArena()) RenderDetailsMarker(this);
        setNeedsLayout(true);
    }

    if (!m_markerIsVisible && m_marker) {
        m_marker->destroy();
        m_marker = 0;
        setNeedsLayout(true);
    }

    if (m_marker) {
        RefPtr<RenderStyle> markerStyle = RenderStyle::create();
        markerStyle->inheritFrom(style());
        m_marker->setStyle(markerStyle.release());
    }

    // Ensure that if we ended up being inline that we set our replaced flag
    // so that we're treated like an inline-block.
    setReplaced(isInline());
}

void RenderSummary::layout()
{
    ASSERT(needsLayout());

    updateMarkerLocation();
    RenderBlock::layout();
}

RenderObject* RenderSummary::getParentOfFirstLineBox(RenderBlock* curr)
{
    RenderObject* firstChild = curr->firstChild();
    if (!firstChild)
        return 0;

    for (RenderObject* currChild = firstChild; currChild; currChild = currChild->nextSibling()) {
        if (currChild == m_marker)
            continue;

        if (currChild->isInline() && (!currChild->isRenderInline() || curr->generatesLineBoxesForInlineChild(currChild)))
            return curr;

        if (currChild->isFloating() || currChild->isPositioned())
            continue;

        if (currChild->isTable() || !currChild->isRenderBlock() || (currChild->isBox() && toRenderBox(currChild)->isWritingModeRoot()))
            break;

        RenderObject* lineBox = getParentOfFirstLineBox(toRenderBlock(currChild));
        if (lineBox)
            return lineBox;
    }

    return 0;
}

RenderObject* RenderSummary::firstNonMarkerChild(RenderObject* parent)
{
    RenderObject* result = parent->firstChild();
    while (result && result->isListMarker())
        result = result->nextSibling();
    return result;
}

void RenderSummary::updateMarkerLocation()
{
    // Sanity check the location of our marker.
    if (m_marker) {
        RenderObject* markerPar = m_marker->parent();
        RenderObject* lineBoxParent = getParentOfFirstLineBox(this);
        if (!lineBoxParent) {
            // If the marker is currently contained inside an anonymous box,
            // then we are the only item in that anonymous box (since no line box
            // parent was found).  It's ok to just leave the marker where it is
            // in this case.
            if (markerPar && markerPar->isAnonymousBlock())
                lineBoxParent = markerPar;
            else
                lineBoxParent = this;
        }

        if (markerPar != lineBoxParent || m_marker->preferredLogicalWidthsDirty()) {
            // Removing and adding the marker can trigger repainting in
            // containers other than ourselves, so we need to disable LayoutState.
            view()->disableLayoutState();
            updateFirstLetter();
            m_marker->remove();
            if (!lineBoxParent)
                lineBoxParent = this;
            lineBoxParent->addChild(m_marker, firstNonMarkerChild(lineBoxParent));

            if (m_marker->preferredLogicalWidthsDirty())
                m_marker->computePreferredLogicalWidths();

//            m_marker->adjustLogicalWidths();
            view()->enableLayoutState();
        }
    }
}

}

Lines 25-37 a/Source/WebCore/rendering/RenderSummary.h_sec1
- a/Source/WebCore/rendering/RenderSummary.h -2 / +18 lines
25		25
26	namespace WebCore {	26	namespace WebCore {
27		27
		28	class RenderDetailsMarker;
		29
28	class RenderSummary : public RenderBlock {	30	class RenderSummary : public RenderBlock {
29	public:	31	public:
30	explicit RenderSummary(Node*);	32	explicit RenderSummary(Node*, bool markerIsVisible);
31		33
32	private:	34	bool markerIsVisible() const { return m_markerIsVisible; }
		35	bool isOpen() const;
		36
		37	protected:
33	virtual const char* renderName() const { return "RenderSummary"; }	38	virtual const char* renderName() const { return "RenderSummary"; }
34	virtual bool isSummary() const { return true; }	39	virtual bool isSummary() const { return true; }
		40	virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
		41	virtual void destroy();
		42	virtual void layout();
		43
		44	private:
		45	void updateMarkerLocation();
		46	RenderObject* getParentOfFirstLineBox(RenderBlock*);
		47	RenderObject* firstNonMarkerChild(RenderObject* parent);
		48
		49	RenderDetailsMarker* m_marker;
		50	bool m_markerIsVisible;
35	};	51	};
36		52
37	inline RenderSummary* toRenderSummary(RenderObject* object)	53	inline RenderSummary* toRenderSummary(RenderObject* object)



2011-02-08  Luiz Agostini  <luiz.agostini@openbossa.org>

        Reviewed by NOBODY (OOPS!).

        RenderDetails: layout the first <summary> element child of a <details> element
        https://bugs.webkit.org/show_bug.cgi?id=51071

        The method summaryDefaultLabel was added to LocalizedStrings. It is used to provide
        the default label to be used by a <details> tag that has no <summary> child.

        * src/LocalizedStrings.cpp:
        (WebCore::summaryDefaultLabel):

2011-02-08  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

Lines 87-92 String fileButtonChooseFileLabel() a/Source/WebKit/chromium/src/LocalizedStrings.cpp_sec1
- a/Source/WebKit/chromium/src/LocalizedStrings.cpp +6 lines
87	return query(WebLocalizedString::FileButtonChooseFileLabel);	87	return query(WebLocalizedString::FileButtonChooseFileLabel);
88	}	88	}
89		89
		90	String summaryDefaultLabel()
		91	{
		92	notImplemented();
		93	return String("Details");
		94	}
		95
90	String fileButtonNoFileSelectedLabel()	96	String fileButtonNoFileSelectedLabel()
91	{	97	{
92	return query(WebLocalizedString::FileButtonNoFileSelectedLabel);	98	return query(WebLocalizedString::FileButtonNoFileSelectedLabel);



2011-02-08  Luiz Agostini  <luiz.agostini@openbossa.org>

        Reviewed by NOBODY (OOPS!).

        RenderDetails: layout the first <summary> element child of a <details> element
        https://bugs.webkit.org/show_bug.cgi?id=51071

        The method summaryDefaultLabel was added to LocalizationStrategy class. It is used to
        provide the default label to be used by a <details> tag that has no <summary> child.

        * WebCoreSupport/WebPlatformStrategies.h:
        * WebCoreSupport/WebPlatformStrategies.mm:
        (WebPlatformStrategies::summaryDefaultLabel):

2011-02-08  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

Lines 55-60 private: a/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h_sec1
- a/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h +1 lines
55	virtual WTF::String fileButtonChooseFileLabel();	55	virtual WTF::String fileButtonChooseFileLabel();
56	virtual WTF::String fileButtonNoFileSelectedLabel();	56	virtual WTF::String fileButtonNoFileSelectedLabel();
57	virtual WTF::String copyImageUnknownFileLabel();	57	virtual WTF::String copyImageUnknownFileLabel();
		58	virtual WTF::String summaryDefaultLabel();
58	#if ENABLE(CONTEXT_MENUS)	59	#if ENABLE(CONTEXT_MENUS)
59	virtual WTF::String contextMenuItemTagOpenLinkInNewWindow();	60	virtual WTF::String contextMenuItemTagOpenLinkInNewWindow();
60	virtual WTF::String contextMenuItemTagDownloadLinkToDisk();	61	virtual WTF::String contextMenuItemTagDownloadLinkToDisk();

Lines 109-114 String WebPlatformStrategies::submitButtonDefaultLabel() a/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm_sec1
- a/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm +5 lines
109	return UI_STRING("Submit", "default label for Submit buttons in forms on web pages");	109	return UI_STRING("Submit", "default label for Submit buttons in forms on web pages");
110	}	110	}
111		111
		112	String WebPlatformStrategies::summaryDefaultLabel()
		113	{
		114	return UI_STRING("Details", "text to display in <details> tag when it has no <summary> child");
		115	}
		116
112	String WebPlatformStrategies::fileButtonChooseFileLabel()	117	String WebPlatformStrategies::fileButtonChooseFileLabel()
113	{	118	{
114	return UI_STRING("Choose File", "title for file button used in HTML forms");	119	return UI_STRING("Choose File", "title for file button used in HTML forms");



2011-02-08  Luiz Agostini  <luiz.agostini@openbossa.org>

        Reviewed by NOBODY (OOPS!).

        RenderDetails: layout the first <summary> element child of a <details> element
        https://bugs.webkit.org/show_bug.cgi?id=51071

        The method summaryDefaultLabel was added to LocalizationStrategy class. It is used to
        provide the default label to be used by a <details> tag that has no <summary> child.

        * WebCoreSupport/WebPlatformStrategies.cpp:
        (WebPlatformStrategies::summaryDefaultLabel):
        * WebCoreSupport/WebPlatformStrategies.h:

2011-02-08  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

Lines 170-175 String WebPlatformStrategies::fileButtonNoFileSelectedLabel() a/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp_sec1
- a/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp +5 lines
170	return QCoreApplication::translate("QWebPage", "No file selected", "text to display in file button used in HTML forms when no file is selected");	170	return QCoreApplication::translate("QWebPage", "No file selected", "text to display in file button used in HTML forms when no file is selected");
171	}	171	}
172		172
		173	String WebPlatformStrategies::summaryDefaultLabel()
		174	{
		175	return QCoreApplication::translate("QWebPage", "Details", "text to display in <details> tag when it has no <summary> child");
		176	}
		177
173	String WebPlatformStrategies::contextMenuItemTagOpenLinkInNewWindow()	178	String WebPlatformStrategies::contextMenuItemTagOpenLinkInNewWindow()
174	{	179	{
175	return QCoreApplication::translate("QWebPage", "Open in New Window", "Open in New Window context menu item");	180	return QCoreApplication::translate("QWebPage", "Open in New Window", "Open in New Window context menu item");

Lines 60-65 private: a/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.h_sec1
- a/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.h +1 lines
60	virtual WTF::String submitButtonDefaultLabel();	60	virtual WTF::String submitButtonDefaultLabel();
61	virtual WTF::String fileButtonChooseFileLabel();	61	virtual WTF::String fileButtonChooseFileLabel();
62	virtual WTF::String fileButtonNoFileSelectedLabel();	62	virtual WTF::String fileButtonNoFileSelectedLabel();
		63	virtual WTF::String summaryDefaultLabel();
63	virtual WTF::String contextMenuItemTagOpenLinkInNewWindow();	64	virtual WTF::String contextMenuItemTagOpenLinkInNewWindow();
64	virtual WTF::String contextMenuItemTagDownloadLinkToDisk();	65	virtual WTF::String contextMenuItemTagDownloadLinkToDisk();
65	virtual WTF::String contextMenuItemTagCopyLinkToClipboard();	66	virtual WTF::String contextMenuItemTagCopyLinkToClipboard();



2011-02-08  Luiz Agostini  <luiz.agostini@openbossa.org>

        Reviewed by NOBODY (OOPS!).

        RenderDetails: layout the first <summary> element child of a <details> element
        https://bugs.webkit.org/show_bug.cgi?id=51071

        The method summaryDefaultLabel was added to LocalizationStrategy class. It is used to
        provide the default label to be used by a <details> tag that has no <summary> child.

        * WebCoreSupport/WebPlatformStrategies.cpp:
        (WebPlatformStrategies::summaryDefaultLabel):
        * WebCoreSupport/WebPlatformStrategies.h:

2011-02-08  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

Lines 133-138 String WebPlatformStrategies::fileButtonNoFileSelectedLabel() a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp_sec1
- a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp +5 lines
133	return UI_STRING("no file selected", "text to display in file button used in HTML forms when no file is selected");	133	return UI_STRING("no file selected", "text to display in file button used in HTML forms when no file is selected");
134	}	134	}
135		135
		136	String WebPlatformStrategies::summaryDefaultLabel()
		137	{
		138	return UI_STRING("Details", "text to display in <details> tag when it has no <summary> child");
		139	}
		140
136	String WebPlatformStrategies::contextMenuItemTagOpenLinkInNewWindow()	141	String WebPlatformStrategies::contextMenuItemTagOpenLinkInNewWindow()
137	{	142	{
138	return UI_STRING("Open Link in New Window", "Open in New Window context menu item");	143	return UI_STRING("Open Link in New Window", "Open in New Window context menu item");

Lines 54-59 private: a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h_sec1
- a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h +1 lines
54	virtual WTF::String submitButtonDefaultLabel();	54	virtual WTF::String submitButtonDefaultLabel();
55	virtual WTF::String fileButtonChooseFileLabel();	55	virtual WTF::String fileButtonChooseFileLabel();
56	virtual WTF::String fileButtonNoFileSelectedLabel();	56	virtual WTF::String fileButtonNoFileSelectedLabel();
		57	virtual WTF::String summaryDefaultLabel();
57	#if ENABLE(CONTEXT_MENUS)	58	#if ENABLE(CONTEXT_MENUS)
58	virtual WTF::String contextMenuItemTagOpenLinkInNewWindow();	59	virtual WTF::String contextMenuItemTagOpenLinkInNewWindow();
59	virtual WTF::String contextMenuItemTagDownloadLinkToDisk();	60	virtual WTF::String contextMenuItemTagDownloadLinkToDisk();



2011-02-08  Luiz Agostini  <luiz.agostini@openbossa.org>

        Reviewed by NOBODY (OOPS!).

        RenderDetails: layout the first <summary> element child of a <details> element
        https://bugs.webkit.org/show_bug.cgi?id=51071

        The method summaryDefaultLabel was added to LocalizationStrategy class. It is used to
        provide the default label to be used by a <details> tag that has no <summary> child.

        * WebCoreSupport/PlatformStrategiesWinCE.cpp:
        (PlatformStrategiesWinCE::summaryDefaultLabel):
        * WebCoreSupport/PlatformStrategiesWinCE.h:

2011-02-08  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

Lines 137-142 String PlatformStrategiesWinCE::fileButtonNoFileSelectedLabel() a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp_sec1
- a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp +5 lines
137	return UI_STRING("no file selected", "text to display in file button used in HTML forms when no file is selected");	137	return UI_STRING("no file selected", "text to display in file button used in HTML forms when no file is selected");
138	}	138	}
139		139
		140	String PlatformStrategiesWinCE::summaryDefaultLabel()
		141	{
		142	return UI_STRING("Details", "text to display in <details> tag when it has no <summary> child");
		143	}
		144
140	String PlatformStrategiesWinCE::contextMenuItemTagOpenLinkInNewWindow()	145	String PlatformStrategiesWinCE::contextMenuItemTagOpenLinkInNewWindow()
141	{	146	{
142	return UI_STRING("Open Link in New Window", "Open in New Window context menu item");	147	return UI_STRING("Open Link in New Window", "Open in New Window context menu item");

Lines 53-58 private: a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h_sec1
- a/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h +1 lines
53	virtual WTF::String submitButtonDefaultLabel();	53	virtual WTF::String submitButtonDefaultLabel();
54	virtual WTF::String fileButtonChooseFileLabel();	54	virtual WTF::String fileButtonChooseFileLabel();
55	virtual WTF::String fileButtonNoFileSelectedLabel();	55	virtual WTF::String fileButtonNoFileSelectedLabel();
		56	virtual WTF::String summaryDefaultLabel();
56	#if ENABLE(CONTEXT_MENUS)	57	#if ENABLE(CONTEXT_MENUS)
57	virtual WTF::String contextMenuItemTagOpenLinkInNewWindow();	58	virtual WTF::String contextMenuItemTagOpenLinkInNewWindow();
58	virtual WTF::String contextMenuItemTagDownloadLinkToDisk();	59	virtual WTF::String contextMenuItemTagDownloadLinkToDisk();



2011-02-08  Luiz Agostini  <luiz.agostini@openbossa.org>

        Reviewed by NOBODY (OOPS!).

        RenderDetails: layout the first <summary> element child of a <details> element
        https://bugs.webkit.org/show_bug.cgi?id=51071

        The method summaryDefaultLabel was added to LocalizationStrategy class. It is used to
        provide the default label to be used by a <details> tag that has no <summary> child.

        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
        (WebKit::WebPlatformStrategies::summaryDefaultLabel):
        * WebProcess/WebCoreSupport/WebPlatformStrategies.h:

2011-02-08  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

Lines 175-180 String WebPlatformStrategies::fileButtonNoFileSelectedLabel() a/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp_sec1
- a/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp +5 lines
175	return UI_STRING("no file selected", "text to display in file button used in HTML forms when no file is selected");	175	return UI_STRING("no file selected", "text to display in file button used in HTML forms when no file is selected");
176	}	176	}
177		177
		178	String WebPlatformStrategies::summaryDefaultLabel()
		179	{
		180	return UI_STRING("Details", "text to display in <details> tag when it has no <summary> child");
		181	}
		182
178	#if PLATFORM(MAC)	183	#if PLATFORM(MAC)
179	String WebPlatformStrategies::copyImageUnknownFileLabel()	184	String WebPlatformStrategies::copyImageUnknownFileLabel()
180	{	185	{



    virtual String submitButtonDefaultLabel();
    virtual String fileButtonChooseFileLabel();
    virtual String fileButtonNoFileSelectedLabel();
    virtual WTF::String summaryDefaultLabel();
#if PLATFORM(MAC)
    virtual String copyImageUnknownFileLabel();
#endif
- 

Return to Bug 51071

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +104 lines
		1	2011-02-08 Luiz Agostini <luiz.agostini@openbossa.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	RenderDetails: layout the first <summary> element child of a <details> element
		6	https://bugs.webkit.org/show_bug.cgi?id=51071
		7
		8	http://www.w3.org/TR/html5/interactive-elements.html#the-details-element
		9
		10	The main <summary> element is the first <summary> element of a <details> element.
		11	All other childs of the <details> element are rendered only if the attribute 'open' is set.
		12	Click event toggles the 'open' attribute.
		13
		14	* html/HTMLDetailsElement.cpp:
		15	(WebCore::HTMLDetailsElement::HTMLDetailsElement):
		16	(WebCore::HTMLDetailsElement::createRenderer):
		17	(WebCore::HTMLDetailsElement::createSummaryRenderer):
		18	(WebCore::HTMLDetailsElement::findMainSummary):
		19	(WebCore::HTMLDetailsElement::childrenChanged):
		20	(WebCore::HTMLDetailsElement::finishParsingChildren):
		21	(WebCore::HTMLDetailsElement::parseMappedAttribute):
		22	(WebCore::HTMLDetailsElement::childShouldCreateRenderer):
		23	(WebCore::HTMLDetailsElement::defaultEventHandler):
		24	* html/HTMLDetailsElement.h:
		25	(WebCore::HTMLDetailsElement::mainSummary):
		26
		27	The method summaryDefaultLabel was added to LocalizationStrategy class and to
		28	platform/LocalizedStrings. It is used to provide the default label to be used by a
		29	<details> tag that has no <summary> child.
		30
		31	* platform/LocalizationStrategy.h:
		32	* platform/LocalizedStrings.cpp:
		33	(WebCore::summaryDefaultLabel):
		34	* platform/LocalizedStrings.h:
		35	* platform/android/LocalizedStringsAndroid.cpp:
		36	(WebCore::summaryDefaultLabel):
		37	* platform/brew/LocalizedStringsBrew.cpp:
		38	(WebCore::summaryDefaultLabel):
		39	* platform/efl/LocalizedStringsEfl.cpp:
		40	(WebCore::summaryDefaultLabel):
		41	* platform/gtk/LocalizedStringsGtk.cpp:
		42	(WebCore::summaryDefaultLabel):
		43	* platform/haiku/LocalizedStringsHaiku.cpp:
		44	(WebCore::summaryDefaultLabel):
		45	* platform/wx/LocalizedStringsWx.cpp:
		46	(WebCore::summaryDefaultLabel):
		47
		48	The first <summary> element is positioned at the top of its <details> parent.
		49	The area occupied by this main <summary> element is the interactive area of the
		50	<details> element.
		51	If the <details> tag has no <summary> child an OwnedSummaryRenderer is created and
		52	added to the corresponding RenderDetails object.
		53
		54	* rendering/RenderDetails.cpp:
		55	(WebCore::OwnedSummaryRenderer::OwnedSummaryRenderer):
		56	(WebCore::OwnedSummaryRenderer::renderName):
		57	(WebCore::OwnedSummaryRenderer::styleDidChange):
		58	(WebCore::RenderDetails::RenderDetails):
		59	(WebCore::RenderDetails::createSummaryStyle):
		60	(WebCore::RenderDetails::styleDidChange):
		61	(WebCore::RenderDetails::layoutSpecialExcludedChild):
		62	(WebCore::RenderDetails::findMainSummary):
		63	(WebCore::RenderDetails::layout):
		64	(WebCore::RenderDetails::isOpen):
65	* rendering/RenderDetails.h:
66	(WebCore::RenderDetails::interactiveArea):
67	(WebCore::RenderDetails::avoidsFloats):
68
69	A marker is added to the main <summary> element to indicate the current value of the 'open'
70	attribute of the <details> element.
71
72	* rendering/RenderDetailsMarker.cpp:
73	(WebCore::RenderDetailsMarker::RenderDetailsMarker):
74	(WebCore::RenderDetailsMarker::lineHeight):
75	(WebCore::RenderDetailsMarker::baselinePosition):
76	(WebCore::RenderDetailsMarker::computePreferredLogicalWidths):
77	(WebCore::RenderDetailsMarker::layout):
78	(WebCore::RenderDetailsMarker::getRelativeMarkerRect):
79	(WebCore::RenderDetailsMarker::isOpen):
80	(WebCore::getCanonicalPath):
81	(WebCore::RenderDetailsMarker::getPath):
82	(WebCore::RenderDetailsMarker::paint):
83	(WebCore::ArrowPath::createPath):
84	* rendering/RenderDetailsMarker.h:
85
86	RenderSummary objects are created to be the renderers of <summary> elements.
87
88	* rendering/RenderObject.cpp:
89	(WebCore::RenderObject::createObject):
90
91	RenderSummary objects are responsible for positioning the marker when the <summary>
92	element is the first <summary> child of a <details> element.
93
94	* rendering/RenderSummary.cpp:
95	(WebCore::RenderSummary::RenderSummary):
96	(WebCore::RenderSummary::destroy):
97	(WebCore::RenderSummary::styleDidChange):
98	(WebCore::RenderSummary::layout):
99	(WebCore::RenderSummary::getParentOfFirstLineBox):
100	(WebCore::RenderSummary::firstNonMarkerChild):
101	(WebCore::RenderSummary::updateMarkerLocation):
102	* rendering/RenderSummary.h:
103	(WebCore::RenderSummary::markerIsVisible):
104
1	2011-02-08 Adam Barth <abarth@webkit.org>	105	2011-02-08 Adam Barth <abarth@webkit.org>
2		106
3	Reviewed by Eric Seidel.	107	Reviewed by Eric Seidel.

Lines 1-3 a/Source/WebKit/chromium/ChangeLog_sec1
- a/Source/WebKit/chromium/ChangeLog +13 lines
		1	2011-02-08 Luiz Agostini <luiz.agostini@openbossa.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	RenderDetails: layout the first <summary> element child of a <details> element
		6	https://bugs.webkit.org/show_bug.cgi?id=51071
		7
		8	The method summaryDefaultLabel was added to LocalizedStrings. It is used to provide
		9	the default label to be used by a <details> tag that has no <summary> child.
		10
		11	* src/LocalizedStrings.cpp:
		12	(WebCore::summaryDefaultLabel):
		13
1	2011-02-08 Adam Barth <abarth@webkit.org>	14	2011-02-08 Adam Barth <abarth@webkit.org>
2		15
3	Reviewed by Eric Seidel.	16	Reviewed by Eric Seidel.

Lines 1-3 a/Source/WebKit/mac/ChangeLog_sec1
- a/Source/WebKit/mac/ChangeLog +14 lines
		1	2011-02-08 Luiz Agostini <luiz.agostini@openbossa.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	RenderDetails: layout the first <summary> element child of a <details> element
		6	https://bugs.webkit.org/show_bug.cgi?id=51071
		7
		8	The method summaryDefaultLabel was added to LocalizationStrategy class. It is used to
		9	provide the default label to be used by a <details> tag that has no <summary> child.
		10
		11	* WebCoreSupport/WebPlatformStrategies.h:
		12	* WebCoreSupport/WebPlatformStrategies.mm:
		13	(WebPlatformStrategies::summaryDefaultLabel):
		14
1	2011-02-08 Adam Barth <abarth@webkit.org>	15	2011-02-08 Adam Barth <abarth@webkit.org>
2		16
3	Reviewed by Eric Seidel.	17	Reviewed by Eric Seidel.

Lines 1-3 a/Source/WebKit/qt/ChangeLog_sec1
- a/Source/WebKit/qt/ChangeLog +14 lines
		1	2011-02-08 Luiz Agostini <luiz.agostini@openbossa.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	RenderDetails: layout the first <summary> element child of a <details> element
		6	https://bugs.webkit.org/show_bug.cgi?id=51071
		7
		8	The method summaryDefaultLabel was added to LocalizationStrategy class. It is used to
		9	provide the default label to be used by a <details> tag that has no <summary> child.
		10
		11	* WebCoreSupport/WebPlatformStrategies.cpp:
		12	(WebPlatformStrategies::summaryDefaultLabel):
		13	* WebCoreSupport/WebPlatformStrategies.h:
		14
1	2011-02-08 Adam Barth <abarth@webkit.org>	15	2011-02-08 Adam Barth <abarth@webkit.org>
2		16
3	Reviewed by Eric Seidel.	17	Reviewed by Eric Seidel.

Lines 1-3 a/Source/WebKit/win/ChangeLog_sec1
- a/Source/WebKit/win/ChangeLog +14 lines
		1	2011-02-08 Luiz Agostini <luiz.agostini@openbossa.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	RenderDetails: layout the first <summary> element child of a <details> element
		6	https://bugs.webkit.org/show_bug.cgi?id=51071
		7
		8	The method summaryDefaultLabel was added to LocalizationStrategy class. It is used to
		9	provide the default label to be used by a <details> tag that has no <summary> child.
		10
		11	* WebCoreSupport/WebPlatformStrategies.cpp:
		12	(WebPlatformStrategies::summaryDefaultLabel):
		13	* WebCoreSupport/WebPlatformStrategies.h:
		14
1	2011-02-08 Adam Barth <abarth@webkit.org>	15	2011-02-08 Adam Barth <abarth@webkit.org>
2		16
3	Reviewed by Eric Seidel.	17	Reviewed by Eric Seidel.

Lines 1-3 a/Source/WebKit/wince/ChangeLog_sec1
- a/Source/WebKit/wince/ChangeLog +14 lines
		1	2011-02-08 Luiz Agostini <luiz.agostini@openbossa.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	RenderDetails: layout the first <summary> element child of a <details> element
		6	https://bugs.webkit.org/show_bug.cgi?id=51071
		7
		8	The method summaryDefaultLabel was added to LocalizationStrategy class. It is used to
		9	provide the default label to be used by a <details> tag that has no <summary> child.
		10
		11	* WebCoreSupport/PlatformStrategiesWinCE.cpp:
		12	(PlatformStrategiesWinCE::summaryDefaultLabel):
		13	* WebCoreSupport/PlatformStrategiesWinCE.h:
		14
1	2011-02-08 Adam Barth <abarth@webkit.org>	15	2011-02-08 Adam Barth <abarth@webkit.org>
2		16
3	Reviewed by Eric Seidel.	17	Reviewed by Eric Seidel.

Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
- a/Source/WebKit2/ChangeLog +14 lines
		1	2011-02-08 Luiz Agostini <luiz.agostini@openbossa.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	RenderDetails: layout the first <summary> element child of a <details> element
		6	https://bugs.webkit.org/show_bug.cgi?id=51071
		7
		8	The method summaryDefaultLabel was added to LocalizationStrategy class. It is used to
		9	provide the default label to be used by a <details> tag that has no <summary> child.
		10
		11	* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
		12	(WebKit::WebPlatformStrategies::summaryDefaultLabel):
		13	* WebProcess/WebCoreSupport/WebPlatformStrategies.h:
		14
1	2011-02-08 Adam Barth <abarth@webkit.org>	15	2011-02-08 Adam Barth <abarth@webkit.org>
2		16
3	Reviewed by Eric Seidel.	17	Reviewed by Eric Seidel.