<!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>[185080] 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/185080">185080</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-01 15:43:45 -0700 (Mon, 01 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WAKScrollView.h cannot be imported standalone
https://bugs.webkit.org/show_bug.cgi?id=145529
Reviewed by Dan Bernstein.
Source/WebCore:
* page/mac/WebCoreFrameView.h:
Remove the __cplusplus #ifdefs since WebCoreFrameView.h is only used by Objective-C++ code.
(The different non-C++ method declarations were wrong anyway!)
* platform/ScrollTypes.h:
Remove the #ifdef __cplusplus surrounding the code, add header includes to make the file self-contained,
and reformat the enum definitions.
Source/WebKit/mac:
Don't migrate WAKScrollView.h, it's not used outside of WebKit.
* MigrateHeaders.make:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagemacWebCoreFrameViewh">trunk/Source/WebCore/page/mac/WebCoreFrameView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollTypesh">trunk/Source/WebCore/platform/ScrollTypes.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMigrateHeadersmake">trunk/Source/WebKit/mac/MigrateHeaders.make</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185079 => 185080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-01 22:40:47 UTC (rev 185079)
+++ trunk/Source/WebCore/ChangeLog 2015-06-01 22:43:45 UTC (rev 185080)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-01 Anders Carlsson <andersca@apple.com>
+
+ WAKScrollView.h cannot be imported standalone
+ https://bugs.webkit.org/show_bug.cgi?id=145529
+
+ Reviewed by Dan Bernstein.
+
+ * page/mac/WebCoreFrameView.h:
+ Remove the __cplusplus #ifdefs since WebCoreFrameView.h is only used by Objective-C++ code.
+ (The different non-C++ method declarations were wrong anyway!)
+
+ * platform/ScrollTypes.h:
+ Remove the #ifdef __cplusplus surrounding the code, add header includes to make the file self-contained,
+ and reformat the enum definitions.
+
</ins><span class="cx"> 2015-06-01 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] resource-type and load-type should be independent.
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacWebCoreFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/WebCoreFrameView.h (185079 => 185080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/WebCoreFrameView.h 2015-06-01 22:40:47 UTC (rev 185079)
+++ trunk/Source/WebCore/page/mac/WebCoreFrameView.h 2015-06-01 22:43:45 UTC (rev 185080)
</span><span class="lines">@@ -23,38 +23,26 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include "ScrollTypes.h"
</del><ins>+#import "ScrollTypes.h"
+#import <wtf/Platform.h>
</ins><span class="cx">
</span><del>-#ifdef __cplusplus
</del><span class="cx"> #if PLATFORM(IOS)
</span><del>-#include "WAKAppKitStubs.h"
</del><ins>+#import "WAKAppKitStubs.h"
</ins><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><del>-// WTF_PLATFORM_IOS
-#ifdef __cplusplus
</del><span class="cx"> namespace WebCore {
</span><del>- class Frame;
</del><ins>+class Frame;
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> @protocol WebCoreFrameScrollView
</span><del>-// WTF_PLATFORM_IOS
-#ifdef __cplusplus
</del><span class="cx"> - (void)setScrollingModes:(WebCore::ScrollbarMode)hMode vertical:(WebCore::ScrollbarMode)vMode andLock:(BOOL)lock;
</span><span class="cx"> - (void)scrollingModes:(WebCore::ScrollbarMode*)hMode vertical:(WebCore::ScrollbarMode*)vMode;
</span><del>-#else
-- (void)setScrollingModes:(int)hMode vertical:(int)vMode andLock:(BOOL)lock;
-- (void)scrollingModes:(int*)hMode vertical:(int*)vMode;
-#endif
</del><ins>+
</ins><span class="cx"> - (void)setScrollBarsSuppressed:(BOOL)suppressed repaintOnUnsuppress:(BOOL)repaint;
</span><span class="cx"> - (void)setScrollOrigin:(NSPoint)origin updatePositionAtAll:(BOOL)updatePositionAtAll immediately:(BOOL)updatePositionImmediately;
</span><span class="cx"> - (NSPoint)scrollOrigin;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @protocol WebCoreFrameView
</span><del>-// WTF_PLATFORM_IOS
-#ifdef __cplusplus
</del><span class="cx"> - (WebCore::Frame*)_web_frame;
</span><del>-#endif
</del><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollTypes.h (185079 => 185080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollTypes.h 2015-06-01 22:40:47 UTC (rev 185079)
+++ trunk/Source/WebCore/platform/ScrollTypes.h 2015-06-01 22:43:45 UTC (rev 185080)
</span><span class="lines">@@ -26,167 +26,167 @@
</span><span class="cx"> #ifndef ScrollTypes_h
</span><span class="cx"> #define ScrollTypes_h
</span><span class="cx">
</span><del>-#ifdef __cplusplus
</del><ins>+#include <cstdint>
+#include <wtf/Assertions.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- enum ScrollDirection : uint8_t {
- ScrollUp,
- ScrollDown,
- ScrollLeft,
- ScrollRight
- };
</del><ins>+enum ScrollDirection : uint8_t {
+ ScrollUp,
+ ScrollDown,
+ ScrollLeft,
+ ScrollRight
+};
</ins><span class="cx">
</span><del>- enum ScrollLogicalDirection : uint8_t {
- ScrollBlockDirectionBackward,
- ScrollBlockDirectionForward,
- ScrollInlineDirectionBackward,
- ScrollInlineDirectionForward
- };
-
-
- inline ScrollDirection logicalToPhysical(ScrollLogicalDirection direction, bool isVertical, bool isFlipped)
- {
- switch (direction) {
- case ScrollBlockDirectionBackward: {
- if (isVertical) {
- if (!isFlipped)
- return ScrollUp;
- return ScrollDown;
- } else {
- if (!isFlipped)
- return ScrollLeft;
- return ScrollRight;
- }
- break;
- }
- case ScrollBlockDirectionForward: {
- if (isVertical) {
- if (!isFlipped)
- return ScrollDown;
</del><ins>+enum ScrollLogicalDirection : uint8_t {
+ ScrollBlockDirectionBackward,
+ ScrollBlockDirectionForward,
+ ScrollInlineDirectionBackward,
+ ScrollInlineDirectionForward
+};
+
+
+inline ScrollDirection logicalToPhysical(ScrollLogicalDirection direction, bool isVertical, bool isFlipped)
+{
+ switch (direction) {
+ case ScrollBlockDirectionBackward: {
+ if (isVertical) {
+ if (!isFlipped)
</ins><span class="cx"> return ScrollUp;
</span><del>- } else {
- if (!isFlipped)
- return ScrollRight;
</del><ins>+ return ScrollDown;
+ } else {
+ if (!isFlipped)
</ins><span class="cx"> return ScrollLeft;
</span><del>- }
- break;
</del><ins>+ return ScrollRight;
</ins><span class="cx"> }
</span><del>- case ScrollInlineDirectionBackward: {
- if (isVertical) {
- if (!isFlipped)
- return ScrollLeft;
</del><ins>+ break;
+ }
+ case ScrollBlockDirectionForward: {
+ if (isVertical) {
+ if (!isFlipped)
+ return ScrollDown;
+ return ScrollUp;
+ } else {
+ if (!isFlipped)
</ins><span class="cx"> return ScrollRight;
</span><del>- } else {
- if (!isFlipped)
- return ScrollUp;
- return ScrollDown;
- }
- break;
</del><ins>+ return ScrollLeft;
</ins><span class="cx"> }
</span><del>- case ScrollInlineDirectionForward: {
- if (isVertical) {
- if (!isFlipped)
- return ScrollRight;
</del><ins>+ break;
+ }
+ case ScrollInlineDirectionBackward: {
+ if (isVertical) {
+ if (!isFlipped)
</ins><span class="cx"> return ScrollLeft;
</span><del>- } else {
- if (!isFlipped)
- return ScrollDown;
</del><ins>+ return ScrollRight;
+ } else {
+ if (!isFlipped)
</ins><span class="cx"> return ScrollUp;
</span><del>- }
- break;
</del><ins>+ return ScrollDown;
</ins><span class="cx"> }
</span><del>- default:
- ASSERT_NOT_REACHED();
- break;
</del><ins>+ break;
+ }
+ case ScrollInlineDirectionForward: {
+ if (isVertical) {
+ if (!isFlipped)
+ return ScrollRight;
+ return ScrollLeft;
+ } else {
+ if (!isFlipped)
+ return ScrollDown;
+ return ScrollUp;
</ins><span class="cx"> }
</span><del>- return ScrollUp;
</del><ins>+ break;
</ins><span class="cx"> }
</span><ins>+ default:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+ return ScrollUp;
+}
</ins><span class="cx">
</span><del>- enum ScrollGranularity : uint8_t {
- ScrollByLine,
- ScrollByPage,
- ScrollByDocument,
- ScrollByPixel,
- ScrollByPrecisePixel
- };
</del><ins>+enum ScrollGranularity : uint8_t {
+ ScrollByLine,
+ ScrollByPage,
+ ScrollByDocument,
+ ScrollByPixel,
+ ScrollByPrecisePixel
+};
</ins><span class="cx">
</span><del>- enum ScrollElasticity {
- ScrollElasticityAutomatic,
- ScrollElasticityNone,
- ScrollElasticityAllowed
- };
</del><ins>+enum ScrollElasticity {
+ ScrollElasticityAutomatic,
+ ScrollElasticityNone,
+ ScrollElasticityAllowed
+};
</ins><span class="cx">
</span><del>- enum ScrollbarOrientation { HorizontalScrollbar, VerticalScrollbar };
</del><ins>+enum ScrollbarOrientation { HorizontalScrollbar, VerticalScrollbar };
</ins><span class="cx">
</span><del>- enum ScrollbarMode { ScrollbarAuto, ScrollbarAlwaysOff, ScrollbarAlwaysOn };
</del><ins>+enum ScrollbarMode { ScrollbarAuto, ScrollbarAlwaysOff, ScrollbarAlwaysOn };
</ins><span class="cx">
</span><del>- enum ScrollbarControlSize { RegularScrollbar, SmallScrollbar };
</del><ins>+enum ScrollbarControlSize { RegularScrollbar, SmallScrollbar };
</ins><span class="cx">
</span><del>- enum class ScrollEventAxis { Horizontal, Vertical };
</del><ins>+enum class ScrollEventAxis { Horizontal, Vertical };
</ins><span class="cx">
</span><del>- typedef unsigned ScrollbarControlState;
</del><ins>+typedef unsigned ScrollbarControlState;
</ins><span class="cx">
</span><del>- enum ScrollbarControlStateMask {
- ActiveScrollbarState = 1,
- EnabledScrollbarState = 1 << 1,
- PressedScrollbarState = 1 << 2
- };
</del><ins>+enum ScrollbarControlStateMask {
+ ActiveScrollbarState = 1,
+ EnabledScrollbarState = 1 << 1,
+ PressedScrollbarState = 1 << 2
+};
</ins><span class="cx">
</span><del>- enum ScrollbarPart {
- NoPart = 0,
- BackButtonStartPart = 1,
- ForwardButtonStartPart = 1 << 1,
- BackTrackPart = 1 << 2,
- ThumbPart = 1 << 3,
- ForwardTrackPart = 1 << 4,
- BackButtonEndPart = 1 << 5,
- ForwardButtonEndPart = 1 << 6,
- ScrollbarBGPart = 1 << 7,
- TrackBGPart = 1 << 8,
- AllParts = 0xffffffff
- };
</del><ins>+enum ScrollbarPart {
+ NoPart = 0,
+ BackButtonStartPart = 1,
+ ForwardButtonStartPart = 1 << 1,
+ BackTrackPart = 1 << 2,
+ ThumbPart = 1 << 3,
+ ForwardTrackPart = 1 << 4,
+ BackButtonEndPart = 1 << 5,
+ ForwardButtonEndPart = 1 << 6,
+ ScrollbarBGPart = 1 << 7,
+ TrackBGPart = 1 << 8,
+ AllParts = 0xffffffff
+};
</ins><span class="cx">
</span><del>- enum ScrollbarButtonsPlacement {
- ScrollbarButtonsNone,
- ScrollbarButtonsSingle,
- ScrollbarButtonsDoubleStart,
- ScrollbarButtonsDoubleEnd,
- ScrollbarButtonsDoubleBoth
- };
</del><ins>+enum ScrollbarButtonsPlacement {
+ ScrollbarButtonsNone,
+ ScrollbarButtonsSingle,
+ ScrollbarButtonsDoubleStart,
+ ScrollbarButtonsDoubleEnd,
+ ScrollbarButtonsDoubleBoth
+};
</ins><span class="cx">
</span><del>- enum class ScrollbarStyle {
- AlwaysVisible,
- Overlay
- };
-
- enum ScrollbarOverlayStyle {
- ScrollbarOverlayStyleDefault,
- ScrollbarOverlayStyleDark,
- ScrollbarOverlayStyleLight
- };
</del><ins>+enum class ScrollbarStyle {
+ AlwaysVisible,
+ Overlay
+};
</ins><span class="cx">
</span><del>- enum ScrollbarOverlayState {
- ScrollbarOverlayStateHidden,
- ScrollbarOverlayStateThumbShown,
- ScrollbarOverlayStateAllShown,
- ScrollbarOverlayStatePulseThumb
- };
</del><ins>+enum ScrollbarOverlayStyle {
+ ScrollbarOverlayStyleDefault,
+ ScrollbarOverlayStyleDark,
+ ScrollbarOverlayStyleLight
+};
</ins><span class="cx">
</span><del>- typedef unsigned ScrollbarControlPartMask;
</del><ins>+enum ScrollbarOverlayState {
+ ScrollbarOverlayStateHidden,
+ ScrollbarOverlayStateThumbShown,
+ ScrollbarOverlayStateAllShown,
+ ScrollbarOverlayStatePulseThumb
+};
</ins><span class="cx">
</span><del>- enum ScrollPinningBehavior {
- DoNotPin,
- PinToTop,
- PinToBottom
- };
</del><ins>+typedef unsigned ScrollbarControlPartMask;
</ins><span class="cx">
</span><del>- enum ScrollBehaviorForFixedElements {
- StickToDocumentBounds,
- StickToViewportBounds
- };
</del><ins>+enum ScrollPinningBehavior {
+ DoNotPin,
+ PinToTop,
+ PinToBottom
+};
+
+enum ScrollBehaviorForFixedElements {
+ StickToDocumentBounds,
+ StickToViewportBounds
+};
+
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // __cplusplus
-
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (185079 => 185080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-06-01 22:40:47 UTC (rev 185079)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-01 22:43:45 UTC (rev 185080)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-06-01 Anders Carlsson <andersca@apple.com>
+
+ WAKScrollView.h cannot be imported standalone
+ https://bugs.webkit.org/show_bug.cgi?id=145529
+
+ Reviewed by Dan Bernstein.
+
+ Don't migrate WAKScrollView.h, it's not used outside of WebKit.
+
+ * MigrateHeaders.make:
+
</ins><span class="cx"> 2015-05-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Make the header replace rule more restrictive and get rid of a special case
</span></span></pre></div>
<a id="trunkSourceWebKitmacMigrateHeadersmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (185079 => 185080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/MigrateHeaders.make 2015-06-01 22:40:47 UTC (rev 185079)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make 2015-06-01 22:43:45 UTC (rev 185080)
</span><span class="lines">@@ -206,7 +206,6 @@
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/SystemMemory.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/WAKAppKitStubs.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/WAKResponder.h \
</span><del>- $(PRIVATE_HEADERS_DIR)/WAKScrollView.h \
</del><span class="cx"> $(PRIVATE_HEADERS_DIR)/WAKView.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/WAKWindow.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/WKContentObservation.h \
</span></span></pre>
</div>
</div>
</body>
</html>