<!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>[171374] branches/safari-537.78-branch/Source</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/171374">171374</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-07-22 17:27:53 -0700 (Tue, 22 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/152704">r152704</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53778branchSourceWebCoreChangeLog">branches/safari-537.78-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53778branchSourceWebCorebindingsjsJSHTMLDocumentCustomcpp">branches/safari-537.78-branch/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp</a></li>
<li><a href="#branchessafari53778branchSourceWebCorecssStyleResolvercpp">branches/safari-537.78-branch/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#branchessafari53778branchSourceWebCoredomDocumentcpp">branches/safari-537.78-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari53778branchSourceWebCorehtmlHTMLIFrameElementh">branches/safari-537.78-branch/Source/WebCore/html/HTMLIFrameElement.h</a></li>
<li><a href="#branchessafari53778branchSourceWebCorerenderingRenderEmbeddedObjectcpp">branches/safari-537.78-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp</a></li>
<li><a href="#branchessafari53778branchSourceWebCorerenderingRenderIFramecpp">branches/safari-537.78-branch/Source/WebCore/rendering/RenderIFrame.cpp</a></li>
<li><a href="#branchessafari53778branchSourceWebKitwinChangeLog">branches/safari-537.78-branch/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#branchessafari53778branchSourceWebKitwinDOMHTMLClassescpp">branches/safari-537.78-branch/Source/WebKit/win/DOMHTMLClasses.cpp</a></li>
<li><a href="#branchessafari53778branchSourceWebKit2ChangeLog">branches/safari-537.78-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari53778branchSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleNodeHandlecpp">branches/safari-537.78-branch/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53778branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebCore/ChangeLog (171373 => 171374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebCore/ChangeLog 2014-07-23 00:14:06 UTC (rev 171373)
+++ branches/safari-537.78-branch/Source/WebCore/ChangeLog 2014-07-23 00:27:53 UTC (rev 171374)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-07-22 Dana Burkart <dburkart@apple.com>
+
+ Merge r152704.
+
+ 2013-07-15 Kangil Han <kangil.han@samsung.com>
+
+ Introduce toHTMLIFrameElement
+ https://bugs.webkit.org/show_bug.cgi?id=118672
+
+ Reviewed by Ryosuke Niwa.
+
+ To avoid direct use of static_cast, this patch introduces toHTMLIFrameElement for code cleanup.
+
+ * bindings/js/JSHTMLDocumentCustom.cpp:
+ (WebCore::JSHTMLDocument::nameGetter):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::adjustRenderStyle):
+ * dom/Document.cpp:
+ (WebCore::Document::seamlessParentIFrame):
+ * html/HTMLIFrameElement.h:
+ (WebCore::toHTMLIFrameElement):
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::viewCleared):
+ * rendering/RenderIFrame.cpp:
+ (WebCore::RenderIFrame::isSeamless):
+ (WebCore::RenderIFrame::flattenFrame):
+
</ins><span class="cx"> 2014-07-19 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r170946
</span></span></pre></div>
<a id="branchessafari53778branchSourceWebCorebindingsjsJSHTMLDocumentCustomcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp (171373 => 171374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp 2014-07-23 00:14:06 UTC (rev 171373)
+++ branches/safari-537.78-branch/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp 2014-07-23 00:27:53 UTC (rev 171374)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> Node* node = document->documentNamedItemMap().getElementByDocumentNamedItem(atomicPropertyName, document);
</span><span class="cx"> Frame* frame;
</span><del>- if (node->hasTagName(iframeTag) && (frame = static_cast<HTMLIFrameElement*>(node)->contentFrame()))
</del><ins>+ if (node->hasTagName(iframeTag) && (frame = toHTMLIFrameElement(node)->contentFrame()))
</ins><span class="cx"> return toJS(exec, frame);
</span><span class="cx">
</span><span class="cx"> return toJS(exec, thisObj->globalObject(), node);
</span></span></pre></div>
<a id="branchessafari53778branchSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebCore/css/StyleResolver.cpp (171373 => 171374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebCore/css/StyleResolver.cpp 2014-07-23 00:14:06 UTC (rev 171373)
+++ branches/safari-537.78-branch/Source/WebCore/css/StyleResolver.cpp 2014-07-23 00:27:53 UTC (rev 171374)
</span><span class="lines">@@ -1508,7 +1508,7 @@
</span><span class="cx"> style->setTransformStyle3D(TransformStyle3DFlat);
</span><span class="cx">
</span><span class="cx"> // Seamless iframes behave like blocks. Map their display to inline-block when marked inline.
</span><del>- if (e && e->hasTagName(iframeTag) && style->display() == INLINE && static_cast<HTMLIFrameElement*>(e)->shouldDisplaySeamlessly())
</del><ins>+ if (e && e->hasTagName(iframeTag) && style->display() == INLINE && toHTMLIFrameElement(e)->shouldDisplaySeamlessly())
</ins><span class="cx"> style->setDisplay(INLINE_BLOCK);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SVG)
</span></span></pre></div>
<a id="branchessafari53778branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebCore/dom/Document.cpp (171373 => 171374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebCore/dom/Document.cpp 2014-07-23 00:14:06 UTC (rev 171373)
+++ branches/safari-537.78-branch/Source/WebCore/dom/Document.cpp 2014-07-23 00:27:53 UTC (rev 171374)
</span><span class="lines">@@ -5651,9 +5651,7 @@
</span><span class="cx"> if (!shouldDisplaySeamlesslyWithParent())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- HTMLFrameOwnerElement* ownerElement = this->ownerElement();
- ASSERT(ownerElement->hasTagName(iframeTag));
- return static_cast<HTMLIFrameElement*>(ownerElement);
</del><ins>+ return toHTMLIFrameElement(ownerElement());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Document::shouldDisplaySeamlesslyWithParent() const
</span></span></pre></div>
<a id="branchessafari53778branchSourceWebCorehtmlHTMLIFrameElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebCore/html/HTMLIFrameElement.h (171373 => 171374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebCore/html/HTMLIFrameElement.h 2014-07-23 00:14:06 UTC (rev 171373)
+++ branches/safari-537.78-branch/Source/WebCore/html/HTMLIFrameElement.h 2014-07-23 00:27:53 UTC (rev 171374)
</span><span class="lines">@@ -52,6 +52,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+inline HTMLIFrameElement* toHTMLIFrameElement(Node* node)
+{
+ ASSERT_WITH_SECURITY_IMPLICATION(!node || node->hasTagName(HTMLNames::iframeTag));
+ return static_cast<HTMLIFrameElement*>(node);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // HTMLIFrameElement_h
</span></span></pre></div>
<a id="branchessafari53778branchSourceWebCorerenderingRenderEmbeddedObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp (171373 => 171374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2014-07-23 00:14:06 UTC (rev 171373)
+++ branches/safari-537.78-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2014-07-23 00:27:53 UTC (rev 171374)
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> int marginWidth = -1;
</span><span class="cx"> int marginHeight = -1;
</span><span class="cx"> if (node()->hasTagName(iframeTag)) {
</span><del>- HTMLIFrameElement* frame = static_cast<HTMLIFrameElement*>(node());
</del><ins>+ HTMLIFrameElement* frame = toHTMLIFrameElement(node());
</ins><span class="cx"> marginWidth = frame->marginWidth();
</span><span class="cx"> marginHeight = frame->marginHeight();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari53778branchSourceWebCorerenderingRenderIFramecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebCore/rendering/RenderIFrame.cpp (171373 => 171374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebCore/rendering/RenderIFrame.cpp 2014-07-23 00:14:06 UTC (rev 171373)
+++ branches/safari-537.78-branch/Source/WebCore/rendering/RenderIFrame.cpp 2014-07-23 00:27:53 UTC (rev 171374)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderIFrame::isSeamless() const
</span><span class="cx"> {
</span><del>- return node() && node()->hasTagName(iframeTag) && static_cast<HTMLIFrameElement*>(node())->shouldDisplaySeamlessly();
</del><ins>+ return node() && node()->hasTagName(iframeTag) && toHTMLIFrameElement(node())->shouldDisplaySeamlessly();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderIFrame::requiresLayer() const
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> if (!node() || !node()->hasTagName(iframeTag))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- HTMLIFrameElement* element = static_cast<HTMLIFrameElement*>(node());
</del><ins>+ HTMLIFrameElement* element = toHTMLIFrameElement(node());
</ins><span class="cx"> Frame* frame = element->document()->frame();
</span><span class="cx">
</span><span class="cx"> if (isSeamless())
</span></span></pre></div>
<a id="branchessafari53778branchSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebKit/win/ChangeLog (171373 => 171374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebKit/win/ChangeLog 2014-07-23 00:14:06 UTC (rev 171373)
+++ branches/safari-537.78-branch/Source/WebKit/win/ChangeLog 2014-07-23 00:27:53 UTC (rev 171374)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-07-22 Dana Burkart <dburkart@apple.com>
+
+ Merge r152704.
+
+ 2013-07-15 Kangil Han <kangil.han@samsung.com>
+
+ Introduce toHTMLIFrameElement
+ https://bugs.webkit.org/show_bug.cgi?id=118672
+
+ Reviewed by Ryosuke Niwa.
+
+ To avoid direct use of static_cast, this patch introduces toHTMLIFrameElement for code cleanup.
+
+ * DOMHTMLClasses.cpp:
+ (DOMHTMLIFrameElement::contentFrame):
+
</ins><span class="cx"> 2014-03-18 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Build correction after last merge.
</span></span></pre></div>
<a id="branchessafari53778branchSourceWebKitwinDOMHTMLClassescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebKit/win/DOMHTMLClasses.cpp (171373 => 171374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebKit/win/DOMHTMLClasses.cpp 2014-07-23 00:14:06 UTC (rev 171373)
+++ branches/safari-537.78-branch/Source/WebKit/win/DOMHTMLClasses.cpp 2014-07-23 00:27:53 UTC (rev 171374)
</span><span class="lines">@@ -1610,8 +1610,8 @@
</span><span class="cx"> if (!result)
</span><span class="cx"> return E_POINTER;
</span><span class="cx"> *result = 0;
</span><del>- ASSERT(m_element && m_element->hasTagName(iframeTag));
- HTMLIFrameElement* iFrameElement = static_cast<HTMLIFrameElement*>(m_element);
</del><ins>+ ASSERT(m_element);
+ HTMLIFrameElement* iFrameElement = toHTMLIFrameElement(m_element);
</ins><span class="cx"> COMPtr<IWebFrame> webFrame = kit(iFrameElement->contentFrame());
</span><span class="cx"> if (!webFrame)
</span><span class="cx"> return E_FAIL;
</span></span></pre></div>
<a id="branchessafari53778branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebKit2/ChangeLog (171373 => 171374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebKit2/ChangeLog 2014-07-23 00:14:06 UTC (rev 171373)
+++ branches/safari-537.78-branch/Source/WebKit2/ChangeLog 2014-07-23 00:27:53 UTC (rev 171374)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r152704.
+
+ 2013-07-15 Kangil Han <kangil.han@samsung.com>
+
+ Introduce toHTMLIFrameElement
+ https://bugs.webkit.org/show_bug.cgi?id=118672
+
+ Reviewed by Ryosuke Niwa.
+
+ To avoid direct use of static_cast, this patch introduces toHTMLIFrameElement for code cleanup.
+
+ * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
+ (WebKit::InjectedBundleNodeHandle::htmlIFrameElementContentFrame):
+
+2014-07-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r169448
</span><span class="cx">
</span><span class="cx"> 2014-05-29 Alexey Proskuryakov <ap@apple.com>
</span></span></pre></div>
<a id="branchessafari53778branchSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleNodeHandlecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.78-branch/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp (171373 => 171374)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.78-branch/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp 2014-07-23 00:14:06 UTC (rev 171373)
+++ branches/safari-537.78-branch/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp 2014-07-23 00:27:53 UTC (rev 171374)
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> if (!m_node->hasTagName(iframeTag))
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- Frame* frame = static_cast<HTMLIFrameElement*>(m_node.get())->contentFrame();
</del><ins>+ Frame* frame = toHTMLIFrameElement(m_node.get())->contentFrame();
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return 0;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>