<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>[171834] trunk/Source/WebCore</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }

#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/171834">171834</a></dd>

<dt>Author</dt> <dd>benjamin@webkit.org</dd>

<dt>Date</dt> <dd>2014-07-30 20:17:39 -0700 (Wed, 30 Jul 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Cleanup DetailsMarkerControl

https://bugs.webkit.org/show_bug.cgi?id=135429

Reviewed by Andreas Kling.

Remove the override of shadowPseudoId(). This is a simple type of shadowId,

it should use the generic pseudo() path.

Move DetailsMarkerControl::create() out-of-line. One could justify inlining the constructor,

inlining the ::create() function has little value.

* html/shadow/DetailsMarkerControl.cpp:

(WebCore::DetailsMarkerControl::create):

(WebCore::DetailsMarkerControl::DetailsMarkerControl):

(WebCore::DetailsMarkerControl::rendererIsNeeded):

(WebCore::DetailsMarkerControl::shadowPseudoId): Deleted.

(WebCore::DetailsMarkerControl::summaryElement): Deleted.

* html/shadow/DetailsMarkerControl.h:

(WebCore::DetailsMarkerControl::create): Deleted.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCorehtmlshadowDetailsMarkerControlcpp">trunk/Source/WebCore/html/shadow/DetailsMarkerControl.cpp</a></li>

<li><a href="#trunkSourceWebCorehtmlshadowDetailsMarkerControlh">trunk/Source/WebCore/html/shadow/DetailsMarkerControl.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171833 => 171834)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-07-31 03:16:52 UTC (rev 171833)

+++ trunk/Source/WebCore/ChangeLog        2014-07-31 03:17:39 UTC (rev 171834)

</span><span class="lines">@@ -1,3 +1,25 @@

</span><ins>+2014-07-30  Benjamin Poulain  &lt;benjamin@webkit.org&gt;

+

+        Cleanup DetailsMarkerControl

+        https://bugs.webkit.org/show_bug.cgi?id=135429

+

+        Reviewed by Andreas Kling.

+

+        Remove the override of shadowPseudoId(). This is a simple type of shadowId,

+        it should use the generic pseudo() path.

+

+        Move DetailsMarkerControl::create() out-of-line. One could justify inlining the constructor,

+        inlining the ::create() function has little value.

+

+        * html/shadow/DetailsMarkerControl.cpp:

+        (WebCore::DetailsMarkerControl::create):

+        (WebCore::DetailsMarkerControl::DetailsMarkerControl):

+        (WebCore::DetailsMarkerControl::rendererIsNeeded):

+        (WebCore::DetailsMarkerControl::shadowPseudoId): Deleted.

+        (WebCore::DetailsMarkerControl::summaryElement): Deleted.

+        * html/shadow/DetailsMarkerControl.h:

+        (WebCore::DetailsMarkerControl::create): Deleted.

+

</ins><span class="cx"> 2014-07-30  Benjamin Poulain  &lt;bpoulain@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Remove UploadButtonElement::shadowPseudoId()

</span></span></pre></div>

<a id="trunkSourceWebCorehtmlshadowDetailsMarkerControlcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/DetailsMarkerControl.cpp (171833 => 171834)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/html/shadow/DetailsMarkerControl.cpp        2014-07-31 03:16:52 UTC (rev 171833)

+++ trunk/Source/WebCore/html/shadow/DetailsMarkerControl.cpp        2014-07-31 03:17:39 UTC (rev 171834)

</span><span class="lines">@@ -1,5 +1,6 @@

