Modified: trunk/Source/WebKit/ChangeLog (204475 => 204476)
--- trunk/Source/WebKit/ChangeLog 2016-08-15 20:40:59 UTC (rev 204475)
+++ trunk/Source/WebKit/ChangeLog 2016-08-15 20:45:38 UTC (rev 204476)
@@ -1,5 +1,14 @@
2016-08-15 Anders Carlsson <[email protected]>
+ Remove OldWebAssertions.c
+ https://bugs.webkit.org/show_bug.cgi?id=160862
+
+ Reviewed by Dan Bernstein.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
+2016-08-15 Anders Carlsson <[email protected]>
+
Remove WebKeyGenerator
https://bugs.webkit.org/show_bug.cgi?id=160854
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (204475 => 204476)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2016-08-15 20:40:59 UTC (rev 204475)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2016-08-15 20:45:38 UTC (rev 204476)
@@ -94,7 +94,6 @@
1C68F672095B5FC100C2984E /* WebNodeHighlightView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C68F666095B5FC100C2984E /* WebNodeHighlightView.mm */; };
1C7B0C660EB2464D00A28502 /* WebInspectorClientCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C7B0C650EB2464D00A28502 /* WebInspectorClientCF.cpp */; };
1C8CB07A0AE9830C00B1F6E9 /* WebEditingDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C8CB0790AE9830C00B1F6E9 /* WebEditingDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 1CCFFD130B1F81F2002EE926 /* OldWebAssertions.c in Sources */ = {isa = PBXBuildFile; fileRef = 1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */; };
22F219CC08D236730030E078 /* WebBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F219CB08D236730030E078 /* WebBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
29AEF960134C76FB00FE5096 /* OutlookQuirksUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = 29AEF95D134C755400FE5096 /* OutlookQuirksUserScript.js */; };
2D25396618CE85C200270222 /* WebSharingServicePickerController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D25396418CE85C200270222 /* WebSharingServicePickerController.h */; };
@@ -553,7 +552,6 @@
1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
1C904FD40BA9DD0F0081E9D0 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
1C904FD50BA9DD0F0081E9D0 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
- 1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = OldWebAssertions.c; sourceTree = "<group>"; };
22F219CB08D236730030E078 /* WebBackForwardListPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebBackForwardListPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
2568C72C0174912D0ECA149E /* WebKit.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKit.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
29AEF95D134C755400FE5096 /* OutlookQuirksUserScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = OutlookQuirksUserScript.js; sourceTree = "<group>"; };
@@ -1094,7 +1092,6 @@
isa = PBXGroup;
children = (
A10C1D2018202FAF0036883A /* ios */,
- 1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */,
29AEF95D134C755400FE5096 /* OutlookQuirksUserScript.js */,
5C7706711D111B220012700F /* QuickDrawCompatibility.h */,
5241ADF30B1BC48A004012BD /* WebCache.h */,
@@ -2176,7 +2173,6 @@
1AAF5CED0EDDE1FE008D883D /* NetscapePluginHostProxy.mm in Sources */,
1AAF5CEF0EDDE1FE008D883D /* NetscapePluginInstanceProxy.mm in Sources */,
939810DD0824BF01008DF038 /* npapi.mm in Sources */,
- 1CCFFD130B1F81F2002EE926 /* OldWebAssertions.c in Sources */,
A10C1D601820300E0036883A /* PopupMenuIOS.mm in Sources */,
7C01CB86173435C900C5D807 /* PopupMenuMac.mm in Sources */,
1A2DBEA00F251E3A0036F8A6 /* ProxyInstance.mm in Sources */,
Modified: trunk/Source/WebKit/mac/ChangeLog (204475 => 204476)
--- trunk/Source/WebKit/mac/ChangeLog 2016-08-15 20:40:59 UTC (rev 204475)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-08-15 20:45:38 UTC (rev 204476)
@@ -1,5 +1,18 @@
2016-08-15 Anders Carlsson <[email protected]>
+ Remove OldWebAssertions.c
+ https://bugs.webkit.org/show_bug.cgi?id=160862
+
+ Reviewed by Dan Bernstein.
+
+ These functions were used by an old version of iWeb. The latest version of iWeb no longer uses them.
+
+ * Misc/OldWebAssertions.c: Removed.
+ (WebReportAssertionFailure): Deleted.
+ (WebReportError): Deleted.
+
+2016-08-15 Anders Carlsson <[email protected]>
+
Remove WebKeyGenerator
https://bugs.webkit.org/show_bug.cgi?id=160854
Deleted: trunk/Source/WebKit/mac/Misc/OldWebAssertions.c (204475 => 204476)
--- trunk/Source/WebKit/mac/Misc/OldWebAssertions.c 2016-08-15 20:40:59 UTC (rev 204475)
+++ trunk/Source/WebKit/mac/Misc/OldWebAssertions.c 2016-08-15 20:45:38 UTC (rev 204476)
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2006 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. ``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
- * 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.
- */
-
-/* These functions are not used anymore, but need to stay for binary compatibility <rdar://problem/4841432>. */
-/* You should use <wtf/Assertions.h>. */
-
-void WebReportAssertionFailure(const char *file, int line, const char *function, const char *assertion);
-void WebReportError(const char *file, int line, const char *function, const char *format, ...);
-
-void WebReportAssertionFailure(const char *file, int line, const char *function, const char *assertion)
-{
-}
-
-void WebReportError(const char *file, int line, const char *function, const char *format, ...)
-{
-}