Title: [184257] branches/safari-601.1.32-branch/Source/WebKit2
- Revision
- 184257
- Author
- dburk...@apple.com
- Date
- 2015-05-12 21:25:46 -0700 (Tue, 12 May 2015)
Log Message
Merge r184121. rdar://problem/20774613
Modified Paths
Diff
Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184256 => 184257)
--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 04:25:44 UTC (rev 184256)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 04:25:46 UTC (rev 184257)
@@ -2,173 +2,168 @@
Dana Burkart <dburk...@apple.com
dburk...@apple.com>
- Merge r184116. rdar://problem/20774613
+ Merge r184121. rdar://problem/20774613
- 2015-05-11 Alex Christensen <achristen...@webkit.org>
+ 2015-05-11 Myles C. Maxfield <mmaxfi...@apple.com>
- [Content Extensions] Support domain-specific rules and exceptions.
- https://bugs.webkit.org/show_bug.cgi?id=144833
+ Unreviewed build fix
- Reviewed by Darin Adler.
+ Unreviewed.
- * Shared/WebCompiledContentExtension.cpp:
- (WebKit::WebCompiledContentExtension::filtersWithoutDomainsBytecode):
- (WebKit::WebCompiledContentExtension::filtersWithoutDomainsBytecodeLength):
- (WebKit::WebCompiledContentExtension::filtersWithDomainsBytecode):
- (WebKit::WebCompiledContentExtension::filtersWithDomainsBytecodeLength):
- (WebKit::WebCompiledContentExtension::domainFiltersBytecode):
- (WebKit::WebCompiledContentExtension::domainFiltersBytecodeLength):
- (WebKit::WebCompiledContentExtension::bytecode): Deleted.
- (WebKit::WebCompiledContentExtension::bytecodeLength): Deleted.
- * Shared/WebCompiledContentExtension.h:
- * Shared/WebCompiledContentExtensionData.cpp:
- (WebKit::WebCompiledContentExtensionData::encode):
- (WebKit::WebCompiledContentExtensionData::decode):
- * Shared/WebCompiledContentExtensionData.h:
- (WebKit::WebCompiledContentExtensionData::WebCompiledContentExtensionData):
* UIProcess/API/APIUserContentExtensionStore.cpp:
- (API::ContentExtensionMetaData::fileSize):
- (API::encodeContentExtensionMetaData):
- (API::decodeContentExtensionMetaData):
(API::compiledToFile):
- (API::createExtension):
- Keep track of 3 different types of bytecode to be able to handle domain-specific rules.
2015-05-12 Dana Burkart
Dana Burkart <dburk...@apple.com
dburk...@apple.com>
- Merge r184026. rdar://problem/20757196
+ Merge r184116. rdar://problem/20774613
- 2015-05-08 Dan Bernstein <m...@apple.com>
+ 2015-05-11 Alex Christensen <achristen...@webkit.org>
- <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
+ [Content Extensions] Support domain-specific rules and exceptions.
+ https://bugs.webkit.org/show_bug.cgi?id=144833
- Reviewed by Anders Carlsson.
+ Reviewed by Darin Adler.
- Allow NSString instances that contain unpaired surrogates to be encoded by
- WKRemoteObjectCoder by encoding them directly rather than using
- -[NSString encodeWithCoder:].
+ * Shared/WebCompiledContentExtension.cpp:
+ (WebKit::WebCompiledContentExtension::filtersWithoutDomainsBytecode):
+ (WebKit::WebCompiledContentExtension::filtersWithoutDomainsBytecodeLength):
+ (WebKit::WebCompiledContentExtension::filtersWithDomainsBytecode):
+ (WebKit::WebCompiledContentExtension::filtersWithDomainsBytecodeLength):
+ (WebKit::WebCompiledContentExtension::domainFiltersBytecode):
+ (WebKit::WebCompiledContentExtension::domainFiltersBytecodeLength):
+ (WebKit::WebCompiledContentExtension::bytecode): Deleted.
+ (WebKit::WebCompiledContentExtension::bytecodeLength): Deleted.
+ * Shared/WebCompiledContentExtension.h:
+ * Shared/WebCompiledContentExtensionData.cpp:
+ (WebKit::WebCompiledContentExtensionData::encode):
+ (WebKit::WebCompiledContentExtensionData::decode):
+ * Shared/WebCompiledContentExtensionData.h:
+ (WebKit::WebCompiledContentExtensionData::WebCompiledContentExtensionData):
+ * UIProcess/API/APIUserContentExtensionStore.cpp:
+ (API::ContentExtensionMetaData::fileSize):
+ (API::encodeContentExtensionMetaData):
+ (API::decodeContentExtensionMetaData):
+ (API::compiledToFile):
+ (API::createExtension):
+ Keep track of 3 different types of bytecode to be able to handle domain-specific rules.
- * 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.
-
2015-05-12 Dana Burkart
Dana Burkart <dburk...@apple.com
dburk...@apple.com>
- Merge r183937. rdar://problem/20458697
+ Merge r184026. rdar://problem/20757196
- 2015-05-07 Jer Noble <jer.no...@apple.com>
+ 2015-05-08 Dan Bernstein <m...@apple.com>
- [WK2][Fullscreen] Fullscreen video does not enter low-power mode.
- https://bugs.webkit.org/show_bug.cgi?id=144744
+ <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
- Reviewed by Darin Adler.
+ Reviewed by Anders Carlsson.
- 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.
+ Allow NSString instances that contain unpaired surrogates to be encoded by
+ WKRemoteObjectCoder by encoding them directly rather than using
+ -[NSString encodeWithCoder:].
- * UIProcess/mac/WKFullScreenWindowController.mm:
- (-[WKFullScreenWindowController initWithWindow:webView:]):
- (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
- (-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
+ * 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.
2015-05-12 Dana Burkart
Dana Burkart <dburk...@apple.com
dburk...@apple.com>
- Merge r183911. rdar://problem/20702435
+ Merge r183937. rdar://problem/20458697
- 2015-05-06 Jer Noble <jer.no...@apple.com>
+ 2015-05-07 Jer Noble <jer.no...@apple.com>
- [WK2][Fullscreen] Elements whose children extend beyond their bounds are clipped in fullscreen mode.
- https://bugs.webkit.org/show_bug.cgi?id=144716
+ [WK2][Fullscreen] Fullscreen video does not enter low-power mode.
+ https://bugs.webkit.org/show_bug.cgi?id=144744
Reviewed by Darin Adler.
- 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.
+ 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.
* UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController initWithWindow:webView:]):
(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
- * WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
- (WebKit::removeAllMediaKeyStorageForOriginPath):
+ (-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
2015-05-12 Dana Burkart
Dana Burkart <dburk...@apple.com
dburk...@apple.com>
- Merge r183909. rdar://problem/18894598
+ Merge r183911. rdar://problem/20702435
- 2015-05-06 Daniel Bates <daba...@apple.com>
+ 2015-05-06 Jer Noble <jer.no...@apple.com>
- [iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
- https://bugs.webkit.org/show_bug.cgi?id=144657
- <rdar://problem/18894598>
+ [WK2][Fullscreen] Elements whose children extend beyond their bounds are clipped in fullscreen mode.
+ https://bugs.webkit.org/show_bug.cgi?id=144716
- Reviewed by Andy Estes.
+ Reviewed by Darin Adler.
- 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.
+ 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.
- * 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.
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+ * WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
+ (WebKit::removeAllMediaKeyStorageForOriginPath):
2015-05-12 Dana Burkart
- Dana Burkart <dburk...@apple.com>
+ Dana Burkart <dburk...@apple.com
+ dburk...@apple.com>
- Merge r183942. rdar://problem/20049088
+ Merge r183909. rdar://problem/18894598
- 2015-05-06 Dean Jackson <d...@apple.com>
+ 2015-05-06 Daniel Bates <daba...@apple.com>
- Handle backdrop views that have to tile
- https://bugs.webkit.org/show_bug.cgi?id=142317
- <rdar://problem/20049088>
+ [iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
+ https://bugs.webkit.org/show_bug.cgi?id=144657
+ <rdar://problem/18894598>
- Reviewed by Simon Fraser.
+ Reviewed by Andy Estes.
- Take 2 - this was rolled out because Mavericks was crashing.
+ 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.
- Add some better logging for custom appearance.
+ * 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.
- * Shared/mac/RemoteLayerTreeTransaction.mm:
- (WebKit::RemoteLayerTreeTextStream::operator<<):
-
2015-05-12 Dana Burkart
Dana Burkart <dburk...@apple.com>
- Merge r183894. rdar://problem/20049088
+ Merge r183942. rdar://problem/20049088
2015-05-06 Dean Jackson <d...@apple.com>
@@ -178,11 +173,31 @@
Reviewed by Simon Fraser.
+ Take 2 - this was rolled out because Mavericks was crashing.
+
Add some better logging for custom appearance.
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTextStream::operator<<):
+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburk...@apple.com>
+
+ Merge r183894. rdar://problem/20049088
+
+ 2015-05-06 Dean Jackson <d...@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<<):
+
2015-05-11 Babak Shafiei <bshaf...@apple.com>
Merge r184004.
Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp (184256 => 184257)
--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-05-13 04:25:44 UTC (rev 184256)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-05-13 04:25:46 UTC (rev 184257)
@@ -186,7 +186,7 @@
ASSERT(!metaData.domainFiltersBytecodeSize);
}
- virtual void writeFiltersWithoutDomainsBytecode(Vector<DFABytecode>&& bytecode)
+ virtual void writeFiltersWithoutDomainsBytecode(Vector<DFABytecode>&& bytecode) override
{
ASSERT(!m_filtersWithDomainBytecodeWritten);
ASSERT(!m_domainFiltersBytecodeWritten);
@@ -194,14 +194,14 @@
writeToFile(Data(bytecode.data(), bytecode.size()));
}
- virtual void writeFiltersWithDomainsBytecode(Vector<DFABytecode>&& bytecode)
+ virtual void writeFiltersWithDomainsBytecode(Vector<DFABytecode>&& bytecode) override
{
ASSERT(!m_domainFiltersBytecodeWritten);
m_filtersWithDomainBytecodeWritten += bytecode.size();
writeToFile(Data(bytecode.data(), bytecode.size()));
}
- virtual void writeDomainFiltersBytecode(Vector<DFABytecode>&& bytecode)
+ virtual void writeDomainFiltersBytecode(Vector<DFABytecode>&& bytecode) override
{
m_domainFiltersBytecodeWritten += bytecode.size();
writeToFile(Data(bytecode.data(), bytecode.size()));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
