<!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>[159775] trunk/Source/WebKit2</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/159775">159775</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2013-11-25 16:47:51 -0800 (Mon, 25 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Use class extensions for IPI
https://bugs.webkit.org/show_bug.cgi?id=124870
Reviewed by Sam Weinig.
* UIProcess/API/mac/WKBrowsingContextController.mm: Reordered methods so that the Private
cateogry isn’t stuck between the API methods and the internal methods.
(-[WKBrowsingContextController setPaginationMode:]):
(-[WKBrowsingContextController paginationMode]):
(-[WKBrowsingContextController setPaginationBehavesLikeColumns:]):
(-[WKBrowsingContextController paginationBehavesLikeColumns]):
(-[WKBrowsingContextController setPageLength:]):
(-[WKBrowsingContextController pageLength]):
(-[WKBrowsingContextController setGapBetweenPages:]):
(-[WKBrowsingContextController gapBetweenPages]):
(-[WKBrowsingContextController pageCount]):
(-[WKBrowsingContextController handle]):
* UIProcess/API/mac/WKBrowsingContextControllerInternal.h: Changed Internal category into
a class extension.
* UIProcess/API/mac/WKConnection.mm:
* UIProcess/API/mac/WKConnectionInternal.h: Changed Internal category into a class
extension.
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm:
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInInternal.h: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKBrowsingContextControllerInternalh">trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKConnectionmm">trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKConnectionInternalh">trunk/Source/WebKit2/UIProcess/API/mac/WKConnectionInternal.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInmm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInInternalh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159774 => 159775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-11-26 00:21:07 UTC (rev 159774)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-26 00:47:51 UTC (rev 159775)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2013-11-25 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [Cocoa] Use class extensions for IPI
+ https://bugs.webkit.org/show_bug.cgi?id=124870
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/mac/WKBrowsingContextController.mm: Reordered methods so that the Private
+ cateogry isn’t stuck between the API methods and the internal methods.
+ (-[WKBrowsingContextController setPaginationMode:]):
+ (-[WKBrowsingContextController paginationMode]):
+ (-[WKBrowsingContextController setPaginationBehavesLikeColumns:]):
+ (-[WKBrowsingContextController paginationBehavesLikeColumns]):
+ (-[WKBrowsingContextController setPageLength:]):
+ (-[WKBrowsingContextController pageLength]):
+ (-[WKBrowsingContextController setGapBetweenPages:]):
+ (-[WKBrowsingContextController gapBetweenPages]):
+ (-[WKBrowsingContextController pageCount]):
+ (-[WKBrowsingContextController handle]):
+ * UIProcess/API/mac/WKBrowsingContextControllerInternal.h: Changed Internal category into
+ a class extension.
+
+ * UIProcess/API/mac/WKConnection.mm:
+ * UIProcess/API/mac/WKConnectionInternal.h: Changed Internal category into a class
+ extension.
+
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm:
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInInternal.h: Ditto.
+
+2013-11-25 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> Fixed the iOS build.
</span><span class="cx">
</span><span class="cx"> * UIProcess/API/mac/WKBrowsingContextController.mm:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm (159774 => 159775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-11-26 00:21:07 UTC (rev 159774)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-11-26 00:47:51 UTC (rev 159775)
</span><span class="lines">@@ -102,10 +102,6 @@
</span><span class="cx"> WKRetainPtr<WKPageRef> _pageRef;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<PageLoadStateObserver> _pageLoadStateObserver;
</span><del>-
-#if PLATFORM(IOS)
- id <WKBrowsingContextLoadDelegateInternal> _loadDelegateInternal;
-#endif // PLATFORM(IOS)
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="lines">@@ -346,99 +342,6 @@
</span><span class="cx"> return WKPageSetPageZoomFactor(_pageRef.get(), pageZoom);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@end
-
-@implementation WKBrowsingContextController (Private)
-
-- (void)setPaginationMode:(WKBrowsingContextPaginationMode)paginationMode
-{
- WKPaginationMode mode;
- switch (paginationMode) {
- case WKPaginationModeUnpaginated:
- mode = kWKPaginationModeUnpaginated;
- break;
- case WKPaginationModeLeftToRight:
- mode = kWKPaginationModeLeftToRight;
- break;
- case WKPaginationModeRightToLeft:
- mode = kWKPaginationModeRightToLeft;
- break;
- case WKPaginationModeTopToBottom:
- mode = kWKPaginationModeTopToBottom;
- break;
- case WKPaginationModeBottomToTop:
- mode = kWKPaginationModeBottomToTop;
- break;
- default:
- return;
- }
-
- WKPageSetPaginationMode(_pageRef.get(), mode);
-}
-
-- (WKBrowsingContextPaginationMode)paginationMode
-{
- switch (WKPageGetPaginationMode(_pageRef.get())) {
- case kWKPaginationModeUnpaginated:
- return WKPaginationModeUnpaginated;
- case kWKPaginationModeLeftToRight:
- return WKPaginationModeLeftToRight;
- case kWKPaginationModeRightToLeft:
- return WKPaginationModeRightToLeft;
- case kWKPaginationModeTopToBottom:
- return WKPaginationModeTopToBottom;
- case kWKPaginationModeBottomToTop:
- return WKPaginationModeBottomToTop;
- }
-
- ASSERT_NOT_REACHED();
- return WKPaginationModeUnpaginated;
-}
-
-- (void)setPaginationBehavesLikeColumns:(BOOL)behavesLikeColumns
-{
- WKPageSetPaginationBehavesLikeColumns(_pageRef.get(), behavesLikeColumns);
-}
-
-- (BOOL)paginationBehavesLikeColumns
-{
- return WKPageGetPaginationBehavesLikeColumns(_pageRef.get());
-}
-
-- (void)setPageLength:(CGFloat)pageLength
-{
- WKPageSetPageLength(_pageRef.get(), pageLength);
-}
-
-- (CGFloat)pageLength
-{
- return WKPageGetPageLength(_pageRef.get());
-}
-
-- (void)setGapBetweenPages:(CGFloat)gapBetweenPages
-{
- WKPageSetGapBetweenPages(_pageRef.get(), gapBetweenPages);
-}
-
-- (CGFloat)gapBetweenPages
-{
- return WKPageGetGapBetweenPages(_pageRef.get());
-}
-
-- (NSUInteger)pageCount
-{
- return WKPageGetPageCount(_pageRef.get());
-}
-
-- (WKBrowsingContextHandle *)handle
-{
- return [[[WKBrowsingContextHandle alloc] _initWithPageID:toImpl(_pageRef.get())->pageID()] autorelease];
-}
-
-@end
-
-@implementation WKBrowsingContextController (Internal)
-
</del><span class="cx"> static void didStartProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> if (!WKFrameIsMainFrame(frame))
</span><span class="lines">@@ -651,18 +554,6 @@
</span><span class="cx"> WKPageSetPagePolicyClient(pageRef, &policyClient);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-- (id <WKBrowsingContextLoadDelegateInternal>)loadDelegateInternal
-{
- return _loadDelegateInternal;
-}
-
-- (void)setLoadDelegateInternal:(id <WKBrowsingContextLoadDelegateInternal>)loadDelegateInternal
-{
- _loadDelegateInternal = loadDelegateInternal;
-}
-#endif // PLATFORM(IOS)
-
</del><span class="cx"> /* This should only be called from associate view. */
</span><span class="cx">
</span><span class="cx"> - (id)_initWithPageRef:(WKPageRef)pageRef
</span><span class="lines">@@ -695,4 +586,93 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@implementation WKBrowsingContextController (Private)
+
+- (void)setPaginationMode:(WKBrowsingContextPaginationMode)paginationMode
+{
+ WKPaginationMode mode;
+ switch (paginationMode) {
+ case WKPaginationModeUnpaginated:
+ mode = kWKPaginationModeUnpaginated;
+ break;
+ case WKPaginationModeLeftToRight:
+ mode = kWKPaginationModeLeftToRight;
+ break;
+ case WKPaginationModeRightToLeft:
+ mode = kWKPaginationModeRightToLeft;
+ break;
+ case WKPaginationModeTopToBottom:
+ mode = kWKPaginationModeTopToBottom;
+ break;
+ case WKPaginationModeBottomToTop:
+ mode = kWKPaginationModeBottomToTop;
+ break;
+ default:
+ return;
+ }
+
+ WKPageSetPaginationMode(_pageRef.get(), mode);
+}
+
+- (WKBrowsingContextPaginationMode)paginationMode
+{
+ switch (WKPageGetPaginationMode(_pageRef.get())) {
+ case kWKPaginationModeUnpaginated:
+ return WKPaginationModeUnpaginated;
+ case kWKPaginationModeLeftToRight:
+ return WKPaginationModeLeftToRight;
+ case kWKPaginationModeRightToLeft:
+ return WKPaginationModeRightToLeft;
+ case kWKPaginationModeTopToBottom:
+ return WKPaginationModeTopToBottom;
+ case kWKPaginationModeBottomToTop:
+ return WKPaginationModeBottomToTop;
+ }
+
+ ASSERT_NOT_REACHED();
+ return WKPaginationModeUnpaginated;
+}
+
+- (void)setPaginationBehavesLikeColumns:(BOOL)behavesLikeColumns
+{
+ WKPageSetPaginationBehavesLikeColumns(_pageRef.get(), behavesLikeColumns);
+}
+
+- (BOOL)paginationBehavesLikeColumns
+{
+ return WKPageGetPaginationBehavesLikeColumns(_pageRef.get());
+}
+
+- (void)setPageLength:(CGFloat)pageLength
+{
+ WKPageSetPageLength(_pageRef.get(), pageLength);
+}
+
+- (CGFloat)pageLength
+{
+ return WKPageGetPageLength(_pageRef.get());
+}
+
+- (void)setGapBetweenPages:(CGFloat)gapBetweenPages
+{
+ WKPageSetGapBetweenPages(_pageRef.get(), gapBetweenPages);
+}
+
+- (CGFloat)gapBetweenPages
+{
+ return WKPageGetGapBetweenPages(_pageRef.get());
+}
+
+- (NSUInteger)pageCount
+{
+ return WKPageGetPageCount(_pageRef.get());
+}
+
+- (WKBrowsingContextHandle *)handle
+{
+ return [[[WKBrowsingContextHandle alloc] _initWithPageID:toImpl(_pageRef.get())->pageID()] autorelease];
+}
+
+@end
+
</ins><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKBrowsingContextControllerInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerInternal.h (159774 => 159775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerInternal.h 2013-11-26 00:21:07 UTC (rev 159774)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerInternal.h 2013-11-26 00:47:51 UTC (rev 159775)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><del>-@interface WKBrowsingContextController (Internal)
</del><ins>+@interface WKBrowsingContextController ()
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> @property (assign) id <WKBrowsingContextLoadDelegateInternal> loadDelegateInternal;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKConnectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm (159774 => 159775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm 2013-11-26 00:21:07 UTC (rev 159774)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm 2013-11-26 00:47:51 UTC (rev 159775)
</span><span class="lines">@@ -68,10 +68,6 @@
</span><span class="cx"> return _remoteObjectRegistry.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@end
-
-@implementation WKConnection (Internal)
-
</del><span class="cx"> static void didReceiveMessage(WKConnectionRef, WKStringRef messageName, WKTypeRef messageBody, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> WKConnection *connection = (WKConnection *)clientInfo;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKConnectionInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKConnectionInternal.h (159774 => 159775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKConnectionInternal.h 2013-11-26 00:21:07 UTC (rev 159774)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKConnectionInternal.h 2013-11-26 00:47:51 UTC (rev 159775)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit2/WKBase.h>
</span><span class="cx">
</span><del>-@interface WKConnection (Internal)
</del><ins>+@interface WKConnection ()
</ins><span class="cx">
</span><span class="cx"> - (id)_initWithConnectionRef:(WKConnectionRef)connectionRef;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm (159774 => 159775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm 2013-11-26 00:21:07 UTC (rev 159774)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm 2013-11-26 00:47:51 UTC (rev 159775)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation WKWebProcessPlugInController (Internal)
</del><ins>+@implementation WKWebProcessPlugInController
</ins><span class="cx">
</span><span class="cx"> static void didCreatePage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo)
</span><span class="cx"> {
</span><span class="lines">@@ -127,10 +127,6 @@
</span><span class="cx"> return _bundlePageWrapperCache.get(pageRef).get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@end
-
-@implementation WKWebProcessPlugInController
-
</del><span class="cx"> - (WKConnection *)connection
</span><span class="cx"> {
</span><span class="cx"> return _connectionWrapper.get();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInInternal.h (159774 => 159775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInInternal.h 2013-11-26 00:21:07 UTC (rev 159774)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInInternal.h 2013-11-26 00:47:51 UTC (rev 159775)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-@interface WKWebProcessPlugInController (Internal)
</del><ins>+@interface WKWebProcessPlugInController ()
</ins><span class="cx">
</span><span class="cx"> + (WKWebProcessPlugInController *)_shared;
</span><span class="cx"> - (id)_initWithPrincipalClassInstance:(id<WKWebProcessPlugIn>)principalClassInstance bundleRef:(WKBundleRef)bundleRef;
</span></span></pre>
</div>
</div>
</body>
</html>