<!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>[197593] 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/197593">197593</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-03-04 15:32:14 -0800 (Fri, 04 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use BoxExtent instead of EdgeSet in TileController
https://bugs.webkit.org/show_bug.cgi?id=155040
Reviewed by Zalan Bujtas.
Remove EdgeSet, which was very similar to the existing BoxExtent, and use BoxExtent
in TileController.
* WebCore.xcodeproj/project.pbxproj:
* platform/graphics/EdgeSet.h: Removed.
(WebCore::EdgeSet::EdgeSet): Deleted.
(WebCore::EdgeSet::top): Deleted.
(WebCore::EdgeSet::setTop): Deleted.
(WebCore::EdgeSet::right): Deleted.
(WebCore::EdgeSet::setRight): Deleted.
(WebCore::EdgeSet::bottom): Deleted.
(WebCore::EdgeSet::setBottom): Deleted.
(WebCore::EdgeSet::left): Deleted.
(WebCore::EdgeSet::setLeft): Deleted.
(WebCore::EdgeSet::operator==): Deleted.
(WebCore::EdgeSet::operator!=): Deleted.
* platform/graphics/ca/TileController.cpp:
(WebCore::TileController::setHasMargins):
* platform/graphics/ca/TileController.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllercpp">trunk/Source/WebCore/platform/graphics/ca/TileController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllerh">trunk/Source/WebCore/platform/graphics/ca/TileController.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsEdgeSeth">trunk/Source/WebCore/platform/graphics/EdgeSet.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197592 => 197593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-04 23:29:31 UTC (rev 197592)
+++ trunk/Source/WebCore/ChangeLog 2016-03-04 23:32:14 UTC (rev 197593)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-03-04 Simon Fraser <simon.fraser@apple.com>
+
+ Use BoxExtent instead of EdgeSet in TileController
+ https://bugs.webkit.org/show_bug.cgi?id=155040
+
+ Reviewed by Zalan Bujtas.
+
+ Remove EdgeSet, which was very similar to the existing BoxExtent, and use BoxExtent
+ in TileController.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/graphics/EdgeSet.h: Removed.
+ (WebCore::EdgeSet::EdgeSet): Deleted.
+ (WebCore::EdgeSet::top): Deleted.
+ (WebCore::EdgeSet::setTop): Deleted.
+ (WebCore::EdgeSet::right): Deleted.
+ (WebCore::EdgeSet::setRight): Deleted.
+ (WebCore::EdgeSet::bottom): Deleted.
+ (WebCore::EdgeSet::setBottom): Deleted.
+ (WebCore::EdgeSet::left): Deleted.
+ (WebCore::EdgeSet::setLeft): Deleted.
+ (WebCore::EdgeSet::operator==): Deleted.
+ (WebCore::EdgeSet::operator!=): Deleted.
+ * platform/graphics/ca/TileController.cpp:
+ (WebCore::TileController::setHasMargins):
+ * platform/graphics/ca/TileController.h:
+
</ins><span class="cx"> 2016-03-04 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Gather resource load statistics
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (197592 => 197593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-03-04 23:29:31 UTC (rev 197592)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-03-04 23:32:14 UTC (rev 197593)
</span><span class="lines">@@ -460,7 +460,6 @@
</span><span class="cx"> 0F15ED5C1B7EC7C500EDDFEB /* WillChangeData.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F15ED5A1B7EC7C500EDDFEB /* WillChangeData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F1774801378B772009DA76A /* ScrollAnimatorIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F17747E1378B771009DA76A /* ScrollAnimatorIOS.h */; };
</span><span class="cx"> 0F1774811378B772009DA76A /* ScrollAnimatorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F17747F1378B772009DA76A /* ScrollAnimatorIOS.mm */; };
</span><del>- 0F2884001C7CF7D500888E9A /* EdgeSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F2883FF1C7CF7D500888E9A /* EdgeSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 0F36E7371BD1837A002DB891 /* LayoutPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F36E7361BD1837A002DB891 /* LayoutPoint.cpp */; };
</span><span class="cx"> 0F36E7391BD184B9002DB891 /* LayoutSize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F36E7381BD184B9002DB891 /* LayoutSize.cpp */; };
</span><span class="cx"> 0F3C725E1974874B00AEDD0C /* ImageSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F3C725D1974874B00AEDD0C /* ImageSource.cpp */; };
</span><span class="lines">@@ -7851,7 +7850,6 @@
</span><span class="cx"> 0F15ED5A1B7EC7C500EDDFEB /* WillChangeData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WillChangeData.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F17747E1378B771009DA76A /* ScrollAnimatorIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollAnimatorIOS.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F17747F1378B772009DA76A /* ScrollAnimatorIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollAnimatorIOS.mm; sourceTree = "<group>"; };
</span><del>- 0F2883FF1C7CF7D500888E9A /* EdgeSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EdgeSet.h; sourceTree = "<group>"; };
</del><span class="cx"> 0F36E7361BD1837A002DB891 /* LayoutPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutPoint.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F36E7381BD184B9002DB891 /* LayoutSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutSize.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F3C725D1974874B00AEDD0C /* ImageSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageSource.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -21865,7 +21863,6 @@
</span><span class="cx"> 2D29ECC2192ECC8300984B78 /* DisplayRefreshMonitorClient.h */,
</span><span class="cx"> 2D29ECC3192ECC8300984B78 /* DisplayRefreshMonitorManager.cpp */,
</span><span class="cx"> 2D29ECC4192ECC8300984B78 /* DisplayRefreshMonitorManager.h */,
</span><del>- 0F2883FF1C7CF7D500888E9A /* EdgeSet.h */,
</del><span class="cx"> 6E67D2A81280E8BD008758F7 /* Extensions3D.h */,
</span><span class="cx"> B275353A0B053814002CE64F /* FloatPoint.cpp */,
</span><span class="cx"> B275353B0B053814002CE64F /* FloatPoint.h */,
</span><span class="lines">@@ -25283,7 +25280,6 @@
</span><span class="cx"> E125F8421824253A00D84CD9 /* CryptoAlgorithmAES_CBC.h in Headers */,
</span><span class="cx"> E1FE137B184D21BB00892F13 /* CryptoAlgorithmAES_KW.h in Headers */,
</span><span class="cx"> E125F83A1824104800D84CD9 /* CryptoAlgorithmAesCbcParams.h in Headers */,
</span><del>- 0F2884001C7CF7D500888E9A /* EdgeSet.h in Headers */,
</del><span class="cx"> E19AC3F71824E5D100349426 /* CryptoAlgorithmAesKeyGenParams.h in Headers */,
</span><span class="cx"> E157A8ED181851AC009F821D /* CryptoAlgorithmDescriptionBuilder.h in Headers */,
</span><span class="cx"> E125F8321822F11B00D84CD9 /* CryptoAlgorithmHMAC.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsEdgeSeth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/EdgeSet.h (197592 => 197593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/EdgeSet.h 2016-03-04 23:29:31 UTC (rev 197592)
+++ trunk/Source/WebCore/platform/graphics/EdgeSet.h 2016-03-04 23:32:14 UTC (rev 197593)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 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. ``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
- * 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 EdgeSet_h
-#define EdgeSet_h
-
-namespace WebCore {
-
-template <typename T>
-class EdgeSet {
-public:
- EdgeSet(T top, T right, T bottom, T left)
- : m_top(top)
- , m_right(right)
- , m_bottom(bottom)
- , m_left(left)
- {
- }
-
- T top() const { return m_top; }
- void setTop(T top) { m_top = top; }
-
- T right() const { return m_right; }
- void setRight(T right) { m_right = right; }
-
- T bottom() const { return m_bottom; }
- void setBottom(T bottom) { m_bottom = bottom; }
-
- T left() const { return m_left; }
- void setLeft(T left) { m_left = left; }
-
- bool operator==(const EdgeSet<T>& b) const
- {
- return top() == b.top()
- && right() == b.right()
- && bottom() == b.bottom()
- && left() == b.left();
- }
-
- bool operator!=(const EdgeSet<T>& b) const
- {
- return !(*this == b);
- }
-
-private:
- T m_top;
- T m_right;
- T m_bottom;
- T m_left;
-};
-
-} // namespace WebCore
-
-#endif // EdgeSet_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.cpp (197592 => 197593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2016-03-04 23:29:31 UTC (rev 197592)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2016-03-04 23:32:14 UTC (rev 197593)
</span><span class="lines">@@ -613,7 +613,7 @@
</span><span class="cx">
</span><span class="cx"> void TileController::setHasMargins(bool marginTop, bool marginBottom, bool marginLeft, bool marginRight)
</span><span class="cx"> {
</span><del>- EdgeSet<bool> marginEdges(marginTop, marginRight, marginBottom, marginLeft);
</del><ins>+ BoxExtent<bool> marginEdges(marginTop, marginRight, marginBottom, marginLeft);
</ins><span class="cx"> if (marginEdges == m_marginEdges)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.h (197592 => 197593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.h 2016-03-04 23:29:31 UTC (rev 197592)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.h 2016-03-04 23:32:14 UTC (rev 197593)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #ifndef TileController_h
</span><span class="cx"> #define TileController_h
</span><span class="cx">
</span><del>-#include "EdgeSet.h"
</del><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "IntRect.h"
</span><ins>+#include "LengthBox.h"
</ins><span class="cx"> #include "PlatformCALayer.h"
</span><span class="cx"> #include "PlatformCALayerClient.h"
</span><span class="cx"> #include "TiledBacking.h"
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx">
</span><span class="cx"> Scrollability m_scrollability { HorizontallyScrollable | VerticallyScrollable };
</span><span class="cx">
</span><del>- EdgeSet<bool> m_marginEdges;
</del><ins>+ BoxExtent<bool> m_marginEdges;
</ins><span class="cx">
</span><span class="cx"> bool m_isInWindow { false };
</span><span class="cx"> bool m_scrollingPerformanceLoggingEnabled { false };
</span></span></pre>
</div>
</div>
</body>
</html>