</span><span class="cx"> /*

</span><span class="cx">  * Copyright (C) 2011 Google Inc. All rights reserved.

</ins><span class="cx">  *

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions are

</span><span class="lines">@@ -38,11 +39,15 @@

</span><span class="cx"> 

</span><span class="cx"> namespace WebCore {

</span><span class="cx"> 

</span><del>-using namespace HTMLNames;

</del><ins>+PassRefPtr&lt;DetailsMarkerControl&gt; DetailsMarkerControl::create(Document&amp; document)

+{

+    return adoptRef(new DetailsMarkerControl(document));

+}

</ins><span class="cx"> 

</span><span class="cx"> DetailsMarkerControl::DetailsMarkerControl(Document&amp; document)

</span><del>-    : HTMLDivElement(divTag, document)

</del><ins>+    : HTMLDivElement(HTMLNames::divTag, document)

</ins><span class="cx"> {

</span><ins>+    setPseudo(AtomicString(&quot;-webkit-details-marker&quot;, AtomicString::ConstructFromLiteral));

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> RenderPtr&lt;RenderElement&gt; DetailsMarkerControl::createElementRenderer(PassRef&lt;RenderStyle&gt; style)

</span><span class="lines">@@ -52,20 +57,9 @@

</span><span class="cx"> 

</span><span class="cx"> bool DetailsMarkerControl::rendererIsNeeded(const RenderStyle&amp; style)

</span><span class="cx"> {

</span><del>-    return summaryElement()-&gt;isMainSummary() &amp;&amp; HTMLDivElement::rendererIsNeeded(style);

</del><ins>+    return toHTMLSummaryElement(shadowHost())-&gt;isMainSummary() &amp;&amp; HTMLDivElement::rendererIsNeeded(style);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><del>-const AtomicString&amp; DetailsMarkerControl::shadowPseudoId() const

-{

-    DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, pseudId, (&quot;-webkit-details-marker&quot;, AtomicString::ConstructFromLiteral));

-    return pseudId;

</del><span class="cx"> }

</span><span class="cx"> 

</span><del>-HTMLSummaryElement* DetailsMarkerControl::summaryElement()

-{

-    return toHTMLSummaryElement(shadowHost());

-}

-

-}

-

</del><span class="cx"> #endif

</span></span></pre></div>

<a id="trunkSourceWebCorehtmlshadowDetailsMarkerControlh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/DetailsMarkerControl.h (171833 => 171834)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/html/shadow/DetailsMarkerControl.h        2014-07-31 03:16:52 UTC (rev 171833)

+++ trunk/Source/WebCore/html/shadow/DetailsMarkerControl.h        2014-07-31 03:17:39 UTC (rev 171834)

</span><span class="lines">@@ -1,5 +1,6 @@

</span><span class="cx"> /*

</ins><span class="cx">  *

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions are

</span><span class="lines">@@ -32,12 +33,9 @@

</span><span class="cx"> #define DetailsMarkerControl_h

</span><span class="cx"> 

</span><span class="cx"> #include &quot;HTMLDivElement.h&quot;

</span><del>-#include &lt;wtf/Forward.h&gt;

</del><span class="cx"> 

</span><span class="cx"> namespace WebCore {

</span><span class="cx"> 

</span><del>-class HTMLSummaryElement;

-

</del><span class="cx"> class DetailsMarkerControl final : public HTMLDivElement {

</span><span class="cx"> public:

</span><span class="cx">     static PassRefPtr&lt;DetailsMarkerControl&gt; create(Document&amp;);

</span><span class="lines">@@ -47,16 +45,8 @@

</span><span class="cx"> 

</span><span class="cx">     virtual RenderPtr&lt;RenderElement&gt; createElementRenderer(PassRef&lt;RenderStyle&gt;) override;

</span><span class="cx">     virtual bool rendererIsNeeded(const RenderStyle&amp;) override;

</span><del>-    virtual const AtomicString&amp; shadowPseudoId() const override;

-

-    HTMLSummaryElement* summaryElement();

</del><span class="cx"> };

</span><span class="cx"> 

</span><del>-inline PassRefPtr&lt;DetailsMarkerControl&gt; DetailsMarkerControl::create(Document&amp; document)

-{

-    return adoptRef(new DetailsMarkerControl(document));

</del><span class="cx"> }

</span><span class="cx"> 

</span><del>-}

-

</del><span class="cx"> #endif

</span></span></pre>

</div>

</div>

</body>

</html>