<!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>[164522] 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/164522">164522</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-21 19:15:47 -0800 (Fri, 21 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Made WKWebView implement all WKContentViewDelegate methods.
Reviewed by Anders Carlsson.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView takeViewSnapshotForContentView:]): Moved from WKViewIOS.mm.
* UIProcess/API/ios/WKContentView.h: Made all protocol methods required.
* UIProcess/API/ios/WKViewIOS.mm:
(-[WKView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]): Removed code
to set self as the delegate on the content view.</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="#trunkSourceWebKit2UIProcessAPIiosWKContentViewh">trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKViewIOSmm">trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164521 => 164522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-22 03:14:13 UTC (rev 164521)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-22 03:15:47 UTC (rev 164522)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-21 Dan Bernstein <mitz@apple.com>
+
+ Made WKWebView implement all WKContentViewDelegate methods.
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView takeViewSnapshotForContentView:]): Moved from WKViewIOS.mm.
+ * UIProcess/API/ios/WKContentView.h: Made all protocol methods required.
+ * UIProcess/API/ios/WKViewIOS.mm:
+ (-[WKView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]): Removed code
+ to set self as the delegate on the content view.
+
</ins><span class="cx"> 2014-02-21 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/16073882> Please add _AbandonCoalition key to plugin XPC service Info.plist
</span><span class="lines">@@ -2,3 +15,3 @@
</span><span class="cx">
</span><del>- Anders Carlsson.
</del><ins>+ Reviewed by Anders Carlsson.
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (164521 => 164522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-22 03:14:13 UTC (rev 164521)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-22 03:15:47 UTC (rev 164522)
</span><span class="lines">@@ -336,6 +336,16 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (RetainPtr<CGImageRef>)takeViewSnapshotForContentView:(WKContentView *)contentView
+{
+ // FIXME: We should be able to use acquire an IOSurface directly, instead of going to CGImage here and back in ViewSnapshotStore.
+ UIGraphicsBeginImageContextWithOptions(self.bounds.size, YES, self.window.screen.scale);
+ [self drawViewHierarchyInRect:[self bounds] afterScreenUpdates:NO];
+ UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
+ UIGraphicsEndImageContext();
+ return image.CGImage;
+}
+
</ins><span class="cx"> #pragma mark - UIScrollViewDelegate
</span><span class="cx">
</span><span class="cx"> - (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKContentViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.h (164521 => 164522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.h 2014-02-22 03:14:13 UTC (rev 164521)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.h 2014-02-22 03:15:47 UTC (rev 164522)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @protocol WKContentViewDelegate <NSObject>
</span><del>-@optional
</del><span class="cx"> - (void)contentViewDidCommitLoadForMainFrame:(WKContentView *)contentView;
</span><span class="cx"> - (void)contentView:(WKContentView *)contentView didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm (164521 => 164522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-02-22 03:14:13 UTC (rev 164521)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-02-22 03:15:47 UTC (rev 164522)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-@interface WKView () <UIScrollViewDelegate, WKContentViewDelegate>
</del><ins>+@interface WKView () <UIScrollViewDelegate>
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface UIScrollView (UIScrollViewInternal)
</span><span class="lines">@@ -147,32 +147,6 @@
</span><span class="cx"> return _allowsBackForwardNavigationGestures;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#pragma mark WKContentViewDelegate
-
-- (void)contentViewDidCommitLoadForMainFrame:(WKContentView *)contentView
-{
- _isWaitingForNewLayerTreeAfterDidCommitLoad = YES;
-}
-
-- (void)contentView:(WKContentView *)contentView didCommitLayerTree:(const RemoteLayerTreeTransaction&)layerTreeTransaction
-{
- [_scrollView setMinimumZoomScale:layerTreeTransaction.minimumScaleFactor()];
- [_scrollView setMaximumZoomScale:layerTreeTransaction.maximumScaleFactor()];
- [_scrollView setZoomEnabled:layerTreeTransaction.allowsUserScaling()];
- if (![_scrollView isZooming] && ![_scrollView isZoomBouncing])
- [_scrollView setZoomScale:layerTreeTransaction.pageScaleFactor()];
-
- if (_gestureController)
- _gestureController->setRenderTreeSize(layerTreeTransaction.renderTreeSize());
-
- if (_isWaitingForNewLayerTreeAfterDidCommitLoad) {
- UIEdgeInsets inset = [_scrollView contentInset];
- [_scrollView setContentOffset:CGPointMake(-inset.left, -inset.top)];
- _isWaitingForNewLayerTreeAfterDidCommitLoad = NO;
- }
- [self _updateVisibleContentRects];
-}
-
</del><span class="cx"> #pragma mark - UIScrollViewDelegate
</span><span class="cx">
</span><span class="cx"> - (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView
</span><span class="lines">@@ -256,7 +230,6 @@
</span><span class="cx">
</span><span class="cx"> _contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds context:*toImpl(contextRef) configuration:std::move(webPageConfiguration)]);
</span><span class="cx">
</span><del>- [_contentView setDelegate:self];
</del><span class="cx"> [[_contentView layer] setAnchorPoint:CGPointZero];
</span><span class="cx"> [_contentView setFrame:bounds];
</span><span class="cx"> [_scrollView addSubview:_contentView.get()];
</span><span class="lines">@@ -293,16 +266,6 @@
</span><span class="cx"> [_contentView didUpdateVisibleRect:visibleRectInContentCoordinates unobscuredRect:unobscuredRectInContentCoordinates scale:scaleFactor];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (RetainPtr<CGImageRef>)takeViewSnapshotForContentView:(WKContentView *)contentView
-{
- // FIXME: We should be able to use acquire an IOSurface directly, instead of going to CGImage here and back in ViewSnapshotStore.
- UIGraphicsBeginImageContextWithOptions(self.bounds.size, YES, self.window.screen.scale);
- [self drawViewHierarchyInRect:[self bounds] afterScreenUpdates:NO];
- UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
- UIGraphicsEndImageContext();
- return image.CGImage;
-}
-
</del><span class="cx"> - (void)_keyboardChangedWithInfo:(NSDictionary *)keyboardInfo adjustScrollView:(BOOL)adjustScrollView
</span><span class="cx"> {
</span><span class="cx"> // FIXME: We will also need to adjust the unobscured rect by taking into account the keyboard rect and the obscured insets.
</span></span></pre>
</div>
</div>
</body>
</html>