<!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>[191690] 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/191690">191690</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-10-28 14:14:43 -0700 (Wed, 28 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKView being inside WKWebView leads to weird API issues
https://bugs.webkit.org/show_bug.cgi?id=150174
Reviewed by Anders Carlsson.
* UIProcess/API/mac/WKView.mm:
(-[WKView _superDoCommandBySelector:]):
(-[WKView _createDrawingAreaProxy]): Deleted.
(-[WKView _processDidExit]): Deleted.
(-[WKView _pageClosed]): Deleted.
(-[WKView _didRelaunchProcess]): Deleted.
(-[WKView _convertToDeviceSpace:]): Deleted.
(-[WKView _convertToUserSpace:]): Deleted.
(-[WKView _executeSavedCommandBySelector:]): Deleted.
(-[WKResponderChainSink initWithResponderChain:]): Deleted.
(-[WKResponderChainSink detach]): Deleted.
(-[WKResponderChainSink didReceiveUnhandledCommand]): Deleted.
(-[WKResponderChainSink noResponderFor:]): Deleted.
(-[WKResponderChainSink doCommandBySelector:]): Deleted.
(-[WKResponderChainSink tryToPerform:with:]): Deleted.
* UIProcess/API/mac/WKViewInternal.h:
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(-[WKResponderChainSink initWithResponderChain:]):
(-[WKResponderChainSink detach]):
(-[WKResponderChainSink didReceiveUnhandledCommand]):
(-[WKResponderChainSink noResponderFor:]):
(-[WKResponderChainSink doCommandBySelector:]):
(-[WKResponderChainSink tryToPerform:with:]):
(WebKit::WebViewImpl::createDrawingAreaProxy):
(WebKit::WebViewImpl::processDidExit):
(WebKit::WebViewImpl::pageClosed):
(WebKit::WebViewImpl::didRelaunchProcess):
(WebKit::WebViewImpl::executeSavedCommandBySelector):
(WebKit::WebViewImpl::resetGestureController): Deleted.
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::createDrawingAreaProxy):
(WebKit::PageClientImpl::processDidExit):
(WebKit::PageClientImpl::pageClosed):
(WebKit::PageClientImpl::didRelaunchProcess):
(WebKit::PageClientImpl::convertToDeviceSpace):
(WebKit::PageClientImpl::convertToUserSpace):
(WebKit::PageClientImpl::executeSavedCommandBySelector):
Move most of the rest of WKViewInternal.h's methods to WebViewImpl.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKit2UIProcessCocoaWebViewImplh">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191689 => 191690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-28 20:41:57 UTC (rev 191689)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-28 21:14:43 UTC (rev 191690)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2015-10-28 Tim Horton <timothy_horton@apple.com>
+
+ WKView being inside WKWebView leads to weird API issues
+ https://bugs.webkit.org/show_bug.cgi?id=150174
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _superDoCommandBySelector:]):
+ (-[WKView _createDrawingAreaProxy]): Deleted.
+ (-[WKView _processDidExit]): Deleted.
+ (-[WKView _pageClosed]): Deleted.
+ (-[WKView _didRelaunchProcess]): Deleted.
+ (-[WKView _convertToDeviceSpace:]): Deleted.
+ (-[WKView _convertToUserSpace:]): Deleted.
+ (-[WKView _executeSavedCommandBySelector:]): Deleted.
+ (-[WKResponderChainSink initWithResponderChain:]): Deleted.
+ (-[WKResponderChainSink detach]): Deleted.
+ (-[WKResponderChainSink didReceiveUnhandledCommand]): Deleted.
+ (-[WKResponderChainSink noResponderFor:]): Deleted.
+ (-[WKResponderChainSink doCommandBySelector:]): Deleted.
+ (-[WKResponderChainSink tryToPerform:with:]): Deleted.
+ * UIProcess/API/mac/WKViewInternal.h:
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (-[WKResponderChainSink initWithResponderChain:]):
+ (-[WKResponderChainSink detach]):
+ (-[WKResponderChainSink didReceiveUnhandledCommand]):
+ (-[WKResponderChainSink noResponderFor:]):
+ (-[WKResponderChainSink doCommandBySelector:]):
+ (-[WKResponderChainSink tryToPerform:with:]):
+ (WebKit::WebViewImpl::createDrawingAreaProxy):
+ (WebKit::WebViewImpl::processDidExit):
+ (WebKit::WebViewImpl::pageClosed):
+ (WebKit::WebViewImpl::didRelaunchProcess):
+ (WebKit::WebViewImpl::executeSavedCommandBySelector):
+ (WebKit::WebViewImpl::resetGestureController): Deleted.
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::createDrawingAreaProxy):
+ (WebKit::PageClientImpl::processDidExit):
+ (WebKit::PageClientImpl::pageClosed):
+ (WebKit::PageClientImpl::didRelaunchProcess):
+ (WebKit::PageClientImpl::convertToDeviceSpace):
+ (WebKit::PageClientImpl::convertToUserSpace):
+ (WebKit::PageClientImpl::executeSavedCommandBySelector):
+ Move most of the rest of WKViewInternal.h's methods to WebViewImpl.
+
</ins><span class="cx"> 2015-10-28 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Compile and link with CMake on Mac
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (191689 => 191690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-10-28 20:41:57 UTC (rev 191689)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-10-28 21:14:43 UTC (rev 191690)
</span><span class="lines">@@ -46,13 +46,11 @@
</span><span class="cx"> #import "NativeWebWheelEvent.h"
</span><span class="cx"> #import "PageClientImpl.h"
</span><span class="cx"> #import "PasteboardTypes.h"
</span><del>-#import "RemoteLayerTreeDrawingAreaProxy.h"
</del><span class="cx"> #import "RemoteObjectRegistry.h"
</span><span class="cx"> #import "RemoteObjectRegistryMessages.h"
</span><span class="cx"> #import "StringUtilities.h"
</span><span class="cx"> #import "TextChecker.h"
</span><span class="cx"> #import "TextCheckerState.h"
</span><del>-#import "TiledCoreAnimationDrawingAreaProxy.h"
</del><span class="cx"> #import "WKAPICast.h"
</span><span class="cx"> #import "WKFullScreenWindowController.h"
</span><span class="cx"> #import "WKLayoutMode.h"
</span><span class="lines">@@ -187,15 +185,6 @@
</span><span class="cx"> @implementation WKViewData
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface WKResponderChainSink : NSResponder {
- NSResponder *_lastResponderInChain;
- bool _didReceiveUnhandledCommand;
-}
-- (id)initWithResponderChain:(NSResponder *)chain;
-- (void)detach;
-- (bool)didReceiveUnhandledCommand;
-@end
-
</del><span class="cx"> @interface WKView () <WebViewImplDelegate>
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -2032,6 +2021,11 @@
</span><span class="cx"> #pragma clang diagnostic pop
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_superDoCommandBySelector:(SEL)selector
+{
+ [super doCommandBySelector:selector];
+}
+
</ins><span class="cx"> - (NSArray *)validAttributesForMarkedText
</span><span class="cx"> {
</span><span class="cx"> static NSArray *validAttributes;
</span><span class="lines">@@ -2193,36 +2187,6 @@
</span><span class="cx"> _data->_impl->quickLookWithEvent(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (std::unique_ptr<WebKit::DrawingAreaProxy>)_createDrawingAreaProxy
-{
- if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKit2UseRemoteLayerTreeDrawingArea"] boolValue])
- return std::make_unique<RemoteLayerTreeDrawingAreaProxy>(*_data->_page);
-
- return std::make_unique<TiledCoreAnimationDrawingAreaProxy>(*_data->_page);
-}
-
-- (void)_processDidExit
-{
- _data->_impl->notifyInputContextAboutDiscardedComposition();
-
- if (_data->_impl->layerHostingView())
- _data->_impl->setAcceleratedCompositingRootLayer(nil);
-
- _data->_impl->updateRemoteAccessibilityRegistration(false);
-
- _data->_impl->resetGestureController();
-}
-
-- (void)_pageClosed
-{
- _data->_impl->updateRemoteAccessibilityRegistration(false);
-}
-
-- (void)_didRelaunchProcess
-{
- _data->_impl->accessibilityRegisterUIProcessTokens();
-}
-
</del><span class="cx"> - (void)_setUserInterfaceItemState:(NSString *)commandName enabled:(BOOL)isEnabled state:(int)newState
</span><span class="cx"> {
</span><span class="cx"> ValidationVector items = _data->_validationMap.take(commandName);
</span><span class="lines">@@ -2260,16 +2224,6 @@
</span><span class="cx"> _data->_keyDownEventBeingResent = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSRect)_convertToDeviceSpace:(NSRect)rect
-{
- return toDeviceSpace(rect, [self window]);
-}
-
-- (NSRect)_convertToUserSpace:(NSRect)rect
-{
- return toUserSpace(rect, [self window]);
-}
-
</del><span class="cx"> - (NSTrackingRectTag)addTrackingRect:(NSRect)rect owner:(id)owner userData:(void *)data assumeInside:(BOOL)assumeInside
</span><span class="cx"> {
</span><span class="cx"> return _data->_impl->addTrackingRect(NSRectToCGRect(rect), owner, data, assumeInside);
</span><span class="lines">@@ -2323,17 +2277,6 @@
</span><span class="cx"> return _data->_impl->namesOfPromisedFilesDroppedAtDestination(dropDestination);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (bool)_executeSavedCommandBySelector:(SEL)selector
-{
- LOG(TextInput, "Executing previously saved command %s", sel_getName(selector));
- // The sink does two things: 1) Tells us if the responder went unhandled, and
- // 2) prevents any NSBeep; we don't ever want to beep here.
- RetainPtr<WKResponderChainSink> sink = adoptNS([[WKResponderChainSink alloc] initWithResponderChain:self]);
- [super doCommandBySelector:selector];
- [sink detach];
- return ![sink didReceiveUnhandledCommand];
-}
-
</del><span class="cx"> - (instancetype)initWithFrame:(NSRect)frame processPool:(WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView
</span><span class="cx"> {
</span><span class="cx"> self = [super initWithFrame:frame];
</span><span class="lines">@@ -2954,60 +2897,4 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation WKResponderChainSink
-
-- (id)initWithResponderChain:(NSResponder *)chain
-{
- self = [super init];
- if (!self)
- return nil;
- _lastResponderInChain = chain;
- while (NSResponder *next = [_lastResponderInChain nextResponder])
- _lastResponderInChain = next;
- [_lastResponderInChain setNextResponder:self];
- return self;
-}
-
-- (void)detach
-{
- // This assumes that the responder chain was either unmodified since
- // -initWithResponderChain: was called, or was modified in such a way
- // that _lastResponderInChain is still in the chain, and self was not
- // moved earlier in the chain than _lastResponderInChain.
- NSResponder *responderBeforeSelf = _lastResponderInChain;
- NSResponder *next = [responderBeforeSelf nextResponder];
- for (; next && next != self; next = [next nextResponder])
- responderBeforeSelf = next;
-
- // Nothing to be done if we are no longer in the responder chain.
- if (next != self)
- return;
-
- [responderBeforeSelf setNextResponder:[self nextResponder]];
- _lastResponderInChain = nil;
-}
-
-- (bool)didReceiveUnhandledCommand
-{
- return _didReceiveUnhandledCommand;
-}
-
-- (void)noResponderFor:(SEL)selector
-{
- _didReceiveUnhandledCommand = true;
-}
-
-- (void)doCommandBySelector:(SEL)selector
-{
- _didReceiveUnhandledCommand = true;
-}
-
-- (BOOL)tryToPerform:(SEL)action with:(id)object
-{
- _didReceiveUnhandledCommand = true;
- return YES;
-}
-
-@end
-
</del><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (191689 => 191690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-10-28 20:41:57 UTC (rev 191689)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-10-28 21:14:43 UTC (rev 191690)
</span><span class="lines">@@ -31,51 +31,34 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx">
</span><del>-@class _WKRemoteObjectRegistry;
-
</del><span class="cx"> namespace API {
</span><span class="cx"> class PageConfiguration;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><del>-class DrawingAreaProxy;
</del><span class="cx"> class WebProcessPool;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @class WKWebView;
</span><span class="cx"> #if WK_API_ENABLED
</span><ins>+@class _WKRemoteObjectRegistry;
</ins><span class="cx"> @class _WKThumbnailView;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @interface WKView ()
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx"> - (instancetype)initWithFrame:(NSRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView;
</span><del>-#endif
-
-- (std::unique_ptr<WebKit::DrawingAreaProxy>)_createDrawingAreaProxy;
-- (void)_processDidExit;
-- (void)_pageClosed;
-- (void)_didRelaunchProcess;
-- (void)_setUserInterfaceItemState:(NSString *)commandName enabled:(BOOL)isEnabled state:(int)newState;
-- (void)_doneWithKeyEvent:(NSEvent *)event eventWasHandled:(BOOL)eventWasHandled;
-- (bool)_executeSavedCommandBySelector:(SEL)selector;
-- (NSRect)_convertToDeviceSpace:(NSRect)rect;
-- (NSRect)_convertToUserSpace:(NSRect)rect;
-
-#if WK_API_ENABLED
</del><span class="cx"> @property (nonatomic, setter=_setThumbnailView:) _WKThumbnailView *_thumbnailView;
</span><ins>+@property (nonatomic, readonly) _WKRemoteObjectRegistry *_remoteObjectRegistry;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+- (void)_doneWithKeyEvent:(NSEvent *)event eventWasHandled:(BOOL)eventWasHandled;
</ins><span class="cx"> - (void)_addFontPanelObserver;
</span><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</span><span class="cx"> - (void)_startWindowDrag;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
-@property (nonatomic, readonly) _WKRemoteObjectRegistry *_remoteObjectRegistry;
-#endif
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (191689 => 191690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2015-10-28 20:41:57 UTC (rev 191689)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2015-10-28 21:14:43 UTC (rev 191690)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> - (void)_superMagnifyWithEvent:(NSEvent *)event;
</span><span class="cx"> - (void)_superSmartMagnifyWithEvent:(NSEvent *)event;
</span><span class="cx"> - (id)_superAccessibilityAttributeValue:(NSString *)attribute;
</span><ins>+- (void)_superDoCommandBySelector:(SEL)selector;
</ins><span class="cx">
</span><span class="cx"> // This is a hack; these things live can live on a category (e.g. WKView (Private)) but WKView itself conforms to this protocol.
</span><span class="cx"> // They're not actually optional.
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+class DrawingAreaProxy;
</ins><span class="cx"> class ViewGestureController;
</span><span class="cx"> class WebEditCommandProxy;
</span><span class="cx"> class WebPageProxy;
</span><span class="lines">@@ -86,6 +88,10 @@
</span><span class="cx">
</span><span class="cx"> ~WebViewImpl();
</span><span class="cx">
</span><ins>+ void processDidExit();
+ void pageClosed();
+ void didRelaunchProcess();
+
</ins><span class="cx"> void setDrawsBackground(bool);
</span><span class="cx"> bool drawsBackground() const;
</span><span class="cx"> void setDrawsTransparentBackground(bool);
</span><span class="lines">@@ -110,6 +116,7 @@
</span><span class="cx"> void setFixedLayoutSize(CGSize);
</span><span class="cx"> CGSize fixedLayoutSize() const;
</span><span class="cx">
</span><ins>+ std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy();
</ins><span class="cx"> void setDrawingAreaSize(CGSize);
</span><span class="cx">
</span><span class="cx"> void setAutomaticallyAdjustsContentInsets(bool);
</span><span class="lines">@@ -287,7 +294,6 @@
</span><span class="cx">
</span><span class="cx"> ViewGestureController* gestureController() { return m_gestureController.get(); }
</span><span class="cx"> ViewGestureController& ensureGestureController();
</span><del>- void resetGestureController();
</del><span class="cx"> void setAllowsBackForwardNavigationGestures(bool);
</span><span class="cx"> bool allowsBackForwardNavigationGestures() const { return m_allowsBackForwardNavigationGestures; }
</span><span class="cx"> void setAllowsMagnification(bool);
</span><span class="lines">@@ -312,6 +318,8 @@
</span><span class="cx"> void gestureEventWasNotHandledByWebCore(NSEvent *);
</span><span class="cx"> void gestureEventWasNotHandledByWebCoreFromViewOnly(NSEvent *);
</span><span class="cx">
</span><ins>+ bool executeSavedCommandBySelector(SEL);
+
</ins><span class="cx"> private:
</span><span class="cx"> WeakPtr<WebViewImpl> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (191689 => 191690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-10-28 20:41:57 UTC (rev 191689)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-10-28 21:14:43 UTC (rev 191690)
</span><span class="lines">@@ -37,7 +37,9 @@
</span><span class="cx"> #import "NativeWebWheelEvent.h"
</span><span class="cx"> #import "PageClient.h"
</span><span class="cx"> #import "PasteboardTypes.h"
</span><ins>+#import "RemoteLayerTreeDrawingAreaProxy.h"
</ins><span class="cx"> #import "StringUtilities.h"
</span><ins>+#import "TiledCoreAnimationDrawingAreaProxy.h"
</ins><span class="cx"> #import "ViewGestureController.h"
</span><span class="cx"> #import "WKFullScreenWindowController.h"
</span><span class="cx"> #import "WKImmediateActionController.h"
</span><span class="lines">@@ -321,6 +323,72 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface WKResponderChainSink : NSResponder {
+ NSResponder *_lastResponderInChain;
+ bool _didReceiveUnhandledCommand;
+}
+
+- (id)initWithResponderChain:(NSResponder *)chain;
+- (void)detach;
+- (bool)didReceiveUnhandledCommand;
+@end
+
+@implementation WKResponderChainSink
+
+- (id)initWithResponderChain:(NSResponder *)chain
+{
+ self = [super init];
+ if (!self)
+ return nil;
+ _lastResponderInChain = chain;
+ while (NSResponder *next = [_lastResponderInChain nextResponder])
+ _lastResponderInChain = next;
+ [_lastResponderInChain setNextResponder:self];
+ return self;
+}
+
+- (void)detach
+{
+ // This assumes that the responder chain was either unmodified since
+ // -initWithResponderChain: was called, or was modified in such a way
+ // that _lastResponderInChain is still in the chain, and self was not
+ // moved earlier in the chain than _lastResponderInChain.
+ NSResponder *responderBeforeSelf = _lastResponderInChain;
+ NSResponder *next = [responderBeforeSelf nextResponder];
+ for (; next && next != self; next = [next nextResponder])
+ responderBeforeSelf = next;
+
+ // Nothing to be done if we are no longer in the responder chain.
+ if (next != self)
+ return;
+
+ [responderBeforeSelf setNextResponder:[self nextResponder]];
+ _lastResponderInChain = nil;
+}
+
+- (bool)didReceiveUnhandledCommand
+{
+ return _didReceiveUnhandledCommand;
+}
+
+- (void)noResponderFor:(SEL)selector
+{
+ _didReceiveUnhandledCommand = true;
+}
+
+- (void)doCommandBySelector:(SEL)selector
+{
+ _didReceiveUnhandledCommand = true;
+}
+
+- (BOOL)tryToPerform:(SEL)action with:(id)object
+{
+ _didReceiveUnhandledCommand = true;
+ return YES;
+}
+
+@end
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> static NSTrackingAreaOptions trackingAreaOptions()
</span><span class="lines">@@ -375,6 +443,36 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+std::unique_ptr<WebKit::DrawingAreaProxy> WebViewImpl::createDrawingAreaProxy()
+{
+ if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKit2UseRemoteLayerTreeDrawingArea"] boolValue])
+ return std::make_unique<RemoteLayerTreeDrawingAreaProxy>(m_page);
+
+ return std::make_unique<TiledCoreAnimationDrawingAreaProxy>(m_page);
+}
+
+void WebViewImpl::processDidExit()
+{
+ notifyInputContextAboutDiscardedComposition();
+
+ if (m_layerHostingView)
+ setAcceleratedCompositingRootLayer(nil);
+
+ updateRemoteAccessibilityRegistration(false);
+
+ m_gestureController = nullptr;
+}
+
+void WebViewImpl::pageClosed()
+{
+ updateRemoteAccessibilityRegistration(false);
+}
+
+void WebViewImpl::didRelaunchProcess()
+{
+ accessibilityRegisterUIProcessTokens();
+}
+
</ins><span class="cx"> void WebViewImpl::setDrawsBackground(bool drawsBackground)
</span><span class="cx"> {
</span><span class="cx"> m_page.setDrawsBackground(drawsBackground);
</span><span class="lines">@@ -2157,11 +2255,6 @@
</span><span class="cx"> return *m_gestureController;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebViewImpl::resetGestureController()
-{
- m_gestureController = nullptr;
-}
-
</del><span class="cx"> void WebViewImpl::setAllowsBackForwardNavigationGestures(bool allowsBackForwardNavigationGestures)
</span><span class="cx"> {
</span><span class="cx"> m_allowsBackForwardNavigationGestures = allowsBackForwardNavigationGestures;
</span><span class="lines">@@ -2349,6 +2442,17 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebViewImpl::executeSavedCommandBySelector(SEL selector)
+{
+ LOG(TextInput, "Executing previously saved command %s", sel_getName(selector));
+ // The sink does two things: 1) Tells us if the responder went unhandled, and
+ // 2) prevents any NSBeep; we don't ever want to beep here.
+ RetainPtr<WKResponderChainSink> sink = adoptNS([[WKResponderChainSink alloc] initWithResponderChain:m_view]);
+ [m_view _superDoCommandBySelector:selector];
+ [sink detach];
+ return ![sink didReceiveUnhandledCommand];
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (191689 => 191690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-10-28 20:41:57 UTC (rev 191689)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-10-28 21:14:43 UTC (rev 191690)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DrawingAreaProxy> PageClientImpl::createDrawingAreaProxy()
</span><span class="cx"> {
</span><del>- return [m_wkView _createDrawingAreaProxy];
</del><ins>+ return m_impl->createDrawingAreaProxy();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::setViewNeedsDisplay(const WebCore::IntRect& rect)
</span><span class="lines">@@ -241,12 +241,12 @@
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::processDidExit()
</span><span class="cx"> {
</span><del>- [m_wkView _processDidExit];
</del><ins>+ m_impl->processDidExit();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::pageClosed()
</span><span class="cx"> {
</span><del>- [m_wkView _pageClosed];
</del><ins>+ m_impl->pageClosed();
</ins><span class="cx"> #if USE(DICTATION_ALTERNATIVES)
</span><span class="cx"> m_alternativeTextUIController->clear();
</span><span class="cx"> #endif
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::didRelaunchProcess()
</span><span class="cx"> {
</span><del>- [m_wkView _didRelaunchProcess];
</del><ins>+ m_impl->didRelaunchProcess();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::preferencesDidChange()
</span><span class="lines">@@ -405,12 +405,12 @@
</span><span class="cx">
</span><span class="cx"> FloatRect PageClientImpl::convertToDeviceSpace(const FloatRect& rect)
</span><span class="cx"> {
</span><del>- return [m_wkView _convertToDeviceSpace:rect];
</del><ins>+ return toDeviceSpace(rect, [m_wkView window]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect PageClientImpl::convertToUserSpace(const FloatRect& rect)
</span><span class="cx"> {
</span><del>- return [m_wkView _convertToUserSpace:rect];
</del><ins>+ return toUserSpace(rect, [m_wkView window]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntPoint PageClientImpl::screenToRootView(const IntPoint& point)
</span><span class="lines">@@ -617,7 +617,7 @@
</span><span class="cx">
</span><span class="cx"> bool PageClientImpl::executeSavedCommandBySelector(const String& selectorString)
</span><span class="cx"> {
</span><del>- return [m_wkView _executeSavedCommandBySelector:NSSelectorFromString(selectorString)];
</del><ins>+ return m_impl->executeSavedCommandBySelector(NSSelectorFromString(selectorString));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(DICTATION_ALTERNATIVES)
</span></span></pre>
</div>
</div>
</body>
</html>