<!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>[168105] branches/safari-537.76-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/168105">168105</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-05-01 09:38:59 -0700 (Thu, 01 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/167295">r167295</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53776branchLayoutTestsChangeLog">branches/safari-537.76-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceWebCoreChangeLog">branches/safari-537.76-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceWebCoreplatformgraphicsfiltersFilterh">branches/safari-537.76-branch/Source/WebCore/platform/graphics/filters/Filter.h</a></li>
<li><a href="#branchessafari53776branchSourceWebCorerenderingFilterEffectRenderercpp">branches/safari-537.76-branch/Source/WebCore/rendering/FilterEffectRenderer.cpp</a></li>
<li><a href="#branchessafari53776branchSourceWebCoresvggraphicsfiltersSVGFEImagecpp">branches/safari-537.76-branch/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp</a></li>
<li><a href="#branchessafari53776branchSourceWebCoresvggraphicsfiltersSVGFiltercpp">branches/safari-537.76-branch/Source/WebCore/svg/graphics/filters/SVGFilter.cpp</a></li>
<li><a href="#branchessafari53776branchSourceWebCoresvggraphicsfiltersSVGFilterh">branches/safari-537.76-branch/Source/WebCore/svg/graphics/filters/SVGFilter.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53776branchLayoutTestssvgfiltersfeImagefilterassertionexpectedtxt">branches/safari-537.76-branch/LayoutTests/svg/filters/feImage-filter-assertion-expected.txt</a></li>
<li><a href="#branchessafari53776branchLayoutTestssvgfiltersfeImagefilterassertionhtml">branches/safari-537.76-branch/LayoutTests/svg/filters/feImage-filter-assertion.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53776branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/LayoutTests/ChangeLog (168104 => 168105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-05-01 16:25:09 UTC (rev 168104)
+++ branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-05-01 16:38:59 UTC (rev 168105)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-05-01 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r167295.
+
+ 2014-04-14 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Assertion failure under FEImage::determineAbsolutePaintRect()
+
+ <https://bugs.webkit.org/show_bug.cgi?id=131660>
+ <rdar://problem/15669294>
+
+ Reviewed by Geoffrey Garen.
+
+ * svg/filters/feImage-filter-assertion-expected.txt: Added.
+ * svg/filters/feImage-filter-assertion.html: Added.
+
+2014-05-01 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r166736.
</span><span class="cx">
</span><span class="cx"> 2014-04-03 David Hyatt <hyatt@apple.com>
</span></span></pre></div>
<a id="branchessafari53776branchLayoutTestssvgfiltersfeImagefilterassertionexpectedtxtfromrev167295trunkLayoutTestssvgfiltersfeImagefilterassertionexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.76-branch/LayoutTests/svg/filters/feImage-filter-assertion-expected.txt (from rev 167295, trunk/LayoutTests/svg/filters/feImage-filter-assertion-expected.txt) (0 => 168105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/svg/filters/feImage-filter-assertion-expected.txt (rev 0)
+++ branches/safari-537.76-branch/LayoutTests/svg/filters/feImage-filter-assertion-expected.txt 2014-05-01 16:38:59 UTC (rev 168105)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+WebKit bug #131660: Assertion failure in FEImage::determineAbsolutePaintRect(). This test passes if it does not assert in a debug build.
+
+
</ins></span></pre></div>
<a id="branchessafari53776branchLayoutTestssvgfiltersfeImagefilterassertionhtmlfromrev167295trunkLayoutTestssvgfiltersfeImagefilterassertionhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.76-branch/LayoutTests/svg/filters/feImage-filter-assertion.html (from rev 167295, trunk/LayoutTests/svg/filters/feImage-filter-assertion.html) (0 => 168105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/svg/filters/feImage-filter-assertion.html (rev 0)
+++ branches/safari-537.76-branch/LayoutTests/svg/filters/feImage-filter-assertion.html 2014-05-01 16:38:59 UTC (rev 168105)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<style>
+ #filtered {
+ width: 160px;
+ height: 90px;
+ -webkit-filter: url(#imagereplace);
+ filter: url(#imagereplace);
+ }
+</style>
+
+<div id="filtered"></div>
+
+<p>
+ WebKit bug #<a href="https://bugs.webkit.org/show_bug.cgi?id=131660">131660</a>: Assertion failure in FEImage::determineAbsolutePaintRect(). This test passes if it does not assert in a debug build.
+</p>
+
+<svg xmlns="http://www.w3.org/3000/svg" width="0" height="0" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <filter id="imagereplace">
+ <feimage xlink:href="test.png"/>
+ </filter>
+</svg>
+
+<script>
+ if (window.testRunner)
+ window.testRunner.dumpAsText();
+</script>
</ins></span></pre></div>
<a id="branchessafari53776branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/ChangeLog (168104 => 168105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-05-01 16:25:09 UTC (rev 168104)
+++ branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-05-01 16:38:59 UTC (rev 168105)
</span><span class="lines">@@ -1,5 +1,52 @@
</span><span class="cx"> 2014-05-01 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r167295.
+
+ 2014-04-14 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Assertion failure under FEImage::determineAbsolutePaintRect()
+
+ <https://bugs.webkit.org/show_bug.cgi?id=131660>
+ <rdar://problem/15669294>
+
+ This patch merges Chromium r149536 (see
+ <https://chromiumcodereview.appspot.com/14701012>), which moves
+ m_absoluteTransform out of SVGFilter and into the base Filter class, so
+ that it isn't necessary to cast a Filter to SVGFilter to get the
+ absolute transform.
+
+ Reviewed by Geoffrey Garen.
+
+ Test: svg/filters/feImage-filter-assertion.html
+
+ * platform/graphics/filters/Filter.h:
+ (WebCore::Filter::Filter):
+ Changed to take the absolute transform.
+ (WebCore::Filter::absoluteTransform):
+ Moved from SVGFilter.
+ (WebCore::Filter::mapAbsolutePointToLocalPoint):
+ Ditto.
+
+ * rendering/FilterEffectRenderer.cpp:
+ (WebCore::FilterEffectRenderer::FilterEffectRenderer):
+ Pass a default AffineTransform() to the Filter base class.
+
+ * svg/graphics/filters/SVGFEImage.cpp:
+ (WebCore::FEImage::determineAbsolutePaintRect):
+ Use the Filter without casting it to SVGFilter.
+ (WebCore::FEImage::platformApplySoftware):
+ Ditto.
+
+ * svg/graphics/filters/SVGFilter.cpp:
+ (WebCore::SVGFilter::SVGFilter):
+ Pass the transform to the base class, and remove initialization of a
+ removed member var.
+
+ * svg/graphics/filters/SVGFilter.h:
+ Member var moved to Filter.h.
+
+2014-05-01 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r166736.
</span><span class="cx">
</span><span class="cx"> 2014-04-03 David Hyatt <hyatt@apple.com>
</span></span></pre></div>
<a id="branchessafari53776branchSourceWebCoreplatformgraphicsfiltersFilterh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/platform/graphics/filters/Filter.h (168104 => 168105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/platform/graphics/filters/Filter.h 2014-05-01 16:25:09 UTC (rev 168104)
+++ branches/safari-537.76-branch/Source/WebCore/platform/graphics/filters/Filter.h 2014-05-01 16:38:59 UTC (rev 168105)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
</span><ins>+ * Copyright (C) 2013 Google Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -32,7 +33,10 @@
</span><span class="cx">
</span><span class="cx"> class Filter : public RefCounted<Filter> {
</span><span class="cx"> public:
</span><del>- Filter() : m_renderingMode(Unaccelerated) { }
</del><ins>+ Filter(const AffineTransform& absoluteTransform)
+ : m_absoluteTransform(absoluteTransform)
+ , m_renderingMode(Unaccelerated)
+ { }
</ins><span class="cx"> virtual ~Filter() { }
</span><span class="cx">
</span><span class="cx"> void setSourceImage(PassOwnPtr<ImageBuffer> sourceImage) { m_sourceImage = sourceImage; }
</span><span class="lines">@@ -41,6 +45,9 @@
</span><span class="cx"> FloatSize filterResolution() const { return m_filterResolution; }
</span><span class="cx"> void setFilterResolution(const FloatSize& filterResolution) { m_filterResolution = filterResolution; }
</span><span class="cx">
</span><ins>+ const AffineTransform& absoluteTransform() const { return m_absoluteTransform; }
+ FloatPoint mapAbsolutePointToLocalPoint(const FloatPoint& point) const { return m_absoluteTransform.inverse().mapPoint(point); }
+
</ins><span class="cx"> RenderingMode renderingMode() const { return m_renderingMode; }
</span><span class="cx"> void setRenderingMode(RenderingMode renderingMode) { m_renderingMode = renderingMode; }
</span><span class="cx">
</span><span class="lines">@@ -49,12 +56,11 @@
</span><span class="cx">
</span><span class="cx"> virtual FloatRect sourceImageRect() const = 0;
</span><span class="cx"> virtual FloatRect filterRegion() const = 0;
</span><del>-
- virtual FloatPoint mapAbsolutePointToLocalPoint(const FloatPoint&) const { return FloatPoint(); }
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> OwnPtr<ImageBuffer> m_sourceImage;
</span><span class="cx"> FloatSize m_filterResolution;
</span><ins>+ AffineTransform m_absoluteTransform;
</ins><span class="cx"> RenderingMode m_renderingMode;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53776branchSourceWebCorerenderingFilterEffectRenderercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/rendering/FilterEffectRenderer.cpp (168104 => 168105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/rendering/FilterEffectRenderer.cpp 2014-05-01 16:25:09 UTC (rev 168104)
+++ branches/safari-537.76-branch/Source/WebCore/rendering/FilterEffectRenderer.cpp 2014-05-01 16:38:59 UTC (rev 168105)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Apple Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2013 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
</span><span class="lines">@@ -103,7 +104,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> FilterEffectRenderer::FilterEffectRenderer()
</span><del>- : m_graphicsBufferAttached(false)
</del><ins>+ : Filter(AffineTransform())
+ , m_graphicsBufferAttached(false)
</ins><span class="cx"> , m_hasFilterThatMovesPixels(false)
</span><span class="cx"> #if ENABLE(CSS_SHADERS)
</span><span class="cx"> , m_hasCustomShaderFilter(false)
</span></span></pre></div>
<a id="branchessafari53776branchSourceWebCoresvggraphicsfiltersSVGFEImagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp (168104 => 168105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp 2014-05-01 16:25:09 UTC (rev 168104)
+++ branches/safari-537.76-branch/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp 2014-05-01 16:38:59 UTC (rev 168105)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "RenderObject.h"
</span><span class="cx"> #include "RenderTreeAsText.h"
</span><del>-#include "SVGFilter.h"
</del><span class="cx"> #include "SVGPreserveAspectRatio.h"
</span><span class="cx"> #include "SVGRenderingContext.h"
</span><span class="cx"> #include "SVGStyledElement.h"
</span><span class="lines">@@ -67,15 +66,13 @@
</span><span class="cx">
</span><span class="cx"> void FEImage::determineAbsolutePaintRect()
</span><span class="cx"> {
</span><del>- SVGFilter* svgFilter = static_cast<SVGFilter*>(filter());
-
- FloatRect paintRect = svgFilter->absoluteTransform().mapRect(filterPrimitiveSubregion());
</del><ins>+ FloatRect paintRect = filter()->absoluteTransform().mapRect(filterPrimitiveSubregion());
</ins><span class="cx"> FloatRect srcRect;
</span><span class="cx"> if (m_image) {
</span><span class="cx"> srcRect.setSize(m_image->size());
</span><span class="cx"> m_preserveAspectRatio.transformRect(paintRect, srcRect);
</span><span class="cx"> } else if (RenderObject* renderer = referencedRenderer())
</span><del>- srcRect = svgFilter->absoluteTransform().mapRect(renderer->repaintRectInLocalCoordinates());
</del><ins>+ srcRect = filter()->absoluteTransform().mapRect(renderer->repaintRectInLocalCoordinates());
</ins><span class="cx">
</span><span class="cx"> if (clipsToBounds())
</span><span class="cx"> paintRect.intersect(maxEffectRect());
</span><span class="lines">@@ -104,12 +101,11 @@
</span><span class="cx"> if (!resultImage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- SVGFilter* svgFilter = static_cast<SVGFilter*>(filter());
- FloatRect destRect = svgFilter->absoluteTransform().mapRect(filterPrimitiveSubregion());
</del><ins>+ FloatRect destRect = filter()->absoluteTransform().mapRect(filterPrimitiveSubregion());
</ins><span class="cx">
</span><span class="cx"> FloatRect srcRect;
</span><span class="cx"> if (renderer)
</span><del>- srcRect = svgFilter->absoluteTransform().mapRect(renderer->repaintRectInLocalCoordinates());
</del><ins>+ srcRect = filter()->absoluteTransform().mapRect(renderer->repaintRectInLocalCoordinates());
</ins><span class="cx"> else {
</span><span class="cx"> srcRect = FloatRect(FloatPoint(), m_image->size());
</span><span class="cx"> m_preserveAspectRatio.transformRect(destRect, srcRect);
</span><span class="lines">@@ -122,7 +118,7 @@
</span><span class="cx"> setResultColorSpace(ColorSpaceDeviceRGB);
</span><span class="cx">
</span><span class="cx"> if (renderer) {
</span><del>- const AffineTransform& absoluteTransform = svgFilter->absoluteTransform();
</del><ins>+ const AffineTransform& absoluteTransform = filter()->absoluteTransform();
</ins><span class="cx"> resultImage->context()->concatCTM(absoluteTransform);
</span><span class="cx">
</span><span class="cx"> SVGElement* contextNode = toSVGElement(renderer->node());
</span></span></pre></div>
<a id="branchessafari53776branchSourceWebCoresvggraphicsfiltersSVGFiltercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/svg/graphics/filters/SVGFilter.cpp (168104 => 168105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/svg/graphics/filters/SVGFilter.cpp 2014-05-01 16:25:09 UTC (rev 168104)
+++ branches/safari-537.76-branch/Source/WebCore/svg/graphics/filters/SVGFilter.cpp 2014-05-01 16:38:59 UTC (rev 168105)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
</span><span class="cx"> * Copyright (C) Research In Motion Limited 2010. All rights reserved.
</span><ins>+ * Copyright (C) 2013 Google Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -26,8 +27,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> SVGFilter::SVGFilter(const AffineTransform& absoluteTransform, const FloatRect& absoluteSourceDrawingRegion, const FloatRect& targetBoundingBox, const FloatRect& filterRegion, bool effectBBoxMode)
</span><del>- : Filter()
- , m_absoluteTransform(absoluteTransform)
</del><ins>+ : Filter(absoluteTransform)
</ins><span class="cx"> , m_absoluteSourceDrawingRegion(absoluteSourceDrawingRegion)
</span><span class="cx"> , m_targetBoundingBox(targetBoundingBox)
</span><span class="cx"> , m_filterRegion(filterRegion)
</span></span></pre></div>
<a id="branchessafari53776branchSourceWebCoresvggraphicsfiltersSVGFilterh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/svg/graphics/filters/SVGFilter.h (168104 => 168105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/svg/graphics/filters/SVGFilter.h 2014-05-01 16:25:09 UTC (rev 168104)
+++ branches/safari-537.76-branch/Source/WebCore/svg/graphics/filters/SVGFilter.h 2014-05-01 16:38:59 UTC (rev 168105)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
</span><ins>+ * Copyright (C) 2013 Google Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -40,9 +41,6 @@
</span><span class="cx"> FloatRect filterRegionInUserSpace() const { return m_filterRegion; }
</span><span class="cx"> virtual FloatRect filterRegion() const { return m_absoluteFilterRegion; }
</span><span class="cx">
</span><del>- virtual FloatPoint mapAbsolutePointToLocalPoint(const FloatPoint& point) const { return m_absoluteTransform.inverse().mapPoint(point); }
- const AffineTransform& absoluteTransform() const { return m_absoluteTransform; }
-
</del><span class="cx"> virtual float applyHorizontalScale(float value) const;
</span><span class="cx"> virtual float applyVerticalScale(float value) const;
</span><span class="cx">
</span><span class="lines">@@ -52,7 +50,6 @@
</span><span class="cx"> private:
</span><span class="cx"> SVGFilter(const AffineTransform& absoluteTransform, const FloatRect& absoluteSourceDrawingRegion, const FloatRect& targetBoundingBox, const FloatRect& filterRegion, bool effectBBoxMode);
</span><span class="cx">
</span><del>- AffineTransform m_absoluteTransform;
</del><span class="cx"> FloatRect m_absoluteSourceDrawingRegion;
</span><span class="cx"> FloatRect m_targetBoundingBox;
</span><span class="cx"> FloatRect m_absoluteFilterRegion;
</span></span></pre>
</div>
</div>
</body>
</html>