<!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>[167497] 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/167497">167497</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-04-18 11:35:20 -0700 (Fri, 18 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some includes from image-related headers, and Document.h
https://bugs.webkit.org/show_bug.cgi?id=131797
Reviewed by Martin Robinson.
Remove some #includes from Document.h, DragImage.h, GradientImage.h,
Image.h, and ImageBuffer.h and deal with the fallout.
* dom/ContainerNode.h:
* dom/Document.cpp:
(WebCore::Document::setInputCursor):
* dom/Document.h:
(WebCore::Document::inputCursor):
* dom/MutationObserverRegistration.cpp:
* html/canvas/WebGLRenderingContext.cpp:
* page/FrameSnapshotting.cpp:
* page/Page.cpp:
* platform/DragImage.h:
* platform/graphics/BitmapImage.cpp:
* platform/graphics/GradientImage.cpp:
(WebCore::GradientImage::GradientImage):
(WebCore::GradientImage::~GradientImage):
* platform/graphics/GradientImage.h:
* platform/graphics/Image.h:
* platform/graphics/ImageBuffer.cpp:
* platform/graphics/ImageBuffer.h:
(WebCore::ImageBuffer::create):
(WebCore::ImageBuffer::internalSize):
(WebCore::ImageBuffer::logicalSize):
(WebCore::ImageBuffer::baseTransform):
(WebCore::ImageBuffer::spaceSize):
(WebCore::ImageBuffer::setSpaceSize):
* rendering/RenderThemeMac.mm:
* rendering/shapes/Shape.cpp:
* rendering/svg/RenderSVGContainer.cpp:
* svg/SVGURIReference.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodeh">trunk/Source/WebCore/dom/ContainerNode.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomMutationObserverRegistrationcpp">trunk/Source/WebCore/dom/MutationObserverRegistration.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameSnapshottingcpp">trunk/Source/WebCore/page/FrameSnapshotting.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformDragImageh">trunk/Source/WebCore/platform/DragImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImagecpp">trunk/Source/WebCore/platform/graphics/BitmapImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGradientImagecpp">trunk/Source/WebCore/platform/graphics/GradientImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGradientImageh">trunk/Source/WebCore/platform/graphics/GradientImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageh">trunk/Source/WebCore/platform/graphics/Image.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBuffercpp">trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBufferh">trunk/Source/WebCore/platform/graphics/ImageBuffer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapecpp">trunk/Source/WebCore/rendering/shapes/Shape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGContainercpp">trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGURIReferenceh">trunk/Source/WebCore/svg/SVGURIReference.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/ChangeLog 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2014-04-18 Simon Fraser <simon.fraser@apple.com>
+
+ Remove some includes from image-related headers, and Document.h
+ https://bugs.webkit.org/show_bug.cgi?id=131797
+
+ Reviewed by Martin Robinson.
+
+ Remove some #includes from Document.h, DragImage.h, GradientImage.h,
+ Image.h, and ImageBuffer.h and deal with the fallout.
+
+ * dom/ContainerNode.h:
+ * dom/Document.cpp:
+ (WebCore::Document::setInputCursor):
+ * dom/Document.h:
+ (WebCore::Document::inputCursor):
+ * dom/MutationObserverRegistration.cpp:
+ * html/canvas/WebGLRenderingContext.cpp:
+ * page/FrameSnapshotting.cpp:
+ * page/Page.cpp:
+ * platform/DragImage.h:
+ * platform/graphics/BitmapImage.cpp:
+ * platform/graphics/GradientImage.cpp:
+ (WebCore::GradientImage::GradientImage):
+ (WebCore::GradientImage::~GradientImage):
+ * platform/graphics/GradientImage.h:
+ * platform/graphics/Image.h:
+ * platform/graphics/ImageBuffer.cpp:
+ * platform/graphics/ImageBuffer.h:
+ (WebCore::ImageBuffer::create):
+ (WebCore::ImageBuffer::internalSize):
+ (WebCore::ImageBuffer::logicalSize):
+ (WebCore::ImageBuffer::baseTransform):
+ (WebCore::ImageBuffer::spaceSize):
+ (WebCore::ImageBuffer::setSpaceSize):
+ * rendering/RenderThemeMac.mm:
+ * rendering/shapes/Shape.cpp:
+ * rendering/svg/RenderSVGContainer.cpp:
+ * svg/SVGURIReference.h:
+
</ins><span class="cx"> 2014-04-18 Gabor Rapcsanyi <rgabor@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed. ARM64 buildfix after r167473.
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.h (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.h 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class FloatPoint;
</span><ins>+class QualifiedName;
</ins><span class="cx"> class RenderElement;
</span><span class="cx">
</span><span class="cx"> typedef void (*NodeCallback)(Node&, unsigned);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -222,6 +222,7 @@
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx"> #include "WebReplayInputs.h"
</span><span class="cx"> #include <replay/EmptyInputCursor.h>
</span><ins>+#include <replay/InputCursor.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace WTF;
</span><span class="lines">@@ -6188,4 +6189,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(WEB_REPLAY)
+void Document::setInputCursor(PassRefPtr<InputCursor> cursor)
+{
+ m_inputCursor = cursor;
+}
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/dom/Document.h 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -35,12 +35,10 @@
</span><span class="cx"> #include "DocumentStyleSheetCollection.h"
</span><span class="cx"> #include "DocumentTiming.h"
</span><span class="cx"> #include "FocusDirection.h"
</span><del>-#include "HitTestRequest.h"
</del><span class="cx"> #include "IconURL.h"
</span><span class="cx"> #include "MutationObserver.h"
</span><span class="cx"> #include "PageVisibilityState.h"
</span><span class="cx"> #include "PlatformScreen.h"
</span><del>-#include "QualifiedName.h"
</del><span class="cx"> #include "ReferrerPolicy.h"
</span><span class="cx"> #include "RenderPtr.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="lines">@@ -59,9 +57,12 @@
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx">
</span><ins>+namespace JSC {
+class ExecState;
</ins><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><del>-#include <replay/InputCursor.h>
</del><ins>+class InputCursor;
</ins><span class="cx"> #endif
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -88,7 +89,6 @@
</span><span class="cx"> class DocumentMarkerController;
</span><span class="cx"> class DocumentParser;
</span><span class="cx"> class DocumentSharedObjectPool;
</span><del>-class DocumentStyleSheetCollection;
</del><span class="cx"> class DocumentType;
</span><span class="cx"> class Element;
</span><span class="cx"> class EntityReference;
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> class Page;
</span><span class="cx"> class PlatformMouseEvent;
</span><span class="cx"> class ProcessingInstruction;
</span><ins>+class QualifiedName;
</ins><span class="cx"> class Range;
</span><span class="cx"> class RegisteredEventListener;
</span><span class="cx"> class RenderView;
</span><span class="lines">@@ -479,8 +480,8 @@
</span><span class="cx"> virtual URL baseURI() const override;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><del>- InputCursor& inputCursor() const { return *m_inputCursor; }
- void setInputCursor(PassRefPtr<InputCursor> cursor) { m_inputCursor = cursor; }
</del><ins>+ JSC::InputCursor& inputCursor() const { return *m_inputCursor; }
+ void setInputCursor(PassRefPtr<JSC::InputCursor>);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PAGE_VISIBILITY_API)
</span><span class="lines">@@ -1692,7 +1693,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><del>- RefPtr<InputCursor> m_inputCursor;
</del><ins>+ RefPtr<JSC::InputCursor> m_inputCursor;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Timer<Document> m_didAssociateFormControlsTimer;
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObserverRegistrationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserverRegistration.cpp (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserverRegistration.cpp 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/dom/MutationObserverRegistration.cpp 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "MutationObserverRegistration.h"
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "QualifiedName.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "FrameView.h"
</span><ins>+#include "GraphicsContext.h"
</ins><span class="cx"> #include "HTMLCanvasElement.h"
</span><span class="cx"> #include "HTMLImageElement.h"
</span><span class="cx"> #include "HTMLVideoElement.h"
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameSnapshottingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameSnapshotting.cpp (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameSnapshotting.cpp 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/page/FrameSnapshotting.cpp 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameSelection.h"
</span><span class="cx"> #include "FrameView.h"
</span><ins>+#include "GraphicsContext.h"
</ins><span class="cx"> #include "ImageBuffer.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderObject.h"
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/page/Page.cpp 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -95,6 +95,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx"> #include "ReplayController.h"
</span><ins>+#include <replay/InputCursor.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDragImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DragImage.h (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DragImage.h 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/platform/DragImage.h 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "FloatSize.h"
</span><span class="cx"> #include "FontRenderingMode.h"
</span><del>-#include "FrameSnapshotting.h"
</del><span class="cx"> #include "ImageOrientation.h"
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.cpp (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "BitmapImage.h"
</span><span class="cx">
</span><span class="cx"> #include "FloatRect.h"
</span><ins>+#include "GraphicsContext.h"
</ins><span class="cx"> #include "ImageBuffer.h"
</span><span class="cx"> #include "ImageObserver.h"
</span><span class="cx"> #include "IntRect.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradientImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GradientImage.cpp (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GradientImage.cpp 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/platform/graphics/GradientImage.cpp 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -28,10 +28,21 @@
</span><span class="cx">
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><ins>+#include "ImageBuffer.h"
</ins><span class="cx"> #include "Length.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+GradientImage::GradientImage(PassRefPtr<Gradient> generator, const FloatSize& size)
+ : m_gradient(generator)
+{
+ setContainerSize(size);
+}
+
+GradientImage::~GradientImage()
+{
+}
+
</ins><span class="cx"> void GradientImage::draw(GraphicsContext* destContext, const FloatRect& destRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</span><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*destContext);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradientImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GradientImage.h (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GradientImage.h 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/platform/graphics/GradientImage.h 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -30,11 +30,12 @@
</span><span class="cx"> #include "GeneratedImage.h"
</span><span class="cx"> #include "Gradient.h"
</span><span class="cx"> #include "Image.h"
</span><del>-#include "ImageBuffer.h"
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class ImageBuffer;
+
</ins><span class="cx"> class GradientImage final : public GeneratedImage {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<GradientImage> create(PassRefPtr<Gradient> generator, const FloatSize& size)
</span><span class="lines">@@ -42,18 +43,14 @@
</span><span class="cx"> return adoptRef(new GradientImage(generator, size));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual ~GradientImage() { }
</del><ins>+ virtual ~GradientImage();
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</span><span class="cx"> virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><span class="cx"> const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode) override;
</span><span class="cx">
</span><del>- GradientImage(PassRefPtr<Gradient> generator, const FloatSize& size)
- : m_gradient(generator)
- {
- setContainerSize(size);
- }
</del><ins>+ GradientImage(PassRefPtr<Gradient>, const FloatSize&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RefPtr<Gradient> m_gradient;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Image.h (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Image.h 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/platform/graphics/Image.h 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "FloatSize.h"
</span><span class="cx"> #include "GraphicsTypes.h"
</span><span class="cx"> #include "ImageOrientation.h"
</span><del>-#include "IntRect.h"
</del><span class="cx"> #include "NativeImagePtr.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ImageBuffer.h"
</span><span class="cx">
</span><ins>+#include "GraphicsContext.h"
</ins><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.h (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -30,15 +30,11 @@
</span><span class="cx">
</span><span class="cx"> #include "AffineTransform.h"
</span><span class="cx"> #include "ColorSpace.h"
</span><del>-#include "FloatRect.h"
-#include "GraphicsContext.h"
</del><span class="cx"> #include "GraphicsTypes.h"
</span><span class="cx"> #include "GraphicsTypes3D.h"
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include "ImageBufferData.h"
</span><span class="cx"> #include "PlatformLayer.h"
</span><del>-#include <runtime/JSCInlines.h>
-#include <runtime/TypedArrayInlines.h>
</del><span class="cx"> #include <runtime/Uint8ClampedArray.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="lines">@@ -47,124 +43,126 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class Image;
- class ImageData;
- class IntPoint;
- class IntRect;
- class GraphicsContext3D;
</del><ins>+class FloatRect;
+class GraphicsContext;
+class GraphicsContext3D;
+class Image;
+class ImageData;
+class IntPoint;
+class IntRect;
</ins><span class="cx">
</span><del>- enum Multiply {
- Premultiplied,
- Unmultiplied
- };
</del><ins>+enum Multiply {
+ Premultiplied,
+ Unmultiplied
+};
</ins><span class="cx">
</span><del>- enum RenderingMode {
- Unaccelerated,
- UnacceleratedNonPlatformBuffer, // Use plain memory allocation rather than platform API to allocate backing store.
- Accelerated
- };
-
- enum BackingStoreCopy {
- CopyBackingStore, // Guarantee subsequent draws don't affect the copy.
- DontCopyBackingStore // Subsequent draws may affect the copy.
- };
</del><ins>+enum RenderingMode {
+ Unaccelerated,
+ UnacceleratedNonPlatformBuffer, // Use plain memory allocation rather than platform API to allocate backing store.
+ Accelerated
+};
</ins><span class="cx">
</span><del>- enum ScaleBehavior {
- Scaled,
- Unscaled
- };
</del><ins>+enum BackingStoreCopy {
+ CopyBackingStore, // Guarantee subsequent draws don't affect the copy.
+ DontCopyBackingStore // Subsequent draws may affect the copy.
+};
</ins><span class="cx">
</span><del>- class ImageBuffer {
- WTF_MAKE_NONCOPYABLE(ImageBuffer); WTF_MAKE_FAST_ALLOCATED;
- public:
- // Will return a null pointer on allocation failure.
- static std::unique_ptr<ImageBuffer> create(const FloatSize& size, float resolutionScale = 1, ColorSpace colorSpace = ColorSpaceDeviceRGB, RenderingMode renderingMode = Unaccelerated)
- {
- bool success = false;
- std::unique_ptr<ImageBuffer> buffer(new ImageBuffer(size, resolutionScale, colorSpace, renderingMode, success));
- if (!success)
- return nullptr;
- return buffer;
- }
</del><ins>+enum ScaleBehavior {
+ Scaled,
+ Unscaled
+};
</ins><span class="cx">
</span><del>- static std::unique_ptr<ImageBuffer> createCompatibleBuffer(const FloatSize&, float resolutionScale, ColorSpace, const GraphicsContext*, bool hasAlpha);
</del><ins>+class ImageBuffer {
+ WTF_MAKE_NONCOPYABLE(ImageBuffer); WTF_MAKE_FAST_ALLOCATED;
+public:
+ // Will return a null pointer on allocation failure.
+ static std::unique_ptr<ImageBuffer> create(const FloatSize& size, float resolutionScale = 1, ColorSpace colorSpace = ColorSpaceDeviceRGB, RenderingMode renderingMode = Unaccelerated)
+ {
+ bool success = false;
+ std::unique_ptr<ImageBuffer> buffer(new ImageBuffer(size, resolutionScale, colorSpace, renderingMode, success));
+ if (!success)
+ return nullptr;
+ return buffer;
+ }
</ins><span class="cx">
</span><del>- ~ImageBuffer();
</del><ins>+ static std::unique_ptr<ImageBuffer> createCompatibleBuffer(const FloatSize&, float resolutionScale, ColorSpace, const GraphicsContext*, bool hasAlpha);
</ins><span class="cx">
</span><del>- // The actual resolution of the backing store
- const IntSize& internalSize() const { return m_size; }
- const IntSize& logicalSize() const { return m_logicalSize; }
</del><ins>+ ~ImageBuffer();
</ins><span class="cx">
</span><del>- GraphicsContext* context() const;
</del><ins>+ // The actual resolution of the backing store
+ const IntSize& internalSize() const { return m_size; }
+ const IntSize& logicalSize() const { return m_logicalSize; }
</ins><span class="cx">
</span><del>- PassRefPtr<Image> copyImage(BackingStoreCopy = CopyBackingStore, ScaleBehavior = Scaled) const;
- // Give hints on the faster copyImage Mode, return DontCopyBackingStore if it supports the DontCopyBackingStore behavior
- // or return CopyBackingStore if it doesn't.
- static BackingStoreCopy fastCopyImageMode();
</del><ins>+ GraphicsContext* context() const;
</ins><span class="cx">
</span><del>- enum CoordinateSystem { LogicalCoordinateSystem, BackingStoreCoordinateSystem };
</del><ins>+ PassRefPtr<Image> copyImage(BackingStoreCopy = CopyBackingStore, ScaleBehavior = Scaled) const;
+ // Give hints on the faster copyImage Mode, return DontCopyBackingStore if it supports the DontCopyBackingStore behavior
+ // or return CopyBackingStore if it doesn't.
+ static BackingStoreCopy fastCopyImageMode();
</ins><span class="cx">
</span><del>- PassRefPtr<Uint8ClampedArray> getUnmultipliedImageData(const IntRect&, CoordinateSystem = LogicalCoordinateSystem) const;
- PassRefPtr<Uint8ClampedArray> getPremultipliedImageData(const IntRect&, CoordinateSystem = LogicalCoordinateSystem) const;
</del><ins>+ enum CoordinateSystem { LogicalCoordinateSystem, BackingStoreCoordinateSystem };
</ins><span class="cx">
</span><del>- void putByteArray(Multiply multiplied, Uint8ClampedArray*, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint, CoordinateSystem = LogicalCoordinateSystem);
-
- void convertToLuminanceMask();
-
- String toDataURL(const String& mimeType, const double* quality = 0, CoordinateSystem = LogicalCoordinateSystem) const;
</del><ins>+ PassRefPtr<Uint8ClampedArray> getUnmultipliedImageData(const IntRect&, CoordinateSystem = LogicalCoordinateSystem) const;
+ PassRefPtr<Uint8ClampedArray> getPremultipliedImageData(const IntRect&, CoordinateSystem = LogicalCoordinateSystem) const;
+
+ void putByteArray(Multiply multiplied, Uint8ClampedArray*, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint, CoordinateSystem = LogicalCoordinateSystem);
+
+ void convertToLuminanceMask();
+
+ String toDataURL(const String& mimeType, const double* quality = 0, CoordinateSystem = LogicalCoordinateSystem) const;
</ins><span class="cx"> #if !USE(CG)
</span><del>- AffineTransform baseTransform() const { return AffineTransform(); }
- void transformColorSpace(ColorSpace srcColorSpace, ColorSpace dstColorSpace);
- void platformTransformColorSpace(const Vector<int>&);
</del><ins>+ AffineTransform baseTransform() const { return AffineTransform(); }
+ void transformColorSpace(ColorSpace srcColorSpace, ColorSpace dstColorSpace);
+ void platformTransformColorSpace(const Vector<int>&);
</ins><span class="cx"> #else
</span><del>- AffineTransform baseTransform() const { return AffineTransform(1, 0, 0, -1, 0, m_data.m_backingStoreSize.height()); }
</del><ins>+ AffineTransform baseTransform() const { return AffineTransform(1, 0, 0, -1, 0, m_data.m_backingStoreSize.height()); }
</ins><span class="cx"> #endif
</span><del>- PlatformLayer* platformLayer() const;
</del><ins>+ PlatformLayer* platformLayer() const;
</ins><span class="cx">
</span><del>- // FIXME: current implementations of this method have the restriction that they only work
- // with textures that are RGB or RGBA format, and UNSIGNED_BYTE type.
- bool copyToPlatformTexture(GraphicsContext3D&, Platform3DObject, GC3Denum, bool, bool);
</del><ins>+ // FIXME: current implementations of this method have the restriction that they only work
+ // with textures that are RGB or RGBA format, and UNSIGNED_BYTE type.
+ bool copyToPlatformTexture(GraphicsContext3D&, Platform3DObject, GC3Denum, bool, bool);
</ins><span class="cx">
</span><del>- FloatSize spaceSize() const { return m_space; }
- void setSpaceSize(const FloatSize& space)
- {
- m_space = space;
- }
</del><ins>+ FloatSize spaceSize() const { return m_space; }
+ void setSpaceSize(const FloatSize& space)
+ {
+ m_space = space;
+ }
</ins><span class="cx">
</span><del>- private:
</del><ins>+private:
</ins><span class="cx"> #if USE(CG)
</span><del>- // The returned image might be larger than the internalSize(). If you want the smaller
- // image, crop the result.
- RetainPtr<CGImageRef> copyNativeImage(BackingStoreCopy = CopyBackingStore) const;
- void flushContext() const;
</del><ins>+ // The returned image might be larger than the internalSize(). If you want the smaller
+ // image, crop the result.
+ RetainPtr<CGImageRef> copyNativeImage(BackingStoreCopy = CopyBackingStore) const;
+ void flushContext() const;
</ins><span class="cx"> #endif
</span><del>- void clip(GraphicsContext*, const FloatRect&) const;
</del><ins>+ void clip(GraphicsContext*, const FloatRect&) const;
</ins><span class="cx">
</span><del>- void draw(GraphicsContext*, ColorSpace, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, bool useLowQualityScale = false);
- void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</del><ins>+ void draw(GraphicsContext*, ColorSpace, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, bool useLowQualityScale = false);
+ void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</ins><span class="cx">
</span><del>- inline void genericConvertToLuminanceMask();
</del><ins>+ inline void genericConvertToLuminanceMask();
</ins><span class="cx">
</span><del>- friend class GraphicsContext;
- friend class GeneratedImage;
- friend class CrossfadeGeneratedImage;
- friend class GradientImage;
</del><ins>+ friend class GraphicsContext;
+ friend class GeneratedImage;
+ friend class CrossfadeGeneratedImage;
+ friend class GradientImage;
</ins><span class="cx">
</span><del>- private:
- ImageBufferData m_data;
- IntSize m_size;
- IntSize m_logicalSize;
- float m_resolutionScale;
- OwnPtr<GraphicsContext> m_context;
- FloatSize m_space;
</del><ins>+private:
+ ImageBufferData m_data;
+ IntSize m_size;
+ IntSize m_logicalSize;
+ float m_resolutionScale;
+ OwnPtr<GraphicsContext> m_context;
+ FloatSize m_space;
</ins><span class="cx">
</span><del>- // This constructor will place its success into the given out-variable
- // so that create() knows when it should return failure.
- ImageBuffer(const FloatSize&, float resolutionScale, ColorSpace, RenderingMode, bool& success);
- };
</del><ins>+ // This constructor will place its success into the given out-variable
+ // so that create() knows when it should return failure.
+ ImageBuffer(const FloatSize&, float resolutionScale, ColorSpace, RenderingMode, bool& success);
+};
</ins><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><del>- String ImageDataToDataURL(const ImageData&, const String& mimeType, const double* quality);
</del><ins>+String ImageDataToDataURL(const ImageData&, const String& mimeType, const double* quality);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/StdLibExtras.h>
</span><ins>+#import <wtf/text/StringBuilder.h>
</ins><span class="cx"> #import <Carbon/Carbon.h>
</span><span class="cx"> #import <Cocoa/Cocoa.h>
</span><span class="cx"> #import <math.h>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/Shape.cpp (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/Shape.cpp 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/rendering/shapes/Shape.cpp 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #include "BasicShapeFunctions.h"
</span><span class="cx"> #include "BoxShape.h"
</span><ins>+#include "GraphicsContext.h"
</ins><span class="cx"> #include "ImageBuffer.h"
</span><span class="cx"> #include "LengthFunctions.h"
</span><span class="cx"> #include "PolygonShape.h"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #include "RenderSVGContainer.h"
</span><span class="cx">
</span><span class="cx"> #include "GraphicsContext.h"
</span><ins>+#include "HitTestRequest.h"
</ins><span class="cx"> #include "LayoutRepainter.h"
</span><span class="cx"> #include "RenderIterator.h"
</span><span class="cx"> #include "RenderSVGResourceFilter.h"
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGURIReferenceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGURIReference.h (167496 => 167497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGURIReference.h 2014-04-18 17:49:24 UTC (rev 167496)
+++ trunk/Source/WebCore/svg/SVGURIReference.h 2014-04-18 18:35:20 UTC (rev 167497)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #define SVGURIReference_h
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "QualifiedName.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>