<!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>[166138] trunk/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/166138">166138</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-03-23 01:36:14 -0700 (Sun, 23 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up #includes by geometry classes
https://bugs.webkit.org/show_bug.cgi?id=130645
Reviewed by Andreas Kling.
Pulling in <wtf/Vector.h> and <wtf/PrintStream.h> in the simple geometry
classes brings in a lot of additional headers. Fix by adding a new
GeometryUtilities file so that the basic files don't need Vector,
and including GeometryUtilities.h where necessary.
Also forward declare PrintStream.h and only bring in the header
in implementation files.
Source/WebCore:
* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSToStyleMap.h:
* html/HTMLCanvasElement.cpp:
* platform/cairo/WidgetBackingStoreCairo.h:
* platform/graphics/FloatPoint.cpp:
* platform/graphics/FloatPoint.h:
* platform/graphics/FloatRect.cpp:
* platform/graphics/FloatRect.h:
* platform/graphics/FloatSize.cpp:
* platform/graphics/FloatSize.h:
* platform/graphics/GeometryUtilities.cpp: Added.
(WebCore::findSlope):
(WebCore::findIntersection):
(WebCore::unionRect):
(WebCore::mapRect):
* platform/graphics/GeometryUtilities.h: Copied from Source/WebCore/platform/graphics/TextTrackRepresentation.h.
* platform/graphics/IntPoint.h:
* platform/graphics/IntRect.cpp:
* platform/graphics/IntRect.h:
* platform/graphics/IntSize.h:
* platform/graphics/TextTrackRepresentation.h:
* platform/graphics/Tile.h:
* platform/gtk/WidgetBackingStoreGtkX11.h:
* rendering/RenderBoxModelObject.cpp:
* rendering/RenderImage.cpp:
* rendering/RenderObject.cpp:
Source/WebKit2:
* UIProcess/BackingStore.h:
* UIProcess/FindIndicator.cpp:
* UIProcess/mac/WKPrintingView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecssCSSToStyleMaph">trunk/Source/WebCore/css/CSSToStyleMap.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcairoWidgetBackingStoreCairoh">trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPointcpp">trunk/Source/WebCore/platform/graphics/FloatPoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPointh">trunk/Source/WebCore/platform/graphics/FloatPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRectcpp">trunk/Source/WebCore/platform/graphics/FloatRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRecth">trunk/Source/WebCore/platform/graphics/FloatRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatSizecpp">trunk/Source/WebCore/platform/graphics/FloatSize.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatSizeh">trunk/Source/WebCore/platform/graphics/FloatSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntPointh">trunk/Source/WebCore/platform/graphics/IntPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntRectcpp">trunk/Source/WebCore/platform/graphics/IntRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntRecth">trunk/Source/WebCore/platform/graphics/IntRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntSizeh">trunk/Source/WebCore/platform/graphics/IntSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTextTrackRepresentationh">trunk/Source/WebCore/platform/graphics/TextTrackRepresentation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTileh">trunk/Source/WebCore/platform/graphics/Tile.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedUpdateAtlash">trunk/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkWidgetBackingStoreGtkX11h">trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedUpdateInfoh">trunk/Source/WebKit2/Shared/UpdateInfo.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessBackingStoreh">trunk/Source/WebKit2/UIProcess/BackingStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsPageViewportControllerh">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessFindIndicatorcpp">trunk/Source/WebKit2/UIProcess/FindIndicator.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKPrintingViewh">trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsGeometryUtilitiescpp">trunk/Source/WebCore/platform/graphics/GeometryUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGeometryUtilitiesh">trunk/Source/WebCore/platform/graphics/GeometryUtilities.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -1882,6 +1882,7 @@
</span><span class="cx"> platform/graphics/FontGenericFamilies.cpp
</span><span class="cx"> platform/graphics/FontGlyphs.cpp
</span><span class="cx"> platform/graphics/GeneratedImage.cpp
</span><ins>+ platform/graphics/GeometryUtilities.cpp
</ins><span class="cx"> platform/graphics/GlyphPageTreeNode.cpp
</span><span class="cx"> platform/graphics/Gradient.cpp
</span><span class="cx"> platform/graphics/GradientImage.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/ChangeLog 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2014-03-23 Simon Fraser <simon.fraser@apple.com>
+
+ Clean up #includes by geometry classes
+ https://bugs.webkit.org/show_bug.cgi?id=130645
+
+ Reviewed by Andreas Kling.
+
+ Pulling in <wtf/Vector.h> and <wtf/PrintStream.h> in the simple geometry
+ classes brings in a lot of additional headers. Fix by adding a new
+ GeometryUtilities file so that the basic files don't need Vector,
+ and including GeometryUtilities.h where necessary.
+
+ Also forward declare PrintStream.h and only bring in the header
+ in implementation files.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * css/CSSToStyleMap.h:
+ * html/HTMLCanvasElement.cpp:
+ * platform/cairo/WidgetBackingStoreCairo.h:
+ * platform/graphics/FloatPoint.cpp:
+ * platform/graphics/FloatPoint.h:
+ * platform/graphics/FloatRect.cpp:
+ * platform/graphics/FloatRect.h:
+ * platform/graphics/FloatSize.cpp:
+ * platform/graphics/FloatSize.h:
+ * platform/graphics/GeometryUtilities.cpp: Added.
+ (WebCore::findSlope):
+ (WebCore::findIntersection):
+ (WebCore::unionRect):
+ (WebCore::mapRect):
+ * platform/graphics/GeometryUtilities.h: Copied from Source/WebCore/platform/graphics/TextTrackRepresentation.h.
+ * platform/graphics/IntPoint.h:
+ * platform/graphics/IntRect.cpp:
+ * platform/graphics/IntRect.h:
+ * platform/graphics/IntSize.h:
+ * platform/graphics/TextTrackRepresentation.h:
+ * platform/graphics/Tile.h:
+ * platform/gtk/WidgetBackingStoreGtkX11.h:
+ * rendering/RenderBoxModelObject.cpp:
+ * rendering/RenderImage.cpp:
+ * rendering/RenderObject.cpp:
+
</ins><span class="cx"> 2014-03-22 Chang Shu <cshu@webkit.org>
</span><span class="cx">
</span><span class="cx"> Replace deprecatedIsCollapsibleWhitespace with RenderStyle::isCollapsibleWhiteSpace in TextIterator.
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -5768,6 +5768,8 @@
</span><span class="cx"> Source/WebCore/platform/graphics/FontWidthVariant.h \
</span><span class="cx"> Source/WebCore/platform/graphics/GeneratedImage.cpp \
</span><span class="cx"> Source/WebCore/platform/graphics/GeneratedImage.h \
</span><ins>+ Source/WebCore/platform/graphics/GeometryUtilities.cpp \
+ Source/WebCore/platform/graphics/GeometryUtilities.h \
</ins><span class="cx"> Source/WebCore/platform/graphics/Glyph.h \
</span><span class="cx"> Source/WebCore/platform/graphics/GlyphBuffer.h \
</span><span class="cx"> Source/WebCore/platform/graphics/GlyphMetricsMap.h \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -7807,6 +7807,7 @@
</span><span class="cx"> <ClCompile Include="..\platform\graphics\FontFastPath.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\graphics\FontFeatureSettings.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\graphics\FontPlatformData.cpp" />
</span><ins>+ <ClCompile Include="..\platform\graphics\GeometryUtilities.cpp" />
</ins><span class="cx"> <ClCompile Include="..\platform\graphics\GeneratedImage.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\graphics\GlyphPageTreeNode.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\graphics\Gradient.cpp" />
</span><span class="lines">@@ -19254,6 +19255,7 @@
</span><span class="cx"> <ClInclude Include="..\platform\graphics\FontSmoothingMode.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\FontTraitsMask.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\GeneratedImage.h" />
</span><ins>+ <ClInclude Include="..\platform\graphics\GeometryUtilities.h" />
</ins><span class="cx"> <ClInclude Include="..\platform\graphics\Glyph.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\GlyphBuffer.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\GlyphMetricsMap.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -4911,6 +4911,9 @@
</span><span class="cx"> <ClCompile Include="..\platform\graphics\GeneratedImage.cpp">
</span><span class="cx"> <Filter>platform\graphics</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\platform\graphics\GeometryUtilities.cpp">
+ <Filter>platform\graphics</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\platform\graphics\FloatRect.cpp">
</span><span class="cx"> <Filter>platform\graphics</Filter>
</span><span class="cx"> </ClCompile>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -514,6 +514,8 @@
</span><span class="cx"> 0FA24D79162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FA24D77162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp */; };
</span><span class="cx"> 0FA24D7A162DF91900A3F4C0 /* GraphicsLayerUpdater.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FA24D78162DF91900A3F4C0 /* GraphicsLayerUpdater.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FA88EBD16A8D1BD00F99984 /* ScrollingStateScrollingNodeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FA88EBC16A8D1BD00F99984 /* ScrollingStateScrollingNodeMac.mm */; };
</span><ins>+ 0FB6252E18DE1B1500A07C05 /* GeometryUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FB6252C18DE1B1500A07C05 /* GeometryUtilities.cpp */; };
+ 0FB6252F18DE1B1500A07C05 /* GeometryUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB6252D18DE1B1500A07C05 /* GeometryUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 0FB8890A167D2FA10010CDA5 /* ScrollingTreeStickyNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB88908167D2FA10010CDA5 /* ScrollingTreeStickyNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FB8890B167D2FA10010CDA5 /* ScrollingTreeStickyNode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FB88909167D2FA10010CDA5 /* ScrollingTreeStickyNode.mm */; };
</span><span class="cx"> 0FB8890E167D30160010CDA5 /* ScrollingStateStickyNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FB8890C167D30160010CDA5 /* ScrollingStateStickyNode.cpp */; };
</span><span class="lines">@@ -7320,6 +7322,8 @@
</span><span class="cx"> 0FA24D77162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsLayerUpdater.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FA24D78162DF91900A3F4C0 /* GraphicsLayerUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsLayerUpdater.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FA88EBC16A8D1BD00F99984 /* ScrollingStateScrollingNodeMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingStateScrollingNodeMac.mm; sourceTree = "<group>"; };
</span><ins>+ 0FB6252C18DE1B1500A07C05 /* GeometryUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeometryUtilities.cpp; sourceTree = "<group>"; };
+ 0FB6252D18DE1B1500A07C05 /* GeometryUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeometryUtilities.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0FB88908167D2FA10010CDA5 /* ScrollingTreeStickyNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeStickyNode.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FB88909167D2FA10010CDA5 /* ScrollingTreeStickyNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingTreeStickyNode.mm; sourceTree = "<group>"; };
</span><span class="cx"> 0FB8890C167D30160010CDA5 /* ScrollingStateStickyNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingStateStickyNode.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -20020,6 +20024,8 @@
</span><span class="cx"> 7CE6CBFA187F370700D46BF5 /* FormatConverter.h */,
</span><span class="cx"> 4FB390AC15EF61F3007AD51F /* GeneratedImage.cpp */,
</span><span class="cx"> BC23F0DA0DAFF4A4009FDC91 /* GeneratedImage.h */,
</span><ins>+ 0FB6252C18DE1B1500A07C05 /* GeometryUtilities.cpp */,
+ 0FB6252D18DE1B1500A07C05 /* GeometryUtilities.h */,
</ins><span class="cx"> 086BBD0E136039C2008B15D8 /* Glyph.h */,
</span><span class="cx"> B2C3DA5B0D006CD600EF6F26 /* GlyphBuffer.h */,
</span><span class="cx"> C5D4AA78116BAFB60069CA93 /* GlyphMetricsMap.h */,
</span><span class="lines">@@ -24492,6 +24498,7 @@
</span><span class="cx"> 75415D56129AB2D2003AD669 /* JSSpeechInputEvent.h in Headers */,
</span><span class="cx"> 75415D58129AB2D2003AD669 /* JSSpeechInputResult.h in Headers */,
</span><span class="cx"> 75415D5A129AB2D2003AD669 /* JSSpeechInputResultList.h in Headers */,
</span><ins>+ 0FB6252F18DE1B1500A07C05 /* GeometryUtilities.h in Headers */,
</ins><span class="cx"> AA7FEEAD16A4E74B004C0C33 /* JSSpeechSynthesis.h in Headers */,
</span><span class="cx"> AA2A5AD216A4860A00976A25 /* JSSpeechSynthesisEvent.h in Headers */,
</span><span class="cx"> AA7FEEA716A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.h in Headers */,
</span><span class="lines">@@ -27936,6 +27943,7 @@
</span><span class="cx"> 07969DBD17D14151007FF842 /* JSRTCSessionDescriptionCallback.cpp in Sources */,
</span><span class="cx"> 07D07B141834158800ABDD3C /* JSRTCSessionDescriptionCustom.cpp in Sources */,
</span><span class="cx"> 07969DBF17D14151007FF842 /* JSRTCStatsCallback.cpp in Sources */,
</span><ins>+ 0FB6252E18DE1B1500A07C05 /* GeometryUtilities.cpp in Sources */,
</ins><span class="cx"> 07969DC117D14151007FF842 /* JSRTCStatsReport.cpp in Sources */,
</span><span class="cx"> 07969DC317D14151007FF842 /* JSRTCStatsResponse.cpp in Sources */,
</span><span class="cx"> 07DC5FD417D3EEE90099F890 /* JSRTCStatsResponseCustom.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSToStyleMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSToStyleMap.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSToStyleMap.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/css/CSSToStyleMap.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="cx"> #include "LengthBox.h"
</span><ins>+#include <wtf/FastMalloc.h>
+#include <wtf/Noncopyable.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><ins>+#include "GeometryUtilities.h"
</ins><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "ImageData.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcairoWidgetBackingStoreCairoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> #define WidgetBackingStoreCairo_h
</span><span class="cx">
</span><span class="cx"> #include "WidgetBackingStore.h"
</span><ins>+#include <wtf/RefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.cpp (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatPoint.cpp 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint.cpp 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -80,45 +80,6 @@
</span><span class="cx"> return FloatPoint(narrowPrecisionToFloat(x), narrowPrecisionToFloat(y));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-float findSlope(const FloatPoint& p1, const FloatPoint& p2, float& c)
-{
- if (p2.x() == p1.x())
- return std::numeric_limits<float>::infinity();
-
- // y = mx + c
- float slope = (p2.y() - p1.y()) / (p2.x() - p1.x());
- c = p1.y() - slope * p1.x();
- return slope;
-}
-
-bool findIntersection(const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& d1, const FloatPoint& d2, FloatPoint& intersection)
-{
- float pOffset = 0;
- float pSlope = findSlope(p1, p2, pOffset);
-
- float dOffset = 0;
- float dSlope = findSlope(d1, d2, dOffset);
-
- if (dSlope == pSlope)
- return false;
-
- if (pSlope == std::numeric_limits<float>::infinity()) {
- intersection.setX(p1.x());
- intersection.setY(dSlope * intersection.x() + dOffset);
- return true;
- }
- if (dSlope == std::numeric_limits<float>::infinity()) {
- intersection.setX(d1.x());
- intersection.setY(pSlope * intersection.x() + pOffset);
- return true;
- }
-
- // Find x at intersection, where ys overlap; x = (c' - c) / (m - m')
- intersection.setX((dOffset - pOffset) / (pSlope - dSlope));
- intersection.setY(pSlope * intersection.x() + pOffset);
- return true;
-}
-
</del><span class="cx"> void FloatPoint::dump(PrintStream& out) const
</span><span class="cx"> {
</span><span class="cx"> out.printf("(%f, %f)", x(), y());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatPoint.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> FloatPoint matrixTransform(const TransformationMatrix&) const;
</span><span class="cx"> FloatPoint matrixTransform(const AffineTransform&) const;
</span><span class="cx">
</span><del>- void dump(PrintStream& out) const;
</del><ins>+ void dump(WTF::PrintStream& out) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> float m_x, m_y;
</span><span class="lines">@@ -235,11 +235,6 @@
</span><span class="cx"> return FloatSize(a.x(), a.y());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-float findSlope(const FloatPoint& p1, const FloatPoint& p2, float& c);
-
-// Find point where lines through the two pairs of points intersect. Returns false if the lines don't intersect.
-bool findIntersection(const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& d1, const FloatPoint& d2, FloatPoint& intersection);
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRect.cpp (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRect.cpp 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.cpp 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -147,17 +147,6 @@
</span><span class="cx"> m_size.setHeight(height() * sy);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatRect unionRect(const Vector<FloatRect>& rects)
-{
- FloatRect result;
-
- size_t count = rects.size();
- for (size_t i = 0; i < count; ++i)
- result.unite(rects[i]);
-
- return result;
-}
-
</del><span class="cx"> void FloatRect::fitToPoints(const FloatPoint& p0, const FloatPoint& p1)
</span><span class="cx"> {
</span><span class="cx"> float left = std::min(p0.x(), p1.x());
</span><span class="lines">@@ -240,18 +229,6 @@
</span><span class="cx"> return IntRect(roundedIntPoint(rect.location()), roundedIntSize(rect.size()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatRect mapRect(const FloatRect& r, const FloatRect& srcRect, const FloatRect& destRect)
-{
- if (srcRect.width() == 0 || srcRect.height() == 0)
- return FloatRect();
-
- float widthScale = destRect.width() / srcRect.width();
- float heightScale = destRect.height() / srcRect.height();
- return FloatRect(destRect.x() + (r.x() - srcRect.x()) * widthScale,
- destRect.y() + (r.y() - srcRect.y()) * heightScale,
- r.width() * widthScale, r.height() * heightScale);
-}
-
</del><span class="cx"> void FloatRect::dump(PrintStream& out) const
</span><span class="cx"> {
</span><span class="cx"> out.print(location(), " ", size());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRect.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #define FloatRect_h
</span><span class="cx">
</span><span class="cx"> #include "FloatPoint.h"
</span><del>-#include <wtf/Vector.h>
</del><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> typedef struct CGRect CGRect;
</span><span class="lines">@@ -177,7 +176,7 @@
</span><span class="cx"> operator cairo_rectangle_t() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void dump(PrintStream& out) const;
</del><ins>+ void dump(WTF::PrintStream& out) const;
</ins><span class="cx">
</span><span class="cx"> static FloatRect infiniteRect();
</span><span class="cx"> bool isInfinite() const;
</span><span class="lines">@@ -208,8 +207,6 @@
</span><span class="cx"> return c;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatRect unionRect(const Vector<FloatRect>&);
-
</del><span class="cx"> inline FloatRect& operator+=(FloatRect& a, const FloatRect& b)
</span><span class="cx"> {
</span><span class="cx"> a.move(b.x(), b.y());
</span><span class="lines">@@ -253,9 +250,6 @@
</span><span class="cx">
</span><span class="cx"> IntRect roundedIntRect(const FloatRect&);
</span><span class="cx">
</span><del>-// Map rect r from srcRect to an equivalent rect in destRect.
-FloatRect mapRect(const FloatRect& r, const FloatRect& srcRect, const FloatRect& destRect);
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatSizecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatSize.cpp (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatSize.cpp 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/graphics/FloatSize.cpp 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include <limits>
</span><span class="cx"> #include <math.h>
</span><ins>+#include <wtf/PrintStream.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatSize.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatSize.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/graphics/FloatSize.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> operator NSSize() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void dump(PrintStream& out) const;
</del><ins>+ void dump(WTF::PrintStream& out) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> float m_width, m_height;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGeometryUtilitiescpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/GeometryUtilities.cpp (0 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GeometryUtilities.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/GeometryUtilities.cpp 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -0,0 +1,104 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GeometryUtilities.h"
+
+namespace WebCore {
+
+float findSlope(const FloatPoint& p1, const FloatPoint& p2, float& c)
+{
+ if (p2.x() == p1.x())
+ return std::numeric_limits<float>::infinity();
+
+ // y = mx + c
+ float slope = (p2.y() - p1.y()) / (p2.x() - p1.x());
+ c = p1.y() - slope * p1.x();
+ return slope;
+}
+
+bool findIntersection(const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& d1, const FloatPoint& d2, FloatPoint& intersection)
+{
+ float pOffset = 0;
+ float pSlope = findSlope(p1, p2, pOffset);
+
+ float dOffset = 0;
+ float dSlope = findSlope(d1, d2, dOffset);
+
+ if (dSlope == pSlope)
+ return false;
+
+ if (pSlope == std::numeric_limits<float>::infinity()) {
+ intersection.setX(p1.x());
+ intersection.setY(dSlope * intersection.x() + dOffset);
+ return true;
+ }
+ if (dSlope == std::numeric_limits<float>::infinity()) {
+ intersection.setX(d1.x());
+ intersection.setY(pSlope * intersection.x() + pOffset);
+ return true;
+ }
+
+ // Find x at intersection, where ys overlap; x = (c' - c) / (m - m')
+ intersection.setX((dOffset - pOffset) / (pSlope - dSlope));
+ intersection.setY(pSlope * intersection.x() + pOffset);
+ return true;
+}
+
+IntRect unionRect(const Vector<IntRect>& rects)
+{
+ IntRect result;
+
+ size_t count = rects.size();
+ for (size_t i = 0; i < count; ++i)
+ result.unite(rects[i]);
+
+ return result;
+}
+
+FloatRect unionRect(const Vector<FloatRect>& rects)
+{
+ FloatRect result;
+
+ size_t count = rects.size();
+ for (size_t i = 0; i < count; ++i)
+ result.unite(rects[i]);
+
+ return result;
+}
+
+FloatRect mapRect(const FloatRect& r, const FloatRect& srcRect, const FloatRect& destRect)
+{
+ if (!srcRect.width() || !srcRect.height())
+ return FloatRect();
+
+ float widthScale = destRect.width() / srcRect.width();
+ float heightScale = destRect.height() / srcRect.height();
+ return FloatRect(destRect.x() + (r.x() - srcRect.x()) * widthScale,
+ destRect.y() + (r.y() - srcRect.y()) * heightScale,
+ r.width() * widthScale, r.height() * heightScale);
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGeometryUtilitieshfromrev166137trunkSourceWebCoreplatformgraphicsTextTrackRepresentationh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/graphics/GeometryUtilities.h (from rev 166137, trunk/Source/WebCore/platform/graphics/TextTrackRepresentation.h) (0 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GeometryUtilities.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/GeometryUtilities.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GeometryUtilities_h
+#define GeometryUtilities_h
+
+#include "FloatRect.h"
+#include "IntRect.h"
+#include <wtf/Vector.h>
+
+namespace WebCore {
+
+float findSlope(const FloatPoint& p1, const FloatPoint& p2, float& c);
+
+// Find point where lines through the two pairs of points intersect. Returns false if the lines don't intersect.
+bool findIntersection(const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& d1, const FloatPoint& d2, FloatPoint& intersection);
+
+IntRect unionRect(const Vector<IntRect>&);
+FloatRect unionRect(const Vector<FloatRect>&);
+
+// Map rect r from srcRect to an equivalent rect in destRect.
+FloatRect mapRect(const FloatRect&, const FloatRect& srcRect, const FloatRect& destRect);
+
+}
+
+#endif // GeometryUtilities_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntPoint.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntPoint.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/graphics/IntPoint.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> operator Evas_Point() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void dump(PrintStream& out) const;
</del><ins>+ void dump(WTF::PrintStream& out) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> int m_x, m_y;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntRect.cpp (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntRect.cpp 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/graphics/IntRect.cpp 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -146,17 +146,6 @@
</span><span class="cx"> return IntSize(xdistance, ydistance);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect unionRect(const Vector<IntRect>& rects)
-{
- IntRect result;
-
- size_t count = rects.size();
- for (size_t i = 0; i < count; ++i)
- result.unite(rects[i]);
-
- return result;
-}
-
</del><span class="cx"> void IntRect::dump(PrintStream& out) const
</span><span class="cx"> {
</span><span class="cx"> out.print(location(), " ", size());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntRect.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "IntPoint.h"
</span><span class="cx"> #include "LayoutUnit.h"
</span><del>-#include <wtf/Vector.h>
</del><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> typedef struct CGRect CGRect;
</span><span class="lines">@@ -197,7 +196,7 @@
</span><span class="cx"> operator NSRect() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void dump(PrintStream& out) const;
</del><ins>+ void dump(WTF::PrintStream& out) const;
</ins><span class="cx">
</span><span class="cx"> static IntRect infiniteRect();
</span><span class="cx"> bool isInfinite() const;
</span><span class="lines">@@ -221,8 +220,6 @@
</span><span class="cx"> return c;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect unionRect(const Vector<IntRect>&);
-
</del><span class="cx"> inline bool operator==(const IntRect& a, const IntRect& b)
</span><span class="cx"> {
</span><span class="cx"> return a.location() == b.location() && a.size() == b.size();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntSize.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntSize.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/graphics/IntSize.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define IntSize_h
</span><span class="cx">
</span><span class="cx"> #include <algorithm>
</span><del>-#include <wtf/PrintStream.h>
</del><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> typedef struct CGSize CGSize;
</span><span class="lines">@@ -51,6 +50,10 @@
</span><span class="cx"> typedef struct tagSIZE SIZE;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+namespace WTF {
+class PrintStream;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class IntSize {
</span><span class="lines">@@ -139,7 +142,7 @@
</span><span class="cx"> operator SIZE() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void dump(PrintStream& out) const;
</del><ins>+ void dump(WTF::PrintStream& out) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> int m_width, m_height;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTextTrackRepresentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TextTrackRepresentation.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TextTrackRepresentation.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/graphics/TextTrackRepresentation.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "PlatformLayer.h"
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Tile.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Tile.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/graphics/Tile.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "IntPointHash.h"
</span><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><ins>+#include <wtf/Vector.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedUpdateAtlash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx"> #include "AreaAllocator.h"
</span><span class="cx"> #include "CoordinatedSurface.h"
</span><span class="cx"> #include "IntSize.h"
</span><ins>+#include <wtf/PassRefPtr.h>
+#include <wtf/RefPtr.h>
</ins><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkWidgetBackingStoreGtkX11h"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> #define WidgetBackingStoreGtkX11_h
</span><span class="cx">
</span><span class="cx"> #include "WidgetBackingStore.h"
</span><ins>+#include <wtf/RefPtr.h>
</ins><span class="cx">
</span><span class="cx"> #include <X11/Xlib.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "FloatRoundedRect.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameView.h"
</span><ins>+#include "GeometryUtilities.h"
</ins><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "FontCache.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameSelection.h"
</span><ins>+#include "GeometryUtilities.h"
</ins><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "HTMLAreaElement.h"
</span><span class="cx"> #include "HTMLImageElement.h"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-03-23 08:36:14 UTC (rev 166138)
</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 "GeometryUtilities.h"
</ins><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "HTMLAnchorElement.h"
</span><span class="cx"> #include "HTMLElement.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-03-23 Simon Fraser <simon.fraser@apple.com>
+
+ Clean up #includes by geometry classes
+ https://bugs.webkit.org/show_bug.cgi?id=130645
+
+ Reviewed by Andreas Kling.
+
+ Pulling in <wtf/Vector.h> and <wtf/PrintStream.h> in the simple geometry
+ classes brings in a lot of additional headers. Fix by adding a new
+ GeometryUtilities file so that the basic files don't need Vector,
+ and including GeometryUtilities.h where necessary.
+
+ Also forward declare PrintStream.h and only bring in the header
+ in implementation files.
+
+ * UIProcess/BackingStore.h:
+ * UIProcess/FindIndicator.cpp:
+ * UIProcess/mac/WKPrintingView.h:
+
</ins><span class="cx"> 2014-03-22 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Assertions in WebPage::rangeFromEditingRange when requested range location is NSNotFound
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUpdateInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UpdateInfo.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UpdateInfo.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebKit2/Shared/UpdateInfo.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><ins>+#include <wtf/Vector.h>
</ins><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx"> class ArgumentDecoder;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/BackingStore.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/BackingStore.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebKit2/UIProcess/BackingStore.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> #include <RefPtrCairo.h>
</span><span class="cx"> #include <WebCore/WidgetBackingStore.h>
</span><ins>+#include <wtf/OwnPtr.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsPageViewportControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="cx"> #include <WebCore/FloatSize.h>
</span><span class="cx"> #include <WebCore/ViewportArguments.h>
</span><ins>+#include <wtf/Noncopyable.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class IntPoint;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessFindIndicatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/FindIndicator.cpp (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/FindIndicator.cpp 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebKit2/UIProcess/FindIndicator.cpp 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "FindIndicator.h"
</span><span class="cx">
</span><span class="cx"> #include "ShareableBitmap.h"
</span><ins>+#include <WebCore/GeometryUtilities.h>
</ins><span class="cx"> #include <WebCore/Gradient.h>
</span><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><span class="cx"> #include <WebCore/IntRect.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKPrintingViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.h (166137 => 166138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.h 2014-03-23 05:40:59 UTC (rev 166137)
+++ trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.h 2014-03-23 08:36:14 UTC (rev 166138)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #import <WebCore/IntRectHash.h>
</span><span class="cx"> #import <condition_variable>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/Vector.h>
</ins><span class="cx">
</span><span class="cx"> @class WKPrintingViewData;
</span><span class="cx"> @class PDFDocument;
</span></span></pre>
</div>
</div>
</body>
</html>