Diff
Modified: trunk/Source/WebKit/ChangeLog (164907 => 164908)
--- trunk/Source/WebKit/ChangeLog 2014-03-01 05:14:42 UTC (rev 164907)
+++ trunk/Source/WebKit/ChangeLog 2014-03-01 05:31:34 UTC (rev 164908)
@@ -1,3 +1,12 @@
+2014-02-28 Dan Bernstein <m...@apple.com>
+
+ [Mac] Remove MailQuirksUserScript.js
+ https://bugs.webkit.org/show_bug.cgi?id=129536
+
+ Reviewed by Andy Estes.
+
+ * WebKit.xcodeproj/project.pbxproj: Removed reference to the file.
+
2014-02-26 Michael Saboff <msab...@apple.com>
Auto generate bytecode information for bytecode parser and LLInt
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (164907 => 164908)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-03-01 05:14:42 UTC (rev 164907)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-03-01 05:31:34 UTC (rev 164908)
@@ -403,7 +403,6 @@
A5DEFC1411D5344B00885273 /* WebApplicationCacheQuotaManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5DEFC1211D5344B00885273 /* WebApplicationCacheQuotaManager.mm */; };
A70936AF0B5608DC00CDB48E /* WebDragClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A70936AD0B5608DC00CDB48E /* WebDragClient.h */; };
A70936B00B5608DC00CDB48E /* WebDragClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = A70936AE0B5608DC00CDB48E /* WebDragClient.mm */; };
- A864B3F6123ED9FA00C2A612 /* MailQuirksUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = A864B3E5123ED83D00C2A612 /* MailQuirksUserScript.js */; };
AB9FBBBB0F8582B0006ADC43 /* WebDOMOperationsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = AB9FBBBA0F8582B0006ADC43 /* WebDOMOperationsInternal.h */; };
ABDDF20D08EB0DDC001E1241 /* WebDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDF20C08EB0DDC001E1241 /* WebDownloadInternal.h */; };
B6CE5C24100BC5CE00219936 /* WebApplicationCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = B68049720FFBCEC1009F7F62 /* WebApplicationCache.mm */; };
@@ -790,7 +789,6 @@
A5DEFC1211D5344B00885273 /* WebApplicationCacheQuotaManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebApplicationCacheQuotaManager.mm; sourceTree = "<group>"; };
A70936AD0B5608DC00CDB48E /* WebDragClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDragClient.h; sourceTree = "<group>"; };
A70936AE0B5608DC00CDB48E /* WebDragClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDragClient.mm; sourceTree = "<group>"; };
- A864B3E5123ED83D00C2A612 /* MailQuirksUserScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = MailQuirksUserScript.js; sourceTree = "<group>"; };
AB9FBBBA0F8582B0006ADC43 /* WebDOMOperationsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDOMOperationsInternal.h; sourceTree = "<group>"; };
ABDDF20C08EB0DDC001E1241 /* WebDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDownloadInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
B68049710FFBCEC1009F7F62 /* WebApplicationCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCache.h; sourceTree = "<group>"; };
@@ -1069,7 +1067,6 @@
isa = PBXGroup;
children = (
A10C1D2018202FAF0036883A /* ios */,
- A864B3E5123ED83D00C2A612 /* MailQuirksUserScript.js */,
1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */,
29AEF95D134C755400FE5096 /* OutlookQuirksUserScript.js */,
5241ADF30B1BC48A004012BD /* WebCache.h */,
@@ -1992,7 +1989,6 @@
buildActionMask = 2147483647;
files = (
1C9F5EFC1651CDF700C480F8 /* Dock.pdf in Resources */,
- A864B3F6123ED9FA00C2A612 /* MailQuirksUserScript.js in Resources */,
29AEF960134C76FB00FE5096 /* OutlookQuirksUserScript.js in Resources */,
939810B70824BF01008DF038 /* url_icon.tiff in Resources */,
939810B50824BF01008DF038 /* WebAuthenticationPanel.nib in Resources */,
Modified: trunk/Source/WebKit/mac/ChangeLog (164907 => 164908)
--- trunk/Source/WebKit/mac/ChangeLog 2014-03-01 05:14:42 UTC (rev 164907)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-03-01 05:31:34 UTC (rev 164908)
@@ -1,3 +1,13 @@
+2014-02-28 Dan Bernstein <m...@apple.com>
+
+ [Mac] Remove MailQuirksUserScript.js
+ https://bugs.webkit.org/show_bug.cgi?id=129536
+
+ Reviewed by Andy Estes.
+
+ * Configurations/WebKit.xcconfig: Removed from EXCLUDED_SOURCE_FILE_NAMES_iphoneos.
+ * Misc/MailQuirksUserScript.js: Removed. This file has been unused since r147447.
+
2014-02-28 Timothy Hatcher <timo...@apple.com>
Properly handle when Test.html is not present in Production builds.
Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (164907 => 164908)
--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-03-01 05:14:42 UTC (rev 164907)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-03-01 05:31:34 UTC (rev 164908)
@@ -25,7 +25,7 @@
#include "Version.xcconfig"
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm MailQuirksUserScript.js OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebRenderNode.mm WebStringTruncator.* WebTextCompletionController.*;
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebRenderNode.mm WebStringTruncator.* WebTextCompletionController.*;
EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringDrawing.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
Deleted: trunk/Source/WebKit/mac/Misc/MailQuirksUserScript.js (164907 => 164908)
--- trunk/Source/WebKit/mac/Misc/MailQuirksUserScript.js 2014-03-01 05:14:42 UTC (rev 164907)
+++ trunk/Source/WebKit/mac/Misc/MailQuirksUserScript.js 2014-03-01 05:31:34 UTC (rev 164908)
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- * Copyright (C) 2011 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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.
- */
-
-(function() {
- // The Mail.app signature panel makes the assumption that
- // document.firstChild.firstChild == document.body. This is no longer true
- // now that WebKit implements the HTML5 parser, which creates an implicit
- // <head> node if not explicitly specified in content. Remove this implicit
- // <head> so that Mail.app's assumption remains true.
- if (document.head && !document.head.childNodes.length && !document.head.attributes.length)
- document.documentElement.removeChild(document.head);
-})();