<!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>[164003] branches/safari-537.75-branch</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/164003">164003</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 17:40:51 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/162679">r162679</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/162820">r162820</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchLayoutTestsChangeLog">branches/safari-537.75-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreChangeLog">branches/safari-537.75-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCorebindingsobjcDOMmm">branches/safari-537.75-branch/Source/WebCore/bindings/objc/DOM.mm</a></li>
<li><a href="#branchessafari53775branchSourceWebCoredomPseudoElementcpp">branches/safari-537.75-branch/Source/WebCore/dom/PseudoElement.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCorehtmlHTMLAreaElementcpp">branches/safari-537.75-branch/Source/WebCore/html/HTMLAreaElement.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCorehtmlHTMLImageElementcpp">branches/safari-537.75-branch/Source/WebCore/html/HTMLImageElement.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreloaderImageLoadercpp">branches/safari-537.75-branch/Source/WebCore/loader/ImageLoader.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCorepageDragControllercpp">branches/safari-537.75-branch/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreplatformgtkPasteboardGtkcpp">branches/safari-537.75-branch/Source/WebCore/platform/gtk/PasteboardGtk.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreplatformwinPasteboardWincpp">branches/safari-537.75-branch/Source/WebCore/platform/win/PasteboardWin.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCorerenderingHitTestResultcpp">branches/safari-537.75-branch/Source/WebCore/rendering/HitTestResult.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCorerenderingRenderLayerBackingcpp">branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebKitmacChangeLog">branches/safari-537.75-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebKitmacMiscWebNSPasteboardExtrasmm">branches/safari-537.75-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm</a></li>
<li><a href="#branchessafari53775branchSourceWebKit2ChangeLog">branches/safari-537.75-branch/Source/WebKit2/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53775branchLayoutTestsfastimagesanimatelistitemimageassertionexpectedtxt">branches/safari-537.75-branch/LayoutTests/fast/images/animate-list-item-image-assertion-expected.txt</a></li>
<li><a href="#branchessafari53775branchLayoutTestsfastimagesanimatelistitemimageassertionhtml">branches/safari-537.75-branch/LayoutTests/fast/images/animate-list-item-image-assertion.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/LayoutTests/ChangeLog (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r162679.
+
+ 2014-01-23 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Assertion failure in WebCore::PseudoElement::didRecalcStyle()
+ <https://bugs.webkit.org/show_bug.cgi?id=126761>
+ <rdar://problem/15793540>
+
+ Reviewed by Andy Estes.
+
+ * fast/images/animate-list-item-image-assertion-expected.txt: Added.
+ * fast/images/animate-list-item-image-assertion.html: Added.
+
</ins><span class="cx"> 2014-02-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r158739.
</span></span></pre></div>
<a id="branchessafari53775branchLayoutTestsfastimagesanimatelistitemimageassertionexpectedtxtfromrev162679trunkLayoutTestsfastimagesanimatelistitemimageassertionexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/LayoutTests/fast/images/animate-list-item-image-assertion-expected.txt (from rev 162679, trunk/LayoutTests/fast/images/animate-list-item-image-assertion-expected.txt) (0 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/fast/images/animate-list-item-image-assertion-expected.txt (rev 0)
+++ branches/safari-537.75-branch/LayoutTests/fast/images/animate-list-item-image-assertion-expected.txt 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASSED
</ins></span></pre></div>
<a id="branchessafari53775branchLayoutTestsfastimagesanimatelistitemimageassertionhtmlfromrev162679trunkLayoutTestsfastimagesanimatelistitemimageassertionhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/LayoutTests/fast/images/animate-list-item-image-assertion.html (from rev 162679, trunk/LayoutTests/fast/images/animate-list-item-image-assertion.html) (0 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/fast/images/animate-list-item-image-assertion.html (rev 0)
+++ branches/safari-537.75-branch/LayoutTests/fast/images/animate-list-item-image-assertion.html 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+
+<!-- Test passes if it doesn't assert in a debug build. -->
+
+<style>
+ #anchor:after {
+ content: ".";
+ display: block;
+ }
+ span {
+ float: left;
+ }
+ ul {
+ -webkit-animation-name: n;
+ -webkit-animation-duration: .1s;
+ }
+ @-webkit-keyframes n {
+ from { }
+ to { list-style-image: -webkit-repeating-radial-gradient(circle cover, rgb(23,136,16) , rgb(2%,5%,72%) , #373f74); }
+ }
+</style>
+
+<ul id="u">
+ <li>
+ <a id="anchor" href="#"><span id="text">PASSED</span></a>
+ </li>
+</ul>
+
+<script>
+ if (window.testRunner) {
+ window.testRunner.dumpAsText(true);
+ window.testRunner.waitUntilDone();
+
+ document.getElementById("u").addEventListener('webkitAnimationStart', function() {
+ window.testRunner.notifyDone();
+ }, false);
+ }
+</script>
</ins></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -1,3 +1,75 @@
</span><ins>+2014-02-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r162820.
+
+ 2014-01-26 David Kilzer <ddkilzer@apple.com>
+
+ Part 2: Assertion failure in WebCore::PseudoElement::didRecalcStyle()
+ <https://bugs.webkit.org/show_bug.cgi?id=126761>
+ <rdar://problem/15793540>
+
+ Reviewed by Simon Fraser.
+
+ * bindings/objc/DOM.mm:
+ (-[DOMElement image]):
+ (-[DOMElement _imageTIFFRepresentation]):
+ * platform/gtk/PasteboardGtk.cpp:
+ (WebCore::Pasteboard::writeImage):
+ * platform/win/PasteboardWin.cpp:
+ (WebCore::Pasteboard::writeImage):
+ (WebCore::getCachedImage):
+ * rendering/HitTestResult.cpp:
+ (WebCore::HitTestResult::image):
+ - More places where toRenderImage() should be used instead of
+ toImage().
+ - Fixed last two places where static_cast<WebCore::RenderImage*>
+ was being used instead of toRenderImage().
+
+2014-02-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r162679.
+
+ 2014-01-23 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Assertion failure in WebCore::PseudoElement::didRecalcStyle()
+ <https://bugs.webkit.org/show_bug.cgi?id=126761>
+ <rdar://problem/15793540>
+
+ Reviewed by Andy Estes.
+
+ Test: fast/images/animate-list-item-image-assertion.html
+
+ * dom/PseudoElement.cpp:
+ (WebCore::PseudoElement::didRecalcStyle):
+ Check isRenderImage() rather than isImage() before casting to
+ RenderImage.
+
+ * editing/ios/EditorIOS.mm:
+ (WebCore::getImage):
+ Ditto.
+
+ * editing/mac/EditorMac.mm:
+ (WebCore::getImage):
+ Ditto.
+
+ * html/HTMLImageElement.cpp:
+ (WebCore::HTMLImageElement::parseAttribute):
+ (WebCore::HTMLImageElement::didAttachRenderers):
+ Ditto.
+
+ * loader/ImageLoader.cpp:
+ (WebCore::ImageLoader::renderImageResource):
+ Ditto.
+
+ * page/DragController.cpp:
+ (WebCore::getCachedImage):
+ Ditto.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::isDirectlyCompositedImage):
+ (WebCore::RenderLayerBacking::updateImageContents):
+ Ditto.
+
</ins><span class="cx"> 2014-02-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r161925.
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorebindingsobjcDOMmm"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/bindings/objc/DOM.mm (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/bindings/objc/DOM.mm 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebCore/bindings/objc/DOM.mm 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Could we move this function to WebCore::Node and autogenerate?
</span><span class="cx"> WebCore::RenderObject* renderer = core(self)->renderer();
</span><del>- if (!renderer || !renderer->isImage())
</del><ins>+ if (!renderer || !renderer->isRenderImage())
</ins><span class="cx"> return nil;
</span><span class="cx"> WebCore::CachedImage* cachedImage = static_cast<WebCore::RenderImage*>(renderer)->cachedImage();
</span><span class="cx"> if (!cachedImage || cachedImage->errorOccurred())
</span><span class="lines">@@ -384,9 +384,9 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Could we move this function to WebCore::Element and autogenerate?
</span><span class="cx"> WebCore::RenderObject* renderer = core(self)->renderer();
</span><del>- if (!renderer || !renderer->isImage())
</del><ins>+ if (!renderer || !renderer->isRenderImage())
</ins><span class="cx"> return nil;
</span><del>- WebCore::CachedImage* cachedImage = static_cast<WebCore::RenderImage*>(renderer)->cachedImage();
</del><ins>+ WebCore::CachedImage* cachedImage = toRenderImage(renderer)->cachedImage();
</ins><span class="cx"> if (!cachedImage || cachedImage->errorOccurred())
</span><span class="cx"> return nil;
</span><span class="cx"> return (NSData *)cachedImage->imageForRenderer(renderer)->getTIFFRepresentation();
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoredomPseudoElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/dom/PseudoElement.cpp (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/dom/PseudoElement.cpp 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebCore/dom/PseudoElement.cpp 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> RenderObject* renderer = this->renderer();
</span><span class="cx"> for (RenderObject* child = renderer->nextInPreOrder(renderer); child; child = child->nextInPreOrder(renderer)) {
</span><span class="cx"> // We only manage the style for the generated content which must be images or text.
</span><del>- if (!child->isText() && !child->isImage())
</del><ins>+ if (!child->isText() && !child->isRenderImage())
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // The style for the RenderTextFragment for first letter is managed by an enclosing block, not by us.
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorehtmlHTMLAreaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/html/HTMLAreaElement.cpp (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/html/HTMLAreaElement.cpp 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebCore/html/HTMLAreaElement.cpp 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RenderObject* renderer = imageElement->renderer();
</span><del>- if (!renderer || !renderer->isImage())
</del><ins>+ if (!renderer || !renderer->isRenderImage())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> toRenderImage(renderer)->areaElementFocusChanged(this);
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/html/HTMLImageElement.cpp (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/html/HTMLImageElement.cpp 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebCore/html/HTMLImageElement.cpp 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> void HTMLImageElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><span class="cx"> if (name == altAttr) {
</span><del>- if (renderer() && renderer()->isImage())
</del><ins>+ if (renderer() && renderer()->isRenderImage())
</ins><span class="cx"> toRenderImage(renderer())->updateAltText();
</span><span class="cx"> } else if (name == srcAttr)
</span><span class="cx"> m_imageLoader.updateFromElementIgnoringPreviousError();
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> {
</span><span class="cx"> HTMLElement::attach(context);
</span><span class="cx">
</span><del>- if (renderer() && renderer()->isImage() && !m_imageLoader.hasPendingBeforeLoadEvent()) {
</del><ins>+ if (renderer() && renderer()->isRenderImage() && !m_imageLoader.hasPendingBeforeLoadEvent()) {
</ins><span class="cx"> RenderImage* renderImage = toRenderImage(renderer());
</span><span class="cx"> RenderImageResource* renderImageResource = renderImage->imageResource();
</span><span class="cx"> if (renderImageResource->hasImage())
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/loader/ImageLoader.cpp (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/loader/ImageLoader.cpp 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebCore/loader/ImageLoader.cpp 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx">
</span><span class="cx"> // We don't return style generated image because it doesn't belong to the ImageLoader.
</span><span class="cx"> // See <https://bugs.webkit.org/show_bug.cgi?id=42840>
</span><del>- if (renderer->isImage() && !static_cast<RenderImage*>(renderer)->isGeneratedContent())
</del><ins>+ if (renderer->isRenderImage() && !static_cast<RenderImage*>(renderer)->isGeneratedContent())
</ins><span class="cx"> return toRenderImage(renderer)->imageResource();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SVG)
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/page/DragController.cpp (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/page/DragController.cpp 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebCore/page/DragController.cpp 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -683,7 +683,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(element);
</span><span class="cx"> RenderObject* renderer = element->renderer();
</span><del>- if (!renderer || !renderer->isImage())
</del><ins>+ if (!renderer || !renderer->isRenderImage())
</ins><span class="cx"> return 0;
</span><span class="cx"> RenderImage* image = toRenderImage(renderer);
</span><span class="cx"> return image->cachedImage();
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreplatformgtkPasteboardGtkcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/platform/gtk/PasteboardGtk.cpp (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(node);
</span><span class="cx">
</span><del>- if (!(node->renderer() && node->renderer()->isImage()))
</del><ins>+ if (!(node->renderer() && node->renderer()->isRenderImage()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RenderImage* renderer = toRenderImage(node->renderer());
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreplatformwinPasteboardWincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/platform/win/PasteboardWin.cpp (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/platform/win/PasteboardWin.cpp 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebCore/platform/win/PasteboardWin.cpp 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -734,7 +734,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(node);
</span><span class="cx">
</span><del>- if (!(node->renderer() && node->renderer()->isImage()))
</del><ins>+ if (!(node->renderer() && node->renderer()->isRenderImage()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RenderImage* renderer = toRenderImage(node->renderer());
</span><span class="lines">@@ -885,7 +885,7 @@
</span><span class="cx"> // Attempt to pull CachedImage from element
</span><span class="cx"> ASSERT(element);
</span><span class="cx"> RenderObject* renderer = element->renderer();
</span><del>- if (!renderer || !renderer->isImage())
</del><ins>+ if (!renderer || !renderer->isRenderImage())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> RenderImage* image = toRenderImage(renderer);
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorerenderingHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/rendering/HitTestResult.cpp (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/rendering/HitTestResult.cpp 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebCore/rendering/HitTestResult.cpp 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -288,8 +288,8 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> RenderObject* renderer = m_innerNonSharedNode->renderer();
</span><del>- if (renderer && renderer->isImage()) {
- RenderImage* image = static_cast<WebCore::RenderImage*>(renderer);
</del><ins>+ if (renderer && renderer->isRenderImage()) {
+ RenderImage* image = toRenderImage(renderer);
</ins><span class="cx"> if (image->cachedImage() && !image->cachedImage()->errorOccurred())
</span><span class="cx"> return image->cachedImage()->imageForRenderer(image);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -1675,7 +1675,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderObject* renderObject = renderer();
</span><span class="cx">
</span><del>- if (!renderObject->isImage() || m_owningLayer->hasBoxDecorationsOrBackground() || renderObject->hasClip())
</del><ins>+ if (!renderObject->isRenderImage() || m_owningLayer->hasBoxDecorationsOrBackground() || renderObject->hasClip())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> RenderImage* imageRenderer = toRenderImage(renderObject);
</span><span class="lines">@@ -1719,7 +1719,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::updateImageContents()
</span><span class="cx"> {
</span><del>- ASSERT(renderer()->isImage());
</del><ins>+ ASSERT(renderer()->isRenderImage());
</ins><span class="cx"> RenderImage* imageRenderer = toRenderImage(renderer());
</span><span class="cx">
</span><span class="cx"> CachedImage* cachedImage = imageRenderer->cachedImage();
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/mac/ChangeLog (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/mac/ChangeLog 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebKit/mac/ChangeLog 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-02-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r162679.
+
+ 2014-01-23 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Assertion failure in WebCore::PseudoElement::didRecalcStyle()
+ <https://bugs.webkit.org/show_bug.cgi?id=126761>
+ <rdar://problem/15793540>
+
+ Some areas of code were erroneously checking the value of
+ RenderObject::isImage() rather than RenderObject::isRenderImage()
+ before casting the object to RenderImage.
+
+ This could lead to an assertion failure for RenderListMarkers, which
+ may return true for isImage(), but are not RenderImages.
+
+ Reviewed by Andy Estes.
+
+ * Misc/WebNSPasteboardExtras.mm:
+ (-[NSPasteboard _web_declareAndWriteDragImageForElement:URL:title:archive:source:]):
+ Check isRenderImage() rather than isImage() before casting to
+ RenderImage.
+
</ins><span class="cx"> 2013-12-23 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge 161003: <rdar://problem/15719584>
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebKitmacMiscWebNSPasteboardExtrasmm"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx">
</span><span class="cx"> NSString *extension = @"";
</span><span class="cx"> if (RenderObject* renderer = core(element)->renderer()) {
</span><del>- if (renderer->isImage()) {
</del><ins>+ if (renderer->isRenderImage()) {
</ins><span class="cx"> if (CachedImage* image = toRenderImage(renderer)->cachedImage()) {
</span><span class="cx"> extension = image->image()->filenameExtension();
</span><span class="cx"> if (![extension length])
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit2/ChangeLog (164002 => 164003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit2/ChangeLog 2014-02-13 01:32:02 UTC (rev 164002)
+++ branches/safari-537.75-branch/Source/WebKit2/ChangeLog 2014-02-13 01:40:51 UTC (rev 164003)
</span><span class="lines">@@ -1,7 +1,24 @@
</span><span class="cx"> 2014-02-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><del>- Merge r162904
</del><ins>+ Merge r162679.
</ins><span class="cx">
</span><ins>+ 2014-01-23 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Assertion failure in WebCore::PseudoElement::didRecalcStyle()
+ <https://bugs.webkit.org/show_bug.cgi?id=126761>
+ <rdar://problem/15793540>
+
+ Reviewed by Andy Estes.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPositionInformation):
+ Check isRenderImage() rather than isImage() before casting to
+ RenderImage.
+
+2014-02-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r162904.
+
</ins><span class="cx"> 2014-01-27 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebKit2] Add SPI to disable the WebCore memory cache
</span></span></pre>
</div>
</div>
</body>
</html>