<!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>[165817] trunk</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/165817">165817</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-03-18 10:57:19 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Renable pagination mode in WK2 MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=130374
Source/WebKit2:
Reviewed by Anders Carlsson.
Add SPI for pagination mode.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _paginationMode]):
(-[WKWebView _setPaginationMode:]):
(-[WKWebView _paginationBehavesLikeColumns]):
(-[WKWebView _setPaginationBehavesLikeColumns:]):
(-[WKWebView _pageLength]):
(-[WKWebView _setPageLength:]):
(-[WKWebView _gapBetweenPages]):
(-[WKWebView _setGapBetweenPages:]):
(-[WKWebView _pageCount]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
(NS_ENUM):
Tools:
Reviewed by Anders Carlsson.
Put the implementation of togglePaginationMode: back, and correctly
enable the menu item.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController validateMenuItem:]):
(-[WK2BrowserWindowController isPaginated]):
(-[WK2BrowserWindowController togglePaginationMode:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165816 => 165817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-18 17:54:53 UTC (rev 165816)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-18 17:57:19 UTC (rev 165817)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-03-17 Simon Fraser <simon.fraser@apple.com>
+
+ Renable pagination mode in WK2 MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=130374
+
+ Reviewed by Anders Carlsson.
+
+ Add SPI for pagination mode.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _paginationMode]):
+ (-[WKWebView _setPaginationMode:]):
+ (-[WKWebView _paginationBehavesLikeColumns]):
+ (-[WKWebView _setPaginationBehavesLikeColumns:]):
+ (-[WKWebView _pageLength]):
+ (-[WKWebView _setPageLength:]):
+ (-[WKWebView _gapBetweenPages]):
+ (-[WKWebView _setGapBetweenPages:]):
+ (-[WKWebView _pageCount]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ (NS_ENUM):
+
</ins><span class="cx"> 2014-03-18 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CMAKE][WK2]Move CoordinatedGraphics related files out of WebKit2/CMakeLists.txt
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (165816 => 165817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-18 17:54:53 UTC (rev 165816)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-18 17:57:19 UTC (rev 165817)
</span><span class="lines">@@ -901,6 +901,86 @@
</span><span class="cx"> _page->runJavaScriptInMainFrame(scriptString, WebKit::ScriptValueCallback::create([](bool, WebKit::WebSerializedScriptValue*){}));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (_WKPaginationMode)_paginationMode
+{
+ switch (_page->paginationMode()) {
+ case WebCore::Pagination::Unpaginated:
+ return _WKPaginationModeUnpaginated;
+ case WebCore::Pagination::LeftToRightPaginated:
+ return _WKPaginationModeLeftToRight;
+ case WebCore::Pagination::RightToLeftPaginated:
+ return _WKPaginationModeRightToLeft;
+ case WebCore::Pagination::TopToBottomPaginated:
+ return _WKPaginationModeTopToBottom;
+ case WebCore::Pagination::BottomToTopPaginated:
+ return _WKPaginationModeBottomToTop;
+ }
+
+ ASSERT_NOT_REACHED();
+ return _WKPaginationModeUnpaginated;
+}
+
+- (void)_setPaginationMode:(_WKPaginationMode)paginationMode
+{
+ WebCore::Pagination::Mode mode;
+ switch (paginationMode) {
+ case _WKPaginationModeUnpaginated:
+ mode = WebCore::Pagination::Unpaginated;
+ break;
+ case _WKPaginationModeLeftToRight:
+ mode = WebCore::Pagination::LeftToRightPaginated;
+ break;
+ case _WKPaginationModeRightToLeft:
+ mode = WebCore::Pagination::RightToLeftPaginated;
+ break;
+ case _WKPaginationModeTopToBottom:
+ mode = WebCore::Pagination::TopToBottomPaginated;
+ break;
+ case _WKPaginationModeBottomToTop:
+ mode = WebCore::Pagination::BottomToTopPaginated;
+ break;
+ default:
+ return;
+ }
+
+ _page->setPaginationMode(mode);
+}
+
+- (BOOL)_paginationBehavesLikeColumns
+{
+ return _page->paginationBehavesLikeColumns();
+}
+
+- (void)_setPaginationBehavesLikeColumns:(BOOL)behavesLikeColumns
+{
+ _page->setPaginationBehavesLikeColumns(behavesLikeColumns);
+}
+
+- (CGFloat)_pageLength
+{
+ return _page->pageLength();
+}
+
+- (void)_setPageLength:(CGFloat)pageLength
+{
+ _page->setPageLength(pageLength);
+}
+
+- (CGFloat)_gapBetweenPages
+{
+ return _page->gapBetweenPages();
+}
+
+- (void)_setGapBetweenPages:(CGFloat)gapBetweenPages
+{
+ _page->setGapBetweenPages(gapBetweenPages);
+}
+
+- (NSUInteger)_pageCount
+{
+ return _page->pageCount();
+}
+
</ins><span class="cx"> #pragma mark iOS-specific methods
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (165816 => 165817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-03-18 17:54:53 UTC (rev 165816)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-03-18 17:57:19 UTC (rev 165817)
</span><span class="lines">@@ -32,6 +32,14 @@
</span><span class="cx"> _WKRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+typedef NS_ENUM(NSUInteger, _WKPaginationMode) {
+ _WKPaginationModeUnpaginated,
+ _WKPaginationModeLeftToRight,
+ _WKPaginationModeRightToLeft,
+ _WKPaginationModeTopToBottom,
+ _WKPaginationModeBottomToTop,
+};
+
</ins><span class="cx"> @class WKBrowsingContextHandle;
</span><span class="cx"> @class WKRemoteObjectRegistry;
</span><span class="cx"> @protocol WKHistoryDelegatePrivate;
</span><span class="lines">@@ -86,6 +94,15 @@
</span><span class="cx">
</span><span class="cx"> - (void)_runJavaScriptInMainFrame:(NSString *)scriptString;
</span><span class="cx">
</span><ins>+@property (nonatomic, setter=_setPaginationMode:) _WKPaginationMode _paginationMode;
+// Whether the column-break-{before,after} properties are respected instead of the
+// page-break-{before,after} properties.
+@property (nonatomic, setter=_setPaginationBehavesLikeColumns:) BOOL _paginationBehavesLikeColumns;
+// Set to 0 to have the page length equal the view length.
+@property (nonatomic, setter=_setPageLength:) CGFloat _pageLength;
+@property (nonatomic, setter=_setGapBetweenPages:) CGFloat _gapBetweenPages;
+@property (readonly) NSUInteger _pageCount;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (165816 => 165817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-18 17:54:53 UTC (rev 165816)
+++ trunk/Tools/ChangeLog 2014-03-18 17:57:19 UTC (rev 165817)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-17 Simon Fraser <simon.fraser@apple.com>
+
+ Renable pagination mode in WK2 MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=130374
+
+ Reviewed by Anders Carlsson.
+
+ Put the implementation of togglePaginationMode: back, and correctly
+ enable the menu item.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController validateMenuItem:]):
+ (-[WK2BrowserWindowController isPaginated]):
+ (-[WK2BrowserWindowController togglePaginationMode:]):
+
</ins><span class="cx"> 2014-03-18 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Add --reset option to Tools/Scripts/set-webkit-configuration script
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (165816 => 165817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-03-18 17:54:53 UTC (rev 165816)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-03-18 17:57:19 UTC (rev 165817)
</span><span class="lines">@@ -118,14 +118,15 @@
</span><span class="cx"> || action == @selector(toggleZoomMode:)
</span><span class="cx"> || action == @selector(resetZoom:)
</span><span class="cx"> || action == @selector(dumpSourceToConsole:)
</span><del>- || action == @selector(find:)
- || action == @selector(togglePaginationMode:))
</del><ins>+ || action == @selector(find:))
</ins><span class="cx"> return NO;
</span><span class="cx">
</span><span class="cx"> if (action == @selector(showHideWebView:))
</span><span class="cx"> [menuItem setTitle:[_webView isHidden] ? @"Show Web View" : @"Hide Web View"];
</span><span class="cx"> else if (action == @selector(removeReinsertWebView:))
</span><span class="cx"> [menuItem setTitle:[_webView window] ? @"Remove Web View" : @"Insert Web View"];
</span><ins>+ else if ([menuItem action] == @selector(togglePaginationMode:))
+ [menuItem setState:[self isPaginated] ? NSOnState : NSOffState];
</ins><span class="cx"> else if ([menuItem action] == @selector(toggleTransparentWindow:))
</span><span class="cx"> [menuItem setState:[[self window] isOpaque] ? NSOffState : NSOnState];
</span><span class="cx"> else if ([menuItem action] == @selector(toggleUISideCompositing:))
</span><span class="lines">@@ -170,10 +171,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)togglePaginationMode:(id)sender
-{
-}
-
</del><span class="cx"> - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
</span><span class="cx"> {
</span><span class="cx"> SEL action = [item action];
</span><span class="lines">@@ -248,6 +245,22 @@
</span><span class="cx"> [self setCurrentZoomFactor:factor];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)isPaginated
+{
+ return _webView._paginationMode != _WKPaginationModeUnpaginated;
+}
+
+- (IBAction)togglePaginationMode:(id)sender
+{
+ if ([self isPaginated])
+ _webView._paginationMode = _WKPaginationModeUnpaginated;
+ else {
+ _webView._paginationMode = _WKPaginationModeLeftToRight;
+ _webView._pageLength = _webView.bounds.size.width / 2;
+ _webView._gapBetweenPages = 10;
+ }
+}
+
</ins><span class="cx"> - (IBAction)toggleTransparentWindow:(id)sender
</span><span class="cx"> {
</span><span class="cx"> BOOL isTransparent = _webView._drawsTransparentBackground;
</span></span></pre>
</div>
</div>
</body>
</html>