<!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>[184253] branches/safari-601.1.32-branch/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/184253">184253</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-05-12 21:17:20 -0700 (Tue, 12 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/184026">r184026</a>. rdar://problem/20757196</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchSourceWebKit2ChangeLog">branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2SharedAPICocoaWKRemoteObjectCodermm">branches/safari-601.1.32-branch/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184252 => 184253)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 04:17:17 UTC (rev 184252)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 04:17:20 UTC (rev 184253)
</span><span class="lines">@@ -2,113 +2,117 @@
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183937. rdar://problem/20458697
</del><ins>+ Merge r184026. rdar://problem/20757196
</ins><span class="cx">
</span><del>- 2015-05-07 Jer Noble <jer.noble@apple.com>
</del><ins>+ 2015-05-08 Dan Bernstein <mitz@apple.com>
</ins><span class="cx">
</span><del>- [WK2][Fullscreen] Fullscreen video does not enter low-power mode.
- https://bugs.webkit.org/show_bug.cgi?id=144744
</del><ins>+ <rdar://problem/20757196> NSInternalInconsistencyException raised in -[NSString encodeWithCoder:] beneath createEncodedObject when using WKRemoteObjectEncoder for Safari AutoFill
+ https://bugs.webkit.org/show_bug.cgi?id=144818
</ins><span class="cx">
</span><del>- Reviewed by Darin Adler.
</del><ins>+ Reviewed by Anders Carlsson.
</ins><span class="cx">
</span><del>- One of the requirements of entering low-power compositing mode is that no masking layers
- are present in any of the ancestors of the fullscreen video layer. So once our fullscreen
- transition animation completes, remove the mask layer entirely from our clipping layer.
- This means it needs to be re-created and added when entering fullscreen, rather than just
- at initialization time.
</del><ins>+ Allow NSString instances that contain unpaired surrogates to be encoded by
+ WKRemoteObjectCoder by encoding them directly rather than using
+ -[NSString encodeWithCoder:].
</ins><span class="cx">
</span><del>- * UIProcess/mac/WKFullScreenWindowController.mm:
- (-[WKFullScreenWindowController initWithWindow:webView:]):
- (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
- (-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
</del><ins>+ * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+ (encodeString): Added. Sets an API::String as the object to encode.
+ (encodeObject): Changed to use encodeString for NSString instances.
+ (decodeString): Added. Gets an API::String from the dictionary and returns it as an
+ NSString.
+ (decodeObject): Changed to use decodeString for NSString instances.
</ins><span class="cx">
</span><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183911. rdar://problem/20702435
</del><ins>+ Merge r183937. rdar://problem/20458697
</ins><span class="cx">
</span><del>- 2015-05-06 Jer Noble <jer.noble@apple.com>
</del><ins>+ 2015-05-07 Jer Noble <jer.noble@apple.com>
</ins><span class="cx">
</span><del>- [WK2][Fullscreen] Elements whose children extend beyond their bounds are clipped in fullscreen mode.
- https://bugs.webkit.org/show_bug.cgi?id=144716
</del><ins>+ [WK2][Fullscreen] Fullscreen video does not enter low-power mode.
+ https://bugs.webkit.org/show_bug.cgi?id=144744
</ins><span class="cx">
</span><span class="cx"> Reviewed by Darin Adler.
</span><span class="cx">
</span><del>- We create a mask animation for the transition between windowed and fullscreen modes, on the
- assumption that the element being taken into fullscreen mode does not have visible children
- who extend beyond that elements bounds. This assumption breaks down in the case where div
- with absolutely positioned children is taken fullscreen. While we can't necessarily make the
- transition look correct in this case, we can remove the mask after the transition completes.
</del><ins>+ One of the requirements of entering low-power compositing mode is that no masking layers
+ are present in any of the ancestors of the fullscreen video layer. So once our fullscreen
+ transition animation completes, remove the mask layer entirely from our clipping layer.
+ This means it needs to be re-created and added when entering fullscreen, rather than just
+ at initialization time.
</ins><span class="cx">
</span><span class="cx"> * UIProcess/mac/WKFullScreenWindowController.mm:
</span><ins>+ (-[WKFullScreenWindowController initWithWindow:webView:]):
</ins><span class="cx"> (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
</span><del>- * WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
- (WebKit::removeAllMediaKeyStorageForOriginPath):
</del><ins>+ (-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
</ins><span class="cx">
</span><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183909. rdar://problem/18894598
</del><ins>+ Merge r183911. rdar://problem/20702435
</ins><span class="cx">
</span><del>- 2015-05-06 Daniel Bates <dabates@apple.com>
</del><ins>+ 2015-05-06 Jer Noble <jer.noble@apple.com>
</ins><span class="cx">
</span><del>- [iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
- https://bugs.webkit.org/show_bug.cgi?id=144657
- <rdar://problem/18894598>
</del><ins>+ [WK2][Fullscreen] Elements whose children extend beyond their bounds are clipped in fullscreen mode.
+ https://bugs.webkit.org/show_bug.cgi?id=144716
</ins><span class="cx">
</span><del>- Reviewed by Andy Estes.
</del><ins>+ Reviewed by Darin Adler.
</ins><span class="cx">
</span><del>- Pause and resume the database thread when the UIProcess enters and leaves the background,
- respectively, so that we avoid WebProcess termination due to holding a locked SQLite
- database file when the WebProcess is suspended. This behavior matches the analagous
- behavior in Legacy WebKit.
</del><ins>+ We create a mask animation for the transition between windowed and fullscreen modes, on the
+ assumption that the element being taken into fullscreen mode does not have visible children
+ who extend beyond that elements bounds. This assumption breaks down in the case where div
+ with absolutely positioned children is taken fullscreen. While we can't necessarily make the
+ transition look correct in this case, we can remove the mask after the transition completes.
</ins><span class="cx">
</span><del>- * UIProcess/WebPageProxy.h:
- * UIProcess/ios/WKContentView.mm:
- (-[WKContentView _applicationDidEnterBackground:]): Call WebPageProxy::applicationDidEnterBackground()
- when the UIProcess enters the background.
- * UIProcess/ios/WebPageProxyIOS.mm:
- (WebKit::WebPageProxy::applicationDidEnterBackground): Added; notify the WebProcess to pause the database thread.
- We temporarily take out background assertion on the WebProcess before sending this notification to ensure that the
- WebProcess is running to receive it. We'll release this assertion when the WebProcess replies that it received the
- notification.
- * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
- (WebKit::WebDatabaseManager::setPauseAllDatabases): Added; turns around and calls DatabaseManager::setPauseAllDatabases().
- * WebProcess/WebCoreSupport/WebDatabaseManager.h:
- * WebProcess/WebPage/WebPage.h:
- * WebProcess/WebPage/WebPage.messages.in: Add message ApplicationDidEnterBackground(). Also,
- add empty lines to help demarcate this message and the other UIKit application lifecycle-related
- messages from the rest of the list of messages.
- * WebProcess/WebPage/ios/WebPageIOS.mm:
- (WebKit::WebPage::applicationWillEnterForeground): Resume the database thread.
- (WebKit::WebPage::applicationDidEnterBackground): Pause the database thread.
</del><ins>+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+ * WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
+ (WebKit::removeAllMediaKeyStorageForOriginPath):
</ins><span class="cx">
</span><span class="cx"> 2015-05-12 Dana Burkart
</span><del>- Dana Burkart <dburkart@apple.com>
</del><ins>+ Dana Burkart <dburkart@apple.com
+ dburkart@apple.com>
</ins><span class="cx">
</span><del>- Merge r183942. rdar://problem/20049088
</del><ins>+ Merge r183909. rdar://problem/18894598
</ins><span class="cx">
</span><del>- 2015-05-06 Dean Jackson <dino@apple.com>
</del><ins>+ 2015-05-06 Daniel Bates <dabates@apple.com>
</ins><span class="cx">
</span><del>- Handle backdrop views that have to tile
- https://bugs.webkit.org/show_bug.cgi?id=142317
- <rdar://problem/20049088>
</del><ins>+ [iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
+ https://bugs.webkit.org/show_bug.cgi?id=144657
+ <rdar://problem/18894598>
</ins><span class="cx">
</span><del>- Reviewed by Simon Fraser.
</del><ins>+ Reviewed by Andy Estes.
</ins><span class="cx">
</span><del>- Take 2 - this was rolled out because Mavericks was crashing.
</del><ins>+ Pause and resume the database thread when the UIProcess enters and leaves the background,
+ respectively, so that we avoid WebProcess termination due to holding a locked SQLite
+ database file when the WebProcess is suspended. This behavior matches the analagous
+ behavior in Legacy WebKit.
</ins><span class="cx">
</span><del>- Add some better logging for custom appearance.
</del><ins>+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView _applicationDidEnterBackground:]): Call WebPageProxy::applicationDidEnterBackground()
+ when the UIProcess enters the background.
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationDidEnterBackground): Added; notify the WebProcess to pause the database thread.
+ We temporarily take out background assertion on the WebProcess before sending this notification to ensure that the
+ WebProcess is running to receive it. We'll release this assertion when the WebProcess replies that it received the
+ notification.
+ * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
+ (WebKit::WebDatabaseManager::setPauseAllDatabases): Added; turns around and calls DatabaseManager::setPauseAllDatabases().
+ * WebProcess/WebCoreSupport/WebDatabaseManager.h:
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in: Add message ApplicationDidEnterBackground(). Also,
+ add empty lines to help demarcate this message and the other UIKit application lifecycle-related
+ messages from the rest of the list of messages.
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::applicationWillEnterForeground): Resume the database thread.
+ (WebKit::WebPage::applicationDidEnterBackground): Pause the database thread.
</ins><span class="cx">
</span><del>- * Shared/mac/RemoteLayerTreeTransaction.mm:
- (WebKit::RemoteLayerTreeTextStream::operator<<):
-
</del><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183894. rdar://problem/20049088
</del><ins>+ Merge r183942. rdar://problem/20049088
</ins><span class="cx">
</span><span class="cx"> 2015-05-06 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="lines">@@ -118,11 +122,31 @@
</span><span class="cx">
</span><span class="cx"> Reviewed by Simon Fraser.
</span><span class="cx">
</span><ins>+ Take 2 - this was rolled out because Mavericks was crashing.
+
</ins><span class="cx"> Add some better logging for custom appearance.
</span><span class="cx">
</span><span class="cx"> * Shared/mac/RemoteLayerTreeTransaction.mm:
</span><span class="cx"> (WebKit::RemoteLayerTreeTextStream::operator<<):
</span><span class="cx">
</span><ins>+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburkart@apple.com>
+
+ Merge r183894. rdar://problem/20049088
+
+ 2015-05-06 Dean Jackson <dino@apple.com>
+
+ Handle backdrop views that have to tile
+ https://bugs.webkit.org/show_bug.cgi?id=142317
+ <rdar://problem/20049088>
+
+ Reviewed by Simon Fraser.
+
+ Add some better logging for custom appearance.
+
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTextStream::operator<<):
+
</ins><span class="cx"> 2015-05-11 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r184004.
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2SharedAPICocoaWKRemoteObjectCodermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm (184252 => 184253)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2015-05-13 04:17:17 UTC (rev 184252)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2015-05-13 04:17:20 UTC (rev 184253)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx">
</span><span class="cx"> static const char* const classNameKey = "$class";
</span><span class="cx"> static const char* const objectStreamKey = "$objectStream";
</span><ins>+static const char* const stringKey = "$string";
</ins><span class="cx">
</span><span class="cx"> static NSString * const selectorKey = @"selector";
</span><span class="cx"> static NSString * const typeStringKey = @"typeString";
</span><span class="lines">@@ -213,6 +214,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void encodeString(WKRemoteObjectEncoder *encoder, NSString *string)
+{
+ encoder->_currentDictionary->set(stringKey, API::String::create(string));
+}
+
</ins><span class="cx"> static void encodeObject(WKRemoteObjectEncoder *encoder, id object)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(object);
</span><span class="lines">@@ -235,6 +241,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ([object isKindOfClass:[NSString class]]) {
+ encodeString(encoder, object);
+ return;
+ }
+
</ins><span class="cx"> [object encodeWithCoder:encoder];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -546,6 +557,15 @@
</span><span class="cx"> return invocation;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static NSString *decodeString(WKRemoteObjectDecoder *decoder)
+{
+ API::String* string = decoder->_currentDictionary->get<API::String>(stringKey);
+ if (!string)
+ [NSException raise:NSInvalidUnarchiveOperationException format:@"String missing"];
+
+ return string->string();
+}
+
</ins><span class="cx"> static id decodeObject(WKRemoteObjectDecoder *decoder)
</span><span class="cx"> {
</span><span class="cx"> API::String* classNameString = decoder->_currentDictionary->get<API::String>(classNameKey);
</span><span class="lines">@@ -563,6 +583,9 @@
</span><span class="cx"> if (objectClass == [NSInvocation class])
</span><span class="cx"> return decodeInvocation(decoder);
</span><span class="cx">
</span><ins>+ if (objectClass == [NSString class])
+ return decodeString(decoder);
+
</ins><span class="cx"> id result = [objectClass allocWithZone:decoder.zone];
</span><span class="cx"> if (!result)
</span><span class="cx"> [NSException raise:NSInvalidUnarchiveOperationException format:@"Class \"%s\" returned nil from +alloc while being decoded", className.data()];
</span></span></pre>
</div>
</div>
</body>
</html>