Diff
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168812 => 168813)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 08:13:55 UTC (rev 168812)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 08:15:54 UTC (rev 168813)
@@ -1,5 +1,20 @@
2014-05-14 Lucas Forschler <[email protected]>
+ Merge r168739
+
+ 2014-05-13 Tim Horton <[email protected]>
+
+ Speculative build fix for iOS.
+
+ * UIProcess/ios/WebMemoryPressureHandlerIOS.cpp: Removed.
+ * UIProcess/ios/WebMemoryPressureHandlerIOS.mm: Added.
+ (WebKit::WebMemoryPressureHandler::shared):
+ (WebKit::WebMemoryPressureHandler::WebMemoryPressureHandler):
+ * WebKit2.xcodeproj/project.pbxproj:
+ Make WebMemoryPressureHandlerIOS Obj-C.
+
+2014-05-14 Lucas Forschler <[email protected]>
+
Merge r168689
2014-05-13 Tim Horton <[email protected]>
Deleted: branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.cpp (168812 => 168813)
--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.cpp 2014-05-14 08:13:55 UTC (rev 168812)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.cpp 2014-05-14 08:15:54 UTC (rev 168813)
@@ -1,58 +0,0 @@
-/*
- * 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.
- */
-
-#include "config.h"
-#include "WebMemoryPressureHandlerIOS.h"
-
-#if PLATFORM(IOS)
-
-#include "ViewSnapshotStore.h"
-#include <dispatch/private.h>
-
-namespace WebKit {
-
-WebMemoryPressureHandler& WebMemoryPressureHandler::shared()
-{
- static NeverDestroyed<WebMemoryPressureHandler> memoryPressureHandler;
- return memoryPressureHandler;
-}
-
-WebMemoryPressureHandler::WebMemoryPressureHandler()
-{
- // FIXME: This should be able to share code with WebCore's MemoryPressureHandler (and be platform independent).
- // Right now it cannot because WebKit1 and WebKit2 need to be able to coexist in the UI process,
- // and you can only have one WebCore::MemoryPressureHandler.
-
- dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS, 0, DISPATCH_MEMORYSTATUS_PRESSURE_WARN, dispatch_get_main_queue());
- dispatch_set_context(source, this);
- dispatch_source_set_event_handler(source, ^{
- ViewSnapshotStore::shared().discardSnapshots();
- });
- dispatch_resume(source);
-}
-
-} // namespace WebKit
-
-#endif
Copied: branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.mm (from rev 168739, trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.mm) (0 => 168813)
--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.mm (rev 0)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.mm 2014-05-14 08:15:54 UTC (rev 168813)
@@ -0,0 +1,58 @@
+/*
+ * 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 "WebMemoryPressureHandlerIOS.h"
+
+#if PLATFORM(IOS)
+
+#import "ViewSnapshotStore.h"
+#import <dispatch/private.h>
+
+namespace WebKit {
+
+WebMemoryPressureHandler& WebMemoryPressureHandler::shared()
+{
+ static NeverDestroyed<WebMemoryPressureHandler> memoryPressureHandler;
+ return memoryPressureHandler;
+}
+
+WebMemoryPressureHandler::WebMemoryPressureHandler()
+{
+ // FIXME: This should be able to share code with WebCore's MemoryPressureHandler (and be platform independent).
+ // Right now it cannot because WebKit1 and WebKit2 need to be able to coexist in the UI process,
+ // and you can only have one WebCore::MemoryPressureHandler.
+
+ dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS, 0, DISPATCH_MEMORYSTATUS_PRESSURE_WARN, dispatch_get_main_queue());
+ dispatch_set_context(source, this);
+ dispatch_source_set_event_handler(source, ^{
+ ViewSnapshotStore::shared().discardSnapshots();
+ });
+ dispatch_resume(source);
+}
+
+} // namespace WebKit
+
+#endif
Modified: branches/safari-538.34-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (168812 => 168813)
--- branches/safari-538.34-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-05-14 08:13:55 UTC (rev 168812)
+++ branches/safari-538.34-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-05-14 08:15:54 UTC (rev 168813)
@@ -518,7 +518,7 @@
2D2ADF0916362DD500197E47 /* PDFPluginTextAnnotation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D2ADF0616362DC700197E47 /* PDFPluginTextAnnotation.mm */; };
2D2ADF0B16362DDB00197E47 /* PDFPluginAnnotation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D2ADF031636243500197E47 /* PDFPluginAnnotation.mm */; };
2D2ADF1016364D8200197E47 /* PDFPluginChoiceAnnotation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D2ADF0E16364D8200197E47 /* PDFPluginChoiceAnnotation.mm */; };
- 2D3EF4421917646300034184 /* WebMemoryPressureHandlerIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D3EF4401917646300034184 /* WebMemoryPressureHandlerIOS.cpp */; };
+ 2D3EF4421917646300034184 /* WebMemoryPressureHandlerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D3EF4401917646300034184 /* WebMemoryPressureHandlerIOS.mm */; };
2D3EF4431917646300034184 /* WebMemoryPressureHandlerIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D3EF4411917646300034184 /* WebMemoryPressureHandlerIOS.h */; };
2D429BFD1721E2C700EC681F /* PDFPluginPasswordField.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D429BFB1721E2BA00EC681F /* PDFPluginPasswordField.mm */; };
2D47B56C1810714E003A3AEE /* RemoteLayerBackingStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D47B56A1810714E003A3AEE /* RemoteLayerBackingStore.mm */; };
@@ -2368,7 +2368,7 @@
2D2ADF0C16363DEC00197E47 /* PDFLayerControllerDetails.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PDFLayerControllerDetails.h; path = PDF/PDFLayerControllerDetails.h; sourceTree = "<group>"; };
2D2ADF0D16364D8200197E47 /* PDFPluginChoiceAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFPluginChoiceAnnotation.h; path = PDF/PDFPluginChoiceAnnotation.h; sourceTree = "<group>"; };
2D2ADF0E16364D8200197E47 /* PDFPluginChoiceAnnotation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PDFPluginChoiceAnnotation.mm; path = PDF/PDFPluginChoiceAnnotation.mm; sourceTree = "<group>"; };
- 2D3EF4401917646300034184 /* WebMemoryPressureHandlerIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebMemoryPressureHandlerIOS.cpp; path = ios/WebMemoryPressureHandlerIOS.cpp; sourceTree = "<group>"; };
+ 2D3EF4401917646300034184 /* WebMemoryPressureHandlerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebMemoryPressureHandlerIOS.mm; path = ios/WebMemoryPressureHandlerIOS.mm; sourceTree = "<group>"; };
2D3EF4411917646300034184 /* WebMemoryPressureHandlerIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebMemoryPressureHandlerIOS.h; path = ios/WebMemoryPressureHandlerIOS.h; sourceTree = "<group>"; };
2D429BFA1721E2BA00EC681F /* PDFPluginPasswordField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFPluginPasswordField.h; path = PDF/PDFPluginPasswordField.h; sourceTree = "<group>"; };
2D429BFB1721E2BA00EC681F /* PDFPluginPasswordField.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PDFPluginPasswordField.mm; path = PDF/PDFPluginPasswordField.mm; sourceTree = "<group>"; };
@@ -4564,7 +4564,7 @@
26F10BE619187E2E001D0E68 /* WKSyntheticClickTapGestureRecognizer.h */,
26F10BE719187E2E001D0E68 /* WKSyntheticClickTapGestureRecognizer.m */,
2DA944AA1884E9BA00ED86DB /* WebInspectorProxyIOS.mm */,
- 2D3EF4401917646300034184 /* WebMemoryPressureHandlerIOS.cpp */,
+ 2D3EF4401917646300034184 /* WebMemoryPressureHandlerIOS.mm */,
2D3EF4411917646300034184 /* WebMemoryPressureHandlerIOS.h */,
2DA944AB1884E9BA00ED86DB /* WebPageProxyIOS.mm */,
2DA944AC1884E9BA00ED86DB /* WebProcessProxyIOS.mm */,
@@ -8783,7 +8783,7 @@
BC1BE1F312D54DBD0004A228 /* WebGeolocationProvider.cpp in Sources */,
7801C099142290C400FAF9AF /* WebHitTestResult.cpp in Sources */,
2684055218B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp in Sources */,
- 2D3EF4421917646300034184 /* WebMemoryPressureHandlerIOS.cpp in Sources */,
+ 2D3EF4421917646300034184 /* WebMemoryPressureHandlerIOS.mm in Sources */,
511B24AA132E097200065A0C /* WebIconDatabase.cpp in Sources */,
51834592134532E90092B696 /* WebIconDatabaseClient.cpp in Sources */,
51D02F64132EC5B900BEAA96 /* WebIconDatabaseMessageReceiver.cpp in Sources */,
