<!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>[173364] trunk/Source</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/173364">173364</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-09-06 15:53:17 -0700 (Sat, 06 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make updates suggested by new version of Xcode
https://bugs.webkit.org/show_bug.cgi?id=136603
Reviewed by Mark Rowe.
Source/JavaScriptCore:
* Configurations/Base.xcconfig: Added CLANG_WARN_UNREACHABLE_CODE, COMBINE_HIDPI_IMAGES,
and ENABLE_STRICT_OBJC_MSGSEND as suggested by Xcode upgrade check.
* JavaScriptCore.xcodeproj/project.pbxproj: Update LastUpgradeCheck.
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::jumpSlowForUnwantedArrayMode): Compile out unreachable code
for clang, since it understands the code is unreachable.
* runtime/JSArray.cpp:
(JSC::JSArray::fillArgList): Ditto.
(JSC::JSArray::copyToArguments): Ditto.
Source/ThirdParty:
* gtest/xcode/Config/General.xcconfig: Moved CLANG_WARN_BOOL_CONVERSION,
CLANG_WARN_ENUM_CONVERSION, CLANG_WARN_INT_CONVERSION, and COMBINE_HIDPI_IMAGES
here from project file. Added CLANG_WARN_UNREACHABLE_CODE, ENABLE_STRICT_OBJC_MSGSEND,
and GCC_WARN_64_TO_32_BIT_CONVERSION as suggested by Xcode upgrade check.
* gtest/xcode/gtest.xcodeproj/project.pbxproj: Updated LastUpgradeCheck and removed
things that are redundant with the xcconfig file above.
Source/ThirdParty/ANGLE:
* ANGLE.xcodeproj/project.pbxproj: Updated LastUpgradeCheck.
* Configurations/ANGLE.xcconfig: Added CLANG_WARN_BOOL_CONVERSION,
CLANG_WARN_ENUM_CONVERSION, CLANG_WARN_INT_CONVERSION, COMBINE_HIDPI_IMAGES,
and ENABLE_STRICT_OBJC_MSGSEND as suggested by Xcode upgrade check.
Source/WebCore:
* Configurations/Base.xcconfig: Added COMBINE_HIDPI_IMAGES and
ENABLE_STRICT_OBJC_MSGSEND as suggested by Xcode upgrade check.
* WebCore.xcodeproj/project.pbxproj: Let Xcode remove an orphaned item from the file,
and also updated LastUpgradeCheck.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::updateTextTrackDisplay): Use #if/#else/#endif instead of
using #if/return/#endif and leaving code unreachable.
(WebCore::HTMLMediaElement::configureMediaControls): Ditto.
(WebCore::HTMLMediaElement::configureTextTrackDisplay): Ditto.
* html/canvas/WebGLDrawBuffers.cpp:
(WebCore::WebGLDrawBuffers::supported): Ditto.
Source/WebInspectorUI:
* Configurations/Base.xcconfig: Added CLANG_WARN_BOOL_CONVERSION, CLANG_WARN_CONSTANT_CONVERSION,
CLANG_WARN_EMPTY_BODY, CLANG_WARN_ENUM_CONVERSION, CLANG_WARN_INT_CONVERSION,
CLANG_WARN_UNREACHABLE_CODE, CLANG_WARN__DUPLICATE_METHOD_MATCH, ENABLE_STRICT_OBJC_MSGSEND,
GCC_WARN_UNDECLARED_SELECTOR, and GCC_WARN_UNUSED_FUNCTION as suggested by Xcode update check.
Also removed duplicate GCC_WARN_UNUSED_VARIABLE line.
* WebInspectorUI.xcodeproj/project.pbxproj: Updated LastUpgradeCheck.
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj: Updated LastUpgradeCheck.
Source/WebKit/mac:
* Configurations/Base.xcconfig: Added CLANG_WARN_UNREACHABLE_CODE, COMBINE_HIDPI_IMAGES,
and ENABLE_STRICT_OBJC_MSGSEND as suggested by Xcode upgrade check.
* History/WebURLsWithTitles.m:
(+[WebURLsWithTitles writeURLs:andTitles:toPasteboard:]): Use NSUInteger instead of
unsigned for correctness, and to quiet the 32-to-64-bit compiler warning (which is
not turned on because it gives us too many false positives).
* Misc/WebElementDictionary.mm:
(-[WebElementDictionary objectForKey:]): Ditto.
* Misc/WebNSDataExtras.m:
(-[NSData _webkit_guessedMIMETypeForXML]): Ditto.
(-[NSData _webkit_guessedMIMEType]): Ditto.
(-[NSData _webkit_parseRFC822HeaderFields]): Ditto.
(-[NSData _web_locationAfterFirstBlankLine]): Ditto.
* Misc/WebNSURLExtras.h: Removed unused _web_URLWithLowercasedScheme, _web_hostData,
_webkit_URLByRemovingFragment, _webkit_URLByRemovingResourceSpecifier, _webkit_isFTPDirectoryURL,
_webkit_shouldLoadAsEmptyDocument, _web_hostNameNeedsDecodingWithRange:,
_web_hostNameNeedsEncodingWithRange:, _web_decodeHostNameWithRange:, _web_encodeHostNameWithRange:,
and _webkit_URLFragment methods.
* Misc/WebNSURLExtras.mm:
(-[NSURL _web_URLByTruncatingOneCharacterBeforeComponent:]): Deleted.
(-[NSURL _webkit_URLByRemovingFragment]): Deleted.
(-[NSURL _webkit_URLByRemovingResourceSpecifier]): Deleted.
(-[NSURL _webkit_isFTPDirectoryURL]): Deleted.
(-[NSURL _webkit_shouldLoadAsEmptyDocument]): Deleted.
(-[NSURL _web_URLWithLowercasedScheme]): Deleted.
(-[NSString _webkit_isFTPDirectoryURL]): Deleted.
(-[NSString _web_hostNameNeedsDecodingWithRange:]): Deleted.
(-[NSString _web_hostNameNeedsEncodingWithRange:]): Deleted.
(-[NSString _web_decodeHostNameWithRange:]): Deleted.
(-[NSString _web_encodeHostNameWithRange:]): Deleted.
(-[NSString _webkit_URLFragment]): Deleted.
* Plugins/WebPluginDatabase.mm:
(-[WebPluginDatabase removePluginInstanceViewsFor:]): Use a modern for loop
to iterate an array instead of a loop using the type "unsigned int".
* WebCoreSupport/WebOpenPanelResultListener.mm:
(-[WebOpenPanelResultListener chooseFilenames:]): Use NSUInteger instead of int.
* WebView/WebDelegateImplementationCaching.mm:
(CallDelegate): Use wtfCallIMP in one overload that was instead just calling the
directly without a proper type for the function pointer. This might have been causing
an actual problem on 64-bit systems, and it was different from all the other CallDelegate
functions that were already doing this correctly.
* WebView/WebTextCompletionController.mm:
(-[WebTextCompletionController _placePopupWindow:]): Use NSUInteger instead of int.
Source/WebKit2:
* Configurations/Base.xcconfig: Added CLANG_WARN_UNREACHABLE_CODE, COMBINE_HIDPI_IMAGES,
and ENABLE_STRICT_OBJC_MSGSEND as suggested by the Xcode upgrade check.
* PluginProcess/mac/PluginProcessMac.mm:
(WebKit::initializeCocoaOverrides): Changed NSConcreteTask_launch to use the same technique
as the other functions in this file, doing the type casting right at the call to
method_setImplementation so the global has a suitable type for making a function call,
rather than relying on the abilty to call through a type without a specific argument list.
* UIProcess/Plugins/PluginInfoStore.cpp:
(WebKit::pathExtension): Use size_t for the result of String::reverseFind rather than
converting it to an int. Also don't rely on the fact that WTF's notFound becomes -1 when
cast from size_t to int.
* WebKit2.xcodeproj/project.pbxproj: Let Xcode delete some orphaned items, and updated
LastUpgradeCheck.
Source/WTF:
* Configurations/Base.xcconfig: Added CLANG_WARN_UNREACHABLE_CODE,
COMBINE_HIDPI_IMAGES, and ENABLE_STRICT_OBJC_MSGSEND as suggested by
Xcode upgrade check.
* WTF.xcodeproj/project.pbxproj: Updated LastUpgradeCheck.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsBasexcconfig">trunk/Source/JavaScriptCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArraycpp">trunk/Source/JavaScriptCore/runtime/JSArray.cpp</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLExcodeprojprojectpbxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEConfigurationsANGLExcconfig">trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartyChangeLog">trunk/Source/ThirdParty/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartygtestxcodeConfigGeneralxcconfig">trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartygtestxcodegtestxcodeprojprojectpbxproj">trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFConfigurationsBasexcconfig">trunk/Source/WTF/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsBasexcconfig">trunk/Source/WebCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLDrawBufferscpp">trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIConfigurationsBasexcconfig">trunk/Source/WebInspectorUI/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIxcodeprojprojectpbxproj">trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsBasexcconfig">trunk/Source/WebKit/mac/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebURLsWithTitlesm">trunk/Source/WebKit/mac/History/WebURLsWithTitles.m</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebElementDictionarymm">trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSDataExtrasm">trunk/Source/WebKit/mac/Misc/WebNSDataExtras.m</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSURLExtrash">trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSURLExtrasmm">trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginDatabasemm">trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebOpenPanelResultListenermm">trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDelegateImplementationCachingmm">trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebTextCompletionControllermm">trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBasexcconfig">trunk/Source/WebKit2/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessmacPluginProcessMacmm">trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginInfoStorecpp">trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-09-06 Darin Adler <darin@apple.com>
+
+ Make updates suggested by new version of Xcode
+ https://bugs.webkit.org/show_bug.cgi?id=136603
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/Base.xcconfig: Added CLANG_WARN_UNREACHABLE_CODE, COMBINE_HIDPI_IMAGES,
+ and ENABLE_STRICT_OBJC_MSGSEND as suggested by Xcode upgrade check.
+
+ * JavaScriptCore.xcodeproj/project.pbxproj: Update LastUpgradeCheck.
+
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::jumpSlowForUnwantedArrayMode): Compile out unreachable code
+ for clang, since it understands the code is unreachable.
+ * runtime/JSArray.cpp:
+ (JSC::JSArray::fillArgList): Ditto.
+ (JSC::JSArray::copyToArguments): Ditto.
+
</ins><span class="cx"> 2014-09-05 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: breakpoint actions should work regardless of Content Security Policy
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/Base.xcconfig (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/Base.xcconfig 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/JavaScriptCore/Configurations/Base.xcconfig 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -32,8 +32,11 @@
</span><span class="cx"> CLANG_WARN_EMPTY_BODY = YES;
</span><span class="cx"> CLANG_WARN_ENUM_CONVERSION = YES;
</span><span class="cx"> CLANG_WARN_INT_CONVERSION = YES;
</span><ins>+CLANG_WARN_UNREACHABLE_CODE = YES;
</ins><span class="cx"> CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
</span><ins>+COMBINE_HIDPI_IMAGES = NO;
</ins><span class="cx"> DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
</span><ins>+ENABLE_STRICT_OBJC_MSGSEND = YES;
</ins><span class="cx"> GCC_C_LANGUAGE_STANDARD = gnu99;
</span><span class="cx"> GCC_DEBUGGING_SYMBOLS = default;
</span><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -6776,7 +6776,7 @@
</span><span class="cx"> isa = PBXProject;
</span><span class="cx"> attributes = {
</span><span class="cx"> BuildIndependentTargetsInParallel = YES;
</span><del>- LastUpgradeCheck = 0500;
</del><ins>+ LastUpgradeCheck = 0600;
</ins><span class="cx"> };
</span><span class="cx"> buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "JavaScriptCore" */;
</span><span class="cx"> compatibilityVersion = "Xcode 3.2";
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -596,8 +596,10 @@
</span><span class="cx"> switch (arrayMode.arrayClass()) {
</span><span class="cx"> case Array::OriginalArray: {
</span><span class="cx"> CRASH();
</span><ins>+#if !COMPILER(CLANG)
</ins><span class="cx"> JITCompiler::Jump result; // I already know that VC++ takes unkindly to the expression "return Jump()", so I'm doing it this way in anticipation of someone eventually using VC++ to compile the DFG.
</span><span class="cx"> return result;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case Array::Array:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArray.cpp (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1553,9 +1553,11 @@
</span><span class="cx">
</span><span class="cx"> default:
</span><span class="cx"> CRASH();
</span><ins>+#if !COMPILER(CLANG)
</ins><span class="cx"> vector = 0;
</span><span class="cx"> vectorEnd = 0;
</span><span class="cx"> break;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (; i < vectorEnd; ++i) {
</span><span class="lines">@@ -1615,9 +1617,11 @@
</span><span class="cx">
</span><span class="cx"> default:
</span><span class="cx"> CRASH();
</span><ins>+#if !COMPILER(CLANG)
</ins><span class="cx"> vector = 0;
</span><span class="cx"> vectorEnd = 0;
</span><span class="cx"> break;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (; i < vectorEnd; ++i) {
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLExcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -805,7 +805,7 @@
</span><span class="cx"> FB39D0701200ED9200088E69 /* Project object */ = {
</span><span class="cx"> isa = PBXProject;
</span><span class="cx"> attributes = {
</span><del>- LastUpgradeCheck = 0440;
</del><ins>+ LastUpgradeCheck = 0600;
</ins><span class="cx"> };
</span><span class="cx"> buildConfigurationList = FB39D0731200ED9200088E69 /* Build configuration list for PBXProject "ANGLE" */;
</span><span class="cx"> compatibilityVersion = "Xcode 3.2";
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-09-06 Darin Adler <darin@apple.com>
+
+ Make updates suggested by new version of Xcode
+ https://bugs.webkit.org/show_bug.cgi?id=136603
+
+ Reviewed by Mark Rowe.
+
+ * ANGLE.xcodeproj/project.pbxproj: Updated LastUpgradeCheck.
+
+ * Configurations/ANGLE.xcconfig: Added CLANG_WARN_BOOL_CONVERSION,
+ CLANG_WARN_ENUM_CONVERSION, CLANG_WARN_INT_CONVERSION, COMBINE_HIDPI_IMAGES,
+ and ENABLE_STRICT_OBJC_MSGSEND as suggested by Xcode upgrade check.
+
</ins><span class="cx"> 2014-09-06 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r173335.
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEConfigurationsANGLExcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1,5 +1,10 @@
</span><span class="cx"> PRODUCT_NAME = ANGLE;
</span><span class="cx">
</span><ins>+CLANG_WARN_BOOL_CONVERSION = YES;
+CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INT_CONVERSION = YES;
+COMBINE_HIDPI_IMAGES = NO;
+ENABLE_STRICT_OBJC_MSGSEND = YES;
</ins><span class="cx"> HEADER_SEARCH_PATHS = include src;
</span><span class="cx"> INSTALL_PATH_ACTUAL = /usr/local/lib;
</span><span class="cx"> PUBLIC_HEADERS_FOLDER_PATH = $(PUBLIC_HEADERS_FOLDER_PATH_$(DEPLOYMENT_LOCATION));
</span></span></pre></div>
<a id="trunkSourceThirdPartyChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ChangeLog (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/ThirdParty/ChangeLog 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-06 Darin Adler <darin@apple.com>
+
+ Make updates suggested by new version of Xcode
+ https://bugs.webkit.org/show_bug.cgi?id=136603
+
+ Reviewed by Mark Rowe.
+
+ * gtest/xcode/Config/General.xcconfig: Moved CLANG_WARN_BOOL_CONVERSION,
+ CLANG_WARN_ENUM_CONVERSION, CLANG_WARN_INT_CONVERSION, and COMBINE_HIDPI_IMAGES
+ here from project file. Added CLANG_WARN_UNREACHABLE_CODE, ENABLE_STRICT_OBJC_MSGSEND,
+ and GCC_WARN_64_TO_32_BIT_CONVERSION as suggested by Xcode upgrade check.
+
+ * gtest/xcode/gtest.xcodeproj/project.pbxproj: Updated LastUpgradeCheck and removed
+ things that are redundant with the xcconfig file above.
+
</ins><span class="cx"> 2014-08-22 Renato Nagy <nagy.renato@stud.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Remove LevelDB.
</span></span></pre></div>
<a id="trunkSourceThirdPartygtestxcodeConfigGeneralxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -23,9 +23,15 @@
</span><span class="cx">
</span><span class="cx"> // Strictest warning policy
</span><span class="cx"> WARNING_CFLAGS = -Wall -Werror -Wendif-labels -Wnewline-eof -Wno-sign-compare -Wshadow
</span><ins>+CLANG_WARN_BOOL_CONVERSION = YES;
</ins><span class="cx"> CLANG_WARN_CONSTANT_CONVERSION = YES;
</span><span class="cx"> CLANG_WARN_EMPTY_BODY = YES;
</span><ins>+CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INT_CONVERSION = YES;
+CLANG_WARN_UNREACHABLE_CODE = YES;
</ins><span class="cx"> CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
</span><ins>+ENABLE_STRICT_OBJC_MSGSEND = YES;
+GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
</ins><span class="cx"> GCC_WARN_ABOUT_RETURN_TYPE = YES;
</span><span class="cx"> GCC_WARN_UNDECLARED_SELECTOR = YES;
</span><span class="cx"> GCC_WARN_UNINITIALIZED_AUTOS = YES;
</span><span class="lines">@@ -54,6 +60,7 @@
</span><span class="cx">
</span><span class="cx"> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</span><span class="cx">
</span><ins>+COMBINE_HIDPI_IMAGES = YES;
</ins><span class="cx">
</span><span class="cx"> // VERSIONING BUILD SETTINGS (used in Info.plist)
</span><span class="cx"> GTEST_VERSIONINFO_ABOUT = © 2008 Google Inc.
</span></span></pre></div>
<a id="trunkSourceThirdPartygtestxcodegtestxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -599,7 +599,7 @@
</span><span class="cx"> 0867D690FE84028FC02AAC07 /* Project object */ = {
</span><span class="cx"> isa = PBXProject;
</span><span class="cx"> attributes = {
</span><del>- LastUpgradeCheck = 0500;
</del><ins>+ LastUpgradeCheck = 0600;
</ins><span class="cx"> };
</span><span class="cx"> buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "gtest" */;
</span><span class="cx"> compatibilityVersion = "Xcode 3.2";
</span><span class="lines">@@ -941,9 +941,6 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = 44C48DFF14A4098F00A2D9C7 /* ProductionProject.xcconfig */;
</span><span class="cx"> buildSettings = {
</span><del>- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
</del><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><span class="lines">@@ -951,7 +948,6 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */;
</span><span class="cx"> buildSettings = {
</span><del>- COMBINE_HIDPI_IMAGES = YES;
</del><span class="cx"> DYLIB_COMPATIBILITY_VERSION = 1;
</span><span class="cx"> DYLIB_CURRENT_VERSION = 1;
</span><span class="cx"> INFOPLIST_FILE = Resources/Info.plist;
</span><span class="lines">@@ -1031,7 +1027,6 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */;
</span><span class="cx"> buildSettings = {
</span><del>- COMBINE_HIDPI_IMAGES = YES;
</del><span class="cx"> DYLIB_COMPATIBILITY_VERSION = 1;
</span><span class="cx"> DYLIB_CURRENT_VERSION = 1;
</span><span class="cx"> INFOPLIST_FILE = Resources/Info.plist;
</span><span class="lines">@@ -1046,7 +1041,6 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */;
</span><span class="cx"> buildSettings = {
</span><del>- COMBINE_HIDPI_IMAGES = YES;
</del><span class="cx"> DYLIB_COMPATIBILITY_VERSION = 1;
</span><span class="cx"> DYLIB_CURRENT_VERSION = 1;
</span><span class="cx"> INFOPLIST_FILE = Resources/Info.plist;
</span><span class="lines">@@ -1061,10 +1055,6 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = 40D4CDF10E30E07400294801 /* DebugProject.xcconfig */;
</span><span class="cx"> buildSettings = {
</span><del>- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- ONLY_ACTIVE_ARCH = YES;
</del><span class="cx"> };
</span><span class="cx"> name = Debug;
</span><span class="cx"> };
</span><span class="lines">@@ -1072,9 +1062,6 @@
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = 40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */;
</span><span class="cx"> buildSettings = {
</span><del>- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
</del><span class="cx"> };
</span><span class="cx"> name = Release;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WTF/ChangeLog 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-09-06 Darin Adler <darin@apple.com>
+
+ Make updates suggested by new version of Xcode
+ https://bugs.webkit.org/show_bug.cgi?id=136603
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/Base.xcconfig: Added CLANG_WARN_UNREACHABLE_CODE,
+ COMBINE_HIDPI_IMAGES, and ENABLE_STRICT_OBJC_MSGSEND as suggested by
+ Xcode upgrade check.
+
+ * WTF.xcodeproj/project.pbxproj: Updated LastUpgradeCheck.
+
</ins><span class="cx"> 2014-09-05 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> bmalloc should honor the FastMalloc statistics API
</span></span></pre></div>
<a id="trunkSourceWTFConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/Configurations/Base.xcconfig (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/Configurations/Base.xcconfig 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WTF/Configurations/Base.xcconfig 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -32,8 +32,11 @@
</span><span class="cx"> CLANG_WARN_EMPTY_BODY = YES;
</span><span class="cx"> CLANG_WARN_ENUM_CONVERSION = YES;
</span><span class="cx"> CLANG_WARN_INT_CONVERSION = YES;
</span><ins>+CLANG_WARN_UNREACHABLE_CODE = YES;
</ins><span class="cx"> CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
</span><ins>+COMBINE_HIDPI_IMAGES = NO;
</ins><span class="cx"> DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
</span><ins>+ENABLE_STRICT_OBJC_MSGSEND = YES;
</ins><span class="cx"> GCC_C_LANGUAGE_STANDARD = gnu99;
</span><span class="cx"> GCC_DEBUGGING_SYMBOLS = default;
</span><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1223,7 +1223,7 @@
</span><span class="cx"> 5D247B5914689B8600E78B76 /* Project object */ = {
</span><span class="cx"> isa = PBXProject;
</span><span class="cx"> attributes = {
</span><del>- LastUpgradeCheck = 0500;
</del><ins>+ LastUpgradeCheck = 0600;
</ins><span class="cx"> };
</span><span class="cx"> buildConfigurationList = 5D247B5C14689B8600E78B76 /* Build configuration list for PBXProject "WTF" */;
</span><span class="cx"> compatibilityVersion = "Xcode 3.2";
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebCore/ChangeLog 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-09-06 Darin Adler <darin@apple.com>
+
+ Make updates suggested by new version of Xcode
+ https://bugs.webkit.org/show_bug.cgi?id=136603
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/Base.xcconfig: Added COMBINE_HIDPI_IMAGES and
+ ENABLE_STRICT_OBJC_MSGSEND as suggested by Xcode upgrade check.
+
+ * WebCore.xcodeproj/project.pbxproj: Let Xcode remove an orphaned item from the file,
+ and also updated LastUpgradeCheck.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::updateTextTrackDisplay): Use #if/#else/#endif instead of
+ using #if/return/#endif and leaving code unreachable.
+ (WebCore::HTMLMediaElement::configureMediaControls): Ditto.
+ (WebCore::HTMLMediaElement::configureTextTrackDisplay): Ditto.
+ * html/canvas/WebGLDrawBuffers.cpp:
+ (WebCore::WebGLDrawBuffers::supported): Ditto.
+
</ins><span class="cx"> 2014-09-06 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: convert DockSide to an enum class
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/Base.xcconfig 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -33,7 +33,9 @@
</span><span class="cx"> CLANG_WARN_ENUM_CONVERSION = YES;
</span><span class="cx"> CLANG_WARN_INT_CONVERSION = YES;
</span><span class="cx"> CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
</span><ins>+COMBINE_HIDPI_IMAGES = NO;
</ins><span class="cx"> DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
</span><ins>+ENABLE_STRICT_OBJC_MSGSEND = YES;
</ins><span class="cx"> GCC_C_LANGUAGE_STANDARD = gnu99;
</span><span class="cx"> GCC_DEBUGGING_SYMBOLS = default;
</span><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -21072,7 +21072,6 @@
</span><span class="cx"> 7EE6847312D26E5500E79415 /* cf */,
</span><span class="cx"> 7E4DE10B198B10810051CB02 /* cocoa */,
</span><span class="cx"> 5126E6B60A2E3AEF005C29FA /* icon */,
</span><del>- CE79D68617F220ED00815C00 /* ios */,
</del><span class="cx"> 93A1EAA20A5634D8006960A0 /* mac */,
</span><span class="cx"> E1424C91164B52C800F32D40 /* CookieJar.cpp */,
</span><span class="cx"> E1424C92164B52C800F32D40 /* CookieJar.h */,
</span><span class="lines">@@ -26715,7 +26714,7 @@
</span><span class="cx"> isa = PBXProject;
</span><span class="cx"> attributes = {
</span><span class="cx"> BuildIndependentTargetsInParallel = YES;
</span><del>- LastUpgradeCheck = 0500;
</del><ins>+ LastUpgradeCheck = 0600;
</ins><span class="cx"> };
</span><span class="cx"> buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
</span><span class="cx"> compatibilityVersion = "Xcode 3.2";
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -5003,19 +5003,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><ins>+
</ins><span class="cx"> void HTMLMediaElement::updateTextTrackDisplay()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> ensureUserAgentShadowRoot();
</span><span class="cx"> ASSERT(m_mediaControlsHost);
</span><span class="cx"> m_mediaControlsHost->updateTextTrackContainer();
</span><del>- return;
-#endif
</del><ins>+#else
</ins><span class="cx"> if (!hasMediaControls() && !createMediaControls())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> mediaControls()->updateTextTrackDisplay();
</span><ins>+#endif
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible)
</span><span class="lines">@@ -5196,9 +5198,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ensureUserAgentShadowRoot();
</span><del>- return;
-#endif
-
</del><ins>+#else
</ins><span class="cx"> if (!controls() || !inDocument()) {
</span><span class="cx"> if (hasMediaControls())
</span><span class="cx"> mediaControls()->hide();
</span><span class="lines">@@ -5209,6 +5209,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> mediaControls()->show();
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="lines">@@ -5242,9 +5243,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ensureUserAgentShadowRoot();
</span><del>- return;
-#endif
-
</del><ins>+#else
</ins><span class="cx"> if (!m_haveVisibleTextTrack && !hasMediaControls())
</span><span class="cx"> return;
</span><span class="cx"> if (!hasMediaControls() && !createMediaControls())
</span><span class="lines">@@ -5256,6 +5255,7 @@
</span><span class="cx"> updateTextTrackDisplay();
</span><span class="cx"> updateActiveTextTrackCues(currentMediaTime());
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::captionPreferencesChanged()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLDrawBufferscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -46,18 +46,25 @@
</span><span class="cx"> return WebGLExtension::WebGLDrawBuffersName;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// static
-bool WebGLDrawBuffers::supported(WebGLRenderingContext* context)
</del><ins>+#if OS(DARWIN)
+
+bool WebGLDrawBuffers::supported(WebGLRenderingContext*)
</ins><span class="cx"> {
</span><del>-#if OS(DARWIN)
</del><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=112486
</span><span class="cx"> return false;
</span><del>-#endif
</del><ins>+}
+
+#else
+
+bool WebGLDrawBuffers::supported(WebGLRenderingContext* context)
+{
</ins><span class="cx"> Extensions3D* extensions = context->graphicsContext3D()->getExtensions();
</span><del>- return (extensions->supports("GL_EXT_draw_buffers")
- && satisfiesWebGLRequirements(context));
</del><ins>+ return extensions->supports("GL_EXT_draw_buffers")
+ && satisfiesWebGLRequirements(context);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif
+
</ins><span class="cx"> void WebGLDrawBuffers::drawBuffersWEBGL(const Vector<GC3Denum>& buffers)
</span><span class="cx"> {
</span><span class="cx"> if (m_context->isContextLost())
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-06 Darin Adler <darin@apple.com>
+
+ Make updates suggested by new version of Xcode
+ https://bugs.webkit.org/show_bug.cgi?id=136603
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/Base.xcconfig: Added CLANG_WARN_BOOL_CONVERSION, CLANG_WARN_CONSTANT_CONVERSION,
+ CLANG_WARN_EMPTY_BODY, CLANG_WARN_ENUM_CONVERSION, CLANG_WARN_INT_CONVERSION,
+ CLANG_WARN_UNREACHABLE_CODE, CLANG_WARN__DUPLICATE_METHOD_MATCH, ENABLE_STRICT_OBJC_MSGSEND,
+ GCC_WARN_UNDECLARED_SELECTOR, and GCC_WARN_UNUSED_FUNCTION as suggested by Xcode update check.
+ Also removed duplicate GCC_WARN_UNUSED_VARIABLE line.
+
+ * WebInspectorUI.xcodeproj/project.pbxproj: Updated LastUpgradeCheck.
+
</ins><span class="cx"> 2014-09-02 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> LegacyProfiler: remove redundant ProfileNode members and other cleanup
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -8,8 +8,15 @@
</span><span class="cx">
</span><span class="cx"> CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
</span><span class="cx"> CLANG_CXX_LIBRARY = libc++;
</span><ins>+CLANG_WARN_BOOL_CONVERSION = YES;
+CLANG_WARN_CONSTANT_CONVERSION = YES;
</ins><span class="cx"> CLANG_WARN_CXX0X_EXTENSIONS = NO;
</span><del>-CLANG_WARN__DUPLICATE_METHOD_MATCH = NO
</del><ins>+CLANG_WARN_EMPTY_BODY = YES;
+CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INT_CONVERSION = YES;
+CLANG_WARN_UNREACHABLE_CODE = YES;
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ENABLE_STRICT_OBJC_MSGSEND = YES;
</ins><span class="cx"> GCC_C_LANGUAGE_STANDARD = gnu99;
</span><span class="cx"> GCC_DYNAMIC_NO_PIC = YES;
</span><span class="cx"> GCC_ENABLE_CPP_EXCEPTIONS = NO;
</span><span class="lines">@@ -31,9 +38,10 @@
</span><span class="cx"> GCC_WARN_ABOUT_RETURN_TYPE = YES
</span><span class="cx"> GCC_WARN_ABOUT_RETURN_TYPE = YES;
</span><span class="cx"> GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
</span><ins>+GCC_WARN_UNDECLARED_SELECTOR = YES;
</ins><span class="cx"> GCC_WARN_UNINITIALIZED_AUTOS = YES
</span><ins>+GCC_WARN_UNUSED_FUNCTION = YES;
</ins><span class="cx"> GCC_WARN_UNUSED_VARIABLE = YES
</span><del>-GCC_WARN_UNUSED_VARIABLE = YES;
</del><span class="cx"> LINKER_DISPLAYS_MANGLED_NAMES = YES;
</span><span class="cx"> WARNING_CFLAGS = -Wall -W -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-unused-parameter -Wexit-time-destructors;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> A54C224D148B23DE00373FA3 /* Project object */ = {
</span><span class="cx"> isa = PBXProject;
</span><span class="cx"> attributes = {
</span><del>- LastUpgradeCheck = 0450;
</del><ins>+ LastUpgradeCheck = 0600;
</ins><span class="cx"> ORGANIZATIONNAME = Apple;
</span><span class="cx"> };
</span><span class="cx"> buildConfigurationList = A54C2250148B23DE00373FA3 /* Build configuration list for PBXProject "WebInspectorUI" */;
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit/ChangeLog 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-09-06 Darin Adler <darin@apple.com>
+
+ Make updates suggested by new version of Xcode
+ https://bugs.webkit.org/show_bug.cgi?id=136603
+
+ Reviewed by Mark Rowe.
+
+ * WebKit.xcodeproj/project.pbxproj: Updated LastUpgradeCheck.
+
</ins><span class="cx"> 2014-09-04 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove iOS specific disk image cache
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1953,7 +1953,7 @@
</span><span class="cx"> 0867D690FE84028FC02AAC07 /* Project object */ = {
</span><span class="cx"> isa = PBXProject;
</span><span class="cx"> attributes = {
</span><del>- LastUpgradeCheck = 0500;
</del><ins>+ LastUpgradeCheck = 0600;
</ins><span class="cx"> };
</span><span class="cx"> buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
</span><span class="cx"> compatibilityVersion = "Xcode 3.2";
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1,3 +1,61 @@
</span><ins>+2014-09-06 Darin Adler <darin@apple.com>
+
+ Make updates suggested by new version of Xcode
+ https://bugs.webkit.org/show_bug.cgi?id=136603
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/Base.xcconfig: Added CLANG_WARN_UNREACHABLE_CODE, COMBINE_HIDPI_IMAGES,
+ and ENABLE_STRICT_OBJC_MSGSEND as suggested by Xcode upgrade check.
+
+ * History/WebURLsWithTitles.m:
+ (+[WebURLsWithTitles writeURLs:andTitles:toPasteboard:]): Use NSUInteger instead of
+ unsigned for correctness, and to quiet the 32-to-64-bit compiler warning (which is
+ not turned on because it gives us too many false positives).
+ * Misc/WebElementDictionary.mm:
+ (-[WebElementDictionary objectForKey:]): Ditto.
+ * Misc/WebNSDataExtras.m:
+ (-[NSData _webkit_guessedMIMETypeForXML]): Ditto.
+ (-[NSData _webkit_guessedMIMEType]): Ditto.
+ (-[NSData _webkit_parseRFC822HeaderFields]): Ditto.
+ (-[NSData _web_locationAfterFirstBlankLine]): Ditto.
+
+ * Misc/WebNSURLExtras.h: Removed unused _web_URLWithLowercasedScheme, _web_hostData,
+ _webkit_URLByRemovingFragment, _webkit_URLByRemovingResourceSpecifier, _webkit_isFTPDirectoryURL,
+ _webkit_shouldLoadAsEmptyDocument, _web_hostNameNeedsDecodingWithRange:,
+ _web_hostNameNeedsEncodingWithRange:, _web_decodeHostNameWithRange:, _web_encodeHostNameWithRange:,
+ and _webkit_URLFragment methods.
+
+ * Misc/WebNSURLExtras.mm:
+ (-[NSURL _web_URLByTruncatingOneCharacterBeforeComponent:]): Deleted.
+ (-[NSURL _webkit_URLByRemovingFragment]): Deleted.
+ (-[NSURL _webkit_URLByRemovingResourceSpecifier]): Deleted.
+ (-[NSURL _webkit_isFTPDirectoryURL]): Deleted.
+ (-[NSURL _webkit_shouldLoadAsEmptyDocument]): Deleted.
+ (-[NSURL _web_URLWithLowercasedScheme]): Deleted.
+ (-[NSString _webkit_isFTPDirectoryURL]): Deleted.
+ (-[NSString _web_hostNameNeedsDecodingWithRange:]): Deleted.
+ (-[NSString _web_hostNameNeedsEncodingWithRange:]): Deleted.
+ (-[NSString _web_decodeHostNameWithRange:]): Deleted.
+ (-[NSString _web_encodeHostNameWithRange:]): Deleted.
+ (-[NSString _webkit_URLFragment]): Deleted.
+
+ * Plugins/WebPluginDatabase.mm:
+ (-[WebPluginDatabase removePluginInstanceViewsFor:]): Use a modern for loop
+ to iterate an array instead of a loop using the type "unsigned int".
+
+ * WebCoreSupport/WebOpenPanelResultListener.mm:
+ (-[WebOpenPanelResultListener chooseFilenames:]): Use NSUInteger instead of int.
+
+ * WebView/WebDelegateImplementationCaching.mm:
+ (CallDelegate): Use wtfCallIMP in one overload that was instead just calling the
+ directly without a proper type for the function pointer. This might have been causing
+ an actual problem on 64-bit systems, and it was different from all the other CallDelegate
+ functions that were already doing this correctly.
+
+ * WebView/WebTextCompletionController.mm:
+ (-[WebTextCompletionController _placePopupWindow:]): Use NSUInteger instead of int.
+
</ins><span class="cx"> 2014-09-06 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: convert DockSide to an enum class
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -32,8 +32,11 @@
</span><span class="cx"> CLANG_WARN_EMPTY_BODY = YES;
</span><span class="cx"> CLANG_WARN_ENUM_CONVERSION = YES;
</span><span class="cx"> CLANG_WARN_INT_CONVERSION = YES;
</span><ins>+CLANG_WARN_UNREACHABLE_CODE = YES;
</ins><span class="cx"> CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
</span><ins>+COMBINE_HIDPI_IMAGES = NO;
</ins><span class="cx"> DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
</span><ins>+ENABLE_STRICT_OBJC_MSGSEND = YES;
</ins><span class="cx"> GCC_C_LANGUAGE_STANDARD = gnu99;
</span><span class="cx"> GCC_DEBUGGING_SYMBOLS = default;
</span><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebURLsWithTitlesm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebURLsWithTitles.m (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebURLsWithTitles.m 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit/mac/History/WebURLsWithTitles.m 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> {
</span><span class="cx"> NSMutableArray *URLStrings;
</span><span class="cx"> NSMutableArray *titlesOrEmptyStrings;
</span><del>- unsigned index, count;
</del><ins>+ NSUInteger index, count;
</ins><span class="cx">
</span><span class="cx"> count = [URLs count];
</span><span class="cx"> if (count == 0) {
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebElementDictionarymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> return nil;
</span><span class="cx"> value = [self performSelector:selector];
</span><span class="cx">
</span><del>- unsigned lookupTableCount = CFDictionaryGetCount(lookupTable);
</del><ins>+ NSUInteger lookupTableCount = CFDictionaryGetCount(lookupTable);
</ins><span class="cx"> if (value) {
</span><span class="cx"> if (!_cache)
</span><span class="cx"> _cache = [[NSMutableDictionary alloc] initWithCapacity:lookupTableCount];
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSDataExtrasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSDataExtras.m (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSDataExtras.m 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit/mac/Misc/WebNSDataExtras.m 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> -(NSString *)_webkit_guessedMIMETypeForXML
</span><span class="cx"> {
</span><del>- int length = [self length];
</del><ins>+ NSUInteger length = [self length];
</ins><span class="cx"> const UInt8 *bytes = [self bytes];
</span><span class="cx">
</span><span class="cx"> #define CHANNEL_TAG_LENGTH 7
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> if ([MIMEType length])
</span><span class="cx"> return MIMEType;
</span><span class="cx">
</span><del>- int length = [self length];
</del><ins>+ NSUInteger length = [self length];
</ins><span class="cx"> const char *bytes = [self bytes];
</span><span class="cx">
</span><span class="cx"> const char *p = bytes;
</span><span class="lines">@@ -236,8 +236,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Test for plain text.
</span><del>- int i;
- for(i=0; i<length; i++){
</del><ins>+ NSUInteger i;
+ for (i = 0; i < length; ++i) {
</ins><span class="cx"> char c = bytes[i];
</span><span class="cx"> if ((c < 0x20 || c > 0x7E) && (c != '\t' && c != '\r' && c != '\n')) {
</span><span class="cx"> break;
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> NSMutableDictionary *headerFields = [NSMutableDictionary dictionary];
</span><span class="cx">
</span><span class="cx"> const UInt8 *bytes = [self bytes];
</span><del>- unsigned length = [self length];
</del><ins>+ NSUInteger length = [self length];
</ins><span class="cx"> NSString *lastKey = nil;
</span><span class="cx"> const UInt8 *eol;
</span><span class="cx">
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> - (NSInteger)_web_locationAfterFirstBlankLine
</span><span class="cx"> {
</span><span class="cx"> const char *bytes = (const char *)[self bytes];
</span><del>- unsigned length = [self length];
</del><ins>+ NSUInteger length = [self length];
</ins><span class="cx">
</span><span class="cx"> unsigned i;
</span><span class="cx"> for (i = 0; i < length - 4; i++) {
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSURLExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005-2009, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -42,13 +42,10 @@
</span><span class="cx"> + (NSURL *)_web_URLWithData:(NSData *)data;
</span><span class="cx"> + (NSURL *)_web_URLWithData:(NSData *)data relativeToURL:(NSURL *)baseURL;
</span><span class="cx">
</span><del>-- (NSURL *)_web_URLWithLowercasedScheme;
-
</del><span class="cx"> - (NSData *)_web_originalData;
</span><span class="cx"> - (NSString *)_web_originalDataAsString;
</span><span class="cx"> - (const char *)_web_URLCString;
</span><span class="cx">
</span><del>-- (NSData *)_web_hostData;
</del><span class="cx"> - (NSString *)_web_hostString;
</span><span class="cx">
</span><span class="cx"> - (NSString *)_web_userVisibleString;
</span><span class="lines">@@ -56,45 +53,34 @@
</span><span class="cx"> - (BOOL)_web_isEmpty;
</span><span class="cx">
</span><span class="cx"> - (NSURL *)_webkit_canonicalize;
</span><del>-- (NSURL *)_webkit_URLByRemovingFragment;
-- (NSURL *)_webkit_URLByRemovingResourceSpecifier;
</del><span class="cx"> - (NSURL *)_web_URLByRemovingUserInfo;
</span><span class="cx">
</span><span class="cx"> - (BOOL)_webkit_isJavaScriptURL;
</span><span class="cx"> - (BOOL)_webkit_isFileURL;
</span><span class="cx"> - (NSString *)_webkit_scriptIfJavaScriptURL;
</span><del>-- (BOOL)_webkit_isFTPDirectoryURL;
</del><span class="cx">
</span><del>-- (BOOL)_webkit_shouldLoadAsEmptyDocument;
-
</del><span class="cx"> - (NSString *)_webkit_suggestedFilenameWithMIMEType:(NSString *)MIMEType;
</span><span class="cx">
</span><span class="cx"> - (NSURL *)_webkit_URLFromURLOrSchemelessFileURL;
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><ins>+// FIXME: This method name needs a prefix.
</ins><span class="cx"> + (NSURL *)uniqueURLWithRelativePart:(NSString *)relativePart;
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface NSString (WebNSURLExtras)
</span><span class="cx">
</span><span class="cx"> - (BOOL)_web_isUserVisibleURL;
</span><span class="cx">
</span><del>-- (BOOL)_web_hostNameNeedsDecodingWithRange:(NSRange)range; // returns NO if decodeHostNameWithRange: would return nil, but more efficient
-- (BOOL)_web_hostNameNeedsEncodingWithRange:(NSRange)range; // returns NO if encodeHostNameWithRange: would return nil, but more efficient
-
-- (NSString *)_web_decodeHostNameWithRange:(NSRange)range; // turns funny-looking ASCII form into Unicode, returns nil if no decoding needed
-- (NSString *)_web_encodeHostNameWithRange:(NSRange)range; // turns Unicode into funny-looking ASCII form, returns nil if no decoding needed
-
</del><span class="cx"> - (NSString *)_web_decodeHostName; // turns funny-looking ASCII form into Unicode, returns self if no decoding needed, convenient cover
</span><span class="cx"> - (NSString *)_web_encodeHostName; // turns Unicode into funny-looking ASCII form, returns self if no decoding needed, convenient cover
</span><span class="cx">
</span><span class="cx"> - (BOOL)_webkit_isJavaScriptURL;
</span><del>-- (BOOL)_webkit_isFTPDirectoryURL;
</del><span class="cx"> - (BOOL)_webkit_isFileURL;
</span><span class="cx"> - (BOOL)_webkit_looksLikeAbsoluteURL;
</span><span class="cx"> - (NSRange)_webkit_rangeOfURLScheme;
</span><del>-- (NSString *)_webkit_URLFragment;
</del><span class="cx"> - (NSString *)_webkit_scriptIfJavaScriptURL;
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSURLExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -132,21 +132,6 @@
</span><span class="cx"> return URLByCanonicalizingURL(self);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSURL *)_web_URLByTruncatingOneCharacterBeforeComponent:(CFURLComponentType)component
-{
- return URLByTruncatingOneCharacterBeforeComponent(self, component);
-}
-
-- (NSURL *)_webkit_URLByRemovingFragment
-{
- return URLByTruncatingOneCharacterBeforeComponent(self, kCFURLComponentFragment);
-}
-
-- (NSURL *)_webkit_URLByRemovingResourceSpecifier
-{
- return URLByTruncatingOneCharacterBeforeComponent(self, kCFURLComponentResourceSpecifier);
-}
-
</del><span class="cx"> - (NSURL *)_web_URLByRemovingUserInfo
</span><span class="cx"> {
</span><span class="cx"> return URLByRemovingUserInfo(self);
</span><span class="lines">@@ -167,57 +152,6 @@
</span><span class="cx"> return [[self _web_originalDataAsString] _webkit_isFileURL];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)_webkit_isFTPDirectoryURL
-{
- return [[self _web_originalDataAsString] _webkit_isFTPDirectoryURL];
-}
-
-- (BOOL)_webkit_shouldLoadAsEmptyDocument
-{
- return [[self _web_originalDataAsString] _webkit_hasCaseInsensitivePrefix:@"about:"] || [self _web_isEmpty];
-}
-
-- (NSURL *)_web_URLWithLowercasedScheme
-{
- CFRange range;
- CFURLGetByteRangeForComponent((CFURLRef)self, kCFURLComponentScheme, &range);
- if (range.location == kCFNotFound) {
- return self;
- }
-
- UInt8 static_buffer[URL_BYTES_BUFFER_LENGTH];
- UInt8 *buffer = static_buffer;
- CFIndex bytesFilled = CFURLGetBytes((CFURLRef)self, buffer, URL_BYTES_BUFFER_LENGTH);
- if (bytesFilled == -1) {
- CFIndex bytesToAllocate = CFURLGetBytes((CFURLRef)self, NULL, 0);
- buffer = static_cast<UInt8 *>(malloc(bytesToAllocate));
- bytesFilled = CFURLGetBytes((CFURLRef)self, buffer, bytesToAllocate);
- ASSERT(bytesFilled == bytesToAllocate);
- }
-
- int i;
- BOOL changed = NO;
- for (i = 0; i < range.length; ++i) {
- char c = buffer[range.location + i];
- char lower = toASCIILower(c);
- if (c != lower) {
- buffer[range.location + i] = lower;
- changed = YES;
- }
- }
-
- NSURL *result = changed
- ? CFBridgingRelease(CFURLCreateAbsoluteURLWithBytes(NULL, buffer, bytesFilled, kCFStringEncodingUTF8, nil, YES))
- : self;
-
- if (buffer != static_buffer) {
- free(buffer);
- }
-
- return result;
-}
-
-
</del><span class="cx"> -(NSData *)_web_schemeSeparatorWithoutColon
</span><span class="cx"> {
</span><span class="cx"> NSData *result = nil;
</span><span class="lines">@@ -318,36 +252,6 @@
</span><span class="cx"> return [[self substringFromIndex:11] _webkit_stringByReplacingValidPercentEscapes];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)_webkit_isFTPDirectoryURL
-{
- int length = [self length];
- if (length < 5) { // 5 is length of "ftp:/"
- return NO;
- }
- unichar lastChar = [self characterAtIndex:length - 1];
- return lastChar == '/' && [self _webkit_hasCaseInsensitivePrefix:@"ftp:"];
-}
-
-- (BOOL)_web_hostNameNeedsDecodingWithRange:(NSRange)range
-{
- return hostNameNeedsDecodingWithRange(self, range);
-}
-
-- (BOOL)_web_hostNameNeedsEncodingWithRange:(NSRange)range
-{
- return hostNameNeedsEncodingWithRange(self, range);
-}
-
-- (NSString *)_web_decodeHostNameWithRange:(NSRange)range
-{
- return decodeHostNameWithRange(self, range);
-}
-
-- (NSString *)_web_encodeHostNameWithRange:(NSRange)range
-{
- return encodeHostNameWithRange(self, range);
-}
-
</del><span class="cx"> - (NSString *)_web_decodeHostName
</span><span class="cx"> {
</span><span class="cx"> return decodeHostName(self);
</span><span class="lines">@@ -386,16 +290,6 @@
</span><span class="cx"> return [[self _webkit_stringByTrimmingWhitespace] _webkit_rangeOfURLScheme].location != NSNotFound;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSString *)_webkit_URLFragment
-{
- NSRange fragmentRange;
-
- fragmentRange = [self rangeOfString:@"#" options:NSLiteralSearch];
- if (fragmentRange.location == NSNotFound)
- return nil;
- return [self substringFromIndex:fragmentRange.location + 1];
-}
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> - (NSString *)_webkit_unescapedQueryValue
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginDatabasemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.mm (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.mm 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.mm 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -348,12 +348,7 @@
</span><span class="cx">
</span><span class="cx"> NSView <WebDocumentView> *documentView = [[webFrame frameView] documentView];
</span><span class="cx"> if ([documentView isKindOfClass:[WebHTMLView class]]) {
</span><del>- NSArray *subviews = [documentView subviews];
- unsigned int subviewCount = [subviews count];
- unsigned int subviewIndex;
-
- for (subviewIndex = 0; subviewIndex < subviewCount; subviewIndex++) {
- NSView *subview = [subviews objectAtIndex:subviewIndex];
</del><ins>+ for (NSView *subview in [documentView subviews]) {
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> if ([subview isKindOfClass:[WebBaseNetscapePluginView class]] || [WebPluginController isPlugInView:subview])
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebOpenPanelResultListenermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.mm (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.mm 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.mm 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -83,9 +83,9 @@
</span><span class="cx"> ASSERT(_chooser);
</span><span class="cx"> if (!_chooser)
</span><span class="cx"> return;
</span><del>- int count = [filenames count];
</del><ins>+ NSUInteger count = [filenames count];
</ins><span class="cx"> Vector<String> names(count);
</span><del>- for (int i = 0; i < count; i++)
</del><ins>+ for (NSUInteger i = 0; i < count; i++)
</ins><span class="cx"> names[i] = [filenames objectAtIndex:i];
</span><span class="cx"> _chooser->chooseFiles(names);
</span><span class="cx"> _chooser->deref();
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDelegateImplementationCachingmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx"> if (!delegate)
</span><span class="cx"> return nil;
</span><span class="cx"> @try {
</span><del>- return implementation(delegate, selector, self, integer);
</del><ins>+ return wtfCallIMP<id>(implementation, delegate, selector, self, integer);
</ins><span class="cx"> } @catch(id exception) {
</span><span class="cx"> ReportDiscardedDelegateException(selector, exception);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebTextCompletionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> // mostly lifted from NSTextView_KeyBinding.m
</span><span class="cx"> - (void)_placePopupWindow:(NSPoint)topLeft
</span><span class="cx"> {
</span><del>- int numberToShow = [_completions count];
</del><ins>+ NSUInteger numberToShow = [_completions count];
</ins><span class="cx"> if (numberToShow > 20)
</span><span class="cx"> numberToShow = 20;
</span><span class="cx">
</span><span class="lines">@@ -140,8 +140,7 @@
</span><span class="cx"> NSDictionary *attributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSFont systemFontOfSize:12.0f], NSFontAttributeName, nil];
</span><span class="cx"> CGFloat maxWidth = 0;
</span><span class="cx"> int maxIndex = -1;
</span><del>- int i;
- for (i = 0; i < numberToShow; i++) {
</del><ins>+ for (NSUInteger i = 0; i < numberToShow; i++) {
</ins><span class="cx"> float width = ceilf([[_completions objectAtIndex:i] sizeWithAttributes:attributes].width);
</span><span class="cx"> if (width > maxWidth) {
</span><span class="cx"> maxWidth = width;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-09-06 Darin Adler <darin@apple.com>
+
+ Make updates suggested by new version of Xcode
+ https://bugs.webkit.org/show_bug.cgi?id=136603
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/Base.xcconfig: Added CLANG_WARN_UNREACHABLE_CODE, COMBINE_HIDPI_IMAGES,
+ and ENABLE_STRICT_OBJC_MSGSEND as suggested by the Xcode upgrade check.
+
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::initializeCocoaOverrides): Changed NSConcreteTask_launch to use the same technique
+ as the other functions in this file, doing the type casting right at the call to
+ method_setImplementation so the global has a suitable type for making a function call,
+ rather than relying on the abilty to call through a type without a specific argument list.
+
+ * UIProcess/Plugins/PluginInfoStore.cpp:
+ (WebKit::pathExtension): Use size_t for the result of String::reverseFind rather than
+ converting it to an int. Also don't rely on the fact that WTF's notFound becomes -1 when
+ cast from size_t to int.
+
+ * WebKit2.xcodeproj/project.pbxproj: Let Xcode delete some orphaned items, and updated
+ LastUpgradeCheck.
+
</ins><span class="cx"> 2014-09-06 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: convert DockSide to an enum class
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/Base.xcconfig 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -32,8 +32,11 @@
</span><span class="cx"> CLANG_WARN_EMPTY_BODY = YES;
</span><span class="cx"> CLANG_WARN_ENUM_CONVERSION = YES;
</span><span class="cx"> CLANG_WARN_INT_CONVERSION = YES;
</span><ins>+CLANG_WARN_UNREACHABLE_CODE = YES;
</ins><span class="cx"> CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
</span><ins>+COMBINE_HIDPI_IMAGES = NO;
</ins><span class="cx"> DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
</span><ins>+ENABLE_STRICT_OBJC_MSGSEND = YES;
</ins><span class="cx"> GCC_C_LANGUAGE_STANDARD = gnu99;
</span><span class="cx"> GCC_DEBUGGING_SYMBOLS = default;
</span><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessmacPluginProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static IMP NSConcreteTask_launch;
</del><ins>+static void (*NSConcreteTask_launch)(NSTask *, SEL);
</ins><span class="cx">
</span><span class="cx"> static void replacedNSConcreteTask_launch(NSTask *self, SEL _cmd)
</span><span class="cx"> {
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Override -[NSConcreteTask launch:]
</span><span class="cx"> Method launchMethod = class_getInstanceMethod(objc_getClass("NSConcreteTask"), @selector(launch));
</span><del>- NSConcreteTask_launch = method_setImplementation(launchMethod, reinterpret_cast<IMP>(replacedNSConcreteTask_launch));
</del><ins>+ NSConcreteTask_launch = reinterpret_cast<void (*)(NSTask *, SEL)>(method_setImplementation(launchMethod, reinterpret_cast<IMP>(replacedNSConcreteTask_launch)));
</ins><span class="cx">
</span><span class="cx"> // Override -[NSWorkspace launchApplicationAtURL:options:configuration:error:]
</span><span class="cx"> Method launchApplicationAtURLOptionsConfigurationErrorMethod = class_getInstanceMethod(objc_getClass("NSWorkspace"), @selector(launchApplicationAtURL:options:configuration:error:));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginInfoStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -156,8 +156,8 @@
</span><span class="cx"> String extension;
</span><span class="cx"> String filename = url.lastPathComponent();
</span><span class="cx"> if (!filename.endsWith('/')) {
</span><del>- int extensionPos = filename.reverseFind('.');
- if (extensionPos != -1)
</del><ins>+ size_t extensionPos = filename.reverseFind('.');
+ if (extensionPos != notFound)
</ins><span class="cx"> extension = filename.substring(extensionPos + 1);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (173363 => 173364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-09-06 22:53:17 UTC (rev 173364)
</span><span class="lines">@@ -717,7 +717,6 @@
</span><span class="cx"> 373CEAD81859553F008C363D /* WKPagePolicyClientInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 373CEAD71859553F008C363D /* WKPagePolicyClientInternal.h */; };
</span><span class="cx"> 373D122218A473010066D9CC /* _WKFrameHandle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 373D122018A473010066D9CC /* _WKFrameHandle.mm */; };
</span><span class="cx"> 373D122318A473010066D9CC /* _WKFrameHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122118A473010066D9CC /* _WKFrameHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 373D122518A473B30066D9CC /* WKBrowsingContextHandleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122418A473B30066D9CC /* WKBrowsingContextHandleInternal.h */; };
</del><span class="cx"> 373D122718A473F60066D9CC /* _WKFrameHandleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */; };
</span><span class="cx"> 373D122D18A4B6EB0066D9CC /* WKWebProcessPlugInFramePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122C18A4B6A80066D9CC /* WKWebProcessPlugInFramePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 3743925818BC4C60001C8675 /* WKUIDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3743925718BC4C60001C8675 /* WKUIDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -7316,7 +7315,6 @@
</span><span class="cx"> BC597075116591D000551FCA /* ProcessModel.h in Headers */,
</span><span class="cx"> 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */,
</span><span class="cx"> 1AB16ADE1648598400290D62 /* RemoteLayerTreeDrawingArea.h in Headers */,
</span><del>- 373D122518A473B30066D9CC /* WKBrowsingContextHandleInternal.h in Headers */,
</del><span class="cx"> 1AB16AE21648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.h in Headers */,
</span><span class="cx"> 1AA3D75C1651B44F008713D0 /* RemoteLayerTreeHost.h in Headers */,
</span><span class="cx"> 1AF1AC6C1651759E00C17D7F /* RemoteLayerTreeTransaction.h in Headers */,
</span><span class="lines">@@ -8179,7 +8177,7 @@
</span><span class="cx"> 0867D690FE84028FC02AAC07 /* Project object */ = {
</span><span class="cx"> isa = PBXProject;
</span><span class="cx"> attributes = {
</span><del>- LastUpgradeCheck = 0500;
</del><ins>+ LastUpgradeCheck = 0600;
</ins><span class="cx"> };
</span><span class="cx"> buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "WebKit2" */;
</span><span class="cx"> compatibilityVersion = "Xcode 3.2";
</span></span></pre>
</div>
</div>
</body>
</html>