<!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>[198604] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198604">198604</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-03-23 16:47:29 -0700 (Wed, 23 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash when using KVO from within -[WebView initWithCoder:]
https://bugs.webkit.org/show_bug.cgi?id=155816
rdar://problem/17073265
Reviewed by Dan Bernstein.
Source/WebKit/mac:
Get rid of the observationInfo getter and setter. It's not clear why they were added (in 2003),
and the methods on NSObject are good enough for us.
* WebView/WebView.mm:
(-[WebView setObservationInfo:]): Deleted.
(-[WebView observationInfo]): Deleted.
* WebView/WebViewData.h:
Tools:
Add test.
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/mac/EarlyKVOCrash.mm: Added.
(-[EarlyKVOCrashResponder initWithWebView:]):
(-[EarlyKVOCrashResponder initWithCoder:]):
(-[EarlyKVOCrashResponder dealloc]):
(-[EarlyKVOCrashResponder encodeWithCoder:]):
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewDatah">trunk/Source/WebKit/mac/WebView/WebViewData.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsTestWebKitAPITestsmacEarlyKVOCrashmm">trunk/Tools/TestWebKitAPI/Tests/mac/EarlyKVOCrash.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (198603 => 198604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-03-23 23:42:18 UTC (rev 198603)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-23 23:47:29 UTC (rev 198604)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-23 Anders Carlsson <andersca@apple.com>
+
+ Crash when using KVO from within -[WebView initWithCoder:]
+ https://bugs.webkit.org/show_bug.cgi?id=155816
+ rdar://problem/17073265
+
+ Reviewed by Dan Bernstein.
+
+ Get rid of the observationInfo getter and setter. It's not clear why they were added (in 2003),
+ and the methods on NSObject are good enough for us.
+
+ * WebView/WebView.mm:
+ (-[WebView setObservationInfo:]): Deleted.
+ (-[WebView observationInfo]): Deleted.
+ * WebView/WebViewData.h:
+
</ins><span class="cx"> 2016-03-22 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Advanced spell checking should be guarded behind
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (198603 => 198604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-23 23:42:18 UTC (rev 198603)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-23 23:47:29 UTC (rev 198604)
</span><span class="lines">@@ -2866,16 +2866,6 @@
</span><span class="cx"> return declaredKeys;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setObservationInfo:(void *)info
-{
- _private->observationInfo = info;
-}
-
-- (void *)observationInfo
-{
- return _private->observationInfo;
-}
-
</del><span class="cx"> - (void)_willChangeBackForwardKeys
</span><span class="cx"> {
</span><span class="cx"> [self _willChangeValueForKey: _WebCanGoBackKey];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewData.h (198603 => 198604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewData.h 2016-03-23 23:42:18 UTC (rev 198603)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.h 2016-03-23 23:47:29 UTC (rev 198604)
</span><span class="lines">@@ -210,8 +210,6 @@
</span><span class="cx"> WebScriptDebugDelegateImplementationCache scriptDebugDelegateImplementations;
</span><span class="cx"> WebHistoryDelegateImplementationCache historyDelegateImplementations;
</span><span class="cx">
</span><del>- void *observationInfo;
-
</del><span class="cx"> BOOL closed;
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> BOOL closing;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198603 => 198604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-23 23:42:18 UTC (rev 198603)
+++ trunk/Tools/ChangeLog 2016-03-23 23:47:29 UTC (rev 198604)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-03-23 Anders Carlsson <andersca@apple.com>
+
+ Crash when using KVO from within -[WebView initWithCoder:]
+ https://bugs.webkit.org/show_bug.cgi?id=155816
+ rdar://problem/17073265
+
+ Reviewed by Dan Bernstein.
+
+ Add test.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/mac/EarlyKVOCrash.mm: Added.
+ (-[EarlyKVOCrashResponder initWithWebView:]):
+ (-[EarlyKVOCrashResponder initWithCoder:]):
+ (-[EarlyKVOCrashResponder dealloc]):
+ (-[EarlyKVOCrashResponder encodeWithCoder:]):
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-03-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Teach kill-old-processes about perl 5.18.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (198603 => 198604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-03-23 23:42:18 UTC (rev 198603)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-03-23 23:47:29 UTC (rev 198604)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> 1A63479F183D72A4005B1707 /* all-content-in-one-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93D3D19B17B1A7B000C7C415 /* all-content-in-one-iframe.html */; };
</span><span class="cx"> 1A7E8B3618120B2F00AEB74A /* FragmentNavigation.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A7E8B351812093600AEB74A /* FragmentNavigation.html */; };
</span><span class="cx"> 1A9E52C913E65EF4006917F5 /* 18-characters.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C045F9461385C2F800C0F3CD /* 18-characters.html */; };
</span><ins>+ 1A9FB6CE1CA34BE500966124 /* EarlyKVOCrash.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9FB6CC1CA34BE500966124 /* EarlyKVOCrash.mm */; };
</ins><span class="cx"> 1AAD19F71C7CE20300831E47 /* Coding.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAD19F51C7CE20300831E47 /* Coding.mm */; };
</span><span class="cx"> 1ADBEFE3130C6AA100D61D19 /* simple-accelerated-compositing.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1ADBEFBC130C6A0100D61D19 /* simple-accelerated-compositing.html */; };
</span><span class="cx"> 1AEDE22613E5E7E700E62FE8 /* InjectedBundleControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEDE22413E5E7A000E62FE8 /* InjectedBundleControllerMac.mm */; };
</span><span class="lines">@@ -519,6 +520,7 @@
</span><span class="cx"> 1A7BFC0A171A0BDB00BC5F64 /* WillSendSubmitEvent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WillSendSubmitEvent.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A7E8B33181208DE00AEB74A /* FragmentNavigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FragmentNavigation.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A7E8B351812093600AEB74A /* FragmentNavigation.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = FragmentNavigation.html; sourceTree = "<group>"; };
</span><ins>+ 1A9FB6CC1CA34BE500966124 /* EarlyKVOCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EarlyKVOCrash.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 1AA9E55714980A9900001A8A /* Functional.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Functional.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AAD19F51C7CE20300831E47 /* Coding.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Coding.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1ABC3DED1899BE6D004F0626 /* Navigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Navigation.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -1441,6 +1443,7 @@
</span><span class="cx"> 3751AF7A169518F800764319 /* DOMNodeFromJSObject.mm */,
</span><span class="cx"> 37DC678B140D7C5000ABCCDB /* DOMRangeOfString.mm */,
</span><span class="cx"> C07E6CAE13FD67650038B22B /* DynamicDeviceScaleFactor.mm */,
</span><ins>+ 1A9FB6CC1CA34BE500966124 /* EarlyKVOCrash.mm */,
</ins><span class="cx"> 4BB4160316815F9100824238 /* ElementAtPointInWebFrame.mm */,
</span><span class="cx"> 1A7E8B33181208DE00AEB74A /* FragmentNavigation.mm */,
</span><span class="cx"> CDBFCC431A9FF44800A7B691 /* FullscreenZoomInitialFrame.mm */,
</span><span class="lines">@@ -1950,6 +1953,7 @@
</span><span class="cx"> 51B1EE8E1C80F5880064FB98 /* IndexedDBPersistence.mm in Sources */,
</span><span class="cx"> 7A5623111AD5AF3E0096B920 /* MenuTypesForMouseEvents.cpp in Sources */,
</span><span class="cx"> 1AAD19F71C7CE20300831E47 /* Coding.mm in Sources */,
</span><ins>+ 1A9FB6CE1CA34BE500966124 /* EarlyKVOCrash.mm in Sources */,
</ins><span class="cx"> 9B0786A31C58830F00D159E3 /* InjectedBundleMakeAllShadowRootsOpen.cpp in Sources */,
</span><span class="cx"> 1A4F81CC1BDFFD37004E672E /* RemoteObjectRegistry.mm in Sources */,
</span><span class="cx"> 51CB4AD81B3A079C00C1B1C6 /* ModalAlertsSPI.cpp in Sources */,
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacEarlyKVOCrashmm"></a>
<div class="addfile"><h4>Added: trunk/Tools/TestWebKitAPI/Tests/mac/EarlyKVOCrash.mm (0 => 198604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/EarlyKVOCrash.mm (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/EarlyKVOCrash.mm 2016-03-23 23:47:29 UTC (rev 198604)
</span><span class="lines">@@ -0,0 +1,92 @@
</span><ins>+/*
+ * Copyright (C) 2016 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 <WebKit/WebView.h>
+#import <wtf/RetainPtr.h>
+
+@interface EarlyKVOCrashResponder : NSResponder {
+ RetainPtr<WebView> _webView;
+}
+
+- (instancetype)initWithWebView:(WebView *)webView;
+
+@end
+
+@implementation EarlyKVOCrashResponder
+
+- (instancetype)initWithWebView:(WebView *)webView
+{
+ if (!(self = [super init]))
+ return nil;
+
+ _webView = webView;
+ [_webView addObserver:self forKeyPath:@"hidden" options:0 context:nullptr];
+
+ return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)coder
+{
+ if (!(self = [super initWithCoder:coder]))
+ return nil;
+
+ _webView = [coder decodeObjectForKey:@"webView"];
+ [_webView addObserver:self forKeyPath:@"hidden" options:0 context:nullptr];
+
+ return self;
+}
+
+- (void)dealloc
+{
+ [_webView removeObserver:self forKeyPath:@"hidden" context:nullptr];
+
+ [super dealloc];
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+ [super encodeWithCoder:coder];
+
+ [coder encodeObject:_webView.get() forKey:@"webView"];
+}
+
+@end
+
+namespace TestWebKitAPI {
+
+TEST(WebKit1, EarlyKVOCrash)
+{
+ auto webView = adoptNS([[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil]);
+ auto earlyKVOCrashResponder = adoptNS([[EarlyKVOCrashResponder alloc] initWithWebView:webView.get()]);
+
+ [webView setNextResponder:earlyKVOCrashResponder.get()];
+
+ NSData *data = [NSKeyedArchiver archivedDataWithRootObject:@[ webView.get(), earlyKVOCrashResponder.get() ]];
+ [NSKeyedUnarchiver unarchiveObjectWithData:data];
+}
+
+} // namespace TestWebKitAPI
</ins></span></pre>
</div>
</div>
</body>
</html>