<!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>[165758] 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/165758">165758</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-03-17 14:29:11 -0700 (Mon, 17 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename WKThumbnailView to _WKThumbnailView
https://bugs.webkit.org/show_bug.cgi?id=130361
Reviewed by Anders Carlsson.
* UIProcess/API/Cocoa/_WKThumbnailView.h: Renamed from Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailView.h.
* UIProcess/API/Cocoa/_WKThumbnailView.mm: Renamed from Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailView.mm.
(-[_WKThumbnailView initWithFrame:fromWKView:]):
(-[_WKThumbnailView _viewWasUnparented]):
(-[_WKThumbnailView _viewWasParented]):
(-[_WKThumbnailView _requestSnapshotIfNeeded]):
(-[_WKThumbnailView _didTakeSnapshot:]):
(-[_WKThumbnailView viewDidMoveToWindow]):
(-[_WKThumbnailView setScale:]):
(-[_WKThumbnailView setUsesSnapshot:]):
(-[_WKThumbnailView _setThumbnailLayer:]):
(-[_WKThumbnailView _thumbnailLayer]):
* UIProcess/API/Cocoa/_WKThumbnailViewInternal.h: Renamed from Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailViewInternal.h.
* UIProcess/API/mac/WKView.mm:
(-[WKView _setThumbnailView:]):
(-[WKView _thumbnailView]):
(-[WKView _updateThumbnailViewLayer]):
* UIProcess/API/mac/WKViewInternal.h:
* UIProcess/mac/PageClientImpl.mm:
* WebKit2.xcodeproj/project.pbxproj:
* MigrateHeaders.make:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMigrateHeadersmake">trunk/Source/WebKit/mac/MigrateHeaders.make</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewInternalh">trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailViewInternal.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKThumbnailViewh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKThumbnailViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKThumbnailViewInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailViewInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (165757 => 165758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-03-17 21:24:42 UTC (rev 165757)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-03-17 21:29:11 UTC (rev 165758)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-17 Tim Horton <timothy_horton@apple.com>
+
+ Rename WKThumbnailView to _WKThumbnailView
+ https://bugs.webkit.org/show_bug.cgi?id=130361
+
+ Reviewed by Anders Carlsson.
+
+ * MigrateHeaders.make:
+
</ins><span class="cx"> 2014-03-17 David Farler <dfarler@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: WebKitLegacy causes ASan build to fail
</span></span></pre></div>
<a id="trunkSourceWebKitmacMigrateHeadersmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (165757 => 165758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/MigrateHeaders.make 2014-03-17 21:24:42 UTC (rev 165757)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make 2014-03-17 21:29:11 UTC (rev 165758)
</span><span class="lines">@@ -272,7 +272,6 @@
</span><span class="cx"> WKProcessPoolConfiguration.h \
</span><span class="cx"> WKProcessPoolConfigurationPrivate.h \
</span><span class="cx"> WKProcessPoolPrivate.h \
</span><del>- WKThumbnailView.h \
</del><span class="cx"> WKUIDelegate.h \
</span><span class="cx"> WKUIDelegatePrivate.h \
</span><span class="cx"> WKVisitedLinkProvider.h \
</span><span class="lines">@@ -283,6 +282,7 @@
</span><span class="cx"> WKWebViewPrivate.h \
</span><span class="cx"> _WKActivatedElementInfo.h \
</span><span class="cx"> _WKElementAction.h \
</span><ins>+ _WKThumbnailView.h \
</ins><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> WEBKIT2_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(filter $(WEBKIT2_HEADERS),$(notdir $(wildcard $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Headers/*))))
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165757 => 165758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-17 21:24:42 UTC (rev 165757)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-17 21:29:11 UTC (rev 165758)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-03-17 Tim Horton <timothy_horton@apple.com>
+
+ Rename WKThumbnailView to _WKThumbnailView
+ https://bugs.webkit.org/show_bug.cgi?id=130361
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/_WKThumbnailView.h: Renamed from Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailView.h.
+ * UIProcess/API/Cocoa/_WKThumbnailView.mm: Renamed from Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailView.mm.
+ (-[_WKThumbnailView initWithFrame:fromWKView:]):
+ (-[_WKThumbnailView _viewWasUnparented]):
+ (-[_WKThumbnailView _viewWasParented]):
+ (-[_WKThumbnailView _requestSnapshotIfNeeded]):
+ (-[_WKThumbnailView _didTakeSnapshot:]):
+ (-[_WKThumbnailView viewDidMoveToWindow]):
+ (-[_WKThumbnailView setScale:]):
+ (-[_WKThumbnailView setUsesSnapshot:]):
+ (-[_WKThumbnailView _setThumbnailLayer:]):
+ (-[_WKThumbnailView _thumbnailLayer]):
+ * UIProcess/API/Cocoa/_WKThumbnailViewInternal.h: Renamed from Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailViewInternal.h.
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _setThumbnailView:]):
+ (-[WKView _thumbnailView]):
+ (-[WKView _updateThumbnailViewLayer]):
+ * UIProcess/API/mac/WKViewInternal.h:
+ * UIProcess/mac/PageClientImpl.mm:
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-03-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add SPI for getting bundle parameters from the injected bundle
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKThumbnailViewh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailView.h (165757 => 165758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailView.h 2014-03-17 21:24:42 UTC (rev 165757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailView.h 2014-03-17 21:29:11 UTC (rev 165758)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#import <WebKit2/WKFoundation.h>
-
-#if WK_API_ENABLED
-
-#if !TARGET_OS_IPHONE
-
-#import <AppKit/AppKit.h>
-
-@class WKView;
-
-WK_API_CLASS
-@interface WKThumbnailView : NSView
-
-- (instancetype)initWithFrame:(NSRect)frame fromWKView:(WKView *)wkView;
-
-@property (nonatomic) CGFloat scale;
-@property (nonatomic) BOOL usesSnapshot;
-
-@end
-
-#endif // TARGET_OS_IPHONE
-
-#endif // WK_API_ENABLED
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKThumbnailViewmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailView.mm (165757 => 165758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailView.mm 2014-03-17 21:24:42 UTC (rev 165757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailView.mm 2014-03-17 21:29:11 UTC (rev 165758)
</span><span class="lines">@@ -1,176 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#import "config.h"
-#import "WKThumbnailViewInternal.h"
-
-#if WK_API_ENABLED
-
-#if PLATFORM(MAC)
-
-#import "WKAPICast.h"
-#import "WKView.h"
-#import "WKViewInternal.h"
-#import "WebPageProxy.h"
-
-// FIXME: Make it possible to leave a snapshot of the content presented in the WKView while the thumbnail is live.
-// FIXME: Don't make new speculative tiles while thumbnailed.
-// FIXME: Hide scrollbars in the thumbnail.
-// FIXME: We should re-use existing tiles for unparented views, if we have them (we need to know if they've been purged; if so, repaint at scaled-down size).
-// FIXME: We should switch to the low-resolution scale if a view we have high-resolution tiles for repaints.
-
-using namespace WebCore;
-using namespace WebKit;
-
-@implementation WKThumbnailView {
- RetainPtr<WKView> _wkView;
- WebPageProxy* _webPageProxy;
-
- BOOL _originalMayStartMediaWhenInWindow;
- BOOL _originalSourceViewIsInWindow;
-
- BOOL _shouldApplyThumbnailScale;
-}
-
-@synthesize _waitingForSnapshot = _waitingForSnapshot;
-
-- (instancetype)initWithFrame:(NSRect)frame fromWKView:(WKView *)wkView
-{
- if (!(self = [super initWithFrame:frame]))
- return nil;
-
- _wkView = wkView;
- _webPageProxy = toImpl([_wkView pageRef]);
- _scale = 1;
-
- _originalMayStartMediaWhenInWindow = _webPageProxy->mayStartMediaWhenInWindow();
- _originalSourceViewIsInWindow = !![_wkView window];
-
- _shouldApplyThumbnailScale = !_originalSourceViewIsInWindow;
- return self;
-}
-
-- (void)_viewWasUnparented
-{
- if (_shouldApplyThumbnailScale)
- _webPageProxy->setThumbnailScale(1);
-
- [_wkView _setThumbnailView:nil];
-
- self.layer.contents = nil;
-
- _webPageProxy->setMayStartMediaWhenInWindow(_originalMayStartMediaWhenInWindow);
-}
-
-- (void)_viewWasParented
-{
- if ([_wkView _thumbnailView])
- return;
-
- if (_shouldApplyThumbnailScale)
- _webPageProxy->setThumbnailScale(_scale);
-
- if (!_originalSourceViewIsInWindow)
- _webPageProxy->setMayStartMediaWhenInWindow(false);
-
- [self _requestSnapshotIfNeeded];
- [_wkView _setThumbnailView:self];
-}
-
-- (void)_requestSnapshotIfNeeded
-{
- if (!_usesSnapshot || _waitingForSnapshot || self.layer.contents)
- return;
-
- _waitingForSnapshot = YES;
-
- RetainPtr<WKThumbnailView> thumbnailView = self;
- _webPageProxy->takeThumbnailSnapshot([thumbnailView](bool, const ShareableBitmap::Handle& imageHandle) {
- RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(imageHandle, SharedMemory::ReadOnly);
- RetainPtr<CGImageRef> cgImage = bitmap->makeCGImage();
- [thumbnailView _didTakeSnapshot:cgImage.get()];
- });
-}
-
-- (void)_didTakeSnapshot:(CGImageRef)image
-{
- _waitingForSnapshot = NO;
- self.layer.sublayers = @[];
- self.layer.contents = (id)image;
-}
-
-- (void)viewDidMoveToWindow
-{
- if (self.window)
- [self _viewWasParented];
- else
- [self _viewWasUnparented];
-}
-
-- (void)setScale:(CGFloat)scale
-{
- if (_scale == scale)
- return;
-
- _scale = scale;
-
- if (self.window && _shouldApplyThumbnailScale)
- _webPageProxy->setThumbnailScale(_scale);
-}
-
-- (void)setUsesSnapshot:(BOOL)usesSnapshot
-{
- if (_usesSnapshot == usesSnapshot)
- return;
-
- _usesSnapshot = usesSnapshot;
-
- if (!self.window)
- return;
-
- if (usesSnapshot)
- [self _requestSnapshotIfNeeded];
- else
- [_wkView _reparentLayerTreeInThumbnailView];
-}
-
-- (void)_setThumbnailLayer:(CALayer *)layer
-{
- self.layer.sublayers = layer ? @[ layer ] : @[ ];
-}
-
-- (CALayer *)_thumbnailLayer
-{
- if (!self.layer.sublayers.count)
- return nil;
-
- return [self.layer.sublayers objectAtIndex:0];
-}
-
-@end
-
-#endif // PLATFORM(MAC)
-
-#endif // WK_API_ENABLED
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKThumbnailViewInternalh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailViewInternal.h (165757 => 165758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailViewInternal.h 2014-03-17 21:24:42 UTC (rev 165757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKThumbnailViewInternal.h 2014-03-17 21:29:11 UTC (rev 165758)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#import "WKThumbnailView.h"
-
-#if WK_API_ENABLED
-
-#if PLATFORM(MAC)
-
-@interface WKThumbnailView ()
-
-@property (nonatomic, assign, setter = _setThumbnailLayer:) CALayer *_thumbnailLayer;
-@property (nonatomic, assign, setter = _setWaitingForSnapshot:) BOOL _waitingForSnapshot;
-
-@end
-
-#endif // PLATFORM(MAC)
-
-#endif // WK_API_ENABLED
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h (0 => 165758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h 2014-03-17 21:29:11 UTC (rev 165758)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+/*
+ * Copyright (C) 2014 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#import <WebKit2/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+#if !TARGET_OS_IPHONE
+
+#import <AppKit/AppKit.h>
+
+@class WKView;
+
+WK_API_CLASS
+@interface _WKThumbnailView : NSView
+
+- (instancetype)initWithFrame:(NSRect)frame fromWKView:(WKView *)wkView;
+
+@property (nonatomic) CGFloat scale;
+@property (nonatomic) BOOL usesSnapshot;
+
+@end
+
+#endif // TARGET_OS_IPHONE
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewmm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm (0 => 165758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm 2014-03-17 21:29:11 UTC (rev 165758)
</span><span class="lines">@@ -0,0 +1,176 @@
</span><ins>+/*
+ * Copyright (C) 2014 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#import "config.h"
+#import "_WKThumbnailViewInternal.h"
+
+#if WK_API_ENABLED
+
+#if PLATFORM(MAC)
+
+#import "WKAPICast.h"
+#import "WKView.h"
+#import "WKViewInternal.h"
+#import "WebPageProxy.h"
+
+// FIXME: Make it possible to leave a snapshot of the content presented in the WKView while the thumbnail is live.
+// FIXME: Don't make new speculative tiles while thumbnailed.
+// FIXME: Hide scrollbars in the thumbnail.
+// FIXME: We should re-use existing tiles for unparented views, if we have them (we need to know if they've been purged; if so, repaint at scaled-down size).
+// FIXME: We should switch to the low-resolution scale if a view we have high-resolution tiles for repaints.
+
+using namespace WebCore;
+using namespace WebKit;
+
+@implementation _WKThumbnailView {
+ RetainPtr<WKView> _wkView;
+ WebPageProxy* _webPageProxy;
+
+ BOOL _originalMayStartMediaWhenInWindow;
+ BOOL _originalSourceViewIsInWindow;
+
+ BOOL _shouldApplyThumbnailScale;
+}
+
+@synthesize _waitingForSnapshot = _waitingForSnapshot;
+
+- (instancetype)initWithFrame:(NSRect)frame fromWKView:(WKView *)wkView
+{
+ if (!(self = [super initWithFrame:frame]))
+ return nil;
+
+ _wkView = wkView;
+ _webPageProxy = toImpl([_wkView pageRef]);
+ _scale = 1;
+
+ _originalMayStartMediaWhenInWindow = _webPageProxy->mayStartMediaWhenInWindow();
+ _originalSourceViewIsInWindow = !![_wkView window];
+
+ _shouldApplyThumbnailScale = !_originalSourceViewIsInWindow;
+ return self;
+}
+
+- (void)_viewWasUnparented
+{
+ if (_shouldApplyThumbnailScale)
+ _webPageProxy->setThumbnailScale(1);
+
+ [_wkView _setThumbnailView:nil];
+
+ self.layer.contents = nil;
+
+ _webPageProxy->setMayStartMediaWhenInWindow(_originalMayStartMediaWhenInWindow);
+}
+
+- (void)_viewWasParented
+{
+ if ([_wkView _thumbnailView])
+ return;
+
+ if (_shouldApplyThumbnailScale)
+ _webPageProxy->setThumbnailScale(_scale);
+
+ if (!_originalSourceViewIsInWindow)
+ _webPageProxy->setMayStartMediaWhenInWindow(false);
+
+ [self _requestSnapshotIfNeeded];
+ [_wkView _setThumbnailView:self];
+}
+
+- (void)_requestSnapshotIfNeeded
+{
+ if (!_usesSnapshot || _waitingForSnapshot || self.layer.contents)
+ return;
+
+ _waitingForSnapshot = YES;
+
+ RetainPtr<_WKThumbnailView> thumbnailView = self;
+ _webPageProxy->takeThumbnailSnapshot([thumbnailView](bool, const ShareableBitmap::Handle& imageHandle) {
+ RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(imageHandle, SharedMemory::ReadOnly);
+ RetainPtr<CGImageRef> cgImage = bitmap->makeCGImage();
+ [thumbnailView _didTakeSnapshot:cgImage.get()];
+ });
+}
+
+- (void)_didTakeSnapshot:(CGImageRef)image
+{
+ _waitingForSnapshot = NO;
+ self.layer.sublayers = @[];
+ self.layer.contents = (id)image;
+}
+
+- (void)viewDidMoveToWindow
+{
+ if (self.window)
+ [self _viewWasParented];
+ else
+ [self _viewWasUnparented];
+}
+
+- (void)setScale:(CGFloat)scale
+{
+ if (_scale == scale)
+ return;
+
+ _scale = scale;
+
+ if (self.window && _shouldApplyThumbnailScale)
+ _webPageProxy->setThumbnailScale(_scale);
+}
+
+- (void)setUsesSnapshot:(BOOL)usesSnapshot
+{
+ if (_usesSnapshot == usesSnapshot)
+ return;
+
+ _usesSnapshot = usesSnapshot;
+
+ if (!self.window)
+ return;
+
+ if (usesSnapshot)
+ [self _requestSnapshotIfNeeded];
+ else
+ [_wkView _reparentLayerTreeInThumbnailView];
+}
+
+- (void)_setThumbnailLayer:(CALayer *)layer
+{
+ self.layer.sublayers = layer ? @[ layer ] : @[ ];
+}
+
+- (CALayer *)_thumbnailLayer
+{
+ if (!self.layer.sublayers.count)
+ return nil;
+
+ return [self.layer.sublayers objectAtIndex:0];
+}
+
+@end
+
+#endif // PLATFORM(MAC)
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewInternalh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailViewInternal.h (0 => 165758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailViewInternal.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailViewInternal.h 2014-03-17 21:29:11 UTC (rev 165758)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2014 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#import "_WKThumbnailView.h"
+
+#if WK_API_ENABLED
+
+#if PLATFORM(MAC)
+
+@interface _WKThumbnailView ()
+
+@property (nonatomic, assign, setter = _setThumbnailLayer:) CALayer *_thumbnailLayer;
+@property (nonatomic, assign, setter = _setWaitingForSnapshot:) BOOL _waitingForSnapshot;
+
+@end
+
+#endif // PLATFORM(MAC)
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (165757 => 165758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-03-17 21:24:42 UTC (rev 165757)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-03-17 21:29:11 UTC (rev 165758)
</span><span class="lines">@@ -59,8 +59,6 @@
</span><span class="cx"> #import "WKProcessPoolInternal.h"
</span><span class="cx"> #import "WKStringCF.h"
</span><span class="cx"> #import "WKTextInputWindowController.h"
</span><del>-#import "WKThumbnailView.h"
-#import "WKThumbnailViewInternal.h"
</del><span class="cx"> #import "WKViewInternal.h"
</span><span class="cx"> #import "WKViewPrivate.h"
</span><span class="cx"> #import "WebBackForwardList.h"
</span><span class="lines">@@ -73,6 +71,7 @@
</span><span class="cx"> #import "WebPreferences.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> #import "WebSystemInterface.h"
</span><ins>+#import "_WKThumbnailViewInternal.h"
</ins><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><span class="cx"> #import <WebCore/AXObjectCache.h>
</span><span class="cx"> #import <WebCore/ColorMac.h>
</span><span class="lines">@@ -228,7 +227,7 @@
</span><span class="cx"> RetainPtr<CALayer> _rootLayer;
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><del>- WKThumbnailView *_thumbnailView;
</del><ins>+ _WKThumbnailView *_thumbnailView;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2966,7 +2965,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><del>-- (void)_setThumbnailView:(WKThumbnailView *)thumbnailView
</del><ins>+- (void)_setThumbnailView:(_WKThumbnailView *)thumbnailView
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!_data->_thumbnailView || !thumbnailView);
</span><span class="cx">
</span><span class="lines">@@ -2980,14 +2979,14 @@
</span><span class="cx"> _data->_page->viewStateDidChange(ViewState::WindowIsActive | ViewState::IsInWindow | ViewState::IsVisible);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (WKThumbnailView *)_thumbnailView
</del><ins>+- (_WKThumbnailView *)_thumbnailView
</ins><span class="cx"> {
</span><span class="cx"> return _data->_thumbnailView;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_updateThumbnailViewLayer
</span><span class="cx"> {
</span><del>- WKThumbnailView *thumbnailView = _data->_thumbnailView;
</del><ins>+ _WKThumbnailView *thumbnailView = _data->_thumbnailView;
</ins><span class="cx"> ASSERT(thumbnailView);
</span><span class="cx">
</span><span class="cx"> if (!thumbnailView.usesSnapshot || thumbnailView._waitingForSnapshot)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (165757 => 165758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-03-17 21:24:42 UTC (rev 165757)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-03-17 21:29:11 UTC (rev 165758)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> @class WKFullScreenWindowController;
</span><span class="cx"> #if WK_API_ENABLED
</span><del>-@class WKThumbnailView;
</del><ins>+@class _WKThumbnailView;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @interface WKView ()
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> - (BOOL)_suppressVisibilityUpdates;
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><del>-@property (nonatomic, setter=_setThumbnailView:) WKThumbnailView *_thumbnailView;
</del><ins>+@property (nonatomic, setter=_setThumbnailView:) _WKThumbnailView *_thumbnailView;
</ins><span class="cx"> - (void)_reparentLayerTreeInThumbnailView;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (165757 => 165758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-03-17 21:24:42 UTC (rev 165757)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-03-17 21:29:11 UTC (rev 165758)
</span><span class="lines">@@ -39,13 +39,13 @@
</span><span class="cx"> #import "WKAPICast.h"
</span><span class="cx"> #import "WKFullScreenWindowController.h"
</span><span class="cx"> #import "WKStringCF.h"
</span><del>-#import "WKThumbnailView.h"
</del><span class="cx"> #import "WKViewInternal.h"
</span><span class="cx"> #import "WebColorPickerMac.h"
</span><span class="cx"> #import "WebContextMenuProxyMac.h"
</span><span class="cx"> #import "WebEditCommandProxy.h"
</span><span class="cx"> #import "WebPopupMenuProxyMac.h"
</span><span class="cx"> #import "WindowServerConnection.h"
</span><ins>+#import "_WKThumbnailView.h"
</ins><span class="cx"> #import <WebCore/AlternativeTextUIController.h>
</span><span class="cx"> #import <WebCore/BitmapImage.h>
</span><span class="cx"> #import <WebCore/Cursor.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (165757 => 165758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-03-17 21:24:42 UTC (rev 165757)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-03-17 21:29:11 UTC (rev 165758)
</span><span class="lines">@@ -499,8 +499,8 @@
</span><span class="cx"> 2D429BFD1721E2C700EC681F /* PDFPluginPasswordField.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D429BFB1721E2BA00EC681F /* PDFPluginPasswordField.mm */; };
</span><span class="cx"> 2D47B56C1810714E003A3AEE /* RemoteLayerBackingStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D47B56A1810714E003A3AEE /* RemoteLayerBackingStore.mm */; };
</span><span class="cx"> 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D47B56B1810714E003A3AEE /* RemoteLayerBackingStore.h */; };
</span><del>- 2D6B371B18A967AD0042AE80 /* WKThumbnailView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D6B371918A967AD0042AE80 /* WKThumbnailView.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 2D6B371C18A967AD0042AE80 /* WKThumbnailView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D6B371A18A967AD0042AE80 /* WKThumbnailView.mm */; };
</del><ins>+ 2D6B371B18A967AD0042AE80 /* _WKThumbnailView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D6B371918A967AD0042AE80 /* _WKThumbnailView.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 2D6B371C18A967AD0042AE80 /* _WKThumbnailView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */; };
</ins><span class="cx"> 2D6CD119189058A500E5A4A0 /* ViewSnapshotStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D6CD117189058A500E5A4A0 /* ViewSnapshotStore.h */; };
</span><span class="cx"> 2D6CD11A189058A500E5A4A0 /* ViewSnapshotStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D6CD118189058A500E5A4A0 /* ViewSnapshotStore.mm */; };
</span><span class="cx"> 2D7AAFD318C8640600A7ACD4 /* WKWebViewContentProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D7AAFD218C8640600A7ACD4 /* WKWebViewContentProvider.h */; };
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> 2DA944B91884EA3900ED86DB /* WebBackForwardListProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944B51884EA3500ED86DB /* WebBackForwardListProxyIOS.mm */; };
</span><span class="cx"> 2DA944BA1884EA3C00ED86DB /* WebPageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944B61884EA3500ED86DB /* WebPageIOS.mm */; };
</span><span class="cx"> 2DA944BD188511E700ED86DB /* NetworkProcessIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944BC188511E700ED86DB /* NetworkProcessIOS.mm */; };
</span><del>- 2DACE64E18ADBFF000E4CA76 /* WKThumbnailViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DACE64D18ADBFF000E4CA76 /* WKThumbnailViewInternal.h */; };
</del><ins>+ 2DACE64E18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DACE64D18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h */; };
</ins><span class="cx"> 2DAF06D618BD1A470081CEB1 /* SmartMagnificationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DAF06D418BD1A470081CEB1 /* SmartMagnificationController.h */; };
</span><span class="cx"> 2DAF06D718BD1A470081CEB1 /* SmartMagnificationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DAF06D518BD1A470081CEB1 /* SmartMagnificationController.mm */; };
</span><span class="cx"> 2DC6D9C318C44A610043BAD4 /* WKWebViewContentProviderRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DC6D9C118C44A610043BAD4 /* WKWebViewContentProviderRegistry.h */; };
</span><span class="lines">@@ -2267,8 +2267,8 @@
</span><span class="cx"> 2D429BFB1721E2BA00EC681F /* PDFPluginPasswordField.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PDFPluginPasswordField.mm; path = PDF/PDFPluginPasswordField.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D47B56A1810714E003A3AEE /* RemoteLayerBackingStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteLayerBackingStore.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D47B56B1810714E003A3AEE /* RemoteLayerBackingStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerBackingStore.h; sourceTree = "<group>"; };
</span><del>- 2D6B371918A967AD0042AE80 /* WKThumbnailView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKThumbnailView.h; sourceTree = "<group>"; };
- 2D6B371A18A967AD0042AE80 /* WKThumbnailView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKThumbnailView.mm; sourceTree = "<group>"; };
</del><ins>+ 2D6B371918A967AD0042AE80 /* _WKThumbnailView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKThumbnailView.h; sourceTree = "<group>"; };
+ 2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKThumbnailView.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 2D6CD117189058A500E5A4A0 /* ViewSnapshotStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewSnapshotStore.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D6CD118189058A500E5A4A0 /* ViewSnapshotStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ViewSnapshotStore.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D70AB1318A1D51A00026D6E /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
</span><span class="lines">@@ -2308,7 +2308,7 @@
</span><span class="cx"> 2DA944B51884EA3500ED86DB /* WebBackForwardListProxyIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebBackForwardListProxyIOS.mm; path = ios/WebBackForwardListProxyIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DA944B61884EA3500ED86DB /* WebPageIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebPageIOS.mm; path = ios/WebPageIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DA944BC188511E700ED86DB /* NetworkProcessIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessIOS.mm; path = NetworkProcess/ios/NetworkProcessIOS.mm; sourceTree = "<group>"; };
</span><del>- 2DACE64D18ADBFF000E4CA76 /* WKThumbnailViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKThumbnailViewInternal.h; sourceTree = "<group>"; };
</del><ins>+ 2DACE64D18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKThumbnailViewInternal.h; sourceTree = "<group>"; };
</ins><span class="cx"> 2DAF06D418BD1A470081CEB1 /* SmartMagnificationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SmartMagnificationController.h; path = ios/SmartMagnificationController.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DAF06D518BD1A470081CEB1 /* SmartMagnificationController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SmartMagnificationController.mm; path = ios/SmartMagnificationController.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DAF06D818BD23BA0081CEB1 /* SmartMagnificationController.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = SmartMagnificationController.messages.in; path = ios/SmartMagnificationController.messages.in; sourceTree = "<group>"; };
</span><span class="lines">@@ -4541,9 +4541,9 @@
</span><span class="cx"> 1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkProvider.h */,
</span><span class="cx"> 1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkProvider.mm */,
</span><span class="cx"> 1A81B38418BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h */,
</span><del>- 2D6B371918A967AD0042AE80 /* WKThumbnailView.h */,
- 2DACE64D18ADBFF000E4CA76 /* WKThumbnailViewInternal.h */,
- 2D6B371A18A967AD0042AE80 /* WKThumbnailView.mm */,
</del><ins>+ 2D6B371918A967AD0042AE80 /* _WKThumbnailView.h */,
+ 2DACE64D18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h */,
+ 2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */,
</ins><span class="cx"> 1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */,
</span><span class="cx"> 1A4D664918A3030E00D82E21 /* WKFrameInfo.mm */,
</span><span class="cx"> 1A4D664D18A3031B00D82E21 /* WKFrameInfoInternal.h */,
</span><span class="lines">@@ -6664,7 +6664,7 @@
</span><span class="cx"> 1A2D82A5127F4EAB001EB962 /* NPObjectMessageReceiver.h in Headers */,
</span><span class="cx"> 1A2D843A127F65D5001EB962 /* NPObjectMessageReceiverMessages.h in Headers */,
</span><span class="cx"> 1A2D82A7127F4EAB001EB962 /* NPObjectProxy.h in Headers */,
</span><del>- 2D6B371B18A967AD0042AE80 /* WKThumbnailView.h in Headers */,
</del><ins>+ 2D6B371B18A967AD0042AE80 /* _WKThumbnailView.h in Headers */,
</ins><span class="cx"> 1A2D82A9127F4EAB001EB962 /* NPRemoteObjectMap.h in Headers */,
</span><span class="cx"> 1A2161B011F37664008AD0F5 /* NPRuntimeObjectMap.h in Headers */,
</span><span class="cx"> 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */,
</span><span class="lines">@@ -6838,7 +6838,7 @@
</span><span class="cx"> BC1DD7B2114DC396005ADAF3 /* WebCoreArgumentCoders.h in Headers */,
</span><span class="cx"> 512F589B12A8838800629530 /* WebCredential.h in Headers */,
</span><span class="cx"> 2D7AAFD618C956AF00A7ACD4 /* WKWebViewConfigurationInternal.h in Headers */,
</span><del>- 2DACE64E18ADBFF000E4CA76 /* WKThumbnailViewInternal.h in Headers */,
</del><ins>+ 2DACE64E18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h in Headers */,
</ins><span class="cx"> 51578B831209ECEF00A37C4A /* APIData.h in Headers */,
</span><span class="cx"> F6A25FDD12ADC6CC00DC40CC /* WebDatabaseManager.h in Headers */,
</span><span class="cx"> F62A76B712B1B25F0005F1B6 /* WebDatabaseManagerMessages.h in Headers */,
</span><span class="lines">@@ -8416,7 +8416,7 @@
</span><span class="cx"> 510AFFB916542048001BA05E /* WebResourceLoader.cpp in Sources */,
</span><span class="cx"> 3F889D14188778C900FEADAF /* WebVideoFullscreenManagerProxy.mm in Sources */,
</span><span class="cx"> 51F060E11654318500F3281B /* WebResourceLoaderMessageReceiver.cpp in Sources */,
</span><del>- 2D6B371C18A967AD0042AE80 /* WKThumbnailView.mm in Sources */,
</del><ins>+ 2D6B371C18A967AD0042AE80 /* _WKThumbnailView.mm in Sources */,
</ins><span class="cx"> 378E1A3D181ED6FF0031007A /* APIObject.mm in Sources */,
</span><span class="cx"> 51FB08FF1639DE1A00EC324A /* WebResourceLoadScheduler.cpp in Sources */,
</span><span class="cx"> 0F5947A7187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>