Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (173363 => 173364)
--- trunk/Source/_javascript_Core/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-09-06 22:53:17 UTC (rev 173364)
@@ -1,3 +1,22 @@
+2014-09-06 Darin Adler <[email protected]>
+
+ 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.
+
+ * _javascript_Core.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.
+
2014-09-05 Matt Baker <[email protected]>
Web Inspector: breakpoint actions should work regardless of Content Security Policy
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (173363 => 173364)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-09-06 22:53:17 UTC (rev 173364)
@@ -32,8 +32,11 @@
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;
+COMBINE_HIDPI_IMAGES = NO;
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
+ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DEBUGGING_SYMBOLS = default;
GCC_DYNAMIC_NO_PIC = NO;
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (173363 => 173364)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2014-09-06 22:53:17 UTC (rev 173364)
@@ -6776,7 +6776,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
- LastUpgradeCheck = 0500;
+ LastUpgradeCheck = 0600;
};
buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "_javascript_Core" */;
compatibilityVersion = "Xcode 3.2";
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (173363 => 173364)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2014-09-06 22:53:17 UTC (rev 173364)
@@ -596,8 +596,10 @@
switch (arrayMode.arrayClass()) {
case Array::OriginalArray: {
CRASH();
+#if !COMPILER(CLANG)
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.
return result;
+#endif
}
case Array::Array:
Modified: trunk/Source/_javascript_Core/runtime/JSArray.cpp (173363 => 173364)
--- trunk/Source/_javascript_Core/runtime/JSArray.cpp 2014-09-06 20:52:28 UTC (rev 173363)
+++ trunk/Source/_javascript_Core/runtime/JSArray.cpp 2014-09-06 22:53:17 UTC (rev 173364)
@@ -1553,9 +1553,11 @@
default:
CRASH();
+#if !COMPILER(CLANG)
vector = 0;
vectorEnd = 0;
break;
+#endif
}
for (; i < vectorEnd; ++i) {
@@ -1615,9 +1617,11 @@
default:
CRASH();
+#if !COMPILER(CLANG)
vector = 0;
vectorEnd = 0;
break;
+#endif
}
for (; i < vectorEnd; ++i) {
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (173363 => 173364)
--- 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)
@@ -805,7 +805,7 @@
FB39D0701200ED9200088E69 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0440;
+ LastUpgradeCheck = 0600;
};
buildConfigurationList = FB39D0731200ED9200088E69 /* Build configuration list for PBXProject "ANGLE" */;
compatibilityVersion = "Xcode 3.2";
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (173363 => 173364)
--- 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)
@@ -1,3 +1,16 @@
+2014-09-06 Darin Adler <[email protected]>
+
+ 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.
+
2014-09-06 Commit Queue <[email protected]>
Unreviewed, rolling out r173335.
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig (173363 => 173364)
--- 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)
@@ -1,5 +1,10 @@
PRODUCT_NAME = ANGLE;
+CLANG_WARN_BOOL_CONVERSION = YES;
+CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INT_CONVERSION = YES;
+COMBINE_HIDPI_IMAGES = NO;
+ENABLE_STRICT_OBJC_MSGSEND = YES;
HEADER_SEARCH_PATHS = include src;
INSTALL_PATH_ACTUAL = /usr/local/lib;
PUBLIC_HEADERS_FOLDER_PATH = $(PUBLIC_HEADERS_FOLDER_PATH_$(DEPLOYMENT_LOCATION));
Modified: trunk/Source/ThirdParty/ChangeLog (173363 => 173364)
--- 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)
@@ -1,3 +1,18 @@
+2014-09-06 Darin Adler <[email protected]>
+
+ 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.
+
2014-08-22 Renato Nagy <[email protected]>
Remove LevelDB.
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (173363 => 173364)
--- 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)
@@ -23,9 +23,15 @@
// Strictest warning policy
WARNING_CFLAGS = -Wall -Werror -Wendif-labels -Wnewline-eof -Wno-sign-compare -Wshadow
+CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
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;
+GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -54,6 +60,7 @@
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+COMBINE_HIDPI_IMAGES = YES;
// VERSIONING BUILD SETTINGS (used in Info.plist)
GTEST_VERSIONINFO_ABOUT = © 2008 Google Inc.
Modified: trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj (173363 => 173364)
--- 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)
@@ -599,7 +599,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0500;
+ LastUpgradeCheck = 0600;
};
buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "gtest" */;
compatibilityVersion = "Xcode 3.2";
@@ -941,9 +941,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 44C48DFF14A4098F00A2D9C7 /* ProductionProject.xcconfig */;
buildSettings = {
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
};
name = Production;
};
@@ -951,7 +948,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
INFOPLIST_FILE = Resources/Info.plist;
@@ -1031,7 +1027,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
INFOPLIST_FILE = Resources/Info.plist;
@@ -1046,7 +1041,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
INFOPLIST_FILE = Resources/Info.plist;
@@ -1061,10 +1055,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40D4CDF10E30E07400294801 /* DebugProject.xcconfig */;
buildSettings = {
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- _ONLY_ACTIVE_ARCH_ = YES;
};
name = Debug;
};
@@ -1072,9 +1062,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */;
buildSettings = {
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
};
name = Release;
};
Modified: trunk/Source/WTF/ChangeLog (173363 => 173364)
--- 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)
@@ -1,3 +1,16 @@
+2014-09-06 Darin Adler <[email protected]>
+
+ 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.
+
2014-09-05 Geoffrey Garen <[email protected]>
bmalloc should honor the FastMalloc statistics API
Modified: trunk/Source/WTF/Configurations/Base.xcconfig (173363 => 173364)
--- 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)
@@ -32,8 +32,11 @@
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;
+COMBINE_HIDPI_IMAGES = NO;
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
+ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DEBUGGING_SYMBOLS = default;
GCC_DYNAMIC_NO_PIC = NO;
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (173363 => 173364)
--- 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)
@@ -1223,7 +1223,7 @@
5D247B5914689B8600E78B76 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0500;
+ LastUpgradeCheck = 0600;
};
buildConfigurationList = 5D247B5C14689B8600E78B76 /* Build configuration list for PBXProject "WTF" */;
compatibilityVersion = "Xcode 3.2";
Modified: trunk/Source/WebCore/ChangeLog (173363 => 173364)
--- 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)
@@ -1,3 +1,24 @@
+2014-09-06 Darin Adler <[email protected]>
+
+ 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.
+
2014-09-06 Brian J. Burg <[email protected]>
Web Inspector: convert DockSide to an enum class
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (173363 => 173364)
--- 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)
@@ -33,7 +33,9 @@
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+COMBINE_HIDPI_IMAGES = NO;
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
+ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DEBUGGING_SYMBOLS = default;
GCC_DYNAMIC_NO_PIC = NO;
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (173363 => 173364)
--- 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)
@@ -21072,7 +21072,6 @@
7EE6847312D26E5500E79415 /* cf */,
7E4DE10B198B10810051CB02 /* cocoa */,
5126E6B60A2E3AEF005C29FA /* icon */,
- CE79D68617F220ED00815C00 /* ios */,
93A1EAA20A5634D8006960A0 /* mac */,
E1424C91164B52C800F32D40 /* CookieJar.cpp */,
E1424C92164B52C800F32D40 /* CookieJar.h */,
@@ -26715,7 +26714,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
- LastUpgradeCheck = 0500;
+ LastUpgradeCheck = 0600;
};
buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
compatibilityVersion = "Xcode 3.2";
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (173363 => 173364)
--- 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)
@@ -5003,19 +5003,21 @@
}
#if ENABLE(VIDEO_TRACK)
+
void HTMLMediaElement::updateTextTrackDisplay()
{
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
ensureUserAgentShadowRoot();
ASSERT(m_mediaControlsHost);
m_mediaControlsHost->updateTextTrackContainer();
- return;
-#endif
+#else
if (!hasMediaControls() && !createMediaControls())
return;
mediaControls()->updateTextTrackDisplay();
+#endif
}
+
#endif
void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible)
@@ -5196,9 +5198,7 @@
return;
ensureUserAgentShadowRoot();
- return;
-#endif
-
+#else
if (!controls() || !inDocument()) {
if (hasMediaControls())
mediaControls()->hide();
@@ -5209,6 +5209,7 @@
return;
mediaControls()->show();
+#endif
}
#if ENABLE(VIDEO_TRACK)
@@ -5242,9 +5243,7 @@
return;
ensureUserAgentShadowRoot();
- return;
-#endif
-
+#else
if (!m_haveVisibleTextTrack && !hasMediaControls())
return;
if (!hasMediaControls() && !createMediaControls())
@@ -5256,6 +5255,7 @@
updateTextTrackDisplay();
updateActiveTextTrackCues(currentMediaTime());
}
+#endif
}
void HTMLMediaElement::captionPreferencesChanged()
Modified: trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp (173363 => 173364)
--- 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)
@@ -46,18 +46,25 @@
return WebGLExtension::WebGLDrawBuffersName;
}
-// static
-bool WebGLDrawBuffers::supported(WebGLRenderingContext* context)
+#if OS(DARWIN)
+
+bool WebGLDrawBuffers::supported(WebGLRenderingContext*)
{
-#if OS(DARWIN)
// https://bugs.webkit.org/show_bug.cgi?id=112486
return false;
-#endif
+}
+
+#else
+
+bool WebGLDrawBuffers::supported(WebGLRenderingContext* context)
+{
Extensions3D* extensions = context->graphicsContext3D()->getExtensions();
- return (extensions->supports("GL_EXT_draw_buffers")
- && satisfiesWebGLRequirements(context));
+ return extensions->supports("GL_EXT_draw_buffers")
+ && satisfiesWebGLRequirements(context);
}
+#endif
+
void WebGLDrawBuffers::drawBuffersWEBGL(const Vector<GC3Denum>& buffers)
{
if (m_context->isContextLost())
Modified: trunk/Source/WebInspectorUI/ChangeLog (173363 => 173364)
--- 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)
@@ -1,3 +1,18 @@
+2014-09-06 Darin Adler <[email protected]>
+
+ 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.
+
2014-09-02 Brian J. Burg <[email protected]>
LegacyProfiler: remove redundant ProfileNode members and other cleanup
Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (173363 => 173364)
--- 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)
@@ -8,8 +8,15 @@
CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
CLANG_CXX_LIBRARY = libc++;
+CLANG_WARN_BOOL_CONVERSION = YES;
+CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
-CLANG_WARN__DUPLICATE_METHOD_MATCH = NO
+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;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = YES;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -31,9 +38,10 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
+GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES
+GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES
-GCC_WARN_UNUSED_VARIABLE = YES;
LINKER_DISPLAYS_MANGLED_NAMES = YES;
WARNING_CFLAGS = -Wall -W -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-unused-parameter -Wexit-time-destructors;
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj (173363 => 173364)
--- 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)
@@ -119,7 +119,7 @@
A54C224D148B23DE00373FA3 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0450;
+ LastUpgradeCheck = 0600;
ORGANIZATIONNAME = Apple;
};
buildConfigurationList = A54C2250148B23DE00373FA3 /* Build configuration list for PBXProject "WebInspectorUI" */;
Modified: trunk/Source/WebKit/ChangeLog (173363 => 173364)
--- 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)
@@ -1,3 +1,12 @@
+2014-09-06 Darin Adler <[email protected]>
+
+ 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.
+
2014-09-04 Pratik Solanki <[email protected]>
Remove iOS specific disk image cache
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (173363 => 173364)
--- 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)
@@ -1953,7 +1953,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0500;
+ LastUpgradeCheck = 0600;
};
buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
compatibilityVersion = "Xcode 3.2";
Modified: trunk/Source/WebKit/mac/ChangeLog (173363 => 173364)
--- 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)
@@ -1,3 +1,61 @@
+2014-09-06 Darin Adler <[email protected]>
+
+ 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.
+
2014-09-06 Brian J. Burg <[email protected]>
Web Inspector: convert DockSide to an enum class
Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (173363 => 173364)
--- 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)
@@ -32,8 +32,11 @@
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;
+COMBINE_HIDPI_IMAGES = NO;
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
+ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DEBUGGING_SYMBOLS = default;
GCC_DYNAMIC_NO_PIC = NO;
Modified: trunk/Source/WebKit/mac/History/WebURLsWithTitles.m (173363 => 173364)
--- 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)
@@ -51,7 +51,7 @@
{
NSMutableArray *URLStrings;
NSMutableArray *titlesOrEmptyStrings;
- unsigned index, count;
+ NSUInteger index, count;
count = [URLs count];
if (count == 0) {
Modified: trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm (173363 => 173364)
--- 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)
@@ -160,7 +160,7 @@
return nil;
value = [self performSelector:selector];
- unsigned lookupTableCount = CFDictionaryGetCount(lookupTable);
+ NSUInteger lookupTableCount = CFDictionaryGetCount(lookupTable);
if (value) {
if (!_cache)
_cache = [[NSMutableDictionary alloc] initWithCapacity:lookupTableCount];
Modified: trunk/Source/WebKit/mac/Misc/WebNSDataExtras.m (173363 => 173364)
--- 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)
@@ -111,7 +111,7 @@
-(NSString *)_webkit_guessedMIMETypeForXML
{
- int length = [self length];
+ NSUInteger length = [self length];
const UInt8 *bytes = [self bytes];
#define CHANNEL_TAG_LENGTH 7
@@ -171,7 +171,7 @@
if ([MIMEType length])
return MIMEType;
- int length = [self length];
+ NSUInteger length = [self length];
const char *bytes = [self bytes];
const char *p = bytes;
@@ -236,8 +236,8 @@
}
// Test for plain text.
- int i;
- for(i=0; i<length; i++){
+ NSUInteger i;
+ for (i = 0; i < length; ++i) {
char c = bytes[i];
if ((c < 0x20 || c > 0x7E) && (c != '\t' && c != '\r' && c != '\n')) {
break;
@@ -311,7 +311,7 @@
NSMutableDictionary *headerFields = [NSMutableDictionary dictionary];
const UInt8 *bytes = [self bytes];
- unsigned length = [self length];
+ NSUInteger length = [self length];
NSString *lastKey = nil;
const UInt8 *eol;
@@ -400,7 +400,7 @@
- (NSInteger)_web_locationAfterFirstBlankLine
{
const char *bytes = (const char *)[self bytes];
- unsigned length = [self length];
+ NSUInteger length = [self length];
unsigned i;
for (i = 0; i < length - 4; i++) {
Modified: trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h (173363 => 173364)
--- 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)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2005-2009, 2014 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -42,13 +42,10 @@
+ (NSURL *)_web_URLWithData:(NSData *)data;
+ (NSURL *)_web_URLWithData:(NSData *)data relativeToURL:(NSURL *)baseURL;
-- (NSURL *)_web_URLWithLowercasedScheme;
-
- (NSData *)_web_originalData;
- (NSString *)_web_originalDataAsString;
- (const char *)_web_URLCString;
-- (NSData *)_web_hostData;
- (NSString *)_web_hostString;
- (NSString *)_web_userVisibleString;
@@ -56,45 +53,34 @@
- (BOOL)_web_isEmpty;
- (NSURL *)_webkit_canonicalize;
-- (NSURL *)_webkit_URLByRemovingFragment;
-- (NSURL *)_webkit_URLByRemovingResourceSpecifier;
- (NSURL *)_web_URLByRemovingUserInfo;
- (BOOL)_webkit_isJavaScriptURL;
- (BOOL)_webkit_isFileURL;
- (NSString *)_webkit_scriptIfJavaScriptURL;
-- (BOOL)_webkit_isFTPDirectoryURL;
-- (BOOL)_webkit_shouldLoadAsEmptyDocument;
-
- (NSString *)_webkit_suggestedFilenameWithMIMEType:(NSString *)MIMEType;
- (NSURL *)_webkit_URLFromURLOrSchemelessFileURL;
#if TARGET_OS_IPHONE
+// FIXME: This method name needs a prefix.
+ (NSURL *)uniqueURLWithRelativePart:(NSString *)relativePart;
#endif
+
@end
@interface NSString (WebNSURLExtras)
- (BOOL)_web_isUserVisibleURL;
-- (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
-
- (NSString *)_web_decodeHostName; // turns funny-looking ASCII form into Unicode, returns self if no decoding needed, convenient cover
- (NSString *)_web_encodeHostName; // turns Unicode into funny-looking ASCII form, returns self if no decoding needed, convenient cover
- (BOOL)_webkit_isJavaScriptURL;
-- (BOOL)_webkit_isFTPDirectoryURL;
- (BOOL)_webkit_isFileURL;
- (BOOL)_webkit_looksLikeAbsoluteURL;
- (NSRange)_webkit_rangeOfURLScheme;
-- (NSString *)_webkit_URLFragment;
- (NSString *)_webkit_scriptIfJavaScriptURL;
#if TARGET_OS_IPHONE
Modified: trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm (173363 => 173364)
--- 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)
@@ -132,21 +132,6 @@
return URLByCanonicalizingURL(self);
}
-- (NSURL *)_web_URLByTruncatingOneCharacterBeforeComponent:(CFURLComponentType)component
-{
- return URLByTruncatingOneCharacterBeforeComponent(self, component);
-}
-
-- (NSURL *)_webkit_URLByRemovingFragment
-{
- return URLByTruncatingOneCharacterBeforeComponent(self, kCFURLComponentFragment);
-}
-
-- (NSURL *)_webkit_URLByRemovingResourceSpecifier
-{
- return URLByTruncatingOneCharacterBeforeComponent(self, kCFURLComponentResourceSpecifier);
-}
-
- (NSURL *)_web_URLByRemovingUserInfo
{
return URLByRemovingUserInfo(self);
@@ -167,57 +152,6 @@
return [[self _web_originalDataAsString] _webkit_isFileURL];
}
-- (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;
-}
-
-
-(NSData *)_web_schemeSeparatorWithoutColon
{
NSData *result = nil;
@@ -318,36 +252,6 @@
return [[self substringFromIndex:11] _webkit_stringByReplacingValidPercentEscapes];
}
-- (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);
-}
-
- (NSString *)_web_decodeHostName
{
return decodeHostName(self);
@@ -386,16 +290,6 @@
return [[self _webkit_stringByTrimmingWhitespace] _webkit_rangeOfURLScheme].location != NSNotFound;
}
-- (NSString *)_webkit_URLFragment
-{
- NSRange fragmentRange;
-
- fragmentRange = [self rangeOfString:@"#" options:NSLiteralSearch];
- if (fragmentRange.location == NSNotFound)
- return nil;
- return [self substringFromIndex:fragmentRange.location + 1];
-}
-
#if PLATFORM(IOS)
- (NSString *)_webkit_unescapedQueryValue
Modified: trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.mm (173363 => 173364)
--- 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)
@@ -348,12 +348,7 @@
NSView <WebDocumentView> *documentView = [[webFrame frameView] documentView];
if ([documentView isKindOfClass:[WebHTMLView class]]) {
- NSArray *subviews = [documentView subviews];
- unsigned int subviewCount = [subviews count];
- unsigned int subviewIndex;
-
- for (subviewIndex = 0; subviewIndex < subviewCount; subviewIndex++) {
- NSView *subview = [subviews objectAtIndex:subviewIndex];
+ for (NSView *subview in [documentView subviews]) {
#if ENABLE(NETSCAPE_PLUGIN_API)
if ([subview isKindOfClass:[WebBaseNetscapePluginView class]] || [WebPluginController isPlugInView:subview])
#else
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebOpenPanelResultListener.mm (173363 => 173364)
--- 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)
@@ -83,9 +83,9 @@
ASSERT(_chooser);
if (!_chooser)
return;
- int count = [filenames count];
+ NSUInteger count = [filenames count];
Vector<String> names(count);
- for (int i = 0; i < count; i++)
+ for (NSUInteger i = 0; i < count; i++)
names[i] = [filenames objectAtIndex:i];
_chooser->chooseFiles(names);
_chooser->deref();
Modified: trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm (173363 => 173364)
--- 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)
@@ -558,7 +558,7 @@
if (!delegate)
return nil;
@try {
- return implementation(delegate, selector, self, integer);
+ return wtfCallIMP<id>(implementation, delegate, selector, self, integer);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
Modified: trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm (173363 => 173364)
--- 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)
@@ -125,7 +125,7 @@
// mostly lifted from NSTextView_KeyBinding.m
- (void)_placePopupWindow:(NSPoint)topLeft
{
- int numberToShow = [_completions count];
+ NSUInteger numberToShow = [_completions count];
if (numberToShow > 20)
numberToShow = 20;
@@ -140,8 +140,7 @@
NSDictionary *attributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSFont systemFontOfSize:12.0f], NSFontAttributeName, nil];
CGFloat maxWidth = 0;
int maxIndex = -1;
- int i;
- for (i = 0; i < numberToShow; i++) {
+ for (NSUInteger i = 0; i < numberToShow; i++) {
float width = ceilf([[_completions objectAtIndex:i] sizeWithAttributes:attributes].width);
if (width > maxWidth) {
maxWidth = width;
Modified: trunk/Source/WebKit2/ChangeLog (173363 => 173364)
--- 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)
@@ -1,3 +1,27 @@
+2014-09-06 Darin Adler <[email protected]>
+
+ 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.
+
2014-09-06 Brian J. Burg <[email protected]>
Web Inspector: convert DockSide to an enum class
Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (173363 => 173364)
--- 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)
@@ -32,8 +32,11 @@
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;
+COMBINE_HIDPI_IMAGES = NO;
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
+ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DEBUGGING_SYMBOLS = default;
GCC_DYNAMIC_NO_PIC = NO;
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (173363 => 173364)
--- 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)
@@ -264,7 +264,7 @@
}
#endif
-static IMP NSConcreteTask_launch;
+static void (*NSConcreteTask_launch)(NSTask *, SEL);
static void replacedNSConcreteTask_launch(NSTask *self, SEL _cmd)
{
@@ -318,7 +318,7 @@
{
// Override -[NSConcreteTask launch:]
Method launchMethod = class_getInstanceMethod(objc_getClass("NSConcreteTask"), @selector(launch));
- NSConcreteTask_launch = method_setImplementation(launchMethod, reinterpret_cast<IMP>(replacedNSConcreteTask_launch));
+ NSConcreteTask_launch = reinterpret_cast<void (*)(NSTask *, SEL)>(method_setImplementation(launchMethod, reinterpret_cast<IMP>(replacedNSConcreteTask_launch)));
// Override -[NSWorkspace launchApplicationAtURL:options:configuration:error:]
Method launchApplicationAtURLOptionsConfigurationErrorMethod = class_getInstanceMethod(objc_getClass("NSWorkspace"), @selector(launchApplicationAtURL:options:configuration:error:));
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp (173363 => 173364)
--- 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)
@@ -156,8 +156,8 @@
String extension;
String filename = url.lastPathComponent();
if (!filename.endsWith('/')) {
- int extensionPos = filename.reverseFind('.');
- if (extensionPos != -1)
+ size_t extensionPos = filename.reverseFind('.');
+ if (extensionPos != notFound)
extension = filename.substring(extensionPos + 1);
}
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (173363 => 173364)
--- 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)
@@ -717,7 +717,6 @@
373CEAD81859553F008C363D /* WKPagePolicyClientInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 373CEAD71859553F008C363D /* WKPagePolicyClientInternal.h */; };
373D122218A473010066D9CC /* _WKFrameHandle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 373D122018A473010066D9CC /* _WKFrameHandle.mm */; };
373D122318A473010066D9CC /* _WKFrameHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122118A473010066D9CC /* _WKFrameHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 373D122518A473B30066D9CC /* WKBrowsingContextHandleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122418A473B30066D9CC /* WKBrowsingContextHandleInternal.h */; };
373D122718A473F60066D9CC /* _WKFrameHandleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */; };
373D122D18A4B6EB0066D9CC /* WKWebProcessPlugInFramePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122C18A4B6A80066D9CC /* WKWebProcessPlugInFramePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
3743925818BC4C60001C8675 /* WKUIDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3743925718BC4C60001C8675 /* WKUIDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7316,7 +7315,6 @@
BC597075116591D000551FCA /* ProcessModel.h in Headers */,
1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */,
1AB16ADE1648598400290D62 /* RemoteLayerTreeDrawingArea.h in Headers */,
- 373D122518A473B30066D9CC /* WKBrowsingContextHandleInternal.h in Headers */,
1AB16AE21648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.h in Headers */,
1AA3D75C1651B44F008713D0 /* RemoteLayerTreeHost.h in Headers */,
1AF1AC6C1651759E00C17D7F /* RemoteLayerTreeTransaction.h in Headers */,
@@ -8179,7 +8177,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0500;
+ LastUpgradeCheck = 0600;
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "WebKit2" */;
compatibilityVersion = "Xcode 3.2";
