[webkit-changes] [179970] trunk/Source/WebCore
Title: [179970] trunk/Source/WebCore
Revision 179970
Author mr...@apple.com
Date 2015-02-11 15:14:30 -0800 (Wed, 11 Feb 2015)
Log Message
extract-localizable-strings.pl shouldn't update the target file if the contents haven't changed
Avoid updating the target file if the contents haven't changed. This prevents Xcode from copying the identical
file into the framework and resigning it, which avoids the resulting relinking of all targets that depend on
the framework.
Reviewed by Dan Bernstein.
* extract-localizable-strings.pl: Write our output to a temporary file. If the output differs from the
existing contents of the target file, move the temporary file over the target file. Otherwise, delete
the temporary file.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/extract-localizable-strings.pl
Diff
Modified: trunk/Source/WebCore/ChangeLog (179969 => 179970)
--- trunk/Source/WebCore/ChangeLog 2015-02-11 23:12:09 UTC (rev 179969)
+++ trunk/Source/WebCore/ChangeLog 2015-02-11 23:14:30 UTC (rev 179970)
@@ -1,3 +1,17 @@
+2015-02-11 Mark Rowe
+
+ extract-localizable-strings.pl shouldn't update the target file if the contents haven't changed
+
+Avoid updating the target file if the contents haven't changed. This prevents Xcode from copying the identical
+file into the framework and resigning it, which avoids the resulting relinking of all targets that depend on
+the framework.
+
+Reviewed by Dan Bernstein.
+
+* extract-localizable-strings.pl: Write our output to a temporary file. If the output differs from the
+existing contents of the target file, move the temporary file over the target file. Otherwise, delete
+the temporary file.
+
2015-02-11 Chris Dumez
Turn recent assertions into release assertions to help track down crash in DocumentLoader::stopLoadingForPolicyChange()
Modified: trunk/Source/WebCore/extract-localizable-strings.pl (179969 => 179970)
--- trunk/Source/WebCore/extract-localizable-strings.pl 2015-02-11 23:12:09 UTC (rev 179969)
+++ trunk/Source/WebCore/extract-localizable-strings.pl 2015-02-11 23:14:30 UTC (rev 179970)
@@ -43,6 +43,8 @@
# The exceptions file has a list of strings in quotes, filenames, and filename/string pairs separated by :.
use strict;
+use File::Compare;
+use File::Copy;
use Getopt::Long;
no warnings 'deprecated';
@@ -401,9 +403,17 @@
if (-e "$fileToUpdate") {
if (!$verify) {
# Write out the strings file as UTF-8
-open STRINGS, ">", "$fileToUpdate" or die;
+my $temporaryFile = "$fileToUpdate.updated";
+open STRINGS, ">", $temporaryFile or die;
print STRINGS $localizedStrings;
close STRINGS;
+
+# Avoid updating the target file's modification time if the contents have not changed.
+if (compare($temporaryFile, $fileToUpdate)) {
+move($temporaryFile, $fileToUpdate);
+} else {
+unlink $temporaryFile;
+}
} else {
open STRINGS, $fileToUpdate or die;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [178690] trunk/Source/WebKit2
Title: [178690] trunk/Source/WebKit2
Revision 178690
Author mr...@apple.com
Date 2015-01-19 19:46:02 -0800 (Mon, 19 Jan 2015)
Log Message
REGRESSION (r178452): Visited link coloring only appears to work in the first web process
Roll out r178452 since it broke visited link coloring.
Reviewed by Anders Carlsson.
* UIProcess/VisitedLinkProvider.cpp:
(WebKit::VisitedLinkProvider::~VisitedLinkProvider):
(WebKit::VisitedLinkProvider::addProcess):
(WebKit::VisitedLinkProvider::removeProcess):
(WebKit::VisitedLinkProvider::removeAll):
(WebKit::VisitedLinkProvider::webProcessWillOpenConnection):
(WebKit::VisitedLinkProvider::webProcessDidCloseConnection):
(WebKit::VisitedLinkProvider::pendingVisitedLinksTimerFired):
(WebKit::VisitedLinkProvider::resizeTable):
* UIProcess/VisitedLinkProvider.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::processDidFinishLaunching):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::disconnect):
(WebKit::WebProcessProxy::addVisitedLinkProvider):
(WebKit::WebProcessProxy::didDestroyVisitedLinkProvider):
* UIProcess/WebProcessProxy.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp
trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp
trunk/Source/WebKit2/UIProcess/WebProcessProxy.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (178689 => 178690)
--- trunk/Source/WebKit2/ChangeLog 2015-01-20 03:43:00 UTC (rev 178689)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-20 03:46:02 UTC (rev 178690)
@@ -1,3 +1,30 @@
+2015-01-19 Mark Rowe
+
+ REGRESSION (r178452): Visited link coloring only appears to work in the first web process
+
+Roll out r178452 since it broke visited link coloring.
+
+Reviewed by Anders Carlsson.
+
+* UIProcess/VisitedLinkProvider.cpp:
+(WebKit::VisitedLinkProvider::~VisitedLinkProvider):
+(WebKit::VisitedLinkProvider::addProcess):
+(WebKit::VisitedLinkProvider::removeProcess):
+(WebKit::VisitedLinkProvider::removeAll):
+(WebKit::VisitedLinkProvider::webProcessWillOpenConnection):
+(WebKit::VisitedLinkProvider::webProcessDidCloseConnection):
+(WebKit::VisitedLinkProvider::pendingVisitedLinksTimerFired):
+(WebKit::VisitedLinkProvider::resizeTable):
+* UIProcess/VisitedLinkProvider.h:
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::WebPageProxy):
+(WebKit::WebPageProxy::processDidFinishLaunching):
+* UIProcess/WebProcessProxy.cpp:
+(WebKit::WebProcessProxy::disconnect):
+(WebKit::WebProcessProxy::addVisitedLinkProvider):
+(WebKit::WebProcessProxy::didDestroyVisitedLinkProvider):
+* UIProcess/WebProcessProxy.h:
+
2015-01-19 Sam Weinig
Sprinkle some CTTE on API::PolicyClient and API::FormClient
Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp (178689 => 178690)
--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2015-01-20 03:43:00 UTC (rev 178689)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2015-01-20 03:46:02 UTC (rev 178690)
@@ -54,6 +54,8 @@
VisitedLinkProvider::~VisitedLinkProvider()
{
+for (WebProcessProxy* process : m_processes)
+process->didDestroyVisitedLinkProvider(*this);
}
VisitedLinkProvider::VisitedLinkProvider()
@@ -64,6 +66,31 @@
{
}
+void VisitedLinkProvider::addProcess(WebProcessProxy& process)
+{
+ASSERT(process.state() == WebProcessProxy::State::Running);
+
+if (!m_processes.add(&process).isNewEntry)
+return;
+
+process.addMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier, *this);
+
+if (!m_keyCount)
+return;
+
+ASSERT(m_table.sharedMemory());
+
+sendTable(process);
+}
+
+void VisitedLinkProvider::removeProcess(WebProcessProxy& process)
+{
+ASSERT(m_processes.contains(&process));
+
+m_processes.remove(&process);
+process.removeMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier);
+}
+
void VisitedLinkProvider::addVisitedLinkHash(LinkHash linkHash)
{
m_pendingVisitedLinks.add(linkHash);
@@ -80,27 +107,20 @@
m_tableSize = 0;
m_table.clear();
-for (WebProcessProxy* process : processes()) {
+for (WebProcessProxy* process : m_processes) {
ASSERT(process->processPool().processes().contains(process));
process->connection()->send(Messages::VisitedLinkTableController::RemoveAllVisitedLinks(), m_identifier);
}
}
-void VisitedLinkProvider::webProcessWillOpenConnection(WebProcessProxy& webProcessProxy, IPC::Connection&)
+void VisitedLinkProvider::webProcessWillOpenConnection(WebProcessProxy&, IPC::Connection&)
{
-webProcessProxy.addMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier, *this);
-
[webkit-changes] [177674] trunk/Source/WebCore
Title: [177674] trunk/Source/WebCore Revision 177674 Author mr...@apple.com Date 2014-12-22 18:24:23 -0800 (Mon, 22 Dec 2014) Log Message [Mac] Engineering builds of WebCore on OS X 10.8 and 10.9 shouldn't build with -gline-tables-only / Reviewed by Alexey Proskuryakov. * Configurations/DebugRelease.xcconfig: Override the setting using conditional settings so that they take precedence over the conditional settings in Base.xcconfig. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/DebugRelease.xcconfig Diff Modified: trunk/Source/WebCore/ChangeLog (177673 => 177674) --- trunk/Source/WebCore/ChangeLog 2014-12-23 01:59:21 UTC (rev 177673) +++ trunk/Source/WebCore/ChangeLog 2014-12-23 02:24:23 UTC (rev 177674) @@ -1,3 +1,13 @@ +2014-12-22 Mark Rowe + +[Mac] Engineering builds of WebCore on OS X 10.8 and 10.9 shouldn't build with -gline-tables-only + / + +Reviewed by Alexey Proskuryakov. + +* Configurations/DebugRelease.xcconfig: Override the setting using conditional settings +so that they take precedence over the conditional settings in Base.xcconfig. + 2014-12-22 Alexey Proskuryakov Unreviewed build fix. Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (177673 => 177674) --- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2014-12-23 01:59:21 UTC (rev 177673) +++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2014-12-23 02:24:23 UTC (rev 177674) @@ -35,8 +35,10 @@ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; DEBUG_INFORMATION_FORMAT = dwarf; -CLANG_DEBUG_INFORMATION_LEVEL = default; +CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = default; +CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = default; + OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS); OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS); OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [177254] trunk/Source/WebCore
Title: [177254] trunk/Source/WebCore Revision 177254 Author mr...@apple.com Date 2014-12-12 17:40:44 -0800 (Fri, 12 Dec 2014) Log Message [Mac] Work around a bug in dsymutil on older OS versions / Older versions of dsymutil are unable to write out more than 2GB of symbols per architecture. WebCore has recently passed that threshold. To work around this we will reduce the level of symbols included in the dSYM bundles on the affected OS versions. Reviewed by Geoff Garen. * Configurations/Base.xcconfig: Include line tables only in the debug symbols for production builds on OS X 10.8 and 10.9. * Configurations/DebugRelease.xcconfig: Include full symbols in debug and release builds since they do not make use of dSYMs. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/Base.xcconfig trunk/Source/WebCore/Configurations/DebugRelease.xcconfig Diff Modified: trunk/Source/WebCore/ChangeLog (177253 => 177254) --- trunk/Source/WebCore/ChangeLog 2014-12-13 01:14:46 UTC (rev 177253) +++ trunk/Source/WebCore/ChangeLog 2014-12-13 01:40:44 UTC (rev 177254) @@ -1,3 +1,19 @@ +2014-12-12 Mark Rowe + +[Mac] Work around a bug in dsymutil on older OS versions + / + +Older versions of dsymutil are unable to write out more than 2GB of symbols per architecture. +WebCore has recently passed that threshold. To work around this we will reduce the level of +symbols included in the dSYM bundles on the affected OS versions. + +Reviewed by Geoff Garen. + +* Configurations/Base.xcconfig: Include line tables only in the debug symbols for production +builds on OS X 10.8 and 10.9. +* Configurations/DebugRelease.xcconfig: Include full symbols in debug and release builds since they +do not make use of dSYMs. + 2014-12-12 Beth Dakin Need a fake mouse move after hiding data detectors UI Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (177253 => 177254) --- trunk/Source/WebCore/Configurations/Base.xcconfig 2014-12-13 01:14:46 UTC (rev 177253) +++ trunk/Source/WebCore/Configurations/Base.xcconfig 2014-12-13 01:40:44 UTC (rev 177254) @@ -116,6 +116,8 @@ SQLITE3_HEADER_SEARCH_PATHS_macosx = $(SQLITE3_HEADER_SEARCH_PATHS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)); GCC_GENERATE_DEBUGGING_SYMBOLS = YES; +CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = line-tables-only; +CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = line-tables-only; SDKROOT = macosx.internal; Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (177253 => 177254) --- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2014-12-13 01:14:46 UTC (rev 177253) +++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2014-12-13 01:40:44 UTC (rev 177254) @@ -38,6 +38,7 @@ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; DEBUG_INFORMATION_FORMAT = dwarf; +CLANG_DEBUG_INFORMATION_LEVEL = default; WEBCORE_SQLITE3_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/WebCoreSQLite3; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [177230] trunk/Source/WebKit2
Title: [177230] trunk/Source/WebKit2
Revision 177230
Author mr...@apple.com
Date 2014-12-12 12:54:07 -0800 (Fri, 12 Dec 2014)
Log Message
Fix the 32-bit build.
* UIProcess/API/mac/WKView.mm:
(-[WKView _setPreviewTitle:]):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (177229 => 177230)
--- trunk/Source/WebKit2/ChangeLog 2014-12-12 20:31:30 UTC (rev 177229)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-12 20:54:07 UTC (rev 177230)
@@ -1,3 +1,10 @@
+2014-12-12 Mark Rowe
+
+Fix the 32-bit build.
+
+* UIProcess/API/mac/WKView.mm:
+(-[WKView _setPreviewTitle:]):
+
2014-12-12 Timothy Horton
Fix the 32-bit build.
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (177229 => 177230)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-12 20:31:30 UTC (rev 177229)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-12 20:54:07 UTC (rev 177230)
@@ -4334,7 +4334,7 @@
- (void)_setPreviewTitle:(NSString *)previewTitle
{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 && WK_API_ENABLED
[_data->_immediateActionController setPreviewTitle:previewTitle];
#endif
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [176838] trunk/Source/WebCore
Title: [176838] trunk/Source/WebCore Revision 176838 Author mr...@apple.com Date 2014-12-04 23:46:11 -0800 (Thu, 04 Dec 2014) Log Message Fix pre-Yosemite builds. The #ifs in two SPI wrapper headers were incorrect, resulting in code being included prior to Yosemite that required Yosemite to compile. * platform/spi/mac/NSSharingServicePickerSPI.h: * platform/spi/mac/NSSharingServiceSPI.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/spi/mac/NSSharingServicePickerSPI.h trunk/Source/WebCore/platform/spi/mac/NSSharingServiceSPI.h Diff Modified: trunk/Source/WebCore/ChangeLog (176837 => 176838) --- trunk/Source/WebCore/ChangeLog 2014-12-05 06:58:04 UTC (rev 176837) +++ trunk/Source/WebCore/ChangeLog 2014-12-05 07:46:11 UTC (rev 176838) @@ -1,3 +1,13 @@ +2014-12-04 Mark Rowe + +Fix pre-Yosemite builds. + +The #ifs in two SPI wrapper headers were incorrect, resulting in code being included +prior to Yosemite that required Yosemite to compile. + +* platform/spi/mac/NSSharingServicePickerSPI.h: +* platform/spi/mac/NSSharingServiceSPI.h: + 2014-12-02 Brian J. Burg Web Inspector: timeline probe records have inaccurate per-probe hit counts Modified: trunk/Source/WebCore/platform/spi/mac/NSSharingServicePickerSPI.h (176837 => 176838) --- trunk/Source/WebCore/platform/spi/mac/NSSharingServicePickerSPI.h 2014-12-05 06:58:04 UTC (rev 176837) +++ trunk/Source/WebCore/platform/spi/mac/NSSharingServicePickerSPI.h 2014-12-05 07:46:11 UTC (rev 176838) @@ -23,8 +23,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#if USE(APPLE_INTERNAL_SDK) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 +#if USE(APPLE_INTERNAL_SDK) + #import #else @@ -44,3 +46,5 @@ @end #endif + +#endif Modified: trunk/Source/WebCore/platform/spi/mac/NSSharingServiceSPI.h (176837 => 176838) --- trunk/Source/WebCore/platform/spi/mac/NSSharingServiceSPI.h 2014-12-05 06:58:04 UTC (rev 176837) +++ trunk/Source/WebCore/platform/spi/mac/NSSharingServiceSPI.h 2014-12-05 07:46:11 UTC (rev 176838) @@ -23,8 +23,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#if USE(APPLE_INTERNAL_SDK) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 +#if USE(APPLE_INTERNAL_SDK) + #import #else @@ -52,3 +54,5 @@ @end #endif + +#endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [176837] trunk/Source/JavaScriptCore
Title: [176837] trunk/Source/_javascript_Core
Revision 176837
Author mr...@apple.com
Date 2014-12-04 22:58:04 -0800 (Thu, 04 Dec 2014)
Log Message
Build fix after r176836.
Reviewed by Mark Lam.
* runtime/VM.h:
(JSC::VM::controlFlowProfiler): Don't try to export an inline function.
Doing so results in a weak external symbol being generated.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/VM.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (176836 => 176837)
--- trunk/Source/_javascript_Core/ChangeLog 2014-12-05 05:58:07 UTC (rev 176836)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-12-05 06:58:04 UTC (rev 176837)
@@ -1,3 +1,13 @@
+2014-12-04 Mark Rowe
+
+Build fix after r176836.
+
+Reviewed by Mark Lam.
+
+* runtime/VM.h:
+(JSC::VM::controlFlowProfiler): Don't try to export an inline function.
+Doing so results in a weak external symbol being generated.
+
2014-12-04 Saam Barati
_javascript_ Control Flow Profiler
Modified: trunk/Source/_javascript_Core/runtime/VM.h (176836 => 176837)
--- trunk/Source/_javascript_Core/runtime/VM.h 2014-12-05 05:58:07 UTC (rev 176836)
+++ trunk/Source/_javascript_Core/runtime/VM.h 2014-12-05 06:58:04 UTC (rev 176837)
@@ -521,7 +521,7 @@
FunctionHasExecutedCache* functionHasExecutedCache() { return &m_functionHasExecutedCache; }
-JS_EXPORT_PRIVATE ControlFlowProfiler* controlFlowProfiler() { return m_controlFlowProfiler.get(); }
+ControlFlowProfiler* controlFlowProfiler() { return m_controlFlowProfiler.get(); }
bool enableControlFlowProfiler();
bool disableControlFlowProfiler();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [176315] trunk/Source/WebKit2
Title: [176315] trunk/Source/WebKit2 Revision 176315 Author mr...@apple.com Date 2014-11-19 01:55:12 -0800 (Wed, 19 Nov 2014) Log Message Remove an unused file. * version.plist: Removed. Modified Paths trunk/Source/WebKit2/ChangeLog Removed Paths trunk/Source/WebKit2/version.plist Diff Modified: trunk/Source/WebKit2/ChangeLog (176314 => 176315) --- trunk/Source/WebKit2/ChangeLog 2014-11-19 09:06:30 UTC (rev 176314) +++ trunk/Source/WebKit2/ChangeLog 2014-11-19 09:55:12 UTC (rev 176315) @@ -1,3 +1,9 @@ +2014-11-19 Mark Rowe + +Remove an unused file. + +* version.plist: Removed. + 2014-11-18 Benjamin Poulain [WK2] Remove the minimalUI code from the UIProcess Deleted: trunk/Source/WebKit2/version.plist (176314 => 176315) --- trunk/Source/WebKit2/version.plist 2014-11-19 09:06:30 UTC (rev 176314) +++ trunk/Source/WebKit2/version.plist 2014-11-19 09:55:12 UTC (rev 176315) @@ -1,16 +0,0 @@ - - - - - BuildVersion - 2 - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - ProjectName - DevToolsWizardTemplates - SourceVersion - 1592 - - ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173036] trunk/Source/WTF
Title: [173036] trunk/Source/WTF Revision 173036 Author mr...@apple.com Date 2014-08-27 17:03:25 -0700 (Wed, 27 Aug 2014) Log Message _javascript_Core is missing debug info for WTF because libWTF.a is stripped. / Reviewed by Dan Bernstein. * Configurations/WTF.xcconfig: Set STRIP_INSTALLED_PRODUCT = NO for the target that produces libWTF.a so that the debug symbols will be linked into _javascript_Core and end up in its dSYM file. Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/Configurations/WTF.xcconfig Diff Modified: trunk/Source/WTF/ChangeLog (173035 => 173036) --- trunk/Source/WTF/ChangeLog 2014-08-27 23:57:12 UTC (rev 173035) +++ trunk/Source/WTF/ChangeLog 2014-08-28 00:03:25 UTC (rev 173036) @@ -1,3 +1,14 @@ +2014-08-27 Mark Rowe + +_javascript_Core is missing debug info for WTF because libWTF.a is stripped. + / + +Reviewed by Dan Bernstein. + +* Configurations/WTF.xcconfig: Set STRIP_INSTALLED_PRODUCT = NO for the target +that produces libWTF.a so that the debug symbols will be linked into _javascript_Core +and end up in its dSYM file. + 2014-08-26 Commit Queue Unreviewed, rolling out r172940. Modified: trunk/Source/WTF/Configurations/WTF.xcconfig (173035 => 173036) --- trunk/Source/WTF/Configurations/WTF.xcconfig 2014-08-27 23:57:12 UTC (rev 173035) +++ trunk/Source/WTF/Configurations/WTF.xcconfig 2014-08-28 00:03:25 UTC (rev 173036) @@ -26,3 +26,4 @@ PRODUCT_NAME = WTF; GCC_SYMBOLS_PRIVATE_EXTERN = YES; +STRIP_INSTALLED_PRODUCT = NO; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [172953] trunk/Source/WebCore
Title: [172953] trunk/Source/WebCore Revision 172953 Author mr...@apple.com Date 2014-08-26 00:24:41 -0700 (Tue, 26 Aug 2014) Log Message Build fix after r172951. * fileapi/Blob.h: Give the argument the name that the predicates expect. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/fileapi/Blob.h Diff Modified: trunk/Source/WebCore/ChangeLog (172952 => 172953) --- trunk/Source/WebCore/ChangeLog 2014-08-26 07:17:44 UTC (rev 172952) +++ trunk/Source/WebCore/ChangeLog 2014-08-26 07:24:41 UTC (rev 172953) @@ -1,3 +1,9 @@ +2014-08-26 Mark Rowe + +Build fix after r172951. + +* fileapi/Blob.h: Give the argument the name that the predicates expect. + 2014-08-25 Gyuyoung Kim Generate toFile() instead of manual functions. Modified: trunk/Source/WebCore/fileapi/Blob.h (172952 => 172953) --- trunk/Source/WebCore/fileapi/Blob.h 2014-08-26 07:17:44 UTC (rev 172952) +++ trunk/Source/WebCore/fileapi/Blob.h 2014-08-26 07:24:41 UTC (rev 172953) @@ -113,7 +113,7 @@ }; #define BLOB_TYPE_CASTS(ToValueTypeName, predicate) \ -TYPE_CASTS_BASE(ToValueTypeName, Blob, object, blob->predicate, blob.predicate) +TYPE_CASTS_BASE(ToValueTypeName, Blob, blob, blob->predicate, blob.predicate) } // namespace WebCore ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [172818] trunk/Source/WebCore
Title: [172818] trunk/Source/WebCore
Revision 172818
Author mr...@apple.com
Date 2014-08-20 16:55:05 -0700 (Wed, 20 Aug 2014)
Log Message
Fix the release build after r172806.
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::sourceBufferPrivateDidReceiveRenderingError): Add a missing semicolon.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (172817 => 172818)
--- trunk/Source/WebCore/ChangeLog 2014-08-20 22:55:29 UTC (rev 172817)
+++ trunk/Source/WebCore/ChangeLog 2014-08-20 23:55:05 UTC (rev 172818)
@@ -1,3 +1,10 @@
+2014-08-20 Mark Rowe
+
+Fix the release build after r172806.
+
+* Modules/mediasource/SourceBuffer.cpp:
+(WebCore::SourceBuffer::sourceBufferPrivateDidReceiveRenderingError): Add a missing semicolon.
+
2014-08-20 Benjamin Poulain
Remove HTMLInputElement's suggestedValue
Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (172817 => 172818)
--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2014-08-20 22:55:29 UTC (rev 172817)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2014-08-20 23:55:05 UTC (rev 172818)
@@ -535,7 +535,7 @@
void SourceBuffer::sourceBufferPrivateDidReceiveRenderingError(SourceBufferPrivate*, int error)
{
#if LOG_DISABLED
-UNUSED_PARAM(error)
+UNUSED_PARAM(error);
#endif
LOG(MediaSource, "SourceBuffer::sourceBufferPrivateDidReceiveRenderingError(%p) - result = %i", this, error);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [172812] trunk/Source/WebKit
Title: [172812] trunk/Source/WebKit
Revision 172812
Author mr...@apple.com
Date 2014-08-20 14:43:33 -0700 (Wed, 20 Aug 2014)
Log Message
WebKit1 plug-in test failures in production builds after r172595
Reviewed by Alexey Proskuryakov.
* WebKit.xcodeproj/project.pbxproj: Add the symlinks at the top level of WebKitLegacy.framework
even in Production builds. Add the symlinks in the right locations too.
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/WebKit/ChangeLog (172811 => 172812)
--- trunk/Source/WebKit/ChangeLog 2014-08-20 21:07:36 UTC (rev 172811)
+++ trunk/Source/WebKit/ChangeLog 2014-08-20 21:43:33 UTC (rev 172812)
@@ -1,3 +1,12 @@
+2014-08-20 Mark Rowe
+
+ WebKit1 plug-in test failures in production builds after r172595
+
+Reviewed by Alexey Proskuryakov.
+
+* WebKit.xcodeproj/project.pbxproj: Add the symlinks at the top level of WebKitLegacy.framework
+even in Production builds. Add the symlinks in the right locations too.
+
2014-08-15 Andy Estes
[Cocoa] Add migrate-headers.sh and postprocess-headers.sh to WebKit.xcodeproj
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (172811 => 172812)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-08-20 21:07:36 UTC (rev 172811)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-08-20 21:43:33 UTC (rev 172812)
@@ -2011,11 +2011,11 @@
);
name = "Symlink WebKitPluginHost";
outputPaths = (
-"$(CONFIGURATION_BUILD_DIR)/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app",
+"$(TARGET_BUILD_DIR)/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" || ${ACTION} != \"build\" ]]; then\nexit 0\nfi\n\n# Prior to r172595, WebKitPluginHost.app lived at the top level of the framework. Replace any stale copy with a symlink to the new location at Versions/Current.\nrm -rf \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\nln -s Versions/Current/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\n# FIXME: This should be removed once faulty links have been removed on the bots.\nif [[ -L \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\" ]]; then\nrm \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nfi\n\nif [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\nln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nelse\nln -s /System/Library/Frameworks/WebKit.framework/Frameworks/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nfi\nfi\n";
+ shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\n# Prior to r172595, WebKitPluginHost.app and WebKitPluginAgent lived at the top level of the framework. Replace any stale copies with symlinks to the new location at Versions/Current.\nrm -rf \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\" \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent\"\nln -s Versions/Current/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\nln -s Versions/Current/WebKitPluginAgent \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent\"\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && ${ACTION} == \"build\" ]]; then\n# FIXME: This should be removed once faulty links have been removed on the bots.\nif [[ -L \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\" ]]; then\nrm \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nfi\n\nif [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\nln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nelse\nln -s /System/Library/Frameworks/WebKit.framework/Frameworks/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nfi\nfi\n";
};
1C395DE20C6BE8ED1E52 /* Generate Export Files */ = {
isa = PBXShellScriptBuildPhase;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [172627] trunk/Source/WebKit
Title: [172627] trunk/Source/WebKit
Revision 172627
Author mr...@apple.com
Date 2014-08-15 09:49:37 -0700 (Fri, 15 Aug 2014)
Log Message
WebKit1 Plug-in test failures in clean builds after r172595
Reviewed by Dan Bernstein.
* WebKit.xcodeproj/project.pbxproj: Add a WebKitPluginHost.app symlink at the top level of
WebKitLegacy.framework that points into Versions/Current. This enables -[NSBundle pathForAuxiliaryExecutable:]
to work correctly. Adding this symlink requires deleting any content that may already exist
at that path, since prior to r172595 it may have contained either a symlink or an
application bundle.
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/WebKit/ChangeLog (172626 => 172627)
--- trunk/Source/WebKit/ChangeLog 2014-08-15 16:38:35 UTC (rev 172626)
+++ trunk/Source/WebKit/ChangeLog 2014-08-15 16:49:37 UTC (rev 172627)
@@ -1,3 +1,15 @@
+2014-08-15 Mark Rowe
+
+ WebKit1 Plug-in test failures in clean builds after r172595
+
+Reviewed by Dan Bernstein.
+
+* WebKit.xcodeproj/project.pbxproj: Add a WebKitPluginHost.app symlink at the top level of
+WebKitLegacy.framework that points into Versions/Current. This enables -[NSBundle pathForAuxiliaryExecutable:]
+to work correctly. Adding this symlink requires deleting any content that may already exist
+at that path, since prior to r172595 it may have contained either a symlink or an
+application bundle.
+
2014-08-13 Mark Rowe
Move helper applications out of the root of the framework.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (172626 => 172627)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-08-15 16:38:35 UTC (rev 172626)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-08-15 16:49:37 UTC (rev 172627)
@@ -2011,7 +2011,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\n# FIXME: This should be removed once faulty links have been removed on the bots.\nif [[ -L \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\" ]]; then\nrm \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nfi\n\nif [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\nln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nelse\nln -s /System/Library/Frameworks/WebKit.framework/Frameworks/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nfi\nfi\n";
+ shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" || ${ACTION} != \"build\" ]]; then\nexit 0\nfi\n\n# Prior to r172595, WebKitPluginHost.app lived at the top level of the framework. Replace any stale copy with a symlink to the new location at Versions/Current.\nrm -rf \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\nln -s Versions/Current/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\n# FIXME: This should be removed once faulty links have been removed on the bots.\nif [[ -L \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\" ]]; then\nrm \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nfi\n\nif [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\nln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nelse\nln -s /System/Library/Frameworks/WebKit.framework/Frameworks/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nfi\nfi\n";
};
1C395DE20C6BE8ED1E52 /* Generate Export Files */ = {
isa = PBXShellScriptBuildPhase;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [172595] trunk/Source
Title: [172595] trunk/Source
Revision 172595
Author mr...@apple.com
Date 2014-08-14 11:17:10 -0700 (Thu, 14 Aug 2014)
Log Message
Move helper applications out of the root of the framework.
As described in , for bundles containing
a Versions directory there may be no other content at the top level of the bundle other than symlinks.
Upcoming changes to code signing will prevent bundles that violate this rule from being signed.
Reviewed by Sam Weinig.
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj: Add the symlink to WebKitPluginHost.app in the Versions/A
directory of the framework rather than at the top level.
Source/WebKit2:
* Configurations/Base.xcconfig: Define a configuration setting that points to the content directory
of the framework. On OS X this is Versions/A. On iOS, where frameworks are shallow, this is the top level.
* Configurations/BaseLegacyProcess.xcconfig: Install the legacy processes in the content directory
of the framework.
* WebKit2.xcodeproj/project.pbxproj: Copy the legacy processes into the content directory of the
framework during engineering builds. Generate symlinks for the legacy processes to their locations
in Versions/Current. This is necessary because -[NSBundle pathForAuxiliaryExecutable:] only looks
at the top level of the framework wrapper.
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Configurations/Base.xcconfig
trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/WebKit/ChangeLog (172594 => 172595)
--- trunk/Source/WebKit/ChangeLog 2014-08-14 18:07:00 UTC (rev 172594)
+++ trunk/Source/WebKit/ChangeLog 2014-08-14 18:17:10 UTC (rev 172595)
@@ -1,3 +1,16 @@
+2014-08-13 Mark Rowe
+
+ Move helper applications out of the root of the framework.
+
+As described in , for bundles containing
+a Versions directory there may be no other content at the top level of the bundle other than symlinks.
+Upcoming changes to code signing will prevent bundles that violate this rule from being signed.
+
+Reviewed by Sam Weinig.
+
+* WebKit.xcodeproj/project.pbxproj: Add the symlink to WebKitPluginHost.app in the Versions/A
+directory of the framework rather than at the top level.
+
2014-08-14 Alex Christensen
Unreviewed. Removing empty directories.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (172594 => 172595)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-08-14 18:07:00 UTC (rev 172594)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-08-14 18:17:10 UTC (rev 172595)
@@ -2007,11 +2007,11 @@
);
name = "Symlink WebKitPluginHost";
outputPaths = (
-"$(CONFIGURATION_BUILD_DIR)/WebKitLegacy.framework/WebKitPluginHost.app",
+"$(CONFIGURATION_BUILD_DIR)/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\n# FIXME: This should be removed once faulty links have been removed on the bots.\nif [[ -L \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\" ]]; then\nrm \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\nfi\n\nif [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\nln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\nelse\nln -s /System/Library/Frameworks/WebKit.framework/Frameworks/WebKitLegacy.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\nfi\nfi\n";
+ shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\n# FIXME: This should be removed once faulty links have been removed on the bots.\nif [[ -L \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\" ]]; then\nrm \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nfi\n\nif [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\nln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\nelse\nln -s /System/Library/Frameworks/WebKit.framework/Frameworks/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}
[webkit-changes] [172542] trunk
Title: [172542] trunk
Revision 172542
Author mr...@apple.com
Date 2014-08-13 16:55:10 -0700 (Wed, 13 Aug 2014)
Log Message
WebKit should build on Yosemite with the public SDK.
Reviewed by Darin Adler.
Source/WebCore:
* rendering/RenderThemeMac.mm: Fix the forward-declaration of NSServicesRolloverButtonCell.
Source/WebKit/mac:
* Misc/WebSharingServicePickerController.mm: Forward-declare some details related to NSSharingServicePicker.
Source/WebKit2:
* Platform/IPC/mac/ImportanceAssertion.h: Forward-declare the new assertion functions we use.
* UIProcess/mac/WebContextMenuProxyMac.mm: Forward-declare some details related to NSSharingServicePicker.
Tools:
* DumpRenderTree/mac/TextInputController.m: Don't use extern "C" in a non-C++ file.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderThemeMac.mm
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/TextInputController.m
Diff
Modified: trunk/Source/WebCore/ChangeLog (172541 => 172542)
--- trunk/Source/WebCore/ChangeLog 2014-08-13 23:35:40 UTC (rev 172541)
+++ trunk/Source/WebCore/ChangeLog 2014-08-13 23:55:10 UTC (rev 172542)
@@ -1,3 +1,11 @@
+2014-08-13 Mark Rowe
+
+ WebKit should build on Yosemite with the public SDK.
+
+Reviewed by Darin Adler.
+
+* rendering/RenderThemeMac.mm: Fix the forward-declaration of NSServicesRolloverButtonCell.
+
2014-08-13 Alex Christensen
Progress towards CMake on Mac.
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (172541 => 172542)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-08-13 23:35:40 UTC (rev 172541)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-08-13 23:55:10 UTC (rev 172542)
@@ -89,22 +89,26 @@
#define APPKIT_PRIVATE_CLASS
#endif
+#if __has_include()
+#import
+#else
+typedef enum {
+NSSharingServicePickerStyleRollover = 1
+} NSSharingServicePickerStyle;
+#endif
+
#if __has_include()
#import
+#else
+@interface NSServicesRolloverButtonCell : NSButtonCell
+@end
#endif
@interface NSServicesRolloverButtonCell (Details)
+ (NSServicesRolloverButtonCell *)serviceRolloverButtonCellForStyle:(NSSharingServicePickerStyle)style;
+- (NSRect)rectForBounds:(NSRect)bounds preferredEdge:(NSRectEdge)preferredEdge;
@end
-#if __has_include()
-#import
-#else
-typedef enum {
-NSSharingServicePickerStyleRollover = 1
-} NSSharingServicePickerStyle;
-#endif
-
#endif // ENABLE(SERVICE_CONTROLS)
// The methods in this file are specific to the Mac OS X platform.
Modified: trunk/Source/WebKit/mac/ChangeLog (172541 => 172542)
--- trunk/Source/WebKit/mac/ChangeLog 2014-08-13 23:35:40 UTC (rev 172541)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-08-13 23:55:10 UTC (rev 172542)
@@ -1,3 +1,11 @@
+2014-08-13 Mark Rowe
+
+ WebKit should build on Yosemite with the public SDK.
+
+Reviewed by Darin Adler.
+
+* Misc/WebSharingServicePickerController.mm: Forward-declare some details related to NSSharingServicePicker.
+
2014-08-13 Timothy Hatcher
Web Inspector: Workaround a NSWindow change to the title bar.
Modified: trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm (172541 => 172542)
--- trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-08-13 23:35:40 UTC (rev 172541)
+++ trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-08-13 23:55:10 UTC (rev 172542)
@@ -46,12 +46,22 @@
NSSharingServicePickerStyleRollover = 1
} NSSharingServicePickerStyle;
+typedef enum {
+NSSharingServiceTypeEditor = 2
+} NSSharingServiceType;
+
+typedef NSUInteger NSSharingServiceMask;
+#endif
+
@interface NSSharingServicePicker (Private)
@property NSSharingServicePickerStyle style;
- (NSMenu *)menu;
@end
-#endif
+@interface NSSharingService (Private)
+@property (readonly) NSSharingServiceType type;
+@end
+
#if __has_include()
#import
#else
Modified: trunk/Source/WebKit2/ChangeLog (172541 => 172542)
--- trunk/Source/WebKit2/ChangeLog 2014-08-13 23:35:40 UTC (rev 172541)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-13 23:55:10 UTC (rev 172542)
@@ -1,3 +1,12 @@
+2014-08-13 Mark Rowe
+
+ WebKit should build on Yosemite with the public SDK.
+
+Reviewed by Darin Adler.
+
+* Platform/IPC/mac/ImportanceAssertion.h: Forward-declare the new assertion functions we use.
+* UIProcess/mac/WebContextMenuProxyMac.mm: Forward-declare some details related to NSSharingServicePicker.
+
2014-08-13 Alexey Proskuryakov
iOS build fix.
Modified: trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h (172541 => 172542)
--- trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h 2014-08-13 23:35:40 UTC (rev 172
[webkit-changes] [172428] trunk/Source/WebCore
Title: [172428] trunk/Source/WebCore
Revision 172428
Author mr...@apple.com
Date 2014-08-11 20:01:52 -0700 (Mon, 11 Aug 2014)
Log Message
Fix the Mac build.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (172427 => 172428)
--- trunk/Source/WebCore/ChangeLog 2014-08-12 01:23:05 UTC (rev 172427)
+++ trunk/Source/WebCore/ChangeLog 2014-08-12 03:01:52 UTC (rev 172428)
@@ -1,3 +1,10 @@
+2014-08-11 Mark Rowe
+
+Fix the Mac build.
+
+* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+#if a function that's only used on iOS.
+
2014-08-11 Brent Fulgham
[Mac, iOS] Some media content never reaches full 'loaded' state
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (172427 => 172428)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-08-12 01:23:05 UTC (rev 172427)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-08-12 03:01:52 UTC (rev 172428)
@@ -715,6 +715,7 @@
return [canonicalRequest URL];
}
+#if PLATFORM(IOS)
static NSHTTPCookie* toNSHTTPCookie(const Cookie& cookie)
{
RetainPtr properties = adoptNS([[NSMutableDictionary alloc] init]);
@@ -732,6 +733,7 @@
return [NSHTTPCookie cookieWithProperties:properties.get()];
}
+#endif
void MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL(const String& url)
{
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [171715] trunk/Source/WebKit2
Title: [171715] trunk/Source/WebKit2
Revision 171715
Author mr...@apple.com
Date 2014-07-28 17:56:18 -0700 (Mon, 28 Jul 2014)
Log Message
Web process crash causes UI process to die with an assertion failure in Connection::exceptionSourceEventHandler
https://bugs.webkit.org/show_bug.cgi?id=135366
Reviewed by Dan Bernstein.
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::Connection::exceptionSourceEventHandler): Remove the assertion since it frequently fires during
normal development with debug builds.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (171714 => 171715)
--- trunk/Source/WebKit2/ChangeLog 2014-07-29 00:51:37 UTC (rev 171714)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-29 00:56:18 UTC (rev 171715)
@@ -1,3 +1,14 @@
+2014-07-28 Mark Rowe
+
+Web process crash causes UI process to die with an assertion failure in Connection::exceptionSourceEventHandler
+https://bugs.webkit.org/show_bug.cgi?id=135366
+
+Reviewed by Dan Bernstein.
+
+* Platform/IPC/mac/ConnectionMac.mm:
+(IPC::Connection::exceptionSourceEventHandler): Remove the assertion since it frequently fires during
+normal development with debug builds.
+
2014-07-28 Benjamin Poulain
[iOS WK2] WKWebView sometime tries to change the size of a null DrawingAreaProxy
Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (171714 => 171715)
--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2014-07-29 00:51:37 UTC (rev 171714)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2014-07-29 00:56:18 UTC (rev 171715)
@@ -553,10 +553,8 @@
// Now send along the message.
kern_return_t kr = mach_msg(header, MACH_SEND_MSG, header->msgh_size, 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
-if (kr != KERN_SUCCESS) {
+if (kr != KERN_SUCCESS)
LOG_ERROR("Failed to send message to real exception port. %s (%x)", mach_error_string(kr), kr);
-ASSERT_NOT_REACHED();
-}
connectionDidClose();
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [171264] trunk/Source/WebCore
Title: [171264] trunk/Source/WebCore
Revision 171264
Author mr...@apple.com
Date 2014-07-19 11:07:43 -0700 (Sat, 19 Jul 2014)
Log Message
Ensure that make_names.pl generates the same result when run multiple times.
Perl 5.18 introduced hash randomization. This results in the iteration order of hashes being different
from one run to the next. To ensure identical output we can iterate over the hash keys in sorted order.
Reviewed by Alexey Proskuryakov.
* bindings/scripts/StaticString.pm:
(GenerateStrings):
(GenerateStringAsserts):
* dom/make_names.pl:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/scripts/StaticString.pm
trunk/Source/WebCore/dom/make_names.pl
Diff
Modified: trunk/Source/WebCore/ChangeLog (171263 => 171264)
--- trunk/Source/WebCore/ChangeLog 2014-07-19 16:16:39 UTC (rev 171263)
+++ trunk/Source/WebCore/ChangeLog 2014-07-19 18:07:43 UTC (rev 171264)
@@ -1,3 +1,17 @@
+2014-07-19 Mark Rowe
+
+ Ensure that make_names.pl generates the same result when run multiple times.
+
+Perl 5.18 introduced hash randomization. This results in the iteration order of hashes being different
+from one run to the next. To ensure identical output we can iterate over the hash keys in sorted order.
+
+Reviewed by Alexey Proskuryakov.
+
+* bindings/scripts/StaticString.pm:
+(GenerateStrings):
+(GenerateStringAsserts):
+* dom/make_names.pl:
+
2014-07-19 Zan Dobersek
Document::unregisterNodeListforInvalidation() and Document::unregisterCollection() have incorrect assertions
Modified: trunk/Source/WebCore/bindings/scripts/StaticString.pm (171263 => 171264)
--- trunk/Source/WebCore/bindings/scripts/StaticString.pm 2014-07-19 16:16:39 UTC (rev 171263)
+++ trunk/Source/WebCore/bindings/scripts/StaticString.pm 2014-07-19 18:07:43 UTC (rev 171264)
@@ -33,13 +33,14 @@
my @result = ();
-while ( my ($name, $value) = each %strings ) {
-push(@result, "static const LChar ${name}String8[] = \"${value}\";\n");
+for my $name (sort keys %strings) {
+push(@result, "static const LChar ${name}String8[] = \"$strings{$name}\";\n");
}
push(@result, "\n");
-while ( my ($name, $value) = each %strings ) {
+for my $name (sort keys %strings) {
+my $value = $strings{$name};
my $length = length($value);
my $hash = Hasher::GenerateHashValue($value);
push(@result, <@@ -66,7 +67,7 @@
push(@result, "#ifndef NDEBUG\n");
-while ( my ($name, $value) = each %strings ) {
+for my $name (sort keys %strings) {
push(@result, "reinterpret_cast(&${name}Data)->assertHashIsCorrect();\n");
}
Modified: trunk/Source/WebCore/dom/make_names.pl (171263 => 171264)
--- trunk/Source/WebCore/dom/make_names.pl 2014-07-19 16:16:39 UTC (rev 171263)
+++ trunk/Source/WebCore/dom/make_names.pl 2014-07-19 18:07:43 UTC (rev 171264)
@@ -119,7 +119,7 @@
print F StaticString::GenerateStrings(\%parameters);
-while ( my ($name, $identifier) = each %parameters ) {
+for my $name (sort keys %parameters) {
print F "DEFINE_GLOBAL(AtomicString, $name)\n";
}
@@ -128,7 +128,7 @@
print F "\n";
print F StaticString::GenerateStringAsserts(\%parameters);
-while ( my ($name, $identifier) = each %parameters ) {
+for my $name (sort keys %parameters) {
# FIXME: Would like to use static_cast here, but there are differences in const
# depending on whether SKIP_STATIC_CONSTRUCTORS_ON_GCC is used, so stick with a
# C-style cast for now.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170735] trunk/Source/WebCore
Title: [170735] trunk/Source/WebCore
Revision 170735
Author mr...@apple.com
Date 2014-07-02 16:02:45 -0700 (Wed, 02 Jul 2014)
Log Message
Ensure that the WebKit bundle version in the user agent string continues to match the current format.
/
Reviewed by Simon Fraser.
* page/cocoa/UserAgent.h:
* page/cocoa/UserAgent.mm:
(WebCore::userVisibleWebKitBundleVersionFromFullVersion): Updated to take an NSString now that it's internal
to the file.
(WebCore::userAgentBundleVersionFromFullVersionString): Limit the bundle version included in the user agent
string to three components.
* page/ios/UserAgentIOS.mm:
(WebCore::standardUserAgentWithApplicationName): Update to call userAgentBundleVersionFromFullVersionString.
* page/mac/UserAgentMac.mm:
(WebCore::standardUserAgentWithApplicationName): Ditto.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/cocoa/UserAgent.h
trunk/Source/WebCore/page/cocoa/UserAgent.mm
trunk/Source/WebCore/page/ios/UserAgentIOS.mm
trunk/Source/WebCore/page/mac/UserAgentMac.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (170734 => 170735)
--- trunk/Source/WebCore/ChangeLog 2014-07-02 23:02:43 UTC (rev 170734)
+++ trunk/Source/WebCore/ChangeLog 2014-07-02 23:02:45 UTC (rev 170735)
@@ -1,5 +1,23 @@
2014-07-01 Mark Rowe
+Ensure that the WebKit bundle version in the user agent string continues to match the current format.
+ /
+
+Reviewed by Simon Fraser.
+
+* page/cocoa/UserAgent.h:
+* page/cocoa/UserAgent.mm:
+(WebCore::userVisibleWebKitBundleVersionFromFullVersion): Updated to take an NSString now that it's internal
+to the file.
+(WebCore::userAgentBundleVersionFromFullVersionString): Limit the bundle version included in the user agent
+string to three components.
+* page/ios/UserAgentIOS.mm:
+(WebCore::standardUserAgentWithApplicationName): Update to call userAgentBundleVersionFromFullVersionString.
+* page/mac/UserAgentMac.mm:
+(WebCore::standardUserAgentWithApplicationName): Ditto.
+
+2014-07-01 Mark Rowe
+
Remove duplication in code that prepares the user agent string on Mac and iOS
Reviewed by Simon Fraser.
Modified: trunk/Source/WebCore/page/cocoa/UserAgent.h (170734 => 170735)
--- trunk/Source/WebCore/page/cocoa/UserAgent.h 2014-07-02 23:02:43 UTC (rev 170734)
+++ trunk/Source/WebCore/page/cocoa/UserAgent.h 2014-07-02 23:02:45 UTC (rev 170735)
@@ -33,7 +33,7 @@
String standardUserAgentWithApplicationName(const String& applicationName, const String& webkitVersionString);
String systemMarketingVersionForUserAgentString();
-String userVisibleWebKitBundleVersionFromFullVersion(const String&);
+String userAgentBundleVersionFromFullVersionString(const String&);
}
Modified: trunk/Source/WebCore/page/cocoa/UserAgent.mm (170734 => 170735)
--- trunk/Source/WebCore/page/cocoa/UserAgent.mm 2014-07-02 23:02:43 UTC (rev 170734)
+++ trunk/Source/WebCore/page/cocoa/UserAgent.mm 2014-07-02 23:02:45 UTC (rev 170735)
@@ -38,10 +38,8 @@
return [systemMarketingVersion() stringByReplacingOccurrencesOfString:@"." withString:@"_"];
}
-String userVisibleWebKitBundleVersionFromFullVersion(const String& fullWebKitVersionString)
+static NSString *userVisibleWebKitBundleVersionFromFullVersion(NSString *fullWebKitVersion)
{
-NSString *fullWebKitVersion = fullWebKitVersionString;
-
// If the version is longer than 3 digits then the leading digits represent the version of the OS. Our user agent
// string should not include the leading digits, so strip them off and report the rest as the version.
NSRange nonDigitRange = [fullWebKitVersion rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]];
@@ -52,4 +50,23 @@
return fullWebKitVersion;
}
+String userAgentBundleVersionFromFullVersionString(const String& fullWebKitVersion)
+{
+// We include at most three components of the bundle version in the user agent string.
+NSString *bundleVersion = userVisibleWebKitBundleVersionFromFullVersion(fullWebKitVersion);
+NSScanner *scanner = [NSScanner scannerWithString:bundleVersion];
+NSInteger periodCount = 0;
+while (true) {
+if (![scanner scanUpToString:@"." intoString:nullptr] || scanner.isAtEnd)
+return bundleVersion;
+
+if (++periodCount == 3)
+return [bundleVersion substringToIndex:scanner.scanLocation];
+
+++scanner.scanLocation;
+}
+
+ASSERT_NOT_REACHED();
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/page/ios/UserAgentIOS.mm (170734 => 170735)
--- trunk/Source/WebCore/page/ios/UserAgentIOS.mm 2014-07-02 23:02:43 UTC (rev 170734)
+++ trunk/Source/WebCore/page/ios/UserAgentIOS.mm 2014-07-02 23:02:45 UTC (rev 170735)
@@ -44,7 +44,7 @@
CFRelease(override);
}
-NSString *webKitVersion = userVisibleWebKitBundleVersionFromFullVersion(fullWebKitVersionString);
+NSS
[webkit-changes] [170734] trunk/Source
Title: [170734] trunk/Source
Revision 170734
Author mr...@apple.com
Date 2014-07-02 16:02:43 -0700 (Wed, 02 Jul 2014)
Log Message
Remove duplication in code that prepares the user agent string on Mac and iOS
Reviewed by Simon Fraser.
Source/WebCore:
* page/cocoa/UserAgent.h:
* page/cocoa/UserAgent.mm:
(WebCore::userVisibleWebKitBundleVersionFromFullVersion): Moved from WebKit2.
* page/ios/UserAgentIOS.mm:
(WebCore::standardUserAgentWithApplicationName): Pass the WebKit bundle version through userVisibleWebKitBundleVersionFromFullVersion
before including it in the user agent string.
* page/mac/UserAgentMac.mm:
(WebCore::standardUserAgentWithApplicationName): Ditto.
Source/WebKit/mac:
* WebView/WebView.mm:
(webKitBundleVersionString): Return the entire CFBundleVersion now that WebCore handles formatting it.
(+[WebView _standardUserAgentWithApplicationName:]):
Source/WebKit2:
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::webKitBundleVersionString): Return the entire CFBundleVersion now that WebCore handles formatting it.
(WebKit::WebPageProxy::standardUserAgent):
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::webKitBundleVersionString): Ditto.
(WebKit::WebPageProxy::standardUserAgent):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/cocoa/UserAgent.h
trunk/Source/WebCore/page/cocoa/UserAgent.mm
trunk/Source/WebCore/page/ios/UserAgentIOS.mm
trunk/Source/WebCore/page/mac/UserAgentMac.mm
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebView.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm
trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (170733 => 170734)
--- trunk/Source/WebCore/ChangeLog 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebCore/ChangeLog 2014-07-02 23:02:43 UTC (rev 170734)
@@ -1,3 +1,18 @@
+2014-07-01 Mark Rowe
+
+ Remove duplication in code that prepares the user agent string on Mac and iOS
+
+Reviewed by Simon Fraser.
+
+* page/cocoa/UserAgent.h:
+* page/cocoa/UserAgent.mm:
+(WebCore::userVisibleWebKitBundleVersionFromFullVersion): Moved from WebKit2.
+* page/ios/UserAgentIOS.mm:
+(WebCore::standardUserAgentWithApplicationName): Pass the WebKit bundle version through userVisibleWebKitBundleVersionFromFullVersion
+before including it in the user agent string.
+* page/mac/UserAgentMac.mm:
+(WebCore::standardUserAgentWithApplicationName): Ditto.
+
2014-07-02 Mark Rowe
iOS should use shared code to determine the system marketing version
Modified: trunk/Source/WebCore/page/cocoa/UserAgent.h (170733 => 170734)
--- trunk/Source/WebCore/page/cocoa/UserAgent.h 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebCore/page/cocoa/UserAgent.h 2014-07-02 23:02:43 UTC (rev 170734)
@@ -29,8 +29,12 @@
#include
namespace WebCore {
+
String standardUserAgentWithApplicationName(const String& applicationName, const String& webkitVersionString);
+
String systemMarketingVersionForUserAgentString();
+String userVisibleWebKitBundleVersionFromFullVersion(const String&);
+
}
#endif // UserAgent_h
Modified: trunk/Source/WebCore/page/cocoa/UserAgent.mm (170733 => 170734)
--- trunk/Source/WebCore/page/cocoa/UserAgent.mm 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebCore/page/cocoa/UserAgent.mm 2014-07-02 23:02:43 UTC (rev 170734)
@@ -38,4 +38,18 @@
return [systemMarketingVersion() stringByReplacingOccurrencesOfString:@"." withString:@"_"];
}
+String userVisibleWebKitBundleVersionFromFullVersion(const String& fullWebKitVersionString)
+{
+NSString *fullWebKitVersion = fullWebKitVersionString;
+
+// If the version is longer than 3 digits then the leading digits represent the version of the OS. Our user agent
+// string should not include the leading digits, so strip them off and report the rest as the version.
+NSRange nonDigitRange = [fullWebKitVersion rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]];
+if (nonDigitRange.location == NSNotFound && fullWebKitVersion.length > 3)
+return [fullWebKitVersion substringFromIndex:fullWebKitVersion.length - 3];
+if (nonDigitRange.location != NSNotFound && nonDigitRange.location > 3)
+return [fullWebKitVersion substringFromIndex:nonDigitRange.location - 3];
+return fullWebKitVersion;
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/page/ios/UserAgentIOS.mm (170733 => 170734)
--- trunk/Source/WebCore/page/ios/UserAgentIOS.mm 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebCore/page/ios/UserAgentIOS.mm 2014-07-02 23:02:43 UTC (rev 170734)
@@ -31,7 +31,7 @@
namespace WebCore {
-String standardUserAgentWithApplicationName(const String& applicationName, const String& webkitVersionString)
+String standardUserAgentWithApplicationName(const String& applicationName, const String& fullWebKitVersion
[webkit-changes] [170730] trunk/Source
Title: [170730] trunk/Source
Revision 170730
Author mr...@apple.com
Date 2014-07-02 15:38:41 -0700 (Wed, 02 Jul 2014)
Log Message
iOS should use shared code to determine the system marketing version
Reviewed by Simon Fraser.
Source/WebCore:
* WebCore.xcodeproj/project.pbxproj: Add the new files, and sort the groups they're in.
* page/cocoa/UserAgent.h: Copied from Source/WebCore/page/mac/UserAgent.h.
* page/cocoa/UserAgent.mm: Renamed from Source/WebCore/page/mac/UserAgent.h.
Move systemMarketingVersionForUserAgentString to a location where it can be shared between
Mac and iOS.
* page/ios/UserAgentIOS.mm:
(WebCore::standardUserAgentWithApplicationName): Switch to systemMarketingVersionForUserAgentString.
* page/mac/UserAgentMac.mm:
* platform/cocoa/SystemVersion.h: Renamed from Source/WebCore/platform/mac/SystemVersionMac.h.
* platform/cocoa/SystemVersion.mm: Renamed from Source/WebCore/platform/mac/SystemVersionMac.mm.
Move to a location that makes it clear this is shared between Mac and iOS. Enable the modern Mac
codepath for iOS as well.
Source/WebKit2:
* Shared/ios/ChildProcessIOS.mm: Update #import.
* Shared/mac/ChildProcessMac.mm: Ditto.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/page/ios/UserAgentIOS.mm
trunk/Source/WebCore/page/mac/UserAgentMac.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm
trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm
Added Paths
trunk/Source/WebCore/page/cocoa/
trunk/Source/WebCore/page/cocoa/UserAgent.h
trunk/Source/WebCore/page/cocoa/UserAgent.mm
trunk/Source/WebCore/platform/cocoa/SystemVersion.h
trunk/Source/WebCore/platform/cocoa/SystemVersion.mm
Removed Paths
trunk/Source/WebCore/page/mac/UserAgent.h
trunk/Source/WebCore/platform/mac/SystemVersionMac.h
trunk/Source/WebCore/platform/mac/SystemVersionMac.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (170729 => 170730)
--- trunk/Source/WebCore/ChangeLog 2014-07-02 22:34:43 UTC (rev 170729)
+++ trunk/Source/WebCore/ChangeLog 2014-07-02 22:38:41 UTC (rev 170730)
@@ -1,3 +1,22 @@
+2014-07-02 Mark Rowe
+
+ iOS should use shared code to determine the system marketing version
+
+Reviewed by Simon Fraser.
+
+* WebCore.xcodeproj/project.pbxproj: Add the new files, and sort the groups they're in.
+* page/cocoa/UserAgent.h: Copied from Source/WebCore/page/mac/UserAgent.h.
+* page/cocoa/UserAgent.mm: Renamed from Source/WebCore/page/mac/UserAgent.h.
+Move systemMarketingVersionForUserAgentString to a location where it can be shared between
+Mac and iOS.
+* page/ios/UserAgentIOS.mm:
+(WebCore::standardUserAgentWithApplicationName): Switch to systemMarketingVersionForUserAgentString.
+* page/mac/UserAgentMac.mm:
+* platform/cocoa/SystemVersion.h: Renamed from Source/WebCore/platform/mac/SystemVersionMac.h.
+* platform/cocoa/SystemVersion.mm: Renamed from Source/WebCore/platform/mac/SystemVersionMac.mm.
+Move to a location that makes it clear this is shared between Mac and iOS. Enable the modern Mac
+codepath for iOS as well.
+
2014-07-02 Anders Carlsson
Remove keyed coding from FormData
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (170729 => 170730)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-07-02 22:34:43 UTC (rev 170729)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-07-02 22:38:41 UTC (rev 170730)
@@ -2101,6 +2101,9 @@
5CFC4350192409E300A0D3B5 /* PointerLockController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CFC434E192406A900A0D3B5 /* PointerLockController.cpp */; };
5D21A80213ECE5DF00BB7064 /* WebVTTParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D21A80013ECE5DF00BB7064 /* WebVTTParser.cpp */; };
5D21A80313ECE5DF00BB7064 /* WebVTTParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D21A80113ECE5DF00BB7064 /* WebVTTParser.h */; };
+ 5D5975B319635F1100D00878 /* SystemVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D5975B119635F1100D00878 /* SystemVersion.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 5D5975B419635F1100D00878 /* SystemVersion.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5D5975B219635F1100D00878 /* SystemVersion.mm */; };
+ 5D5975B71963637B00D00878 /* UserAgent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5D5975B61963637B00D00878 /* UserAgent.mm */; };
5D874F130D161D3200796C3B /* NetscapePlugInStreamLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93E227DD0AF589AD00D48324 /* NetscapePlugInStreamLoader.cpp */; };
5D87BB8311E3ED8600702B6F /* ExportFileGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D87BB8211E3ED8600702B6F /* ExportFileGenerator.cpp */; };
5D8C4DBF1428222C0026CE72 /* DisplaySleepDisablerCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D8C4DBD1428222C0026CE72 /* DisplayS
[webkit-changes] [170689] trunk/Source/WebKit2
Title: [170689] trunk/Source/WebKit2 Revision 170689 Author mr...@apple.com Date 2014-07-01 19:24:44 -0700 (Tue, 01 Jul 2014) Log Message Add a missing return statement in WKPageCopySessionState. Reviewed by Anders Carlsson. * UIProcess/API/C/WKPage.cpp: (WKPageCopySessionState): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (170688 => 170689) --- trunk/Source/WebKit2/ChangeLog 2014-07-02 01:36:40 UTC (rev 170688) +++ trunk/Source/WebKit2/ChangeLog 2014-07-02 02:24:44 UTC (rev 170689) @@ -1,3 +1,12 @@ +2014-07-01 Mark Rowe + +Add a missing return statement in WKPageCopySessionState. + +Reviewed by Anders Carlsson. + +* UIProcess/API/C/WKPage.cpp: +(WKPageCopySessionState): + 2014-07-01 Anders Carlsson Don't encode/decode the snapshot UUID Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (170688 => 170689) --- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-02 01:36:40 UTC (rev 170688) +++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-02 02:24:44 UTC (rev 170689) @@ -370,7 +370,7 @@ }); if (shouldReturnData) -toAPI(encodeLegacySessionState(sessionState).release().leakRef()); +return toAPI(encodeLegacySessionState(sessionState).release().leakRef()); return toAPI(API::SessionState::create(std::move(sessionState)).leakRef()); } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170404] trunk
Title: [170404] trunk
Revision 170404
Author mr...@apple.com
Date 2014-06-24 16:33:55 -0700 (Tue, 24 Jun 2014)
Log Message
WKContextHistoryClient::didNavigateWithNavigationData is passed incorrect URL when history.pushState is used
/
Reviewed by Brady Eidson.
Source/WebCore:
Tests: http/tests/globalhistory/history-delegate-pushstate.html
http/tests/globalhistory/history-delegate-replacestate.html
* page/History.cpp:
(WebCore::History::stateObjectAdded): Call HistoryController after updating the document's URL so that the
URL will reflect the destination of the navigation when FrameLoaderClient::updateGlobalHistory is called.
LayoutTests:
* http/tests/globalhistory/history-delegate-pushstate-expected.txt: Added.
* http/tests/globalhistory/history-delegate-pushstate.html: Added.
* http/tests/globalhistory/history-delegate-replacestate-expected.txt: Added.
* http/tests/globalhistory/history-delegate-replacestate.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/History.cpp
Added Paths
trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate-expected.txt
trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate.html
trunk/LayoutTests/http/tests/globalhistory/history-delegate-replacestate-expected.txt
trunk/LayoutTests/http/tests/globalhistory/history-delegate-replacestate.html
Diff
Modified: trunk/LayoutTests/ChangeLog (170403 => 170404)
--- trunk/LayoutTests/ChangeLog 2014-06-24 23:33:03 UTC (rev 170403)
+++ trunk/LayoutTests/ChangeLog 2014-06-24 23:33:55 UTC (rev 170404)
@@ -1,3 +1,15 @@
+2014-06-24 Mark Rowe
+
+WKContextHistoryClient::didNavigateWithNavigationData is passed incorrect URL when history.pushState is used
+ /
+
+Reviewed by Brady Eidson.
+
+* http/tests/globalhistory/history-delegate-pushstate-expected.txt: Added.
+* http/tests/globalhistory/history-delegate-pushstate.html: Added.
+* http/tests/globalhistory/history-delegate-replacestate-expected.txt: Added.
+* http/tests/globalhistory/history-delegate-replacestate.html: Added.
+
2014-06-24 Yusuke Suzuki
CSS JIT: Add positionInRootFragments to SelectorFragment
Added: trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate-expected.txt (0 => 170404)
--- trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate-expected.txt 2014-06-24 23:33:55 UTC (rev 170404)
@@ -0,0 +1,10 @@
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?1" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?2" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?3" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?4" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?5" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+This tests functionality of the history delegate related to history.pushState.
Added: trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate.html (0 => 170404)
--- trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate.html (rev 0)
+++ trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate.html 2014-06-24 23:33:55 UTC (rev 170404)
@@ -0,0 +1,23 @@
+
+
+if (window.testRunner) {
+testRunner.waitUntilDone();
+testRunner.dumpAsText();
+testRunner.dumpFrameLoadCallbacks();
+}
+
+var n = 0;
+function runTest() {
+if (++n > 5) {
+if (window.testRunner)
+testRunner.notifyDone();
+return;
+}
+history.pushState({}, 'State ' + n, 'http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?' + n);
+setTimeout(runTest, 10);
+}
+
+
+
+This tests functionality of the history delegate related to history.pushState.
+
Added: trunk/LayoutTests/http/tests/globalhistory
[webkit-changes] [169039] trunk/Source/WebKit2
Title: [169039] trunk/Source/WebKit2 Revision 169039 Author mr...@apple.com Date 2014-05-19 01:44:52 -0700 (Mon, 19 May 2014) Log Message Build fix after r169023. * Shared/API/Cocoa/WebKitPrivate.h: Stop including headers that no longer exist. I hope for weinig's sake that no-one was relying on them. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h Diff Modified: trunk/Source/WebKit2/ChangeLog (169038 => 169039) --- trunk/Source/WebKit2/ChangeLog 2014-05-19 06:44:35 UTC (rev 169038) +++ trunk/Source/WebKit2/ChangeLog 2014-05-19 08:44:52 UTC (rev 169039) @@ -1,3 +1,10 @@ +2014-05-19 Mark Rowe + +Build fix after r169023. + +* Shared/API/Cocoa/WebKitPrivate.h: Stop including headers that no longer exist. +I hope for weinig's sake that no-one was relying on them. + 2014-05-18 Anders Carlsson Relax an assertion when creating document loaders Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h (169038 => 169039) --- trunk/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h 2014-05-19 06:44:35 UTC (rev 169038) +++ trunk/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h 2014-05-19 08:44:52 UTC (rev 169039) @@ -26,9 +26,7 @@ #import #import #import -#import #import -#import #import #import #import ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [168918] trunk/Source/WebKit2
Title: [168918] trunk/Source/WebKit2
Revision 168918
Author mr...@apple.com
Date 2014-05-15 17:11:39 -0700 (Thu, 15 May 2014)
Log Message
Move discovery of sharing services off the main thread
Discovery of sharing services can require disk access and IPC. Since the interface to
ServicesController is already asynchronous, we can easily perform the discovery on a
background queue. This can eliminate tens to hundreds of milliseconds worth of work
from the main thread when creating the first web process.
Reviewed by Brady Eidson.
* UIProcess/mac/ServicesController.h:
* UIProcess/mac/ServicesController.mm:
(WebKit::ServicesController::ServicesController):
(WebKit::ServicesController::refreshExistingServices): Bail out early if we're already
in the process of refreshing the services. Kick the discovery over to a background queue,
with it hopping back to the main queue to update the actual state and notify any contexts
that were interested.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/mac/ServicesController.h
trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (168917 => 168918)
--- trunk/Source/WebKit2/ChangeLog 2014-05-16 00:02:53 UTC (rev 168917)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-16 00:11:39 UTC (rev 168918)
@@ -1,3 +1,22 @@
+2014-05-15 Mark Rowe
+
+ Move discovery of sharing services off the main thread
+
+Discovery of sharing services can require disk access and IPC. Since the interface to
+ServicesController is already asynchronous, we can easily perform the discovery on a
+background queue. This can eliminate tens to hundreds of milliseconds worth of work
+from the main thread when creating the first web process.
+
+Reviewed by Brady Eidson.
+
+* UIProcess/mac/ServicesController.h:
+* UIProcess/mac/ServicesController.mm:
+(WebKit::ServicesController::ServicesController):
+(WebKit::ServicesController::refreshExistingServices): Bail out early if we're already
+in the process of refreshing the services. Kick the discovery over to a background queue,
+with it hopping back to the main queue to update the actual state and notify any contexts
+that were interested.
+
2014-05-15 Dan Bernstein
Fixed a typo in a comment and updated previous change log entry.
Modified: trunk/Source/WebKit2/UIProcess/mac/ServicesController.h (168917 => 168918)
--- trunk/Source/WebKit2/UIProcess/mac/ServicesController.h 2014-05-16 00:02:53 UTC (rev 168917)
+++ trunk/Source/WebKit2/UIProcess/mac/ServicesController.h 2014-05-16 00:11:39 UTC (rev 168918)
@@ -51,9 +51,10 @@
private:
ServicesController();
-void refreshExistingServicesTimerFired();
+void refreshExistingServices();
-RunLoop::Timer m_refreshExistingServicesTimer;
+dispatch_queue_t m_refreshQueue;
+bool m_isRefreshing;
bool m_hasImageServices;
bool m_hasSelectionServices;
Modified: trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm (168917 => 168918)
--- trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm 2014-05-16 00:02:53 UTC (rev 168917)
+++ trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm 2014-05-16 00:11:39 UTC (rev 168918)
@@ -57,45 +57,57 @@
}
ServicesController::ServicesController()
-: m_refreshExistingServicesTimer(RunLoop::main(), this, &ServicesController::refreshExistingServicesTimerFired)
+: m_refreshQueue(dispatch_queue_create("com.apple.WebKit.ServicesController", DISPATCH_QUEUE_SERIAL))
+, m_isRefreshing(false)
, m_hasImageServices(false)
, m_hasSelectionServices(false)
{
-m_refreshExistingServicesTimer.startOneShot(0);
+refreshExistingServices();
}
void ServicesController::refreshExistingServices(WebContext* context)
{
-ASSERT(context);
+ASSERT_ARG(context, context);
+ASSERT([NSThread isMainThread]);
m_contextsToNotify.add(context);
-m_refreshExistingServicesTimer.startOneShot(0);
+refreshExistingServices();
}
-void ServicesController::refreshExistingServicesTimerFired()
+void ServicesController::refreshExistingServices()
{
-static NeverDestroyed image([[NSImage alloc] init]);
-RetainPtr picker = adoptNS([[NSSharingServicePicker alloc] initWithItems:@[ image ]]);
-[picker setStyle:NSSharingServicePickerStyleRollover];
+if (m_isRefreshing)
+return;
-bool hasImageServices = picker.get().menu;
+m_isRefreshing = true;
+dispatch_async(m_refreshQueue, ^{
+static NeverDestroyed image([[NSImage alloc] init]);
+RetainPtr picker = adoptNS([[NSSharingServicePicker alloc] initWithItems:@[ image ]]);
+[picker setStyle:NSSharingServicePickerStyleRollover];
-static NeverDestroyed attributedString([[NSAttributedString alloc] initWithString:@"a"]);
-picker = adoptNS([[NSSharingServicePicker alloc] initWithItems:@[ attributedString ]]);
-
[webkit-changes] [168218] trunk/Tools
Title: [168218] trunk/Tools
Revision 168218
Author mr...@apple.com
Date 2014-05-02 18:15:47 -0700 (Fri, 02 May 2014)
Log Message
Make it possible to tell copy-webkitlibraries-to-product-directory which OS X version to copy for
Reviewed by Dan Bernstein.
* Scripts/copy-webkitlibraries-to-product-directory: Add an --osx-version argument and use the passed value
when determining which LLVM archive to extract.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory
Diff
Modified: trunk/Tools/ChangeLog (168217 => 168218)
--- trunk/Tools/ChangeLog 2014-05-03 01:15:07 UTC (rev 168217)
+++ trunk/Tools/ChangeLog 2014-05-03 01:15:47 UTC (rev 168218)
@@ -1,3 +1,12 @@
+2014-05-02 Mark Rowe
+
+ Make it possible to tell copy-webkitlibraries-to-product-directory which OS X version to copy for
+
+Reviewed by Dan Bernstein.
+
+* Scripts/copy-webkitlibraries-to-product-directory: Add an --osx-version argument and use the passed value
+when determining which LLVM archive to extract.
+
2014-05-02 Jeremy Jones
Add Jeremy as a committer.
Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (168217 => 168218)
--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-05-03 01:15:07 UTC (rev 168217)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-05-03 01:15:47 UTC (rev 168218)
@@ -40,6 +40,7 @@
my $llvmSubdirectoryName = "llvm";
my $llvmPrefix = "/usr/local/LLVMForJavaScriptCore";
my $sdkName = ""; # Ideally we only use this for build commands, rather than deciding policies about what needs to get copied or built and where it needs to be placed.
+my $osxVersion;
my $force = 0;
my $programName = basename($0);
@@ -55,6 +56,7 @@
--llvm-subdirectory=Set the name of the LLVM subdirectory to search for (default: $llvmSubdirectoryName)
--llvm-prefix= Set the prefix into which LLVM is installed (default: $llvmPrefix)
--sdk-name= Set the name of the Xcode SDK to use.
+ --osx-version= Set the OS X version to use when deciding what to copy.
--[no-]force Toggle forcing the copy - i.e. ignoring timestamps (default: $force)
EOF
@@ -69,6 +71,7 @@
'llvm-subdirectory=s' => \$llvmSubdirectoryName,
'llvm-prefix=s' => \$llvmPrefix,
'sdk-name=s' => \$sdkName,
+'osx-version=s' => \$osxVersion,
'force!' => \$force
);
@@ -84,6 +87,11 @@
$productDir = $ENV{BUILT_PRODUCTS_DIR};
}
+if (!$osxVersion) {
+$osxVersion = `sw_vers -productVersion | cut -d. -f-2`;
+chomp($osxVersion);
+}
+
chdirWebKit();
my $xcrunOptions = "";
@@ -151,7 +159,6 @@
(system("mkdir", "-p", $libraryDir) == 0) or die;
# Determine where to get LLVM binaries and headers.
-my $majorDarwinVersion = (split /\./, `uname -r`)[0];
my $useOwnLLVM = 0;
my $ownLLVMDirectory;
if (defined($ENV{LLVM_SOURCE_PATH})) {
@@ -172,10 +179,10 @@
} elsif ($preferSystemLLVMOverDrops) {
# Don't fall through to drop detection.
print "Using system LLVM.\n";
-} elsif ($majorDarwinVersion == 12) {
+} elsif ($osxVersion eq "10.8") {
$llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2";
$llvmIncludePackage = "WebKitLibraries/LLVMIncludesMountainLion.tar.bz2";
-} elsif ($majorDarwinVersion == 13) {
+} elsif ($osxVersion eq "10.9") {
$llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMavericks.tar.bz2";
$llvmIncludePackage = "WebKitLibraries/LLVMIncludesMavericks.tar.bz2";
} else {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [168195] trunk/Source/WebKit2
Title: [168195] trunk/Source/WebKit2
Revision 168195
Author mr...@apple.com
Date 2014-05-02 15:04:02 -0700 (Fri, 02 May 2014)
Log Message
-[_WKThumbnailView _requestSnapshotIfNeeded] assumes that taking a snapshot will always succeed
/
Reviewed by Tim Horton.
* UIProcess/API/Cocoa/_WKThumbnailView.mm:
(-[_WKThumbnailView _requestSnapshotIfNeeded]): Don't attempt to create a CGImageRef if we failed
to create a ShareableBitmap. This handles both the callback receiving a null Handle and a failure
within ShareableBitmap::create.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (168194 => 168195)
--- trunk/Source/WebKit2/ChangeLog 2014-05-02 21:58:55 UTC (rev 168194)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-02 22:04:02 UTC (rev 168195)
@@ -1,3 +1,15 @@
+2014-05-02 Mark Rowe
+
+-[_WKThumbnailView _requestSnapshotIfNeeded] assumes that taking a snapshot will always succeed
+ /
+
+Reviewed by Tim Horton.
+
+* UIProcess/API/Cocoa/_WKThumbnailView.mm:
+(-[_WKThumbnailView _requestSnapshotIfNeeded]): Don't attempt to create a CGImageRef if we failed
+to create a ShareableBitmap. This handles both the callback receiving a null Handle and a failure
+within ShareableBitmap::create.
+
2014-05-02 Anders Carlsson
Clean up FormDataElement
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm (168194 => 168195)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm 2014-05-02 21:58:55 UTC (rev 168194)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm 2014-05-02 22:04:02 UTC (rev 168195)
@@ -131,7 +131,7 @@
_lastSnapshotScale = _scale;
_webPageProxy->takeSnapshot(snapshotRect, bitmapSize, options, [thumbnailView](bool, const ShareableBitmap::Handle& imageHandle) {
RefPtr bitmap = ShareableBitmap::create(imageHandle, SharedMemory::ReadOnly);
-RetainPtr cgImage = bitmap->makeCGImage();
+RetainPtr cgImage = bitmap ? bitmap->makeCGImage() : nullptr;
[thumbnailView _didTakeSnapshot:cgImage.get()];
});
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167709] trunk/Source/JavaScriptCore
Title: [167709] trunk/Source/_javascript_Core
Revision 167709
Author mr...@apple.com
Date 2014-04-23 07:39:46 -0700 (Wed, 23 Apr 2014)
Log Message
[Mac] REGRESSION (r164823): Building _javascript_Core creates files under /tmp/_javascript_Core.dst
Reviewed by Dan Bernstein.
* _javascript_Core.xcodeproj/project.pbxproj: Don't try to create a symlink at /usr/local/bin/jsc inside
the DSTROOT unless we're building to the deployment location. Also remove the unnecessary -x argument
from /bin/sh since that generates unnecessary output.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (167708 => 167709)
--- trunk/Source/_javascript_Core/ChangeLog 2014-04-23 13:43:12 UTC (rev 167708)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-04-23 14:39:46 UTC (rev 167709)
@@ -1,3 +1,14 @@
+2014-04-23 Mark Rowe
+
+[Mac] REGRESSION (r164823): Building _javascript_Core creates files under /tmp/_javascript_Core.dst
+
+
+Reviewed by Dan Bernstein.
+
+* _javascript_Core.xcodeproj/project.pbxproj: Don't try to create a symlink at /usr/local/bin/jsc inside
+the DSTROOT unless we're building to the deployment location. Also remove the unnecessary -x argument
+from /bin/sh since that generates unnecessary output.
+
2014-04-22 Mark Lam
DFG::Worklist should acquire the m_lock before iterating DFG plans.
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (167708 => 167709)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2014-04-23 13:43:12 UTC (rev 167708)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2014-04-23 14:39:46 UTC (rev 167709)
@@ -6660,8 +6660,8 @@
outputPaths = (
"$(DSTROOT)$(INSTALL_PATH_PREFIX)/usr/local/bin/jsc",
);
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = "/bin/sh -x";
+ runOnlyForDeploymentPostprocessing = 1;
+ shellPath = /bin/sh;
shellScript = "if [[ \"${SKIP_INSTALL}\" == \"NO\" ]]; then\nmkdir -p \"${DSTROOT}${INSTALL_PATH_PREFIX}/usr/local/bin\"\ncd \"${DSTROOT}${INSTALL_PATH_PREFIX}/usr/local/bin\"\nif [ -L jsc ]; then\nrm -f jsc\nfi\nln -s \"../../..${INSTALL_PATH_ACTUAL}/jsc\" jsc\nexit\nfi\n";
};
5DAFD6CD146B6B6E00FBEFB4 /* Install Support Script */ = {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166954] trunk/Tools
Title: [166954] trunk/Tools
Revision 166954
Author mr...@apple.com
Date 2014-04-08 13:32:31 -0700 (Tue, 08 Apr 2014)
Log Message
XPC services launched by Safari have wrong DYLD_FRAMEWORK_PATH set when launched via run-safari / debug-safari
/
Reviewed by Alexey Proskuryakov.
* Scripts/webkitdirs.pm:
(runMacWebKitApp): Set __XPC_DYLD_FRAMEWORK_PATH to the absolute path to the built products directory.
(execMacWebKitAppForDebugging): Ditto.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitdirs.pm
Diff
Modified: trunk/Tools/ChangeLog (166953 => 166954)
--- trunk/Tools/ChangeLog 2014-04-08 20:26:54 UTC (rev 166953)
+++ trunk/Tools/ChangeLog 2014-04-08 20:32:31 UTC (rev 166954)
@@ -1,3 +1,14 @@
+2014-04-08 Mark Rowe
+
+XPC services launched by Safari have wrong DYLD_FRAMEWORK_PATH set when launched via run-safari / debug-safari
+ /
+
+Reviewed by Alexey Proskuryakov.
+
+* Scripts/webkitdirs.pm:
+(runMacWebKitApp): Set __XPC_DYLD_FRAMEWORK_PATH to the absolute path to the built products directory.
+(execMacWebKitAppForDebugging): Ditto.
+
2014-04-08 Geoffrey Garen
Build bmalloc on iOS too
Modified: trunk/Tools/Scripts/webkitdirs.pm (166953 => 166954)
--- trunk/Tools/Scripts/webkitdirs.pm 2014-04-08 20:26:54 UTC (rev 166953)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-04-08 20:32:31 UTC (rev 166954)
@@ -2009,6 +2009,7 @@
my $productDir = productDir();
print "Starting @{[basename($appPath)]} with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
+$ENV{__XPC_DYLD_FRAMEWORK_PATH} = File::Spec->rel2abs($productDir);
$ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES";
setUpGuardMallocIfNeeded();
@@ -2044,6 +2045,7 @@
my $productDir = productDir();
$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
+$ENV{__XPC_DYLD_FRAMEWORK_PATH} = File::Spec->rel2abs($productDir);
$ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES";
setUpGuardMallocIfNeeded();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166828] trunk/Source/WebCore
Title: [166828] trunk/Source/WebCore Revision 166828 Author mr...@apple.com Date 2014-04-05 00:08:36 -0700 (Sat, 05 Apr 2014) Log Message Fix the 32-bit build after r166818. * WebCore.exp.in: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.exp.in Diff Modified: trunk/Source/WebCore/ChangeLog (166827 => 166828) --- trunk/Source/WebCore/ChangeLog 2014-04-05 05:53:51 UTC (rev 166827) +++ trunk/Source/WebCore/ChangeLog 2014-04-05 07:08:36 UTC (rev 166828) @@ -1,3 +1,9 @@ +2014-04-05 Mark Rowe + +Fix the 32-bit build after r166818. + +* WebCore.exp.in: + 2014-04-03 Brian J. Burg Web Inspector: hook up probe samples to TimelineAgent's records Modified: trunk/Source/WebCore/WebCore.exp.in (166827 => 166828) --- trunk/Source/WebCore/WebCore.exp.in 2014-04-05 05:53:51 UTC (rev 166827) +++ trunk/Source/WebCore/WebCore.exp.in 2014-04-05 07:08:36 UTC (rev 166828) @@ -72,6 +72,7 @@ __ZN7WebCore10ClientRectC1Ev __ZN7WebCore10CredentialC1ERKN3WTF6StringES4_NS_21CredentialPersistenceE __ZN7WebCore10CredentialC1Ev +__ZN7WebCore10FloatPointC1ERK7CGPoint __ZN7WebCore10FloatPointC1ERKNS_8IntPointE __ZN7WebCore10FontGlyphs15releaseFontDataEv __ZN7WebCore10JSDocument6s_infoE @@ -2419,7 +2420,6 @@ _WebUIApplicationDidBecomeActiveNotification _WebUIApplicationWillEnterForegroundNotification _WebUIApplicationWillResignActiveNotification -__ZN7WebCore10FloatPointC1ERK7CGPoint __ZN7WebCore10ScrollView15setScrollOffsetERKNS_8IntPointE __ZN7WebCore10ScrollView17setScrollVelocityE __ZN7WebCore10ScrollView21setExposedContentRectERKNS_7IntRectE ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166688] trunk/Source/WebKit
Title: [166688] trunk/Source/WebKit
Revision 166688
Author mr...@apple.com
Date 2014-04-02 18:36:58 -0700 (Wed, 02 Apr 2014)
Log Message
Build fix after r166684.
Source/WebKit/ios:
* WebView/WebPDFViewPlaceholder.mm:
(-[WebPDFViewPlaceholder simulateClickOnLinkToURL:]):
Source/WebKit/win:
* WebCoreSupport/WebContextMenuClient.cpp:
(WebContextMenuClient::searchWithGoogle):
Modified Paths
trunk/Source/WebKit/ios/ChangeLog
trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp
Diff
Modified: trunk/Source/WebKit/ios/ChangeLog (166687 => 166688)
--- trunk/Source/WebKit/ios/ChangeLog 2014-04-03 01:34:57 UTC (rev 166687)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-04-03 01:36:58 UTC (rev 166688)
@@ -1,3 +1,10 @@
+2014-04-02 Mark Rowe
+
+Build fix after r166684.
+
+* WebView/WebPDFViewPlaceholder.mm:
+(-[WebPDFViewPlaceholder simulateClickOnLinkToURL:]):
+
2014-03-31 Anders Carlsson
Fix iOS build.
Modified: trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm (166687 => 166688)
--- trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm 2014-04-03 01:34:57 UTC (rev 166687)
+++ trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm 2014-04-03 01:36:58 UTC (rev 166688)
@@ -504,7 +504,7 @@
// Call to the frame loader because this is where our security checks are made.
Frame* frame = core([_dataSource webFrame]);
-frame->loader().loadFrameRequest(FrameLoadRequest(frame->document()->securityOrigin(), ResourceRequest(URL)), false, false, event.get(), 0, MaybeSendReferrer);
+frame->loader().loadFrameRequest(FrameLoadRequest(frame->document()->securityOrigin(), ResourceRequest(URL)), LockHistory::No, LockBackForwardList::No, event.get(), 0, MaybeSendReferrer);
}
@end
Modified: trunk/Source/WebKit/win/ChangeLog (166687 => 166688)
--- trunk/Source/WebKit/win/ChangeLog 2014-04-03 01:34:57 UTC (rev 166687)
+++ trunk/Source/WebKit/win/ChangeLog 2014-04-03 01:36:58 UTC (rev 166688)
@@ -1,3 +1,10 @@
+2014-04-02 Mark Rowe
+
+Build fix after r166684.
+
+* WebCoreSupport/WebContextMenuClient.cpp:
+(WebContextMenuClient::searchWithGoogle):
+
2014-04-02 Martin Hock
Unify private browsing with sessions.
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp (166687 => 166688)
--- trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp 2014-04-03 01:34:57 UTC (rev 166687)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp 2014-04-03 01:36:58 UTC (rev 166688)
@@ -121,7 +121,7 @@
if (Page* page = frame->page()) {
UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
-page->mainFrame().loader().urlSelected(URL(ParsedURLString, url), String(), 0, false, false, MaybeSendReferrer);
+page->mainFrame().loader().urlSelected(URL(ParsedURLString, url), String(), 0, LockHistory::No, LockBackForwardList::No, MaybeSendReferrer);
}
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166685] trunk/Source/WebCore
Title: [166685] trunk/Source/WebCore
Revision 166685
Author mr...@apple.com
Date 2014-04-02 17:56:09 -0700 (Wed, 02 Apr 2014)
Log Message
Remove FrameLoadRequest's m_lockHistory member since it's always false.
Reviewed by Andreas Kling.
* loader/FrameLoadRequest.cpp:
(WebCore::FrameLoadRequest::FrameLoadRequest):
* loader/FrameLoadRequest.h:
(WebCore::FrameLoadRequest::FrameLoadRequest):
(WebCore::FrameLoadRequest::lockHistory): Deleted.
(WebCore::FrameLoadRequest::setLockHistory): Deleted.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::load): Remove an if whose body was never executed.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/FrameLoadRequest.cpp
trunk/Source/WebCore/loader/FrameLoadRequest.h
trunk/Source/WebCore/loader/FrameLoader.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (166684 => 166685)
--- trunk/Source/WebCore/ChangeLog 2014-04-03 00:51:04 UTC (rev 166684)
+++ trunk/Source/WebCore/ChangeLog 2014-04-03 00:56:09 UTC (rev 166685)
@@ -1,5 +1,20 @@
2014-04-02 Mark Rowe
+ Remove FrameLoadRequest's m_lockHistory member since it's always false.
+
+Reviewed by Andreas Kling.
+
+* loader/FrameLoadRequest.cpp:
+(WebCore::FrameLoadRequest::FrameLoadRequest):
+* loader/FrameLoadRequest.h:
+(WebCore::FrameLoadRequest::FrameLoadRequest):
+(WebCore::FrameLoadRequest::lockHistory): Deleted.
+(WebCore::FrameLoadRequest::setLockHistory): Deleted.
+* loader/FrameLoader.cpp:
+(WebCore::FrameLoader::load): Remove an if whose body was never executed.
+
+2014-04-02 Mark Rowe
+
Introduce LockHistory and LockBackForwardList enums to use in place of bools.
These arguments are often passed using literals at the call site, where the use of bools severely hinders
Modified: trunk/Source/WebCore/loader/FrameLoadRequest.cpp (166684 => 166685)
--- trunk/Source/WebCore/loader/FrameLoadRequest.cpp 2014-04-03 00:51:04 UTC (rev 166684)
+++ trunk/Source/WebCore/loader/FrameLoadRequest.cpp 2014-04-03 00:56:09 UTC (rev 166685)
@@ -39,7 +39,6 @@
FrameLoadRequest::FrameLoadRequest(Frame* frame, const ResourceRequest& resourceRequest, const SubstituteData& substituteData)
: m_requester(frame->document()->securityOrigin())
, m_resourceRequest(resourceRequest)
-, m_lockHistory(false)
, m_shouldCheckNewWindowPolicy(false)
, m_substituteData(substituteData)
{
Modified: trunk/Source/WebCore/loader/FrameLoadRequest.h (166684 => 166685)
--- trunk/Source/WebCore/loader/FrameLoadRequest.h 2014-04-03 00:51:04 UTC (rev 166684)
+++ trunk/Source/WebCore/loader/FrameLoadRequest.h 2014-04-03 00:56:09 UTC (rev 166685)
@@ -37,7 +37,6 @@
public:
explicit FrameLoadRequest(SecurityOrigin* requester)
: m_requester(requester)
-, m_lockHistory(false)
, m_shouldCheckNewWindowPolicy(false)
{
}
@@ -45,7 +44,6 @@
FrameLoadRequest(SecurityOrigin* requester, const ResourceRequest& resourceRequest)
: m_requester(requester)
, m_resourceRequest(resourceRequest)
-, m_lockHistory(false)
, m_shouldCheckNewWindowPolicy(false)
{
}
@@ -54,7 +52,6 @@
: m_requester(requester)
, m_resourceRequest(resourceRequest)
, m_frameName(frameName)
-, m_lockHistory(false)
, m_shouldCheckNewWindowPolicy(false)
{
}
@@ -71,9 +68,6 @@
const String& frameName() const { return m_frameName; }
void setFrameName(const String& frameName) { m_frameName = frameName; }
-void setLockHistory(bool lockHistory) { m_lockHistory = lockHistory; }
-bool lockHistory() const { return m_lockHistory; }
-
void setShouldCheckNewWindowPolicy(bool checkPolicy) { m_shouldCheckNewWindowPolicy = checkPolicy; }
bool shouldCheckNewWindowPolicy() const { return m_shouldCheckNewWindowPolicy; }
@@ -85,7 +79,6 @@
RefPtr m_requester;
ResourceRequest m_resourceRequest;
String m_frameName;
-bool m_lockHistory;
bool m_shouldCheckNewWindowPolicy;
SubstituteData m_substituteData;
};
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (166684 => 166685)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-04-03 00:51:04 UTC (rev 166684)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-04-03 00:56:09 UTC (rev 166685)
@@ -1357,8 +1357,6 @@
request.setSubstituteData(defaultSubstituteDataForURL(request.resourceRequest().url()));
RefPtr loader = m_client.createDocumentLoader(request.resourceRequest(), request.substituteData());
-if (request.lockHistory() && m_documentLoader)
-loader->setClientRedirectSourceForHistory(m_documentLoader->didCreateGlobalHistoryEntry() ? m_documentLoader->urlForHistory().string() : m_documentLoader->clientRedirectSourceForHistory());
load(loader.get());
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.
[webkit-changes] [166396] trunk
Title: [166396] trunk Revision 166396 Author mr...@apple.com Date 2014-03-27 21:06:58 -0700 (Thu, 27 Mar 2014) Log Message WebKitTestRunner needs to print history delegate information Tools: Provide an implementation of WKContextHistoryClient that logs when called for tests in the globalhistory directory. Patch by Mikhail Pozdnyakov on 2014-03-27 Reviewed by Sam Weinig. * WebKitTestRunner/TestController.cpp: (WTR::TestController::TestController): (WTR::TestController::initialize): Set the history client. (WTR::TestController::resetStateToConsistentValues): Disable logging of history client callbacks. (WTR::TestController::didNavigateWithNavigationData): Log information about the navigation. Some portions of the output are hard-coded to match WebKit1's results for now since they're fixed in our existing tests and we don't yet have API to access the data in question. (WTR::TestController::didPerformClientRedirect): (WTR::TestController::didPerformServerRedirect): (WTR::TestController::didUpdateHistoryTitle): * WebKitTestRunner/TestController.h: (WTR::TestController::setShouldLogHistoryClientCallbacks): * WebKitTestRunner/TestInvocation.cpp: (WTR::shouldLogHistoryClientCallbacks): Log history client callbacks for tests in a globalhistory directory. (WTR::TestInvocation::invoke): LayoutTests: Reviewed by Sam Weinig. * platform/wk2/TestExpectations: Enable the two layout tests that pass. One test remains disabled due to lack of testRunner API, and another due to an apparent bug in WebKit2's handling of client redirects. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/wk2/TestExpectations trunk/Tools/ChangeLog trunk/Tools/WebKitTestRunner/TestController.cpp trunk/Tools/WebKitTestRunner/TestController.h trunk/Tools/WebKitTestRunner/TestInvocation.cpp Diff Modified: trunk/LayoutTests/ChangeLog (166395 => 166396) --- trunk/LayoutTests/ChangeLog 2014-03-28 03:52:01 UTC (rev 166395) +++ trunk/LayoutTests/ChangeLog 2014-03-28 04:06:58 UTC (rev 166396) @@ -1,3 +1,13 @@ +2014-03-27 Mark Rowe + + WebKitTestRunner needs to print history delegate information + +Reviewed by Sam Weinig. + +* platform/wk2/TestExpectations: Enable the two layout tests that pass. One test remains disabled +due to lack of testRunner API, and another due to an apparent bug in WebKit2's handling of +client redirects. + 2014-03-27 Oliver Hunt Support spread operand in |new| expressions Modified: trunk/LayoutTests/platform/wk2/TestExpectations (166395 => 166396) --- trunk/LayoutTests/platform/wk2/TestExpectations 2014-03-28 03:52:01 UTC (rev 166395) +++ trunk/LayoutTests/platform/wk2/TestExpectations 2014-03-28 04:06:58 UTC (rev 166396) @@ -175,13 +175,12 @@ # fast/loader/non-deferred-substitute-load.html -# WebKitTestRunner needs to print history delegate information -# -http/tests/globalhistory/history-delegate-basic-302-redirect.html -http/tests/globalhistory/history-delegate-basic-refresh-redirect.html -http/tests/globalhistory/history-delegate-basic-title.html +# WebKitTestRunner needs testRunner.removeAllVisitedLinks http/tests/globalhistory/history-delegate-basic-visited-links.html +# WebKit2 passes the wrong source URL for client redirects +http/tests/globalhistory/history-delegate-basic-refresh-redirect.html + # transitions/default-timing-function.html failing on WebKit2 since it was added # transitions/default-timing-function.html Modified: trunk/Tools/ChangeLog (166395 => 166396) --- trunk/Tools/ChangeLog 2014-03-28 03:52:01 UTC (rev 166395) +++ trunk/Tools/ChangeLog 2014-03-28 04:06:58 UTC (rev 166396) @@ -1,3 +1,28 @@ +2014-03-27 Mikhail Pozdnyakov + + WebKitTestRunner needs to print history delegate information + +Provide an implementation of WKContextHistoryClient that logs when called for tests in +the globalhistory directory. + +Reviewed by Sam Weinig. + +* WebKitTestRunner/TestController.cpp: +(WTR::TestController::TestController): +(WTR::TestController::initialize): Set the history client. +(WTR::TestController::resetStateToConsistentValues): Disable logging of history client callbacks. +(WTR::TestController::didNavigateWithNavigationData): Log information about the navigation. Some portions +of the output are hard-coded to match WebKit1's results for now since they're fixed in our existing tests +and we don't yet have API to access the data in question. +(WTR::TestController::didPerformClientRedirect): +(WTR::TestController::didPerformServerRedirect): +(WTR::TestController::didUpdateHistoryTitle): +* WebKitTestRunner/TestController.h: +(WTR::TestController::setShouldLogHistoryClientCallbacks): +* WebKitTestRunner/TestInvocation.cpp: +(WTR::shouldLogHistoryClientCallbacks): Log history client callbacks for tests in a globalhistory directory. +(WTR::TestIn
[webkit-changes] [166195] trunk/Source/WebKit2
Title: [166195] trunk/Source/WebKit2 Revision 166195 Author mr...@apple.com Date 2014-03-24 14:47:48 -0700 (Mon, 24 Mar 2014) Log Message Build fix after r166186. * UIProcess/Cocoa/DownloadClient.mm: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/Cocoa/DownloadClient.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (166194 => 166195) --- trunk/Source/WebKit2/ChangeLog 2014-03-24 21:26:25 UTC (rev 166194) +++ trunk/Source/WebKit2/ChangeLog 2014-03-24 21:47:48 UTC (rev 166195) @@ -1,3 +1,9 @@ +2014-03-24 Mark Rowe + +Build fix after r166186. + +* UIProcess/Cocoa/DownloadClient.mm: + 2014-03-24 Benjamin Poulain [WK2] Make updates on ViewUpdateDispatcher less heavy Modified: trunk/Source/WebKit2/UIProcess/Cocoa/DownloadClient.mm (166194 => 166195) --- trunk/Source/WebKit2/UIProcess/Cocoa/DownloadClient.mm 2014-03-24 21:26:25 UTC (rev 166194) +++ trunk/Source/WebKit2/UIProcess/Cocoa/DownloadClient.mm 2014-03-24 21:47:48 UTC (rev 166195) @@ -88,4 +88,4 @@ } // namespace WebKit -#endif // WK_API_ENABLED \ No newline at end of file +#endif // WK_API_ENABLED ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [165677] trunk/Source
Title: [165677] trunk/Source Revision 165677 Author mr...@apple.com Date 2014-03-14 21:38:58 -0700 (Fri, 14 Mar 2014) Log Message Fix the production build. Don't rely on USE_INTERNAL_SDK being set for the Production configuration since UseInternalSDK.xcconfig won't be at the expected relative path when working from installed source. Source/_javascript_Core: * Configurations/Base.xcconfig: Source/ThirdParty/ANGLE: * Configurations/Base.xcconfig: Source/WebCore: * Configurations/Base.xcconfig: Source/WebKit/mac: * Configurations/Base.xcconfig: Source/WebKit2: * Configurations/Base.xcconfig: Source/WTF: * Configurations/Base.xcconfig: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/Base.xcconfig trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig trunk/Source/WTF/ChangeLog trunk/Source/WTF/Configurations/Base.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/Base.xcconfig trunk/Source/WebKit/mac/ChangeLog trunk/Source/WebKit/mac/Configurations/Base.xcconfig trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Configurations/Base.xcconfig Diff Modified: trunk/Source/_javascript_Core/ChangeLog (165676 => 165677) --- trunk/Source/_javascript_Core/ChangeLog 2014-03-15 04:08:27 UTC (rev 165676) +++ trunk/Source/_javascript_Core/ChangeLog 2014-03-15 04:38:58 UTC (rev 165677) @@ -1,3 +1,12 @@ +2014-03-14 Mark Rowe + +Fix the production build. + +Don't rely on USE_INTERNAL_SDK being set for the Production configuration since UseInternalSDK.xcconfig won't +be at the expected relative path when working from installed source. + +* Configurations/Base.xcconfig: + 2014-03-14 Maciej Stachowiak Replace "Apple Computer, Inc." with "Apple Inc." in copyright headers Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (165676 => 165677) --- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-03-15 04:08:27 UTC (rev 165676) +++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-03-15 04:38:58 UTC (rev 165677) @@ -43,9 +43,13 @@ GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME)); GCC_ENABLE_OBJC_GC_iphoneos = NO; GCC_ENABLE_OBJC_GC_iphonesimulator = NO; -GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK)); -GCC_ENABLE_OBJC_GC_macosx_ = NO; -GCC_ENABLE_OBJC_GC_macosx_YES = supported; +GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(CONFIGURATION)); +GCC_ENABLE_OBJC_GC_macosx_Production = supported; +GCC_ENABLE_OBJC_GC_macosx_Debug = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release); +GCC_ENABLE_OBJC_GC_macosx_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release); +GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_$(USE_INTERNAL_SDK)); +GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_ = NO; +GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_YES = supported; GCC_ENABLE_SYMBOL_SEPARATION = NO; GCC_FAST_OBJC_DISPATCH = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (165676 => 165677) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-03-15 04:08:27 UTC (rev 165676) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-03-15 04:38:58 UTC (rev 165677) @@ -1,3 +1,12 @@ +2014-03-14 Mark Rowe + +Fix the production build. + +Don't rely on USE_INTERNAL_SDK being set for the Production configuration since UseInternalSDK.xcconfig won't +be at the expected relative path when working from installed source. + +* Configurations/Base.xcconfig: + 2014-03-13 Tim Horton Fix relative paths to UseInternalSDK.xcconfig for ANGLE and WebKit/mac Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (165676 => 165677) --- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2014-03-15 04:08:27 UTC (rev 165676) +++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2014-03-15 04:38:58 UTC (rev 165677) @@ -16,9 +16,13 @@ GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME)); GCC_ENABLE_OBJC_GC_iphoneos = NO; GCC_ENABLE_OBJC_GC_iphonesimulator = NO; -GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK)); -GCC_ENABLE_OBJC_GC_macosx_ = NO; -GCC_ENABLE_OBJC_GC_macosx_YES = supported; +GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(CONFIGURATION)); +GCC_ENABLE_OBJC_GC_macosx_Production = supported; +GCC_ENABLE_OBJC_GC_macosx_Debug = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release); +GCC_ENABLE_OBJC_GC_macosx_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release); +GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_$(USE_INTERNAL_SDK)); +GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_ = NO; +GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_YES = supported; GCC_ENABLE_SYMBOL_SEPARATION = NO; GCC_FAST_OBJC_DISPATCH = YES; GCC_INLINES_ARE_PRIVATE_EXTERN =
[webkit-changes] [163766] trunk/Source/WebKit
Title: [163766] trunk/Source/WebKit Revision 163766 Author mr...@apple.com Date 2014-02-09 23:41:33 -0800 (Sun, 09 Feb 2014) Log Message Stop relinking WebKit on every build. * WebKit.xcodeproj/project.pbxproj: Fix the case on an input file for the Generate Export Files script phase so it will run only when the inputs change rather than on every build. Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj Diff Modified: trunk/Source/WebKit/ChangeLog (163765 => 163766) --- trunk/Source/WebKit/ChangeLog 2014-02-10 07:21:09 UTC (rev 163765) +++ trunk/Source/WebKit/ChangeLog 2014-02-10 07:41:33 UTC (rev 163766) @@ -1,3 +1,10 @@ +2014-02-09 Mark Rowe + +Stop relinking WebKit on every build. + +* WebKit.xcodeproj/project.pbxproj: Fix the case on an input file for the Generate Export Files +script phase so it will run only when the inputs change rather than on every build. + 2014-02-09 Ryuan Choi [EFL] Remove PageClientEfl Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (163765 => 163766) --- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-02-10 07:21:09 UTC (rev 163765) +++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-02-10 07:41:33 UTC (rev 163766) @@ -2014,7 +2014,7 @@ ); inputPaths = ( "$(SRCROOT)/mac/WebKit.exp", -"$(SRCROOT)/ios/WebKit.IOS.exp", +"$(SRCROOT)/ios/WebKit.iOS.exp", "$(SRCROOT)/mac/WebKit.mac.exp", ); name = "Generate Export Files"; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [163710] trunk/Source/JavaScriptCore
Title: [163710] trunk/Source/_javascript_Core
Revision 163710
Author mr...@apple.com
Date 2014-02-08 02:33:02 -0800 (Sat, 08 Feb 2014)
Log Message
Don't duplicate the list of input files for postprocess-headers.sh
Reviewed by Dan Bernstein.
* postprocess-headers.sh: Pull the list of headers to process out of the environment.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/postprocess-headers.sh
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (163709 => 163710)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-08 10:03:39 UTC (rev 163709)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-08 10:33:02 UTC (rev 163710)
@@ -1,5 +1,13 @@
2014-02-08 Mark Rowe
+ Don't duplicate the list of input files for postprocess-headers.sh
+
+Reviewed by Dan Bernstein.
+
+* postprocess-headers.sh: Pull the list of headers to process out of the environment.
+
+2014-02-08 Mark Rowe
+
Fix the iOS build.
* API/WebKitAvailability.h: Skip the workarounds specific to OS X when we're building for iOS.
Modified: trunk/Source/_javascript_Core/postprocess-headers.sh (163709 => 163710)
--- trunk/Source/_javascript_Core/postprocess-headers.sh 2014-02-08 10:03:39 UTC (rev 163709)
+++ trunk/Source/_javascript_Core/postprocess-headers.sh 2014-02-08 10:33:02 UTC (rev 163710)
@@ -8,8 +8,8 @@
UNIFDEF_OPTIONS+=" -D__MAC_OS_X_VERSION_MIN_REQUIRED=${TARGET_MAC_OS_X_VERSION_MAJOR}"
-
-for HEADER in JSBase.h JSContext.h JSManagedValue.h JSValue.h JSVirtualMachine.h WebKitAvailability.h; do
+for ((i = 0; i < ${SCRIPT_INPUT_FILE_COUNT}; ++i)); do
+eval HEADER=\${SCRIPT_INPUT_FILE_${i}};
unifdef -B ${UNIFDEF_OPTIONS} -o ${HEADER}.unifdef ${HEADER}
case $? in
0)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [163709] trunk/Source/JavaScriptCore
Title: [163709] trunk/Source/_javascript_Core Revision 163709 Author mr...@apple.com Date 2014-02-08 02:03:39 -0800 (Sat, 08 Feb 2014) Log Message Fix the iOS build. * API/WebKitAvailability.h: Skip the workarounds specific to OS X when we're building for iOS. Modified Paths trunk/Source/_javascript_Core/API/WebKitAvailability.h trunk/Source/_javascript_Core/ChangeLog Diff Modified: trunk/Source/_javascript_Core/API/WebKitAvailability.h (163708 => 163709) --- trunk/Source/_javascript_Core/API/WebKitAvailability.h 2014-02-08 09:26:44 UTC (rev 163708) +++ trunk/Source/_javascript_Core/API/WebKitAvailability.h 2014-02-08 10:03:39 UTC (rev 163709) @@ -31,7 +31,7 @@ #include #include -#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090 +#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090 /* To support availability macros that mention newer OS X versions when building on older OS X versions, we provide our own definitions of the underlying macros that the availability macros expand to. We're free to expand the macros as no-ops since frameworks built on older OS X versions only ship bundled with Modified: trunk/Source/_javascript_Core/ChangeLog (163708 => 163709) --- trunk/Source/_javascript_Core/ChangeLog 2014-02-08 09:26:44 UTC (rev 163708) +++ trunk/Source/_javascript_Core/ChangeLog 2014-02-08 10:03:39 UTC (rev 163709) @@ -1,3 +1,9 @@ +2014-02-08 Mark Rowe + +Fix the iOS build. + +* API/WebKitAvailability.h: Skip the workarounds specific to OS X when we're building for iOS. + 2014-02-07 Mark Rowe Fix use of availability macros on recently-added APIs ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [163707] trunk/Source/JavaScriptCore
Title: [163707] trunk/Source/_javascript_Core Revision 163707 Author mr...@apple.com Date 2014-02-08 01:01:14 -0800 (Sat, 08 Feb 2014) Log Message Fix use of availability macros on recently-added APIs Reviewed by Dan Bernstein. * API/JSContext.h: Remove some #ifs. * API/JSManagedValue.h: Ditto. * API/WebKitAvailability.h: #define the macros that availability macros mentioning newer OS X versions would expand to when building on older OS versions. * _javascript_Core.xcodeproj/project.pbxproj: Call the new postprocess-headers.sh. * postprocess-headers.sh: Extracted from the Xcode project. Updated to remove content from headers based on the __MAC_OS_X_VERSION_MIN_REQUIRED macro, and to process WebKitAvailability.h. Modified Paths trunk/Source/_javascript_Core/API/JSContext.h trunk/Source/_javascript_Core/API/JSManagedValue.h trunk/Source/_javascript_Core/API/WebKitAvailability.h trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj Added Paths trunk/Source/_javascript_Core/postprocess-headers.sh Diff Modified: trunk/Source/_javascript_Core/API/JSContext.h (163706 => 163707) --- trunk/Source/_javascript_Core/API/JSContext.h 2014-02-08 08:53:17 UTC (rev 163706) +++ trunk/Source/_javascript_Core/API/JSContext.h 2014-02-08 09:01:14 UTC (rev 163707) @@ -101,15 +101,7 @@ a callback from _javascript_ this method will return nil. @result The currently executing _javascript_ function or nil if there isn't one. */ -#if TARGET_OS_IPHONE || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 + (JSValue *)currentCallee NS_AVAILABLE(10_10, 8_0); -#else -#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) -+ (JSValue *)currentCallee __attribute__((availability(macosx,__NSi_10_10))); -#else -+ (JSValue *)currentCallee __attribute__((availability(ios,__NSi_8_0))); -#endif -#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 /*! @method Modified: trunk/Source/_javascript_Core/API/JSManagedValue.h (163706 => 163707) --- trunk/Source/_javascript_Core/API/JSManagedValue.h 2014-02-08 08:53:17 UTC (rev 163706) +++ trunk/Source/_javascript_Core/API/JSManagedValue.h 2014-02-08 09:01:14 UTC (rev 163707) @@ -64,18 +64,7 @@ @result The new JSManagedValue. */ + (JSManagedValue *)managedValueWithValue:(JSValue *)value; -// FIXME: There's a bug in earlier versions of clang that shipped on 10.8 that causes the NS_AVAILABLE macro -// to be ignored by the preprocessor when it follows a class method. The compiler then tries to treat the -// macro as part of the selector. -#if (TARGET_OS_EMBEDDED || TARGET_OS_IPHONE) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 + (JSManagedValue *)managedValueWithValue:(JSValue *)value andOwner:(id)owner NS_AVAILABLE(10_10, 8_0); -#else -#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) -+ (JSManagedValue *)managedValueWithValue:(JSValue *)value andOwner:(id)owner __attribute__((availability(macosx,__NSi_10_10))); -#else -+ (JSManagedValue *)managedValueWithValue:(JSValue *)value andOwner:(id)owner __attribute__((availability(ios,__NSi_8_0))); -#endif -#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 /*! @method Modified: trunk/Source/_javascript_Core/API/WebKitAvailability.h (163706 => 163707) --- trunk/Source/_javascript_Core/API/WebKitAvailability.h 2014-02-08 08:53:17 UTC (rev 163706) +++ trunk/Source/_javascript_Core/API/WebKitAvailability.h 2014-02-08 09:01:14 UTC (rev 163707) @@ -31,26 +31,37 @@ #include #include -#if !defined(NS_AVAILABLE) -#define NS_AVAILABLE(_mac, _ios) -#endif // !defined(NS_AVAILABLE) -#if !defined(CF_AVAILABLE) -#define CF_AVAILABLE(_mac, _ios) -#endif // !defined(CF_AVAILABLE) +#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090 +/* To support availability macros that mention newer OS X versions when building on older OS X versions, + we provide our own definitions of the underlying macros that the availability macros expand to. We're + free to expand the macros as no-ops since frameworks built on older OS X versions only ship bundled with + an application rather than as part of the system. +*/ -#else // __APPLE__ +#ifndef __NSi_10_10 +#define __NSi_10_10 introduced=10.0 +#endif -#define CF_AVAILABLE(_mac, _ios) -#define NS_AVAILABLE(_mac, _ios) +#ifndef __AVAILABILITY_INTERNAL__MAC_10_9 +#define __AVAILABILITY_INTERNAL__MAC_10_9 +#endif -#endif // __APPLE__ +#ifndef __AVAILABILITY_INTERNAL__MAC_10_10 +#define __AVAILABILITY_INTERNAL__MAC_10_10 +#endif -#if !defined(__NSi_10_10) -#define __NSi_10_10 introduced=10.10 +#ifndef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER +#define AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER #endif -#if !defined(__NSi_8_0) -#define __NSi_8_0 introduced=8.0 +#ifndef AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER +#define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER #endif +#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090 */ + +#else +#define CF_AVAILABLE(_mac, _ios) +#endif + #endif /* __WebKitAvailability__ */ Modified: t
[webkit-changes] [163099] trunk/Source/WebKit2
Title: [163099] trunk/Source/WebKit2 Revision 163099 Author mr...@apple.com Date 2014-01-30 12:29:12 -0800 (Thu, 30 Jan 2014) Log Message Host plug-ins in XPC services / We disabled use of XPC services for plug-ins back in r143829 as the per-architecture services were not being built for the appropriate architectures. Fixing that allows us to reenable them. Reviewed by Anders Carlsson. * Configurations/PluginService.32.xcconfig: Use VALID_ARCHS to restrict the service to building for i386-only in production builds. Non-production builds allow building for all standard architectures to ensure that Xcode will be able to build this target. The exact architecture used isn't a concern for non-production builds since we'll use the development version of the service anyway. * UIProcess/Plugins/mac/PluginProcessProxyMac.mm: (WebKit::shouldUseXPC): Remove the workaround that disables use of the XPC services. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (163098 => 163099) --- trunk/Source/WebKit2/ChangeLog 2014-01-30 20:00:12 UTC (rev 163098) +++ trunk/Source/WebKit2/ChangeLog 2014-01-30 20:29:12 UTC (rev 163099) @@ -1,3 +1,21 @@ +2014-01-30 Mark Rowe + +Host plug-ins in XPC services + / + +We disabled use of XPC services for plug-ins back in r143829 as the per-architecture services +were not being built for the appropriate architectures. Fixing that allows us to reenable them. + +Reviewed by Anders Carlsson. + +* Configurations/PluginService.32.xcconfig: Use VALID_ARCHS to restrict the service +to building for i386-only in production builds. Non-production builds allow building +for all standard architectures to ensure that Xcode will be able to build this target. +The exact architecture used isn't a concern for non-production builds since we'll use +the development version of the service anyway. +* UIProcess/Plugins/mac/PluginProcessProxyMac.mm: +(WebKit::shouldUseXPC): Remove the workaround that disables use of the XPC services. + 2014-01-30 Anders Carlsson Add WKNavigationDelegate class Modified: trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig (163098 => 163099) --- trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2014-01-30 20:00:12 UTC (rev 163098) +++ trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2014-01-30 20:29:12 UTC (rev 163099) @@ -23,10 +23,13 @@ #include "BaseXPCService.xcconfig" -ARCHS = $(ARCHS_$(PLATFORM_NAME)); -ARCHS_macosx = i386; -ARCHS_iphoneos = $(ARCHS_STANDARD_32_64_BIT); -ARCHS_iphonesimulator = $(ARCHS_iphoneos); +VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME)); +VALID_ARCHS_macosx = $(VALID_ARCHS_macosx_$(CONFIGURATION)); +VALID_ARCHS_macosx_Debug = $(ARCHS_STANDARD_32_64_BIT); +VALID_ARCHS_macosx_Release = $(VALID_ARCHS_macosx_Debug); +VALID_ARCHS_macosx_Production = i386; +VALID_ARCHS_iphoneos = $(VALID_ARCHS); +VALID_ARCHS_iphonesimulator = $(VALID_ARCHS_iphoneos); PRODUCT_NAME = com.apple.WebKit.Plugin.32; INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist; Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (163098 => 163099) --- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2014-01-30 20:00:12 UTC (rev 163098) +++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2014-01-30 20:29:12 UTC (rev 163099) @@ -33,16 +33,14 @@ #import "PluginProcessCreationParameters.h" #import "PluginProcessMessages.h" #import "WebKitSystemInterface.h" +#import #import #import -#import #import #import #import #import -#import - @interface WKPlaceholderModalWindow : NSWindow @end @@ -129,10 +127,6 @@ return [value boolValue]; #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 -// FIXME: Temporary workaround for -if (applicationIsSafari()) -return false; - return true; #else return false; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [162929] trunk/Source
Title: [162929] trunk/Source
Revision 162929
Author mr...@apple.com
Date 2014-01-28 02:40:58 -0800 (Tue, 28 Jan 2014)
Log Message
Disable some deprecation warnings to fix the build.
Reviewed by Ryosuke Niwa.
Source/WebCore:
* accessibility/mac/AXObjectCacheMac.mm:
(WebCore::AXObjectCache::postPlatformNotification):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper renderWidgetChildren]):
* platform/audio/mac/AudioDestinationMac.cpp:
(WebCore::AudioDestinationMac::configure):
* platform/audio/mac/AudioFileReaderMac.cpp:
(WebCore::AudioFileReader::createBus):
Source/WebKit/mac:
* WebCoreSupport/PopupMenuMac.mm:
(PopupMenuMac::populate):
Source/WebKit2:
* UIProcess/API/mac/WKView.mm:
(-[WKView _updateWindowAndViewFrames]):
* WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp
trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (162928 => 162929)
--- trunk/Source/WebCore/ChangeLog 2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebCore/ChangeLog 2014-01-28 10:40:58 UTC (rev 162929)
@@ -1,3 +1,18 @@
+2014-01-28 Mark Rowe
+
+ Disable some deprecation warnings to fix the build.
+
+Reviewed by Ryosuke Niwa.
+
+* accessibility/mac/AXObjectCacheMac.mm:
+(WebCore::AXObjectCache::postPlatformNotification):
+* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+(-[WebAccessibilityObjectWrapper renderWidgetChildren]):
+* platform/audio/mac/AudioDestinationMac.cpp:
+(WebCore::AudioDestinationMac::configure):
+* platform/audio/mac/AudioFileReaderMac.cpp:
+(WebCore::AudioFileReader::createBus):
+
2014-01-28 Carlos Garcia Campos
[SOUP] Remove soupURIToKURL
Modified: trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (162928 => 162929)
--- trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2014-01-28 10:40:58 UTC (rev 162929)
@@ -135,7 +135,10 @@
// NSAccessibilityPostNotification will call this method, (but not when running DRT), so ASSERT here to make sure it does not crash.
// https://bugs.webkit.org/show_bug.cgi?id=46662
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
ASSERT([obj->wrapper() accessibilityIsIgnored] || true);
+#pragma clang diagnostic pop
NSAccessibilityPostNotification(obj->wrapper(), macNotification);
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (162928 => 162929)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-01-28 10:40:58 UTC (rev 162929)
@@ -1531,7 +1531,10 @@
Widget* widget = m_object->widget();
if (!widget)
return nil;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
return [(widget->platformWidget()) accessibilityAttributeValue: NSAccessibilityChildrenAttribute];
+#pragma clang diagnostic pop
}
- (id)remoteAccessibilityParentObject
@@ -1835,6 +1838,8 @@
return NSAccessibilityUnknownRole;
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (NSString*)subrole
{
if (m_object->isPasswordField())
@@ -1979,6 +1984,7 @@
return nil;
}
+#pragma clang diagnostic pop
- (NSString*)roleDescription
{
@@ -3625,6 +3631,8 @@
return NSNotFound;
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (NSUInteger)accessibilityArrayAttributeCount:(NSString *)attribute
{
if (![self updateObjectBackingStore])
@@ -3645,6 +3653,7 @@
return [super accessibilityArrayAttributeCount:attribute];
}
+#pragma clang diagnostic pop
- (NSArray *)accessibilityArrayAttributeValues:(NSString *)attribute index:(NSUInteger)index maxCount:(NSUInteger)maxCount
{
Modified: trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp (162928 => 162929)
--- trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp 2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp 2014-01-28 10:40:58 UTC (rev 162929)
@@ -124,6 +124,8 @@
OSStatus result = AudioUnitSetPropert
[webkit-changes] [162495] trunk/Source
Title: [162495] trunk/Source
Revision 162495
Author mr...@apple.com
Date 2014-01-21 20:01:01 -0800 (Tue, 21 Jan 2014)
Log Message
Roll out r162483. It removes SPI that is currently in use.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/HTMLCanvasElement.cpp
trunk/Source/WebCore/loader/FrameLoaderTypes.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h
trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (162494 => 162495)
--- trunk/Source/WebCore/ChangeLog 2014-01-22 03:24:51 UTC (rev 162494)
+++ trunk/Source/WebCore/ChangeLog 2014-01-22 04:01:01 UTC (rev 162495)
@@ -43,14 +43,6 @@
of the two original scales when doing so, so that it is absolutely certain
to fit inside space allocated for the image during layout.
-2014-01-21 Roger Fong
-
-Unreviewed. WebGLLoadPolicy::WebGLAsk is an unnecessary value.
-
-* html/HTMLCanvasElement.cpp:
-(WebCore::HTMLCanvasElement::getContext):
-* loader/FrameLoaderTypes.h:
-
2014-01-21 Simon Fraser
Remove #if PLATFORM(IOS) in various places around customFixedPositionLayoutRect() code
Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (162494 => 162495)
--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-01-22 03:24:51 UTC (rev 162494)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-01-22 04:01:01 UTC (rev 162495)
@@ -230,6 +230,9 @@
if (page && !document().url().isLocalFile()) {
WebGLLoadPolicy policy = page->mainFrame().loader().client().webGLPolicyForURL(document().url());
+if (policy == WebGLAsk)
+return nullptr;
+
if (policy == WebGLBlock)
return nullptr;
}
Modified: trunk/Source/WebCore/loader/FrameLoaderTypes.h (162494 => 162495)
--- trunk/Source/WebCore/loader/FrameLoaderTypes.h 2014-01-22 03:24:51 UTC (rev 162494)
+++ trunk/Source/WebCore/loader/FrameLoaderTypes.h 2014-01-22 04:01:01 UTC (rev 162495)
@@ -107,8 +107,9 @@
};
enum WebGLLoadPolicy {
-WebGLBlock = 0,
-WebGLAllow
+WebGLAsk = 0,
+WebGLAllow,
+WebGLBlock
};
}
Modified: trunk/Source/WebKit2/ChangeLog (162494 => 162495)
--- trunk/Source/WebKit2/ChangeLog 2014-01-22 03:24:51 UTC (rev 162494)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-22 04:01:01 UTC (rev 162495)
@@ -56,14 +56,6 @@
* UIProcess/mac/ViewGestureController.mm: Renamed from Source/WebKit2/UIProcess/mac/ViewGestureController.cpp.
* WebKit2.xcodeproj/project.pbxproj:
-2014-01-21 Roger Fong
-
-Unreviewed. WebGLLoadPolicy::WebGLAsk is an unnecessary value.
-
-* UIProcess/API/C/WKAPICast.h:
-(WebKit::toWebGLLoadPolicy):
-* UIProcess/API/C/WKPageLoaderClient.h:
-
2014-01-21 Anders Carlsson
Make all the WebKit2 headers private and move Cocoa UIProcess API headers to a Deprecated group
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (162494 => 162495)
--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2014-01-22 03:24:51 UTC (rev 162494)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2014-01-22 04:01:01 UTC (rev 162495)
@@ -480,6 +480,8 @@
inline WebCore::WebGLLoadPolicy toWebGLLoadPolicy(WKWebGLLoadPolicy webGLLoadPolicy)
{
switch (webGLLoadPolicy) {
+case kWKWebGLLoadPolicyInactive:
+return WebCore::WebGLAsk;
case kWKWebGLLoadPolicyLoadNormally:
return WebCore::WebGLAllow;
case kWKWebGLLoadPolicyBlocked:
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h (162494 => 162495)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-01-22 03:24:51 UTC (rev 162494)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-01-22 04:01:01 UTC (rev 162495)
@@ -43,8 +43,9 @@
typedef uint32_t WKPluginLoadPolicy;
enum {
-kWKWebGLLoadPolicyBlocked = 0,
+kWKWebGLLoadPolicyInactive = 0,
kWKWebGLLoadPolicyLoadNormally,
+kWKWebGLLoadPolicyBlocked
};
typedef uint32_t WKWebGLLoadPolicy;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [162434] trunk/Source/JavaScriptCore
Title: [162434] trunk/Source/_javascript_Core Revision 162434 Author mr...@apple.com Date 2014-01-21 03:47:42 -0800 (Tue, 21 Jan 2014) Log Message Mac production build fix. Move the shell script build phase to copy jsc into _javascript_Core.framework out of the jsc target and in to the All target so that it's not run during production builds. Xcode appears to the parent directories of paths referenced in the Output Files of the build phase, which leads to problems when the SYMROOT for the _javascript_Core framework and the jsc executables are later merged. I've also fixed the path to the Resources folder in the script while I'm here. On iOS the framework bundle is shallow so the correct destination is Resources/ rather than Versions/A/Resources. This is handled by tweaking the _javascript_CORE_RESOURCES_DIR configuration setting to be relative rather than a complete path so we can reuse it in the script. The references in JSC.xcconfig and ToolExecutable.xcconfig are updated to prepend _javascript_CORE_FRAMEWORKS_DIR to preserve their former values. * Configurations/Base.xcconfig: * Configurations/JSC.xcconfig: * Configurations/ToolExecutable.xcconfig: * _javascript_Core.xcodeproj/project.pbxproj: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/Base.xcconfig trunk/Source/_javascript_Core/Configurations/JSC.xcconfig trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj Diff Modified: trunk/Source/_javascript_Core/ChangeLog (162433 => 162434) --- trunk/Source/_javascript_Core/ChangeLog 2014-01-21 10:50:37 UTC (rev 162433) +++ trunk/Source/_javascript_Core/ChangeLog 2014-01-21 11:47:42 UTC (rev 162434) @@ -1,3 +1,26 @@ +2014-01-21 Mark Rowe + +Mac production build fix. + +Move the shell script build phase to copy jsc into _javascript_Core.framework +out of the jsc target and in to the All target so that it's not run during +production builds. Xcode appears to the parent directories of paths referenced +in the Output Files of the build phase, which leads to problems when the +SYMROOT for the _javascript_Core framework and the jsc executables are later merged. + +I've also fixed the path to the Resources folder in the script while I'm here. +On iOS the framework bundle is shallow so the correct destination is Resources/ +rather than Versions/A/Resources. This is handled by tweaking the +_javascript_CORE_RESOURCES_DIR configuration setting to be relative rather than +a complete path so we can reuse it in the script. The references in JSC.xcconfig +and ToolExecutable.xcconfig are updated to prepend _javascript_CORE_FRAMEWORKS_DIR +to preserve their former values. + +* Configurations/Base.xcconfig: +* Configurations/JSC.xcconfig: +* Configurations/ToolExecutable.xcconfig: +* _javascript_Core.xcodeproj/project.pbxproj: + 2014-01-19 Andreas Kling JSC Parser: Shrink BindingNode. Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (162433 => 162434) --- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-01-21 10:50:37 UTC (rev 162433) +++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-01-21 11:47:42 UTC (rev 162434) @@ -101,9 +101,9 @@ _javascript_CORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari; _javascript_CORE_RESOURCES_DIR = $(_javascript_CORE_RESOURCES_DIR_$(PLATFORM_NAME)); -_javascript_CORE_RESOURCES_DIR_iphoneos = $(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/Resources; +_javascript_CORE_RESOURCES_DIR_iphoneos = _javascript_Core.framework/Resources; _javascript_CORE_RESOURCES_DIR_iphonesimulator = $(_javascript_CORE_RESOURCES_DIR_iphoneos); -_javascript_CORE_RESOURCES_DIR_macosx = $(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/Versions/A/Resources; +_javascript_CORE_RESOURCES_DIR_macosx = _javascript_Core.framework/Versions/A/Resources; // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants. // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant. Modified: trunk/Source/_javascript_Core/Configurations/JSC.xcconfig (162433 => 162434) --- trunk/Source/_javascript_Core/Configurations/JSC.xcconfig 2014-01-21 10:50:37 UTC (rev 162433) +++ trunk/Source/_javascript_Core/Configurations/JSC.xcconfig 2014-01-21 11:47:42 UTC (rev 162434) @@ -24,7 +24,7 @@ #include "FeatureDefines.xcconfig" #include "Version.xcconfig" -INSTALL_PATH_ACTUAL = $(_javascript_CORE_RESOURCES_DIR); +INSTALL_PATH_ACTUAL = $(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_RESOURCES_DIR); PRODUCT_NAME = jsc; CODE_SIGN_ENTITLEMENTS = $(CODE_SI
[webkit-changes] [162048] trunk/Source/WebKit/mac
Title: [162048] trunk/Source/WebKit/mac
Revision 162048
Author mr...@apple.com
Date 2014-01-14 22:34:14 -0800 (Tue, 14 Jan 2014)
Log Message
Stop cmp from spewing useless info during postprocess-headers.sh.
* postprocess-headers.sh: Pass -s to silence cmp since we only care about the
exit status.
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/postprocess-headers.sh
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (162047 => 162048)
--- trunk/Source/WebKit/mac/ChangeLog 2014-01-15 06:31:16 UTC (rev 162047)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-15 06:34:14 UTC (rev 162048)
@@ -1,3 +1,10 @@
+2014-01-14 Mark Rowe
+
+Stop cmp from spewing useless info during postprocess-headers.sh.
+
+* postprocess-headers.sh: Pass -s to silence cmp since we only care about the
+exit status.
+
2014-01-14 Joseph Pecoraro
[iOS] Crash in NavigatorBase::vendor loading apple.com
Modified: trunk/Source/WebKit/mac/postprocess-headers.sh (162047 => 162048)
--- trunk/Source/WebKit/mac/postprocess-headers.sh 2014-01-15 06:31:16 UTC (rev 162047)
+++ trunk/Source/WebKit/mac/postprocess-headers.sh 2014-01-15 06:34:14 UTC (rev 162048)
@@ -39,7 +39,7 @@
fi
sed -E -e "${sedExpression}" < ${header} > ${header}.sed
-if cmp ${header} ${header}.sed; then
+if cmp -s ${header} ${header}.sed; then
rm ${header}.sed
else
mv ${header}.sed ${header}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [161998] trunk/Source/WebKit2
Title: [161998] trunk/Source/WebKit2
Revision 161998
Author mr...@apple.com
Date 2014-01-14 13:19:12 -0800 (Tue, 14 Jan 2014)
Log Message
WebKit2 leaks sudden termination assertions when a page with unload handlers is closed.
/
When a page with an unload handler is loaded, the web process tells the UI process that it
should disable sudden termination. However, when the page is closed the connection between
the web and UI process is torn down before the web content has a chance to tell the UI
process to reenable sudden termination.
Reviewed by Anders Carlsson.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::WebProcessProxy):
(WebKit::WebProcessProxy::~WebProcessProxy): Balance any outstanding disableSuddenTermination calls.
(WebKit::WebProcessProxy::enableSuddenTermination): Decrement the count.
(WebKit::WebProcessProxy::disableSuddenTermination): Increment the count.
* UIProcess/WebProcessProxy.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp
trunk/Source/WebKit2/UIProcess/WebProcessProxy.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (161997 => 161998)
--- trunk/Source/WebKit2/ChangeLog 2014-01-14 20:59:26 UTC (rev 161997)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-14 21:19:12 UTC (rev 161998)
@@ -1,3 +1,22 @@
+2014-01-14 Mark Rowe
+
+WebKit2 leaks sudden termination assertions when a page with unload handlers is closed.
+ /
+
+When a page with an unload handler is loaded, the web process tells the UI process that it
+should disable sudden termination. However, when the page is closed the connection between
+the web and UI process is torn down before the web content has a chance to tell the UI
+process to reenable sudden termination.
+
+Reviewed by Anders Carlsson.
+
+* UIProcess/WebProcessProxy.cpp:
+(WebKit::WebProcessProxy::WebProcessProxy):
+(WebKit::WebProcessProxy::~WebProcessProxy): Balance any outstanding disableSuddenTermination calls.
+(WebKit::WebProcessProxy::enableSuddenTermination): Decrement the count.
+(WebKit::WebProcessProxy::disableSuddenTermination): Increment the count.
+* UIProcess/WebProcessProxy.h:
+
2014-01-14 Joseph Pecoraro
Web Inspector: For Remote Inspection link WebProcess's to their parent UIProcess
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (161997 => 161998)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-01-14 20:59:26 UTC (rev 161997)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-01-14 21:19:12 UTC (rev 161998)
@@ -94,6 +94,7 @@
#if PLATFORM(MAC)
, m_processSuppressionEnabled(false)
#endif
+, m_numberOfTimesSuddenTerminationWasDisabled(0)
{
connect();
}
@@ -102,6 +103,9 @@
{
if (m_webConnection)
m_webConnection->invalidate();
+
+while (m_numberOfTimesSuddenTerminationWasDisabled-- > 0)
+WebCore::enableSuddenTermination();
}
void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
@@ -662,7 +666,9 @@
if (!isValid())
return;
+ASSERT(m_numberOfTimesSuddenTerminationWasDisabled);
WebCore::enableSuddenTermination();
+--m_numberOfTimesSuddenTerminationWasDisabled;
}
void WebProcessProxy::disableSuddenTermination()
@@ -671,6 +677,7 @@
return;
WebCore::disableSuddenTermination();
+++m_numberOfTimesSuddenTerminationWasDisabled;
}
RefPtr WebProcessProxy::apiObjectByConvertingToHandles(API::Object* object)
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (161997 => 161998)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-01-14 20:59:26 UTC (rev 161997)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-01-14 21:19:12 UTC (rev 161998)
@@ -208,6 +208,8 @@
HashSet m_processSuppressiblePages;
bool m_processSuppressionEnabled;
#endif
+
+int m_numberOfTimesSuddenTerminationWasDisabled;
};
} // namespace WebKit
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [161995] trunk/Source/WebCore
Title: [161995] trunk/Source/WebCore
Revision 161995
Author mr...@apple.com
Date 2014-01-14 12:28:23 -0800 (Tue, 14 Jan 2014)
Log Message
WebCore icon database appears to leak sudden termination assertions
/
Introduce an RAII wrapper around disableSuddenTermination / enableSuddenTermination
and adopt it in IconDatabase to address the incorrect management of sudden termination.
IconDatabase now owns up to two SuddenTerminationDisabler objects. One ensures that
sudden termination is disabled while we're waiting on the sync timer to fire. The second
ensures that sudden termination is disabled while we're waiting on the sync thread to
process any pending work.
Reviewed by Alexey Proskuryakov.
* loader/icon/IconDatabase.cpp:
(WebCore::IconDatabase::IconDatabase):
(WebCore::IconDatabase::wakeSyncThread): Disable sudden termination until the sync thread
has finished this unit of work.
(WebCore::IconDatabase::scheduleOrDeferSyncTimer): Disable sudden termination until the
sync timer has fired.
(WebCore::IconDatabase::syncTimerFired): Clear the member variable to reenable sudden termination.
(WebCore::IconDatabase::syncThreadMainLoop): Taken ownership of the SuddenTerminationDisabler
instance when we start processing a unit of work. Discard the object when our work is complete.
* loader/icon/IconDatabase.h:
* platform/SuddenTermination.h:
(WebCore::SuddenTerminationDisabler::SuddenTerminationDisabler): Disable sudden termination when created.
(WebCore::SuddenTerminationDisabler::~SuddenTerminationDisabler): Enable it when destroyed.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/icon/IconDatabase.cpp
trunk/Source/WebCore/loader/icon/IconDatabase.h
trunk/Source/WebCore/platform/SuddenTermination.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (161994 => 161995)
--- trunk/Source/WebCore/ChangeLog 2014-01-14 20:23:41 UTC (rev 161994)
+++ trunk/Source/WebCore/ChangeLog 2014-01-14 20:28:23 UTC (rev 161995)
@@ -1,3 +1,32 @@
+2014-01-14 Mark Rowe
+
+WebCore icon database appears to leak sudden termination assertions
+ /
+
+Introduce an RAII wrapper around disableSuddenTermination / enableSuddenTermination
+and adopt it in IconDatabase to address the incorrect management of sudden termination.
+
+IconDatabase now owns up to two SuddenTerminationDisabler objects. One ensures that
+sudden termination is disabled while we're waiting on the sync timer to fire. The second
+ensures that sudden termination is disabled while we're waiting on the sync thread to
+process any pending work.
+
+Reviewed by Alexey Proskuryakov.
+
+* loader/icon/IconDatabase.cpp:
+(WebCore::IconDatabase::IconDatabase):
+(WebCore::IconDatabase::wakeSyncThread): Disable sudden termination until the sync thread
+has finished this unit of work.
+(WebCore::IconDatabase::scheduleOrDeferSyncTimer): Disable sudden termination until the
+sync timer has fired.
+(WebCore::IconDatabase::syncTimerFired): Clear the member variable to reenable sudden termination.
+(WebCore::IconDatabase::syncThreadMainLoop): Taken ownership of the SuddenTerminationDisabler
+instance when we start processing a unit of work. Discard the object when our work is complete.
+* loader/icon/IconDatabase.h:
+* platform/SuddenTermination.h:
+(WebCore::SuddenTerminationDisabler::SuddenTerminationDisabler): Disable sudden termination when created.
+(WebCore::SuddenTerminationDisabler::~SuddenTerminationDisabler): Enable it when destroyed.
+
2014-01-14 Joseph Pecoraro
Web Inspector: For Remote Inspection link WebProcess's to their parent UIProcess
Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (161994 => 161995)
--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2014-01-14 20:23:41 UTC (rev 161994)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2014-01-14 20:28:23 UTC (rev 161995)
@@ -797,7 +797,6 @@
, m_removeIconsRequested(false)
, m_iconURLImportComplete(false)
, m_syncThreadHasWorkToDo(false)
-, m_disabledSuddenTerminationForSyncThread(false)
, m_retainOrReleaseIconRequested(false)
, m_initialPruningComplete(false)
, m_client(defaultClient())
@@ -838,14 +837,8 @@
{
MutexLocker locker(m_syncLock);
-if (!m_disabledSuddenTerminationForSyncThread) {
-m_disabledSuddenTerminationForSyncThread = true;
-// The following is balanced by the call to enableSuddenTermination in the
-// syncThreadMainLoop function.
-// FIXME: It would be better to only disable sudden termination if we have
-// something to write, not just if we have something to read.
-disableSuddenTermination();
-}
+if (!m_disableSuddenTerminationWhileSyncThreadHasWorkToDo)
+m_disableSuddenTerminationWhileSyncThreadHasWorkToDo = std::make_unique();
m_syncThre
[webkit-changes] [161415] trunk/Source
Title: [161415] trunk/Source
Revision 161415
Author mr...@apple.com
Date 2014-01-07 01:46:36 -0800 (Tue, 07 Jan 2014)
Log Message
DOMProgressEvent has unspecified availability
Reviewed by Ryosuke Niwa.
Source/WebCore:
* bindings/objc/PublicDOMInterfaces.h: Add DOMProgressEvent. It first appeared in 10.6.
Source/WebKit/mac:
* MigrateHeaders.make: Ensure that public DOM headers do not have unspecified availability.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/objc/PublicDOMInterfaces.h
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/MigrateHeaders.make
Diff
Modified: trunk/Source/WebCore/ChangeLog (161414 => 161415)
--- trunk/Source/WebCore/ChangeLog 2014-01-07 09:42:26 UTC (rev 161414)
+++ trunk/Source/WebCore/ChangeLog 2014-01-07 09:46:36 UTC (rev 161415)
@@ -1,5 +1,13 @@
2014-01-07 Mark Rowe
+ DOMProgressEvent has unspecified availability
+
+Reviewed by Ryosuke Niwa.
+
+* bindings/objc/PublicDOMInterfaces.h: Add DOMProgressEvent. It first appeared in 10.6.
+
+2014-01-07 Mark Rowe
+
Another Mountain Lion build fix.
The Mountain Lion version of NS_DEPRECATED_MAC generates a reference to a nonexistent
Modified: trunk/Source/WebCore/bindings/objc/PublicDOMInterfaces.h (161414 => 161415)
--- trunk/Source/WebCore/bindings/objc/PublicDOMInterfaces.h 2014-01-07 09:42:26 UTC (rev 161414)
+++ trunk/Source/WebCore/bindings/objc/PublicDOMInterfaces.h 2014-01-07 09:46:36 UTC (rev 161415)
@@ -1216,6 +1216,12 @@
- (DOMXPathResult *)evaluate:(DOMNode *)contextNode :(unsigned short)type :(DOMXPathResult *)inResult WEBKIT_DEPRECATED_MAC(10_5, 10_5);
@end
+@interface DOMProgressEvent : DOMEvent 10_6
+@property (readonly) BOOL lengthComputable;
+@property (readonly) unsigned long long loaded;
+@property (readonly) unsigned long long total;
+@end
+
// Protocols
@protocol DOMEventListener 10_4
Modified: trunk/Source/WebKit/mac/ChangeLog (161414 => 161415)
--- trunk/Source/WebKit/mac/ChangeLog 2014-01-07 09:42:26 UTC (rev 161414)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-07 09:46:36 UTC (rev 161415)
@@ -1,3 +1,11 @@
+2014-01-07 Mark Rowe
+
+ DOMProgressEvent has unspecified availability
+
+Reviewed by Ryosuke Niwa.
+
+* MigrateHeaders.make: Ensure that public DOM headers do not have unspecified availability.
+
2014-01-06 Mark Rowe
Mountain Lion build fix after r161332.
Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (161414 => 161415)
--- trunk/Source/WebKit/mac/MigrateHeaders.make 2014-01-07 09:42:26 UTC (rev 161414)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make 2014-01-07 09:46:36 UTC (rev 161415)
@@ -192,14 +192,17 @@
REPLACE_RULES = -e s/\ HEADER_MIGRATE_CMD = sed $(REPLACE_RULES) $< > $@
+PUBLIC_HEADER_CHECK_CMD = @if grep -q "AVAILABLE.*TBD" "$<"; then line=$$(awk "/AVAILABLE.*TBD/ { print FNR; exit }" "$<" ); echo "$<:$$line: error: A class within a public header has unspecified availability."; false; fi
$(PUBLIC_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
+ $(PUBLIC_HEADER_CHECK_CMD)
$(HEADER_MIGRATE_CMD)
$(PRIVATE_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
$(HEADER_MIGRATE_CMD)
$(PUBLIC_HEADERS_DIR)/% : % MigrateHeaders.make
+ $(PUBLIC_HEADER_CHECK_CMD)
$(HEADER_MIGRATE_CMD)
$(PRIVATE_HEADERS_DIR)/% : % MigrateHeaders.make
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [161414] trunk/Source/JavaScriptCore
Title: [161414] trunk/Source/_javascript_Core Revision 161414 Author mr...@apple.com Date 2014-01-07 01:42:26 -0800 (Tue, 07 Jan 2014) Log Message Remove the legacy WebKit availability macros They're no longer used. Reviewed by Ryosuke Niwa. * API/WebKitAvailability.h: Modified Paths trunk/Source/_javascript_Core/API/WebKitAvailability.h trunk/Source/_javascript_Core/ChangeLog Diff Modified: trunk/Source/_javascript_Core/API/WebKitAvailability.h (161413 => 161414) --- trunk/Source/_javascript_Core/API/WebKitAvailability.h 2014-01-07 09:36:46 UTC (rev 161413) +++ trunk/Source/_javascript_Core/API/WebKitAvailability.h 2014-01-07 09:42:26 UTC (rev 161414) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008, 2009, 2010 Apple Inc. All Rights Reserved. + * Copyright (C) 2008, 2009, 2010, 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 @@ -26,900 +26,11 @@ #ifndef __WebKitAvailability__ #define __WebKitAvailability__ -/* The structure of this header is based on AvailabilityMacros.h. The major difference is that the availability - macros are defined in terms of WebKit version numbers rather than Mac OS X system version numbers, as WebKit - releases span multiple versions of Mac OS X. -*/ - -#define WEBKIT_VERSION_1_00x0100 -#define WEBKIT_VERSION_1_10x0110 -#define WEBKIT_VERSION_1_20x0120 -#define WEBKIT_VERSION_1_30x0130 -#define WEBKIT_VERSION_2_00x0200 -#define WEBKIT_VERSION_3_00x0300 -#define WEBKIT_VERSION_3_10x0310 -#define WEBKIT_VERSION_4_00x0400 -#define WEBKIT_VERSION_LATEST 0x - #ifdef __APPLE__ #include #include #else #define CF_AVAILABLE(_mac, _ios) -/* - * For non-Mac platforms, require the newest version. - */ -#define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_LATEST -/* - * only certain compilers support __attribute__((deprecated)) - */ -#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) -#define DEPRECATED_ATTRIBUTE __attribute__((deprecated)) -#else -#define DEPRECATED_ATTRIBUTE #endif -#endif -/* The versions of GCC that shipped with Xcode prior to 3.0 (GCC build number < 5400) did not support attributes on methods. - If we are building with one of these versions, we need to omit the attribute. We achieve this by wrapping the annotation - in WEBKIT_OBJC_METHOD_ANNOTATION, which will remove the annotation when an old version of GCC is in use and will otherwise - expand to the annotation. The same is needed for protocol methods. -*/ -#if defined(__APPLE_CC__) && __APPLE_CC__ < 5400 -#define WEBKIT_OBJC_METHOD_ANNOTATION(ANNOTATION) -#else -#define WEBKIT_OBJC_METHOD_ANNOTATION(ANNOTATION) ANNOTATION -#endif - - -/* If minimum WebKit version is not specified, assume the version that shipped with the target Mac OS X version */ -#ifndef WEBKIT_VERSION_MIN_REQUIRED -#if !defined(MAC_OS_X_VERSION_10_2) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_2 -#error WebKit was not available prior to Mac OS X 10.2 -#elif !defined(MAC_OS_X_VERSION_10_3) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_3 -/* WebKit 1.0 is the only version available on Mac OS X 10.2. */ -#define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_1_0 -#elif !defined(MAC_OS_X_VERSION_10_4) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4 -/* WebKit 1.1 is the version that shipped on Mac OS X 10.3. */ -#define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_1_1 -#elif !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 -/* WebKit 2.0 is the version that shipped on Mac OS X 10.4. */ -#define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_2_0 -#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6 -/* WebKit 3.0 is the version that shipped on Mac OS X 10.5. */ -#define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_3_0 -#elif !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7 -/* WebKit 4.0 is the version that shipped on Mac OS X 10.6. */ -#define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_4_0 -#else -#define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_LATEST -#endif -#endif - - -/* If maximum WebKit version is not specified, assume largerof(latest, minimum) */ -#ifndef WEBKIT_VERSION_MAX_ALLOWED -#if WEBKIT_VERSION_MIN_REQUIRED > WEBKIT_VERSION_LATEST -#define WEBKIT_VERSION_MAX_ALLOWED WEBKIT_VERSION_MIN_REQUIRED -#else -#define WEBKIT_VERSION_MAX_ALLOWED WEBKIT_VERSION_LATEST -#endif -#endif - - -/* Sanity check the configured values */ -#if WEBKIT_VERSION_MAX_ALLOWED < WEBKIT_VERSION_MIN_REQUIRED -#error WEBKIT_VERSION_MAX_ALLOWED must be >= WEBKIT_VERSION_MIN_REQUIRED -#endif -#if WEBKIT_VERSION_MIN
[webkit-changes] [161412] trunk/Source/WebCore
Title: [161412] trunk/Source/WebCore Revision 161412 Author mr...@apple.com Date 2014-01-07 00:46:53 -0800 (Tue, 07 Jan 2014) Log Message Another Mountain Lion build fix. The Mountain Lion version of NS_DEPRECATED_MAC generates a reference to a nonexistent availability macro when the introduced and deprecated versions are the same. Follow AppKit's lead in working around this by defining the macros that will be referenced for the various possible OS version numbers. This isn't an issue on newer versions of OS X as the Foundation availability macros expand directly in to __attributes__ rather than in to the legacy availability maros. * bindings/objc/WebKitAvailability.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/bindings/objc/WebKitAvailability.h Diff Modified: trunk/Source/WebCore/ChangeLog (161411 => 161412) --- trunk/Source/WebCore/ChangeLog 2014-01-07 08:22:04 UTC (rev 161411) +++ trunk/Source/WebCore/ChangeLog 2014-01-07 08:46:53 UTC (rev 161412) @@ -1,3 +1,16 @@ +2014-01-07 Mark Rowe + +Another Mountain Lion build fix. + +The Mountain Lion version of NS_DEPRECATED_MAC generates a reference to a nonexistent +availability macro when the introduced and deprecated versions are the same. Follow +AppKit's lead in working around this by defining the macros that will be referenced +for the various possible OS version numbers. This isn't an issue on newer versions of +OS X as the Foundation availability macros expand directly in to __attributes__ rather +than in to the legacy availability maros. + +* bindings/objc/WebKitAvailability.h: + 2014-01-06 Mark Rowe Mountain Lion build fix. Modified: trunk/Source/WebCore/bindings/objc/WebKitAvailability.h (161411 => 161412) --- trunk/Source/WebCore/bindings/objc/WebKitAvailability.h 2014-01-07 08:22:04 UTC (rev 161411) +++ trunk/Source/WebCore/bindings/objc/WebKitAvailability.h 2014-01-07 08:46:53 UTC (rev 161412) @@ -38,6 +38,17 @@ #define __AVAILABILITY_INTERNAL__MAC_TBD __attribute__((availability(macosx,introduced=9876.5))) +#ifndef AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_0 +#define AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_0 DEPRECATED_IN_MAC_OS_X_VERSION_10_0_AND_LATER +#define AVAILABLE_MAC_OS_X_VERSION_10_1_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_1 DEPRECATED_IN_MAC_OS_X_VERSION_10_1_AND_LATER +#define AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_2 DEPRECATED_IN_MAC_OS_X_VERSION_10_2_AND_LATER +#define AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3 DEPRECATED_IN_MAC_OS_X_VERSION_10_3_AND_LATER +#define AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4 DEPRECATED_IN_MAC_OS_X_VERSION_10_4_AND_LATER +#define AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_5 DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER +#define AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_6 DEPRECATED_IN_MAC_OS_X_VERSION_10_6_AND_LATER +#define AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7 DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER +#endif + #else #define WEBKIT_AVAILABLE_MAC(introduced) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [161410] trunk/Source/WebCore
Title: [161410] trunk/Source/WebCore Revision 161410 Author mr...@apple.com Date 2014-01-06 23:26:58 -0800 (Mon, 06 Jan 2014) Log Message Mountain Lion build fix. * bindings/objc/WebKitAvailability.h: #define __AVAILABILITY_INTERNAL__MAC_TBD so that the TBD version works on Mountain Lion. Newer OS versions use a slightly different set of macros that already support this version. Add a missing #include so that defintions of the Foundation availability macros can be found even if no other Foundation headers were included first. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/bindings/objc/WebKitAvailability.h Diff Modified: trunk/Source/WebCore/ChangeLog (161409 => 161410) --- trunk/Source/WebCore/ChangeLog 2014-01-07 07:19:46 UTC (rev 161409) +++ trunk/Source/WebCore/ChangeLog 2014-01-07 07:26:58 UTC (rev 161410) @@ -1,3 +1,13 @@ +2014-01-06 Mark Rowe + +Mountain Lion build fix. + +* bindings/objc/WebKitAvailability.h: #define __AVAILABILITY_INTERNAL__MAC_TBD so that +the TBD version works on Mountain Lion. Newer OS versions use a slightly different set +of macros that already support this version. Add a missing #include so that defintions +of the Foundation availability macros can be found even if no other Foundation headers +were included first. + 2014-01-06 Gyuyoung Kim Unreviewed, rolling out r161401. Modified: trunk/Source/WebCore/bindings/objc/WebKitAvailability.h (161409 => 161410) --- trunk/Source/WebCore/bindings/objc/WebKitAvailability.h 2014-01-07 07:19:46 UTC (rev 161409) +++ trunk/Source/WebCore/bindings/objc/WebKitAvailability.h 2014-01-07 07:26:58 UTC (rev 161410) @@ -29,12 +29,15 @@ #import #if !TARGET_OS_IPHONE +#import #define WEBKIT_AVAILABLE_MAC(introduced) NS_AVAILABLE_MAC(introduced) #define WEBKIT_CLASS_AVAILABLE_MAC(introduced) NS_CLASS_AVAILABLE_MAC(introduced) #define WEBKIT_ENUM_AVAILABLE_MAC(introduced) NS_ENUM_AVAILABLE_MAC(introduced) #define WEBKIT_DEPRECATED_MAC(introduced, deprecated) NS_DEPRECATED_MAC(introduced, deprecated) +#define __AVAILABILITY_INTERNAL__MAC_TBD __attribute__((availability(macosx,introduced=9876.5))) + #else #define WEBKIT_AVAILABLE_MAC(introduced) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [161397] trunk/Source/WebCore
Title: [161397] trunk/Source/WebCore
Revision 161397
Author mr...@apple.com
Date 2014-01-06 20:45:57 -0800 (Mon, 06 Jan 2014)
Log Message
Be more correct in dealing with NSControlSize
Reviewed by Ryosuke Niwa.
* platform/mac/ScrollbarThemeMac.mm:
(WebCore::scrollbarControlSizeToNSControlSize): Helper function to map from ScrollbarControlSize
to NSControlSize.
(WebCore::ScrollbarThemeMac::registerScrollbar): Use the helper rather than casting.
(WebCore::ScrollbarThemeMac::scrollbarThickness): Use the helper.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::progressBarRectForBounds): Update the type of the local to NSControlSize.
(WebCore::RenderThemeMac::paintProgressBar): Ditto.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm
trunk/Source/WebCore/rendering/RenderThemeMac.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (161396 => 161397)
--- trunk/Source/WebCore/ChangeLog 2014-01-07 04:00:31 UTC (rev 161396)
+++ trunk/Source/WebCore/ChangeLog 2014-01-07 04:45:57 UTC (rev 161397)
@@ -1,3 +1,18 @@
+2014-01-06 Mark Rowe
+
+ Be more correct in dealing with NSControlSize
+
+Reviewed by Ryosuke Niwa.
+
+* platform/mac/ScrollbarThemeMac.mm:
+(WebCore::scrollbarControlSizeToNSControlSize): Helper function to map from ScrollbarControlSize
+to NSControlSize.
+(WebCore::ScrollbarThemeMac::registerScrollbar): Use the helper rather than casting.
+(WebCore::ScrollbarThemeMac::scrollbarThickness): Use the helper.
+* rendering/RenderThemeMac.mm:
+(WebCore::RenderThemeMac::progressBarRectForBounds): Update the type of the local to NSControlSize.
+(WebCore::RenderThemeMac::paintProgressBar): Ditto.
+
2014-01-06 Brent Fulgham
[WebGL] Be safer about toggling OpenGL state by using a scoped object to control setting lifetime.
Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (161396 => 161397)
--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2014-01-07 04:00:31 UTC (rev 161396)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2014-01-07 04:45:57 UTC (rev 161397)
@@ -156,10 +156,23 @@
}
}
+static NSControlSize scrollbarControlSizeToNSControlSize(ScrollbarControlSize controlSize)
+{
+switch (controlSize) {
+case RegularScrollbar:
+return NSRegularControlSize;
+case SmallScrollbar:
+return NSSmallControlSize;
+}
+
+ASSERT_NOT_REACHED();
+return NSRegularControlSize;
+}
+
void ScrollbarThemeMac::registerScrollbar(ScrollbarThemeClient* scrollbar)
{
bool isHorizontal = scrollbar->orientation() == HorizontalScrollbar;
-ScrollbarPainter scrollbarPainter = [NSClassFromString(@"NSScrollerImp") scrollerImpWithStyle:recommendedScrollerStyle() controlSize:(NSControlSize)scrollbar->controlSize() horizontal:isHorizontal replacingScrollerImp:nil];
+ScrollbarPainter scrollbarPainter = [NSClassFromString(@"NSScrollerImp") scrollerImpWithStyle:recommendedScrollerStyle() controlSize:scrollbarControlSizeToNSControlSize(scrollbar->controlSize()) horizontal:isHorizontal replacingScrollerImp:nil];
scrollbarMap()->add(scrollbar, scrollbarPainter);
updateEnabledState(scrollbar);
updateScrollbarOverlayStyle(scrollbar);
@@ -223,7 +236,7 @@
int ScrollbarThemeMac::scrollbarThickness(ScrollbarControlSize controlSize)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
-ScrollbarPainter scrollbarPainter = [NSClassFromString(@"NSScrollerImp") scrollerImpWithStyle:recommendedScrollerStyle() controlSize:controlSize horizontal:NO replacingScrollerImp:nil];
+ScrollbarPainter scrollbarPainter = [NSClassFromString(@"NSScrollerImp") scrollerImpWithStyle:recommendedScrollerStyle() controlSize:scrollbarControlSizeToNSControlSize(controlSize) horizontal:NO replacingScrollerImp:nil];
if (supportsExpandedScrollbars())
[scrollbarPainter setExpanded:YES];
return [scrollbarPainter trackBoxWidth];
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (161396 => 161397)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-01-07 04:00:31 UTC (rev 161396)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-01-07 04:45:57 UTC (rev 161397)
@@ -991,7 +991,7 @@
return bounds;
float zoomLevel = renderObject->style().effectiveZoom();
-int controlSize = controlSizeForFont(&renderObject->style());
+NSControlSize controlSize = controlSizeForFont(&renderObject->style());
IntSize size = progressBarSizes()[controlSize];
size.setHeight(size.height() * zoomLevel);
size.setWidth(bounds.width());
@@ -1029,7 +1029,7 @@
return true;
IntRect inflatedRect = progressBarRectForBounds(renderObject, rect);
-int controlSize = controlSizeForFont(&renderObject->style());
+NSControlSize controlSize = controlSizeForFont(&renderObject->style());
RenderProgress* renderProgress = toRenderProgress(renderObject);
HIT
[webkit-changes] [161396] trunk/Tools
Title: [161396] trunk/Tools
Revision 161396
Author mr...@apple.com
Date 2014-01-06 20:00:31 -0800 (Mon, 06 Jan 2014)
Log Message
Fix incorrectness in use of some AppKit enums
Reviewed by Ryosuke Niwa.
* DumpRenderTree/mac/DumpRenderTree.mm:
(-[DRTMockScroller rectForPart:]): Move to using an if with early return instead of a switch
with a single case. This avoids the potential for warnings about unhandled cases.
* WebKitTestRunner/mac/PlatformWebViewMac.mm:
(WTR::PlatformWebView::PlatformWebView): Cast the argument to NSBackingStoreType.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm
trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm
Diff
Modified: trunk/Tools/ChangeLog (161395 => 161396)
--- trunk/Tools/ChangeLog 2014-01-07 03:52:38 UTC (rev 161395)
+++ trunk/Tools/ChangeLog 2014-01-07 04:00:31 UTC (rev 161396)
@@ -1,3 +1,15 @@
+2014-01-06 Mark Rowe
+
+ Fix incorrectness in use of some AppKit enums
+
+Reviewed by Ryosuke Niwa.
+
+* DumpRenderTree/mac/DumpRenderTree.mm:
+(-[DRTMockScroller rectForPart:]): Move to using an if with early return instead of a switch
+with a single case. This avoids the potential for warnings about unhandled cases.
+* WebKitTestRunner/mac/PlatformWebViewMac.mm:
+(WTR::PlatformWebView::PlatformWebView): Cast the argument to NSBackingStoreType.
+
2014-01-04 Carlos Garcia Campos
[GTK] Move all GTK/GObject unit tests to Tools/TestWebKitAPI
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (161395 => 161396)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-01-07 03:52:38 UTC (rev 161395)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-01-07 04:00:31 UTC (rev 161396)
@@ -479,24 +479,21 @@
- (NSRect)rectForPart:(NSScrollerPart)partCode
{
-switch (partCode) {
-case NSScrollerKnob: {
-NSRect frameRect = [self frame];
-NSRect bounds = [self bounds];
-BOOL isHorizontal = frameRect.size.width > frameRect.size.height;
-CGFloat trackLength = isHorizontal ? bounds.size.width : bounds.size.height;
-CGFloat minKnobSize = isHorizontal ? bounds.size.height : bounds.size.width;
-CGFloat knobLength = max(minKnobSize, static_cast(round(trackLength * [self knobProportion])));
-CGFloat knobPosition = static_cast((round([self doubleValue] * (trackLength - knobLength;
-
-if (isHorizontal)
-return NSMakeRect(bounds.origin.x + knobPosition, bounds.origin.y, knobLength, bounds.size.height);
+if (partCode != NSScrollerKnob)
+return [super rectForPart:partCode];
-return NSMakeRect(bounds.origin.x, bounds.origin.y + + knobPosition, bounds.size.width, knobLength);
-}
-}
+NSRect frameRect = [self frame];
+NSRect bounds = [self bounds];
+BOOL isHorizontal = frameRect.size.width > frameRect.size.height;
+CGFloat trackLength = isHorizontal ? bounds.size.width : bounds.size.height;
+CGFloat minKnobSize = isHorizontal ? bounds.size.height : bounds.size.width;
+CGFloat knobLength = max(minKnobSize, static_cast(round(trackLength * [self knobProportion])));
+CGFloat knobPosition = static_cast((round([self doubleValue] * (trackLength - knobLength;
-return [super rectForPart:partCode];
+if (isHorizontal)
+return NSMakeRect(bounds.origin.x + knobPosition, bounds.origin.y, knobLength, bounds.size.height);
+
+return NSMakeRect(bounds.origin.x, bounds.origin.y + + knobPosition, bounds.size.width, knobLength);
}
- (void)drawKnob
Modified: trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm (161395 => 161396)
--- trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2014-01-07 03:52:38 UTC (rev 161395)
+++ trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2014-01-07 04:00:31 UTC (rev 161396)
@@ -137,7 +137,7 @@
[m_view setWindowOcclusionDetectionEnabled:NO];
NSRect windowRect = NSOffsetRect(rect, -1, [(NSScreen *)[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.size.height + 1);
-m_window = [[WebKitTestRunnerWindow alloc] initWithContentRect:windowRect styleMask:NSBorderlessWindowMask backing:_NSBackingStoreUnbuffered defer:YES];
+m_window = [[WebKitTestRunnerWindow alloc] initWithContentRect:windowRect styleMask:NSBorderlessWindowMask backing:(NSBackingStoreType)_NSBackingStoreUnbuffered defer:YES];
m_window.platformWebView = this;
[m_window setColorSpace:[[NSScreen mainScreen] colorSpace]];
[m_window setCollectionBehavior:NSWindowCollectionBehaviorStationary];
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [161347] trunk/Source/WebKit/mac
Title: [161347] trunk/Source/WebKit/mac Revision 161347 Author mr...@apple.com Date 2014-01-06 09:22:39 -0800 (Mon, 06 Jan 2014) Log Message Mountain Lion build fix after r161332. * Carbon/HIWebView.h: Mountain Lion's version of CF_AVAILABLE_MAC doesn't accept a message argument so remove it. Modified Paths trunk/Source/WebKit/mac/Carbon/HIWebView.h trunk/Source/WebKit/mac/ChangeLog Diff Modified: trunk/Source/WebKit/mac/Carbon/HIWebView.h (161346 => 161347) --- trunk/Source/WebKit/mac/Carbon/HIWebView.h 2014-01-06 16:29:01 UTC (rev 161346) +++ trunk/Source/WebKit/mac/Carbon/HIWebView.h 2014-01-06 17:22:39 UTC (rev 161347) @@ -67,7 +67,7 @@ *Non-Carbon CFM: not available */ extern OSStatus -HIWebViewCreate(HIViewRef * outControl) CF_DEPRECATED_MAC(10_3, 10_6, "Use WebView instead."); +HIWebViewCreate(HIViewRef * outControl) CF_DEPRECATED_MAC(10_3, 10_6); #ifdef __OBJC__ Modified: trunk/Source/WebKit/mac/ChangeLog (161346 => 161347) --- trunk/Source/WebKit/mac/ChangeLog 2014-01-06 16:29:01 UTC (rev 161346) +++ trunk/Source/WebKit/mac/ChangeLog 2014-01-06 17:22:39 UTC (rev 161347) @@ -1,5 +1,12 @@ 2014-01-06 Mark Rowe +Mountain Lion build fix after r161332. + +* Carbon/HIWebView.h: Mountain Lion's version of CF_AVAILABLE_MAC doesn't accept a message +argument so remove it. + +2014-01-06 Mark Rowe + Move WebKit off the legacy WebKit availability macros The legacy WebKit availability macros are verbose, confusing, and provide no benefit ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [161332] trunk/Source
Title: [161332] trunk/Source
Revision 161332
Author mr...@apple.com
Date 2014-01-06 00:15:52 -0800 (Mon, 06 Jan 2014)
Log Message
Move WebKit off the legacy WebKit availability macros
The legacy WebKit availability macros are verbose, confusing, and provide no benefit
over using the system availability macros directly. The original vision was that
they'd serve a cross-platform purpose but that never came to be.
Since WebKit1 is API on OS X but SPI on iOS, some indirection is still needed in the
availability macros to allow the headers to advertise the API as unavailable on OS X
without interfering with the ability to build on iOS. This is achieved by defining
WEBKIT-prefixed versions of the Foundation availability macros that are defined to
their NS-prefixed equivalents. The installed headers are post-processed to map these
macros back to their Foundation equivalents.
Part of .
Source/WebCore:
Reviewed by Sam Weinig.
* WebCore.xcodeproj/project.pbxproj:
* bindings/objc/WebKitAvailability.h: Added. This lives at the WebCore level since it
will be needed by the Objective-C DOM bindings.
Source/WebKit:
Reviewed by Sam Weinig.
* WebKit.xcodeproj/project.pbxproj: Change the Postprocess Headers build phase to
invoke mac/postprocess-headers.sh.
Source/WebKit/mac:
The OS X version used in the new availability macros is based on the mapping in
_javascript_Core/WebKitAvailability.h.
Reviewed by Sam Weinig.
* Carbon/CarbonUtils.h:
* Carbon/HIWebView.h:
* MigrateHeaders.make: Migrate WebKitAvailability.h from WebCore as an API header.
* Plugins/WebPlugin.h:
* Plugins/WebPluginViewFactory.h:
* WebView/WebFrameLoadDelegate.h:
* WebView/WebResourceLoadDelegatePrivate.h:
* WebView/WebUIDelegate.h:
* postprocess-headers.sh: Added. Extracted from the Xcode project. Extended to map the
WEBKIT-prefixed macros to their NS-prefixed equivalents on OS X and to remove them on iOS.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKit/mac/Carbon/CarbonUtils.h
trunk/Source/WebKit/mac/Carbon/HIWebView.h
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/MigrateHeaders.make
trunk/Source/WebKit/mac/Plugins/WebPlugin.h
trunk/Source/WebKit/mac/Plugins/WebPluginViewFactory.h
trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h
trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegatePrivate.h
trunk/Source/WebKit/mac/WebView/WebUIDelegate.h
Added Paths
trunk/Source/WebCore/bindings/objc/WebKitAvailability.h
trunk/Source/WebKit/mac/postprocess-headers.sh
Diff
Modified: trunk/Source/WebCore/ChangeLog (161331 => 161332)
--- trunk/Source/WebCore/ChangeLog 2014-01-06 07:54:02 UTC (rev 161331)
+++ trunk/Source/WebCore/ChangeLog 2014-01-06 08:15:52 UTC (rev 161332)
@@ -1,3 +1,26 @@
+2014-01-06 Mark Rowe
+
+ Move WebKit off the legacy WebKit availability macros
+
+The legacy WebKit availability macros are verbose, confusing, and provide no benefit
+over using the system availability macros directly. The original vision was that
+they'd serve a cross-platform purpose but that never came to be.
+
+Since WebKit1 is API on OS X but SPI on iOS, some indirection is still needed in the
+availability macros to allow the headers to advertise the API as unavailable on OS X
+without interfering with the ability to build on iOS. This is achieved by defining
+WEBKIT-prefixed versions of the Foundation availability macros that are defined to
+their NS-prefixed equivalents. The installed headers are post-processed to map these
+macros back to their Foundation equivalents.
+
+Part of .
+
+Reviewed by Sam Weinig.
+
+* WebCore.xcodeproj/project.pbxproj:
+* bindings/objc/WebKitAvailability.h: Added. This lives at the WebCore level since it
+will be needed by the Objective-C DOM bindings.
+
2014-01-05 Simon Fraser
Move responsibility for remote layer tree committing to RemoteLayerTreeDrawingArea
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161331 => 161332)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-06 07:54:02 UTC (rev 161331)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-06 08:15:52 UTC (rev 161332)
@@ -1968,6 +1968,7 @@
5DFE8F570D16477C0076E937 /* ScheduledAction.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA378BB0D15F64200B793D6 /* ScheduledAction.h */; };
5F2DBBE9178E3C8100141486 /* CertificateInfoMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5F2DBBE7178E332D00141486 /* CertificateInfoMac.mm */; };
5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F2DBBE8178E336900141486 /* CertificateInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 5DFEBAB718592B6D00C75BEB /* WebKitAvailability.h in Headers */ =
[webkit-changes] [160594] trunk/Source
Title: [160594] trunk/Source
Revision 160594
Author mr...@apple.com
Date 2013-12-14 02:13:51 -0800 (Sat, 14 Dec 2013)
Log Message
Build fix after r160557.
Source/_javascript_Core:
r160557 added the first generated header to _javascript_Core that needs to be installed in to
the framework wrapper. Sadly _javascript_Core's Derived Sources target was not set to generate
headers when invoked as part of the installhdrs action. This resulted in the build failing
due to Xcode being unable to find the header file to install. The fix for this is to configure
the Derived Sources target to use _javascript_Core.xcconfig, which sets INSTALLHDRS_SCRIPT_PHASE
to YES and allows Xcode to generate derived sources during the installhdrs action.
Enabling INSTALLHDRS_SCRIPT_PHASE required tweaking the Generate Derived Sources script build
phase to skip running code related to offlineasm that depends on JSCLLIntOffsetExtractor
having been compiled, which isn't the case at installhdrs time.
* _javascript_Core.xcodeproj/project.pbxproj:
Source/WebCore:
* Configurations/WebCore.xcconfig: Find _javascript_Core.framework below SDKROOT so that we'll pick
up the built version in production builds rather than the system version.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/WebCore.xcconfig
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (160593 => 160594)
--- trunk/Source/_javascript_Core/ChangeLog 2013-12-14 09:03:58 UTC (rev 160593)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-12-14 10:13:51 UTC (rev 160594)
@@ -1,3 +1,20 @@
+2013-12-14 Mark Rowe
+
+Build fix after r160557.
+
+r160557 added the first generated header to _javascript_Core that needs to be installed in to
+the framework wrapper. Sadly _javascript_Core's Derived Sources target was not set to generate
+headers when invoked as part of the installhdrs action. This resulted in the build failing
+due to Xcode being unable to find the header file to install. The fix for this is to configure
+the Derived Sources target to use _javascript_Core.xcconfig, which sets INSTALLHDRS_SCRIPT_PHASE
+to YES and allows Xcode to generate derived sources during the installhdrs action.
+
+Enabling INSTALLHDRS_SCRIPT_PHASE required tweaking the Generate Derived Sources script build
+phase to skip running code related to offlineasm that depends on JSCLLIntOffsetExtractor
+having been compiled, which isn't the case at installhdrs time.
+
+* _javascript_Core.xcodeproj/project.pbxproj:
+
2013-12-13 Joseph Pecoraro
Some Set and Map prototype functions have incorrect function lengths
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (160593 => 160594)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2013-12-14 09:03:58 UTC (rev 160593)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2013-12-14 10:13:51 UTC (rev 160594)
@@ -5403,7 +5403,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core\"\n\n/bin/ln -sfh \"${SRCROOT}\" _javascript_Core\nexport _javascript_Core=\"_javascript_Core\"\nexport BUILT_PRODUCTS_DIR=\"../..\"\n\nmake --no-builtin-rules -f \"_javascript_Core/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.ncpu` || exit 1\n\n/usr/bin/env ruby _javascript_Core/offlineasm/asm.rb _javascript_Core/llint/LowLevelInterpreter.asm ${BUILT_PRODUCTS_DIR}/JSCLLIntOffsetsExtractor LLIntAssembly.h || exit 1\n";
+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core\"\n\n/bin/ln -sfh \"${SRCROOT}\" _javascript_Core\nexport _javascript_Core=\"_javascript_Core\"\nexport BUILT_PRODUCTS_DIR=\"../..\"\n\nmake --no-builtin-rules -f \"_javascript_Core/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.ncpu` || exit 1\n\nif [[ \"${ACTION}\" == \"installhdrs\" ]]; then\nexit 0\nfi\n\n/usr/bin/env ruby _javascript_Core/offlineasm/asm.rb _javascript_Core/llint/LowLevelInterpreter.asm ${BUILT_PRODUCTS_DIR}/JSCLLIntOffsetsExtractor LLIntAssembly.h || exit 1\n";
};
A55DEAA416703DF7003DB841 /* Check For Inappropriate Macros in External Headers */ = {
isa = PBXShellScriptBuildPhase;
@@ -6296,6 +6296,7 @@
};
65FB3F7809D11EBD00F49DEB /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* _javascript_Core.xcconfig */;
buildSettings = {
PRODUCT_NAME = "Generate Derived Sources";
};
@@ -6303,6 +6304,7 @@
};
65FB3F7909D11EBD00F49DEB /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfiguration
[webkit-changes] [160454] trunk/Source/JavaScriptCore
Title: [160454] trunk/Source/_javascript_Core
Revision 160454
Author mr...@apple.com
Date 2013-12-11 14:13:23 -0800 (Wed, 11 Dec 2013)
Log Message
Modernize the _javascript_Core API headers
This consists of three main changes:
1) Converting the return type of initializer methods to instancetype.
2) Declaring properties rather than getters and setters.
3) Tagging C API methods with information about their memory management semantics.
Changing the declarations from getters and setters to properties also required
updating the headerdoc in a number of places.
Reviewed by Anders Carlsson.
* API/JSContext.h:
* API/JSContext.mm:
* API/JSManagedValue.h:
* API/JSManagedValue.mm:
* API/JSStringRefCF.h:
* API/JSValue.h:
* API/JSVirtualMachine.h:
* API/JSVirtualMachine.mm:
Modified Paths
trunk/Source/_javascript_Core/API/JSContext.h
trunk/Source/_javascript_Core/API/JSContext.mm
trunk/Source/_javascript_Core/API/JSManagedValue.h
trunk/Source/_javascript_Core/API/JSManagedValue.mm
trunk/Source/_javascript_Core/API/JSStringRefCF.h
trunk/Source/_javascript_Core/API/JSValue.h
trunk/Source/_javascript_Core/API/JSVirtualMachine.h
trunk/Source/_javascript_Core/API/JSVirtualMachine.mm
trunk/Source/_javascript_Core/ChangeLog
Diff
Modified: trunk/Source/_javascript_Core/API/JSContext.h (160453 => 160454)
--- trunk/Source/_javascript_Core/API/JSContext.h 2013-12-11 22:06:13 UTC (rev 160453)
+++ trunk/Source/_javascript_Core/API/JSContext.h 2013-12-11 22:13:23 UTC (rev 160454)
@@ -58,7 +58,7 @@
@abstract Create a JSContext.
@result The new context.
*/
-- (id)init;
+- (instancetype)init;
/*!
@method
@@ -66,7 +66,7 @@
@param virtualMachine The JSVirtualMachine in which the context will be created.
@result The new context.
*/
-- (id)initWithVirtualMachine:(JSVirtualMachine *)virtualMachine;
+- (instancetype)initWithVirtualMachine:(JSVirtualMachine *)virtualMachine;
/*!
@methodgroup Evaluating Scripts
@@ -117,14 +117,14 @@
@methodgroup Global Properties
*/
/*!
-@method
+@property
@abstract Get the global object of the context.
@discussion This method retrieves the global object of the _javascript_ execution context.
Instances of JSContext originating from WebKit will return a reference to the
WindowProxy object.
@result The global object.
*/
-- (JSValue *)globalObject;
+@property (readonly, strong) JSValue *globalObject;
/*!
@property
@@ -143,7 +143,7 @@
If a JSValue originating from a different JSVirtualMachine than this context
is assigned to this property, an Objective-C exception will be raised.
*/
-@property(retain) JSValue *exception;
+@property (strong) JSValue *exception;
/*!
@property
@@ -155,14 +155,14 @@
Setting this value to nil will result in all uncaught exceptions thrown from
the API being silently consumed.
*/
-@property(copy) void(^exceptionHandler)(JSContext *context, JSValue *exception);
+@property (copy) void(^exceptionHandler)(JSContext *context, JSValue *exception);
/*!
@property
@discussion All instances of JSContext are associated with a single JSVirtualMachine. The
virtual machine provides an "object space" or set of execution resources.
*/
-@property(readonly, retain) JSVirtualMachine *virtualMachine;
+@property (readonly, strong) JSVirtualMachine *virtualMachine;
/*!
@property
@@ -187,7 +187,7 @@
and then the value converted to a string used to resolve a property of the
global object.
*/
-@interface JSContext(SubscriptSupport)
+@interface JSContext (SubscriptSupport)
/*!
method
@@ -211,7 +211,7 @@
@category
@discussion These functions are for bridging between the C API and the Objective-C API.
*/
-@interface JSContext(JSContextRefSupport)
+@interface JSContext (JSContextRefSupport)
/*!
@method
@@ -222,11 +222,11 @@
+ (JSContext *)contextWithJSGlobalContextRef:(JSGlobalContextRef)jsGlobalContextRef;
/*!
-@method
+@property
@abstract Get the C API counterpart wrapped by a JSContext.
@result The C API equivalent of this JSContext.
*/
-- (JSGlobalContextRef)JSGlobalContextRef;
+@property (readonly) JSGlobalContextRef JSGlobalContextRef;
@end
#endif
Modified: trunk/Source/_javascript_Core/API/JSContext.mm (160453 => 160454)
--- trunk/Source/_javascript_Core/API/JSContext.mm 2013-12-11 22:06:13 UTC (rev 160453)
+++ trunk/Source/_javascript_Core/API/JSContext.mm 2013-12-11 22:13:23 UTC (rev 160454)
@@ -54,12 +54,12 @@
return m_context;
}
-- (id)init
+- (instancetype)init
{
return [self initWithVirtualMachine:[[[JSVirtualMachine alloc] init] autorelease]];
}
-- (id)initWithVirtualMachine:(JSVirtualMachine *)virtualMachine
+- (instancetype)initWithVirtualMachine:(JSVirtualMachine *)virtualMachine
{
self = [super init];
if (!self)
@@ -198,9 +198,9 @@
@end
-@implementation JSContext(Internal)
+@implementation JSContext (Internal)
-- (id)initWithGlobalContextRef:(JSGlobalContextRef)context
+- (instancetype)initWithGlobalContextRef:(JSGlobalContextRef)context
{
self = [sup
[webkit-changes] [160452] trunk/Source/JavaScriptCore
Title: [160452] trunk/Source/_javascript_Core Revision 160452 Author mr...@apple.com Date 2013-12-11 14:06:11 -0800 (Wed, 11 Dec 2013) Log Message Move _javascript_Core off the legacy WebKit availability macros The legacy WebKit availability macros are verbose, confusing, and provide no benefit over using the system availability macros directly. The original vision was that they'd serve a cross-platform purpose but that never came to be. Map from WebKit version to OS X version based on the mapping in WebKitAvailability.h. All iOS versions are specified as 7.0 as that is when the _javascript_Core C API was made public. Part of . Reviewed by Anders Carlsson. * API/JSBasePrivate.h: * API/JSContextRef.h: * API/JSContextRefPrivate.h: * API/JSObjectRef.h: * API/JSValueRef.h: Modified Paths trunk/Source/_javascript_Core/API/JSBasePrivate.h trunk/Source/_javascript_Core/API/JSContextRef.h trunk/Source/_javascript_Core/API/JSContextRefPrivate.h trunk/Source/_javascript_Core/API/JSObjectRef.h trunk/Source/_javascript_Core/API/JSValueRef.h trunk/Source/_javascript_Core/ChangeLog Diff Modified: trunk/Source/_javascript_Core/API/JSBasePrivate.h (160451 => 160452) --- trunk/Source/_javascript_Core/API/JSBasePrivate.h 2013-12-11 21:33:08 UTC (rev 160451) +++ trunk/Source/_javascript_Core/API/JSBasePrivate.h 2013-12-11 22:06:11 UTC (rev 160452) @@ -43,7 +43,7 @@ garbage collector to collect soon, hoping to reclaim that large non-GC memory region. */ -JS_EXPORT void JSReportExtraMemoryCost(JSContextRef ctx, size_t size) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT void JSReportExtraMemoryCost(JSContextRef ctx, size_t size) CF_AVAILABLE(10_6, 7_0); JS_EXPORT void JSDisableGCTimer(void); Modified: trunk/Source/_javascript_Core/API/JSContextRef.h (160451 => 160452) --- trunk/Source/_javascript_Core/API/JSContextRef.h 2013-12-11 21:33:08 UTC (rev 160451) +++ trunk/Source/_javascript_Core/API/JSContextRef.h 2013-12-11 22:06:11 UTC (rev 160452) @@ -48,7 +48,7 @@ synchronization is required. @result The created JSContextGroup. */ -JS_EXPORT JSContextGroupRef JSContextGroupCreate() AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT JSContextGroupRef JSContextGroupCreate() CF_AVAILABLE(10_6, 7_0); /*! @function @@ -56,14 +56,14 @@ @param group The JSContextGroup to retain. @result A JSContextGroup that is the same as group. */ -JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group) CF_AVAILABLE(10_6, 7_0); /*! @function @abstract Releases a _javascript_ context group. @param group The JSContextGroup to release. */ -JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group) CF_AVAILABLE(10_6, 7_0); /*! @function @@ -78,7 +78,7 @@ NULL to use the default object class. @result A JSGlobalContext with a global object of class globalObjectClass. */ -JS_EXPORT JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass) AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER; +JS_EXPORT JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass) CF_AVAILABLE(10_5, 7_0); /*! @function @@ -92,7 +92,7 @@ @result A JSGlobalContext with a global object of class globalObjectClass and a context group equal to group. */ -JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass) CF_AVAILABLE(10_6, 7_0); /*! @function @@ -123,7 +123,7 @@ @param ctx The JSContext whose group you want to get. @result ctx's group. */ -JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx) CF_AVAILABLE(10_6, 7_0); /*! @function @@ -131,7 +131,7 @@ @param ctx The JSContext whose global context you want to get. @result ctx's global context. */ -JS_EXPORT JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx) CF_AVAILABLE(10_7, 4_0); +JS_EXPORT JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx) CF_AVAILABLE(10_7, 7_0); /*! @function Modified: trunk/Source/_javascript_Core/API/JSContextRefPrivate.h (160451 => 160452) --- trunk/Source/_javascript_Core/API/JSContextRefPrivate.h 2013-12-11 21:33:08 UTC (rev 160451) +++ trunk/Source/_javascript_Core/API/JSContextRefPrivate.h 2013-12-11 22:06:11 UTC (rev 160452) @@ -44,7 +44,7 @@ @param ctx The JSContext whose backtrace you want to get @result A string containing the backtrace */ -JS_EXPORT JSStringRef JSContextCreateBacktrace(JSContextRef ctx, unsigned maxStackSize) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT JSStringRef JSContextCreateBacktrace(JSContextRef ctx, unsigned maxStackSize) CF_AVAILA
[webkit-changes] [160439] trunk/Tools
Title: [160439] trunk/Tools
Revision 160439
Author mr...@apple.com
Date 2013-12-11 09:49:44 -0800 (Wed, 11 Dec 2013)
Log Message
Remove the DumpRenderTree Perl Support module
Now that old-run-webkit-tests is not used on OS X it's not worth the time and effort
to build and maintain this custom Perl module.
Reviewed by Anders Carlsson.
* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Remove the target.
* DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport.c: Removed.
* DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupportPregenerated.pm: Removed.
* DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c: Removed.
* DumpRenderTree/mac/PerlSupport/Makefile: Removed.
* Scripts/old-run-webkit-tests: Update a comment that referred to DumpRenderTreeSupport as a reason to
build DumpRenderTree.
(dumpToolDidCrash): Stop importing and using the module.
* Scripts/webkitpy/port/base.py:
(Port._build_driver): Update a comment in the same manner as in old-run-webkit-tests.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
trunk/Tools/Scripts/old-run-webkit-tests
trunk/Tools/Scripts/webkitpy/port/base.py
Removed Paths
trunk/Tools/DumpRenderTree/mac/PerlSupport/
Diff
Modified: trunk/Tools/ChangeLog (160438 => 160439)
--- trunk/Tools/ChangeLog 2013-12-11 17:47:40 UTC (rev 160438)
+++ trunk/Tools/ChangeLog 2013-12-11 17:49:44 UTC (rev 160439)
@@ -1,3 +1,23 @@
+2013-12-11 Mark Rowe
+
+ Remove the DumpRenderTree Perl Support module
+
+Now that old-run-webkit-tests is not used on OS X it's not worth the time and effort
+to build and maintain this custom Perl module.
+
+Reviewed by Anders Carlsson.
+
+* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Remove the target.
+* DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport.c: Removed.
+* DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupportPregenerated.pm: Removed.
+* DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c: Removed.
+* DumpRenderTree/mac/PerlSupport/Makefile: Removed.
+* Scripts/old-run-webkit-tests: Update a comment that referred to DumpRenderTreeSupport as a reason to
+build DumpRenderTree.
+(dumpToolDidCrash): Stop importing and using the module.
+* Scripts/webkitpy/port/base.py:
+(Port._build_driver): Update a comment in the same manner as in old-run-webkit-tests.
+
2013-12-11 Brendan Long
[GTK] Add "enable-mediasource" property to WebKitWebSettings
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (160438 => 160439)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2013-12-11 17:47:40 UTC (rev 160438)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2013-12-11 17:49:44 UTC (rev 160439)
@@ -17,7 +17,6 @@
A84F609108B1370E00E9745F /* PBXTargetDependency */,
A84F608F08B1370E00E9745F /* PBXTargetDependency */,
141BF238096A451E00E0753C /* PBXTargetDependency */,
-5DC82A701023C93D00FD1D3B /* PBXTargetDependency */,
);
name = All;
productName = All;
@@ -191,20 +190,6 @@
remoteGlobalIDString = 2D403EB2150871F9005358D2;
remoteInfo = LayoutTestHelper;
};
- 378C802315AB589B00746821 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 9340994A08540CAE007F3BC8;
- remoteInfo = DumpRenderTree;
- };
- 5DC82A6F1023C93D00FD1D3B /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 5DC82A661023C8DE00FD1D3B;
- remoteInfo = "DumpRenderTree Perl Support";
- };
A84F608E08B1370E00E9745F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
@@ -788,24 +773,6 @@
};
/* End PBXHeadersBuildPhase section */
-/* Begin PBXLegacyTarget section */
- 5DC82A661023C8DE00FD1D3B /* DumpRenderTree Perl Support */ = {
- isa = PBXLegacyTarget;
- buildArgumentsString = "$(ACTION)";
- buildConfigurationList = 5DC82A6E1023C92A00FD1D3B /* Build configuration list for PBXLegacyTarget "DumpRenderTree Perl Support" */;
- buildPhases = (
- );
- buildToolPath = make;
- buildWorkingDirectory = "$(SRCROOT)/mac/PerlSupport";
- dependencies = (
-378C802415AB589B00746821 /* PBXTargetDependency */,
- );
- name = "DumpRenderTree Perl Support";
- passBuildSettingsInEnvironment = 1;
- productName = "DumpRenderTree Perl Support";
- };
-/* End PBXLegacyTarget section */
-
/* Begin PBXNativeTarget section */
141BF21E096A441D00E0753C /* TestNetscapePlugIn */ = {
isa = PBXNativeTarget;
@@ -905,7 +872,6 @@
9340994A08540CAE007F3BC8 /* DumpRenderTree */,
B5A7525A0
[webkit-changes] [160438] trunk/Source/WebKit
Title: [160438] trunk/Source/WebKit
Revision 160438
Author mr...@apple.com
Date 2013-12-11 09:47:40 -0800 (Wed, 11 Dec 2013)
Log Message
Remove a Leopard-specific check from WebKit.xcodeproj
Reviewed by Anders Carlsson.
* WebKit.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/WebKit/ChangeLog (160437 => 160438)
--- trunk/Source/WebKit/ChangeLog 2013-12-11 16:46:18 UTC (rev 160437)
+++ trunk/Source/WebKit/ChangeLog 2013-12-11 17:47:40 UTC (rev 160438)
@@ -1,3 +1,11 @@
+2013-12-11 Mark Rowe
+
+ Remove a Leopard-specific check from WebKit.xcodeproj
+
+Reviewed by Anders Carlsson.
+
+* WebKit.xcodeproj/project.pbxproj:
+
2013-12-06 Roger Fong and Brent Fulgham
[Win] Support compiling with VS2013.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (160437 => 160438)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2013-12-11 16:46:18 UTC (rev 160437)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2013-12-11 17:47:40 UTC (rev 160438)
@@ -2100,7 +2100,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ \"${MACOSX_DEPLOYMENT_TARGET}\" > \"10.5\" && \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\nif [[ ! -e \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\" ]]; then\n ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\"\nfi\nfi\n";
+ shellScript = "if [[ \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\nif [[ ! -e \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\" ]]; then\n ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\"\nfi\nfi\n";
};
939811300824BF01008DF038 /* Make Frameworks Symbolic Link */ = {
isa = PBXShellScriptBuildPhase;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [160412] trunk/Source
Title: [160412] trunk/Source
Revision 160412
Author mr...@apple.com
Date 2013-12-10 23:25:45 -0800 (Tue, 10 Dec 2013)
Log Message
WebKit doesn't deal with longer bundle versions correctly
Reviewed by Dan Bernstein.
Source/WebKit/mac:
* WebView/WebView.mm:
(createUserVisibleWebKitVersionString): Strip as many leading digits as is necessary to
bring the major component of the version down to 3 digits.
Source/WebKit2:
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::userVisibleWebKitVersionString): Strip as many leading digits as is necessary to
bring the major component of the version down to 3 digits.
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebView.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (160411 => 160412)
--- trunk/Source/WebKit/mac/ChangeLog 2013-12-11 06:50:19 UTC (rev 160411)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-12-11 07:25:45 UTC (rev 160412)
@@ -1,3 +1,14 @@
+2013-12-10 Mark Rowe
+
+ WebKit doesn't deal with longer bundle versions correctly
+
+
+Reviewed by Dan Bernstein.
+
+* WebView/WebView.mm:
+(createUserVisibleWebKitVersionString): Strip as many leading digits as is necessary to
+bring the major component of the version down to 3 digits.
+
2013-12-09 Sam Weinig
Fix the build of projects including
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (160411 => 160412)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2013-12-11 06:50:19 UTC (rev 160411)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2013-12-11 07:25:45 UTC (rev 160412)
@@ -594,15 +594,14 @@
static NSString *createUserVisibleWebKitVersionString()
{
-// If the version is 4 digits long or longer, then the first digit represents
-// the version of the OS. Our user agent string should not include this first digit,
-// so strip it off and report the rest as the version.
+// If the version is longer than 3 digits then the leading digits represent the version of the OS. Our user agent
+// string should not include the leading digits, so strip them off and report the rest as the version.
NSString *fullVersion = [[NSBundle bundleForClass:[WebView class]] objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey];
NSRange nonDigitRange = [fullVersion rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]];
-if (nonDigitRange.location == NSNotFound && [fullVersion length] >= 4)
-return [[fullVersion substringFromIndex:1] copy];
-if (nonDigitRange.location != NSNotFound && nonDigitRange.location >= 4)
-return [[fullVersion substringFromIndex:1] copy];
+if (nonDigitRange.location == NSNotFound && fullVersion.length > 3)
+return [[fullVersion substringFromIndex:fullVersion.length - 3] copy];
+if (nonDigitRange.location != NSNotFound && nonDigitRange.location > 3)
+return [[fullVersion substringFromIndex:nonDigitRange.location - 3] copy];
return [fullVersion copy];
}
Modified: trunk/Source/WebKit2/ChangeLog (160411 => 160412)
--- trunk/Source/WebKit2/ChangeLog 2013-12-11 06:50:19 UTC (rev 160411)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-11 07:25:45 UTC (rev 160412)
@@ -1,3 +1,14 @@
+2013-12-10 Mark Rowe
+
+ WebKit doesn't deal with longer bundle versions correctly
+
+
+Reviewed by Dan Bernstein.
+
+* UIProcess/mac/WebPageProxyMac.mm:
+(WebKit::userVisibleWebKitVersionString): Strip as many leading digits as is necessary to
+bring the major component of the version down to 3 digits.
+
2013-12-10 Ryuan Choi
Unreviewed GTK build fix attempt after r160395 (second)
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (160411 => 160412)
--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-12-11 06:50:19 UTC (rev 160411)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-12-11 07:25:45 UTC (rev 160412)
@@ -92,15 +92,14 @@
static String userVisibleWebKitVersionString()
{
-// If the version is 4 digits long or longer, then the first digit represents
-// the version of the OS. Our user agent string should not include this first digit,
-// so strip it off and report the rest as the version.
+// If the version is longer than 3 digits then the leading digits represent the version of the OS. Our user agent
+// string should not include the leading digits, so strip them off and report the rest as the version.
NSString *fullVersion = [[NSBundle bundleForClass:NSClassFromString(@"WKView")] objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey];
NSRange nonDigitRange = [fullVersion rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]];
-if (nonDigitRange.location == NSNotFound && [fullVersion length] >= 4)
-return [fullVersion substringF
[webkit-changes] [159885] trunk/Websites/webkit.org
Title: [159885] trunk/Websites/webkit.org
Revision 159885
Author mr...@apple.com
Date 2013-11-30 09:05:06 -0800 (Sat, 30 Nov 2013)
Log Message
Update the analytics account used by webkit.org
Switch to a Google Analytics id that's accessible to someone that's involved with the WebKit project.
Reviewed by Sam Weinig.
* footer.inc: Remove the old analytics code.
* header.inc: Add the new stuff.
Modified Paths
trunk/Websites/webkit.org/ChangeLog
trunk/Websites/webkit.org/footer.inc
trunk/Websites/webkit.org/header.inc
Diff
Modified: trunk/Websites/webkit.org/ChangeLog (159884 => 159885)
--- trunk/Websites/webkit.org/ChangeLog 2013-11-30 07:41:14 UTC (rev 159884)
+++ trunk/Websites/webkit.org/ChangeLog 2013-11-30 17:05:06 UTC (rev 159885)
@@ -1,3 +1,14 @@
+2013-11-30 Mark Rowe
+
+ Update the analytics account used by webkit.org
+
+Switch to a Google Analytics id that's accessible to someone that's involved with the WebKit project.
+
+Reviewed by Sam Weinig.
+
+* footer.inc: Remove the old analytics code.
+* header.inc: Add the new stuff.
+
2013-10-29 Beth Dakin
Just updating the sample code for this potential blog post.
Modified: trunk/Websites/webkit.org/footer.inc (159884 => 159885)
--- trunk/Websites/webkit.org/footer.inc 2013-11-30 07:41:14 UTC (rev 159884)
+++ trunk/Websites/webkit.org/footer.inc 2013-11-30 17:05:06 UTC (rev 159885)
@@ -1,11 +1,5 @@
-
-
-
-_uacct = "UA-336489-2";
-urchinTracker();
-
Modified: trunk/Websites/webkit.org/header.inc (159884 => 159885)
--- trunk/Websites/webkit.org/header.inc 2013-11-30 07:41:14 UTC (rev 159884)
+++ trunk/Websites/webkit.org/header.inc 2013-11-30 17:05:06 UTC (rev 159885)
@@ -32,6 +32,16 @@
pic5 = new Image(8,9);
pic5.src=""
+
+
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=""
+ })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ ga('create', 'UA-7299333-1', 'webkit.org');
+ ga('send', 'pageview');
+
if (isset($extra_head_content)) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [159669] trunk
Title: [159669] trunk
Revision 159669
Author mr...@apple.com
Date 2013-11-21 19:04:12 -0800 (Thu, 21 Nov 2013)
Log Message
Stop overriding VALID_ARCHS.
All modern versions of Xcode set it appropriately for our needs.
Reviewed by Alexey Proskuryakov.
Source/_javascript_Core:
* Configurations/Base.xcconfig:
Source/WebCore:
* Configurations/Base.xcconfig:
Source/WebInspectorUI:
* Configurations/Base.xcconfig:
Source/WebKit/mac:
* Configurations/Base.xcconfig:
Source/WebKit2:
* Configurations/Base.xcconfig:
Tools:
* MiniBrowser/Configurations/Base.xcconfig:
* WebKitTestRunner/Configurations/Base.xcconfig:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/Base.xcconfig
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/Base.xcconfig
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Configurations/Base.xcconfig
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/Configurations/Base.xcconfig
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Configurations/Base.xcconfig
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/Configurations/Base.xcconfig
trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (159668 => 159669)
--- trunk/Source/_javascript_Core/ChangeLog 2013-11-22 03:01:55 UTC (rev 159668)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-11-22 03:04:12 UTC (rev 159669)
@@ -1,5 +1,15 @@
2013-11-21 Mark Rowe
+ Stop overriding VALID_ARCHS.
+
+All modern versions of Xcode set it appropriately for our needs.
+
+Reviewed by Alexey Proskuryakov.
+
+* Configurations/Base.xcconfig:
+
+2013-11-21 Mark Rowe
+
Fix an error in a few Xcode configuration setting files.
Reviewed by Alexey Proskuryakov.
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (159668 => 159669)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2013-11-22 03:01:55 UTC (rev 159668)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2013-11-22 03:04:12 UTC (rev 159669)
@@ -76,10 +76,6 @@
GCC_WARN_UNUSED_VARIABLE = YES;
LINKER_DISPLAYS_MANGLED_NAMES = YES;
PREBINDING = NO;
-VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));
-VALID_ARCHS_iphoneos = $(ARCHS_STANDARD_32_64_BIT);
-VALID_ARCHS_iphonesimulator = $(ARCHS_STANDARD_32_64_BIT);
-VALID_ARCHS_macosx = i386 ppc x86_64 ppc64;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare;
HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
Modified: trunk/Source/WebCore/ChangeLog (159668 => 159669)
--- trunk/Source/WebCore/ChangeLog 2013-11-22 03:01:55 UTC (rev 159668)
+++ trunk/Source/WebCore/ChangeLog 2013-11-22 03:04:12 UTC (rev 159669)
@@ -1,3 +1,13 @@
+2013-11-21 Mark Rowe
+
+ Stop overriding VALID_ARCHS.
+
+All modern versions of Xcode set it appropriately for our needs.
+
+Reviewed by Alexey Proskuryakov.
+
+* Configurations/Base.xcconfig:
+
2013-11-21 Gwang Yoon Hwang
[GTK] Unreviewed buildfix after r159614 and r159656.
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (159668 => 159669)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2013-11-22 03:01:55 UTC (rev 159668)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2013-11-22 03:04:12 UTC (rev 159669)
@@ -70,10 +70,6 @@
GCC_WARN_UNUSED_VARIABLE = YES;
LINKER_DISPLAYS_MANGLED_NAMES = YES;
PREBINDING = NO;
-VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));
-VALID_ARCHS_iphoneos = $(ARCHS_STANDARD_32_BIT);
-VALID_ARCHS_iphonesimulator = $(ARCHS_STANDARD_32_BIT);
-VALID_ARCHS_macosx = i386 ppc x86_64 ppc64;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare;
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
Modified: trunk/Source/WebInspectorUI/ChangeLog (159668 => 159669)
--- trunk/Source/WebInspectorUI/ChangeLog 2013-11-22 03:01:55 UTC (rev 159668)
+++ trunk/Source/WebInspectorUI/ChangeLog 2013-11-22 03:04:12 UTC (rev 159669)
@@ -1,3 +1,13 @@
+2013-11-21 Mark Rowe
+
+ Stop overriding VALID_ARCHS.
+
+All modern versions of Xcode set it appropriately for our needs.
+
+Reviewed by Alexey Proskuryakov.
+
+* Configurations/Base.xcconfig:
+
2013-11-19 Antoine Quint
Web Inspector: layer info sidebar should convert to MB for very large layers
Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (159668 => 159669)
--- trunk
[webkit-changes] [159665] trunk/Source
Title: [159665] trunk/Source Revision 159665 Author mr...@apple.com Date 2013-11-21 18:57:41 -0800 (Thu, 21 Nov 2013) Log Message Fix an error in a few Xcode configuration setting files. Reviewed by Alexey Proskuryakov. Source/_javascript_Core: * Configurations/Base.xcconfig: Source/ThirdParty/ANGLE: * Configurations/Base.xcconfig: Source/WebCore: * Configurations/Base.xcconfig: Source/WebKit/mac: * Configurations/Base.xcconfig: Source/WebKit2: * Configurations/Base.xcconfig: Source/WTF: * Configurations/Base.xcconfig: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/Base.xcconfig trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig trunk/Source/WTF/ChangeLog trunk/Source/WTF/Configurations/Base.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/Base.xcconfig trunk/Source/WebKit/mac/ChangeLog trunk/Source/WebKit/mac/Configurations/Base.xcconfig trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Configurations/Base.xcconfig Diff Modified: trunk/Source/_javascript_Core/ChangeLog (159664 => 159665) --- trunk/Source/_javascript_Core/ChangeLog 2013-11-22 02:56:22 UTC (rev 159664) +++ trunk/Source/_javascript_Core/ChangeLog 2013-11-22 02:57:41 UTC (rev 159665) @@ -1,3 +1,11 @@ +2013-11-21 Mark Rowe + + Fix an error in a few Xcode configuration setting files. + +Reviewed by Alexey Proskuryakov. + +* Configurations/Base.xcconfig: + 2013-11-21 Michael Saboff ARM64: Implement push/pop equivalents in LLInt Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (159664 => 159665) --- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2013-11-22 02:56:22 UTC (rev 159664) +++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2013-11-22 02:57:41 UTC (rev 159665) @@ -42,10 +42,7 @@ GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME)); GCC_ENABLE_OBJC_GC_iphoneos = NO; GCC_ENABLE_OBJC_GC_iphonesimulator = NO; -GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(MAC_OS_X_VERSION_MAJOR)); -GCC_ENABLE_OBJC_GC_macosx_1080 = supported; -GCC_ENABLE_OBJC_GC_macosx_1090 = supported; -GCC_ENABLE_OBJC_GC_macosx_101000 = NO; +GCC_ENABLE_OBJC_GC_macosx = supported; GCC_ENABLE_SYMBOL_SEPARATION = NO; GCC_FAST_OBJC_DISPATCH = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (159664 => 159665) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-11-22 02:56:22 UTC (rev 159664) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-11-22 02:57:41 UTC (rev 159665) @@ -1,3 +1,11 @@ +2013-11-21 Mark Rowe + + Fix an error in a few Xcode configuration setting files. + +Reviewed by Alexey Proskuryakov. + +* Configurations/Base.xcconfig: + 2013-11-21 Brent Fulgham Unreviewed gardening to hide annoying *.user files when. Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (159664 => 159665) --- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2013-11-22 02:56:22 UTC (rev 159664) +++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2013-11-22 02:57:41 UTC (rev 159665) @@ -15,10 +15,7 @@ GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME)); GCC_ENABLE_OBJC_GC_iphoneos = NO; GCC_ENABLE_OBJC_GC_iphonesimulator = NO; -GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(MAC_OS_X_VERSION_MAJOR)); -GCC_ENABLE_OBJC_GC_macosx_1080 = supported; -GCC_ENABLE_OBJC_GC_macosx_1090 = supported; -GCC_ENABLE_OBJC_GC_macosx_101000 = NO; +GCC_ENABLE_OBJC_GC_macosx = supported; GCC_ENABLE_SYMBOL_SEPARATION = NO; GCC_FAST_OBJC_DISPATCH = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; Modified: trunk/Source/WTF/ChangeLog (159664 => 159665) --- trunk/Source/WTF/ChangeLog 2013-11-22 02:56:22 UTC (rev 159664) +++ trunk/Source/WTF/ChangeLog 2013-11-22 02:57:41 UTC (rev 159665) @@ -1,3 +1,11 @@ +2013-11-21 Mark Rowe + + Fix an error in a few Xcode configuration setting files. + +Reviewed by Alexey Proskuryakov. + +* Configurations/Base.xcconfig: + 2013-11-20 Mark Lam Introducing VMEntryScope to update the VM stack limit. Modified: trunk/Source/WTF/Configurations/Base.xcconfig (159664 => 159665) --- trunk/Source/WTF/Configurations/Base.xcconfig 2013-11-22 02:56:22 UTC (rev 159664) +++ trunk/Source/WTF/Configurations/Base.xcconfig 2013-11-22 02:57:41 UTC (rev 159665) @@ -42,10 +42,7 @@ GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME)); GCC_ENABLE_OBJC_GC_iphoneos = NO; GCC_ENABLE_OBJC_GC_iphonesimulator = NO; -GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(MAC_OS_X_VERSION_MAJOR)); -GCC_ENABLE_OBJC_GC_macosx_1080 = supported; -GCC_ENABLE_OBJC_GC_macosx_1090 = supported; -GCC_ENABLE_OBJC_GC_macosx_101000 = NO; +GCC_ENABLE_OBJC_GC_macosx = supported; GCC_ENABLE_SYMBOL_SEPARATION = NO; GCC_FAST_OBJC_DISPATCH = YES; GCC_GENERATE_D
[webkit-changes] [159663] trunk/Source
Title: [159663] trunk/Source
Revision 159663
Author mr...@apple.com
Date 2013-11-21 18:55:19 -0800 (Thu, 21 Nov 2013)
Log Message
Fix some deprecation warnings.
Reviewed by Anders Carlsson.
Source/WebCore:
* platform/mac/HTMLConverter.mm:
(fileWrapperForURL): Move off a deprecated NSFileWrapper method.
Source/WebKit/mac:
* Plugins/WebNetscapePluginStream.mm:
(WebNetscapePluginStream::startStream): Move off a deprecated NSData method.
* WebView/WebDataSource.mm:
(-[WebDataSource _fileWrapperForURL:]): Move off a deprecated NSFileWrapper method.
* WebView/WebHTMLView.mm:
(-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]): Ditto.
Source/WebKit2:
* UIProcess/API/mac/WKView.mm:
(-[WKView namesOfPromisedFilesDroppedAtDestination:]): Move off a deprecated NSFileWrapper method.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/HTMLConverter.mm
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm
trunk/Source/WebKit/mac/WebView/WebDataSource.mm
trunk/Source/WebKit/mac/WebView/WebHTMLView.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (159662 => 159663)
--- trunk/Source/WebCore/ChangeLog 2013-11-22 02:53:04 UTC (rev 159662)
+++ trunk/Source/WebCore/ChangeLog 2013-11-22 02:55:19 UTC (rev 159663)
@@ -1,3 +1,12 @@
+2013-11-21 Mark Rowe
+
+ Fix some deprecation warnings.
+
+Reviewed by Anders Carlsson.
+
+* platform/mac/HTMLConverter.mm:
+(fileWrapperForURL): Move off a deprecated NSFileWrapper method.
+
2013-11-21 Daniel Bates
[iOS] Build fix; export symbol for WebCore::provideDeviceOrientationTo()
Modified: trunk/Source/WebCore/platform/mac/HTMLConverter.mm (159662 => 159663)
--- trunk/Source/WebCore/platform/mac/HTMLConverter.mm 2013-11-22 02:53:04 UTC (rev 159662)
+++ trunk/Source/WebCore/platform/mac/HTMLConverter.mm 2013-11-22 02:55:19 UTC (rev 159663)
@@ -2537,11 +2537,9 @@
#if !PLATFORM(IOS)
static NSFileWrapper *fileWrapperForURL(DocumentLoader *dataSource, NSURL *URL)
{
-if ([URL isFileURL]) {
-NSString *path = [[URL path] stringByResolvingSymlinksInPath];
-return [[[NSFileWrapper alloc] initWithPath:path] autorelease];
-}
-
+if ([URL isFileURL])
+return [[[NSFileWrapper alloc] initWithURL:[URL URLByResolvingSymlinksInPath] options:0 error:nullptr] autorelease];
+
RefPtr resource = dataSource->subresource(URL);
if (resource) {
NSFileWrapper *wrapper = [[[NSFileWrapper alloc] initRegularFileWithContents:resource->data()->createNSData().get()] autorelease];
Modified: trunk/Source/WebKit/mac/ChangeLog (159662 => 159663)
--- trunk/Source/WebKit/mac/ChangeLog 2013-11-22 02:53:04 UTC (rev 159662)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-11-22 02:55:19 UTC (rev 159663)
@@ -1,3 +1,16 @@
+2013-11-21 Mark Rowe
+
+ Fix some deprecation warnings.
+
+Reviewed by Anders Carlsson.
+
+* Plugins/WebNetscapePluginStream.mm:
+(WebNetscapePluginStream::startStream): Move off a deprecated NSData method.
+* WebView/WebDataSource.mm:
+(-[WebDataSource _fileWrapperForURL:]): Move off a deprecated NSFileWrapper method.
+* WebView/WebHTMLView.mm:
+(-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]): Ditto.
+
2013-11-20 Mark Lam
Introducing VMEntryScope to update the VM stack limit.
Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm (159662 => 159663)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2013-11-22 02:53:04 UTC (rev 159662)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2013-11-22 02:55:19 UTC (rev 159663)
@@ -231,7 +231,7 @@
if (headers) {
unsigned len = [headers length];
m_headers = (char*) malloc(len + 1);
-[headers getBytes:m_headers];
+[headers getBytes:m_headers length:len];
m_headers[len] = 0;
m_stream.headers = m_headers;
}
Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (159662 => 159663)
--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2013-11-22 02:53:04 UTC (rev 159662)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2013-11-22 02:55:19 UTC (rev 159663)
@@ -166,11 +166,9 @@
- (NSFileWrapper *)_fileWrapperForURL:(NSURL *)URL
{
-if ([URL isFileURL]) {
-NSString *path = [[URL path] stringByResolvingSymlinksInPath];
-return [[[NSFileWrapper alloc] initWithPath:path] autorelease];
-}
-
+if ([URL isFileURL])
+return [[[NSFileWrapper alloc] initWithURL:[URL URLByResolvingSymlinksInPath] options:0 error:nullptr] autorelease];
+
WebResource *resource = [self subresourceForURL:URL];
if (resource)
return [resource _fileWrapperRepresentation];
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (159662 => 159663)
--- trunk/Source/WebK
[webkit-changes] [159576] trunk/Tools
Title: [159576] trunk/Tools
Revision 159576
Author mr...@apple.com
Date 2013-11-20 13:02:42 -0800 (Wed, 20 Nov 2013)
Log Message
Remove some obsolete logic from WebKit.app.
Reviewed by Alexey Proskuryakov.
* WebKitLauncher/WebKitNightlyEnabler.m:
(poseAsWebKitApp): Remove a pre-10.6 codepath.
(enableWebKitNightlyBehaviour): Remove a 10.4-specific codepath.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/WebKitLauncher/WebKitNightlyEnabler.m
Diff
Modified: trunk/Tools/ChangeLog (159575 => 159576)
--- trunk/Tools/ChangeLog 2013-11-20 19:26:10 UTC (rev 159575)
+++ trunk/Tools/ChangeLog 2013-11-20 21:02:42 UTC (rev 159576)
@@ -1,3 +1,13 @@
+2013-11-20 Mark Rowe
+
+Remove some obsolete logic from WebKit.app.
+
+Reviewed by Alexey Proskuryakov.
+
+* WebKitLauncher/WebKitNightlyEnabler.m:
+(poseAsWebKitApp): Remove a pre-10.6 codepath.
+(enableWebKitNightlyBehaviour): Remove a 10.4-specific codepath.
+
2013-11-20 Dániel Bátyai
Moved stray urls from svn.py and statusserver.py into common.config.urls
Modified: trunk/Tools/WebKitLauncher/WebKitNightlyEnabler.m (159575 => 159576)
--- trunk/Tools/WebKitLauncher/WebKitNightlyEnabler.m 2013-11-20 19:26:10 UTC (rev 159575)
+++ trunk/Tools/WebKitLauncher/WebKitNightlyEnabler.m 2013-11-20 21:02:42 UTC (rev 159576)
@@ -45,16 +45,6 @@
static bool extensionBundlesWereLoaded = NO;
static NSSet *extensionPaths = nil;
-static int32_t systemVersion()
-{
-static SInt32 version = 0;
-if (!version)
-Gestalt(gestaltSystemVersion, &version);
-
-return version;
-}
-
-
static void myBundleDidLoad(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef userInfo)
{
NSBundle *bundle = (NSBundle *)object;
@@ -116,7 +106,6 @@
return [NSBundle bundleWithPath:appPath];
}
-extern char **_CFGetProcessPath() __attribute__((weak));
extern OSStatus _RegisterApplication(CFDictionaryRef additionalAppInfoRef, ProcessSerialNumber* myPSN) __attribute__((weak));
static void poseAsWebKitApp()
@@ -130,60 +119,21 @@
// Set up the main bundle early so it points at Safari.app
CFBundleGetMainBundle();
-if (systemVersion() < 0x1060) {
-if (!_CFGetProcessPath)
-return;
+if (!_RegisterApplication)
+return;
-// Fiddle with CoreFoundation to have it pick up the executable path as being within WebKit.app
-char **processPath = _CFGetProcessPath();
-*processPath = NULL;
-setenv("CFProcessPath", webKitAppPath, 1);
-_CFGetProcessPath();
-unsetenv("CFProcessPath");
-} else {
-if (!_RegisterApplication)
-return;
-
-// Register the application with LaunchServices, passing a customized registration dictionary that
-// uses the WebKit launcher as the application bundle.
-NSBundle *bundle = webKitLauncherBundle();
-NSMutableDictionary *checkInDictionary = [[bundle infoDictionary] mutableCopy];
-[checkInDictionary setObject:[bundle bundlePath] forKey:@"LSBundlePath"];
-[checkInDictionary setObject:[checkInDictionary objectForKey:(NSString *)kCFBundleNameKey] forKey:@"LSDisplayName"];
-_RegisterApplication((CFDictionaryRef)checkInDictionary, 0);
-[checkInDictionary release];
-}
+// Register the application with LaunchServices, passing a customized registration dictionary that
+// uses the WebKit launcher as the application bundle.
+NSBundle *bundle = webKitLauncherBundle();
+NSMutableDictionary *checkInDictionary = [[bundle infoDictionary] mutableCopy];
+[checkInDictionary setObject:[bundle bundlePath] forKey:@"LSBundlePath"];
+[checkInDictionary setObject:[checkInDictionary objectForKey:(NSString *)kCFBundleNameKey] forKey:@"LSDisplayName"];
+_RegisterApplication((CFDictionaryRef)checkInDictionary, 0);
+[checkInDictionary release];
}
-static BOOL insideSafari4OnTigerTrampoline()
-{
-// If we're not on Tiger then we can't be in the trampoline state.
-if ((systemVersion() & 0xFFF0) != 0x1040)
-return NO;
-
-// If we're running Safari < 4.0 then we can't be in the trampoline state.
-CFBundleRef safariBundle = CFBundleGetMainBundle();
-CFStringRef safariVersion = CFBundleGetValueForInfoDictionaryKey(safariBundle, CFSTR("CFBundleShortVersionString"));
-if ([(NSString *)safariVersion intValue] < 4)
-return NO;
-
-const char* frameworkPath = getenv("DYLD_FRAMEWORK_PATH");
-if (!frameworkPath)
-frameworkPath = "";
-
-// If the framework search path is empty or otherwise does not contain the Safari
-// framework's Frameworks directory then we are in the trampoline state.
-const char safariFrameworkSearchPath[] = "/System/Library/PrivateFrameworks/Safari.framework/Frameworks";
-return strstr(frameworkPath, safariFrameworkSearchPath) == 0;
-}
-
static void enableWebKitNightlyBe
[webkit-changes] [159549] trunk/Tools
Title: [159549] trunk/Tools
Revision 159549
Author mr...@apple.com
Date 2013-11-19 22:01:19 -0800 (Tue, 19 Nov 2013)
Log Message
Modernize WebKit.app's OS X version checking logic.
Gestalt is deprecated on recent OS X versions so we should switch off it.
Reviewed by Sam Weinig.
* WebKitLauncher/main.m:
(currentMacOSXVersion): Retrieve the version string from SystemVersion.plist.
(currentMacOSXMajorVersion): Split the version string at the periods, retrieve the first
two components, then join them back up.
(main): Switch to using currentMacOSXMajorVersion to make it clearer which part of
the version we care about.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/WebKitLauncher/main.m
Diff
Modified: trunk/Tools/ChangeLog (159548 => 159549)
--- trunk/Tools/ChangeLog 2013-11-20 05:59:46 UTC (rev 159548)
+++ trunk/Tools/ChangeLog 2013-11-20 06:01:19 UTC (rev 159549)
@@ -1,3 +1,18 @@
+2013-11-19 Mark Rowe
+
+ Modernize WebKit.app's OS X version checking logic.
+
+Gestalt is deprecated on recent OS X versions so we should switch off it.
+
+Reviewed by Sam Weinig.
+
+* WebKitLauncher/main.m:
+(currentMacOSXVersion): Retrieve the version string from SystemVersion.plist.
+(currentMacOSXMajorVersion): Split the version string at the periods, retrieve the first
+two components, then join them back up.
+(main): Switch to using currentMacOSXMajorVersion to make it clearer which part of
+the version we care about.
+
2013-11-19 Commit Queue
Unreviewed, rolling out r159538.
Modified: trunk/Tools/WebKitLauncher/main.m (159548 => 159549)
--- trunk/Tools/WebKitLauncher/main.m 2013-11-20 05:59:46 UTC (rev 159548)
+++ trunk/Tools/WebKitLauncher/main.m 2013-11-20 06:01:19 UTC (rev 159549)
@@ -185,11 +185,18 @@
static NSString *currentMacOSXVersion()
{
-SInt32 version;
-if (Gestalt(gestaltSystemVersion, &version) != noErr)
-return @"10.4";
+// Can't use -[NSProcessInfo operatingSystemVersionString] because it has too much stuff we don't want.
+NSString *systemLibraryPath = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSSystemDomainMask, YES) objectAtIndex:0];
+NSString *systemVersionPlistPath = [systemLibraryPath stringByAppendingPathComponent:@"CoreServices/SystemVersion.plist"];
+NSDictionary *systemVersionInfo = [NSDictionary dictionaryWithContentsOfFile:systemVersionPlistPath];
+return [systemVersionInfo objectForKey:@"ProductVersion"];
+}
-return [NSString stringWithFormat:@"%lx.%lx", (long)(version & 0xFF00) >> 8, (long)(version & 0x00F0) >> 4l];
+static NSString *currentMacOSXMajorVersion()
+{
+NSArray *allComponents = [currentMacOSXVersion() componentsSeparatedByString:@"."];
+NSArray *majorAndMinorComponents = [allComponents objectsAtIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, 2)]];
+return [majorAndMinorComponents componentsJoinedByString:@"."];
}
static NSString *fallbackMacOSXVersion(NSString *systemVersion)
@@ -221,7 +228,7 @@
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-NSString *systemVersion = currentMacOSXVersion();
+NSString *systemVersion = currentMacOSXMajorVersion();
NSString *frameworkPath = [[[NSBundle mainBundle] privateFrameworksPath] stringByAppendingPathComponent:systemVersion];
BOOL frameworkPathIsUsable = checkFrameworkPath(frameworkPath);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [159485] trunk
Title: [159485] trunk
Revision 159485
Author mr...@apple.com
Date 2013-11-18 23:20:20 -0800 (Mon, 18 Nov 2013)
Log Message
Use hw.activecpu for determining how many processes to spawn.
It's documented as the preferred way to determine the number of threads
or processes to create in a SMP aware application.
Rubber-stamped by Tim Horton.
Source/ThirdParty/ANGLE:
* ANGLE.xcodeproj/project.pbxproj:
Source/WebCore:
* WebCore.xcodeproj/project.pbxproj:
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Source/WebKit2:
* WebKit2.xcodeproj/project.pbxproj:
Tools:
* Scripts/copy-webkitlibraries-to-product-directory:
* Scripts/run-jsc-stress-tests:
* WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
trunk/Tools/ChangeLog
trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory
trunk/Tools/Scripts/run-jsc-stress-tests
trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (159484 => 159485)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2013-11-19 06:47:53 UTC (rev 159484)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2013-11-19 07:20:20 UTC (rev 159485)
@@ -668,7 +668,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/ANGLE\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/ANGLE\"\n\n/bin/ln -sfh \"${SRCROOT}\" ANGLE\nexport ANGLE=\"ANGLE\"\n\nmake --no-builtin-rules -f \"ANGLE/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.availcpu`";
+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/ANGLE\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/ANGLE\"\n\n/bin/ln -sfh \"${SRCROOT}\" ANGLE\nexport ANGLE=\"ANGLE\"\n\nmake --no-builtin-rules -f \"ANGLE/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.activecpu`";
};
/* End PBXShellScriptBuildPhase section */
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (159484 => 159485)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-11-19 06:47:53 UTC (rev 159484)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-11-19 07:20:20 UTC (rev 159485)
@@ -1,3 +1,14 @@
+2013-11-18 Mark Rowe
+
+Use hw.activecpu for determining how many processes to spawn.
+
+It's documented as the preferred way to determine the number of threads
+or processes to create in a SMP aware application.
+
+Rubber-stamped by Tim Horton.
+
+* ANGLE.xcodeproj/project.pbxproj:
+
2013-11-06 Dean Jackson
kTraceBufferLen is unused in default builds
Modified: trunk/Source/WebCore/ChangeLog (159484 => 159485)
--- trunk/Source/WebCore/ChangeLog 2013-11-19 06:47:53 UTC (rev 159484)
+++ trunk/Source/WebCore/ChangeLog 2013-11-19 07:20:20 UTC (rev 159485)
@@ -1,3 +1,14 @@
+2013-11-18 Mark Rowe
+
+Use hw.activecpu for determining how many processes to spawn.
+
+It's documented as the preferred way to determine the number of threads
+or processes to create in a SMP aware application.
+
+Rubber-stamped by Tim Horton.
+
+* WebCore.xcodeproj/project.pbxproj:
+
2013-11-18 Samuel White
AX: aria-labelledby should be used in preference to aria-labeledby
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (159484 => 159485)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-11-19 06:47:53 UTC (rev 159484)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-11-19 07:20:20 UTC (rev 159485)
@@ -25499,7 +25499,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\n/bin/ln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\n\nif [ ! $CC ]; then\nexport CC=\"`xcrun -find clang`\"\nfi\n\nif [ ! $GPERF ]; then\nexport GPERF=\"`xcrun -find gperf`\"\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\nmake --no-builtin-rules -f \"WebCore/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.availcpu` SDKROOT=\"${SDKROOT}\"\nfi\n";
+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\n/bin/ln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\n\nif [ ! $CC ]; then\nexport CC=\"`xcrun -find clang`\"\nfi\n\nif [ ! $GPERF ]; then\nexport GPERF=\"`xcrun -find gperf`\"\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" =
[webkit-changes] [159480] trunk/Source/WebKit/mac
Title: [159480] trunk/Source/WebKit/mac
Revision 159480
Author mr...@apple.com
Date 2013-11-18 21:14:36 -0800 (Mon, 18 Nov 2013)
Log Message
Disable deprecation warnings related to NSCalendarDate in WebHistory.
Reviewed by Anders Carlsson.
* History/WebHistory.h: Use a #pragma to have the compiler treat this header as
a system header, even when not included from a system location. This has the effect
of suppressing warnings when including this header. It's a more general effect than
we're after but is also less invasive than disabling deprecation warnings around
the APIs that are defined in terms of NSCalendarDate. We'll hopefully revisit this
in the future.
* History/WebHistory.mm: Disable deprecation warnings around uses of NSCalendarDate.
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/History/WebHistory.h
trunk/Source/WebKit/mac/History/WebHistory.mm
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (159479 => 159480)
--- trunk/Source/WebKit/mac/ChangeLog 2013-11-19 04:55:03 UTC (rev 159479)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-11-19 05:14:36 UTC (rev 159480)
@@ -1,3 +1,17 @@
+2013-11-18 Mark Rowe
+
+Disable deprecation warnings related to NSCalendarDate in WebHistory.
+
+Reviewed by Anders Carlsson.
+
+* History/WebHistory.h: Use a #pragma to have the compiler treat this header as
+a system header, even when not included from a system location. This has the effect
+of suppressing warnings when including this header. It's a more general effect than
+we're after but is also less invasive than disabling deprecation warnings around
+the APIs that are defined in terms of NSCalendarDate. We'll hopefully revisit this
+in the future.
+* History/WebHistory.mm: Disable deprecation warnings around uses of NSCalendarDate.
+
2013-11-18 David Hyatt
Add a quirk to not respect center text-align when positioning
Modified: trunk/Source/WebKit/mac/History/WebHistory.h (159479 => 159480)
--- trunk/Source/WebKit/mac/History/WebHistory.h 2013-11-19 04:55:03 UTC (rev 159479)
+++ trunk/Source/WebKit/mac/History/WebHistory.h 2013-11-19 05:14:36 UTC (rev 159480)
@@ -28,6 +28,8 @@
#import
+#pragma GCC system_header
+
@class NSError;
@class WebHistoryItem;
Modified: trunk/Source/WebKit/mac/History/WebHistory.mm (159479 => 159480)
--- trunk/Source/WebKit/mac/History/WebHistory.mm 2013-11-19 04:55:03 UTC (rev 159479)
+++ trunk/Source/WebKit/mac/History/WebHistory.mm 2013-11-19 05:14:36 UTC (rev 159480)
@@ -92,7 +92,6 @@
- (void)rebuildHistoryByDayIfNeeded:(WebHistory *)webHistory;
- (NSArray *)orderedLastVisitedDays;
-- (NSArray *)orderedItemsLastVisitedOnDay:(NSCalendarDate *)calendarDate;
- (BOOL)containsURL:(NSURL *)URL;
- (WebHistoryItem *)itemForURL:(NSURL *)URL;
- (WebHistoryItem *)itemForURLString:(NSString *)URLString;
@@ -101,8 +100,6 @@
- (BOOL)loadFromURL:(NSURL *)URL collectDiscardedItemsInto:(NSMutableArray *)discardedItems error:(NSError **)error;
- (BOOL)saveToURL:(NSURL *)URL error:(NSError **)error;
-- (NSCalendarDate *)ageLimitDate;
-
- (void)setHistoryItemLimit:(int)limit;
- (int)historyItemLimit;
- (void)setHistoryAgeInDaysLimit:(int)limit;
@@ -445,6 +442,9 @@
// MARK: DATE-BASED RETRIEVAL
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
- (NSArray *)orderedLastVisitedDays
{
if (!_orderedLastVisitedDays) {
@@ -475,6 +475,8 @@
return _entriesByDate->get(dateKey).get();
}
+#pragma clang diagnostic pop
+
// MARK: URL MATCHING
- (WebHistoryItem *)itemForURLString:(NSString *)URLString
@@ -525,6 +527,9 @@
return [[NSUserDefaults standardUserDefaults] integerForKey:@"WebKitHistoryItemLimit"];
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
// Return a date that marks the age limit for history entries saved to or
// loaded from disk. Any entry older than this item should be rejected.
- (NSCalendarDate *)ageLimitDate
@@ -533,6 +538,8 @@
hours:0 minutes:0 seconds:0];
}
+#pragma clang diagnostic pop
+
- (BOOL)loadHistoryGutsFromURL:(NSURL *)URL savedItemsCount:(int *)numberOfItemsLoaded collectDiscardedItemsInto:(NSMutableArray *)discardedItems error:(NSError **)error
{
*numberOfItemsLoaded = 0;
@@ -774,11 +781,16 @@
return [_historyPrivate orderedLastVisitedDays];
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
- (NSArray *)orderedItemsLastVisitedOnDay:(NSCalendarDate *)date
{
return [_historyPrivate orderedItemsLastVisitedOnDay:date];
}
+#pragma clang diagnostic pop
+
// MARK: URL MATCHING
- (BOOL)containsURL:(NSURL *)URL
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [158036] trunk/Source/WebKit/mac
Title: [158036] trunk/Source/WebKit/mac
Revision 158036
Author mr...@apple.com
Date 2013-10-25 13:16:56 -0700 (Fri, 25 Oct 2013)
Log Message
Fix or disable some deprecation warnings.
Reviewed by Darin Adler.
* Panels/WebAuthenticationPanel.m:
(-[WebAuthenticationPanel cancel:]): On newer OS versions, use the modern API.
(-[WebAuthenticationPanel logIn:]): Ditto.
(-[WebAuthenticationPanel runAsSheetOnWindow:withChallenge:]): Ditto. Translate the
response code in to the form that -sheetDidEnd:responseCode:contextInfo: expects.
* WebView/WebClipView.mm:
(-[WebClipView initWithFrame:]): Disable deprecation warnings since it's not obvious
how to avoid calling -releaseGState here.
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/Panels/WebAuthenticationPanel.m
trunk/Source/WebKit/mac/WebView/WebClipView.mm
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (158035 => 158036)
--- trunk/Source/WebKit/mac/ChangeLog 2013-10-25 19:55:14 UTC (rev 158035)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-10-25 20:16:56 UTC (rev 158036)
@@ -1,3 +1,18 @@
+2013-10-25 Mark Rowe
+
+Fix or disable some deprecation warnings.
+
+Reviewed by Darin Adler.
+
+* Panels/WebAuthenticationPanel.m:
+(-[WebAuthenticationPanel cancel:]): On newer OS versions, use the modern API.
+(-[WebAuthenticationPanel logIn:]): Ditto.
+(-[WebAuthenticationPanel runAsSheetOnWindow:withChallenge:]): Ditto. Translate the
+response code in to the form that -sheetDidEnd:responseCode:contextInfo: expects.
+* WebView/WebClipView.mm:
+(-[WebClipView initWithFrame:]): Disable deprecation warnings since it's not obvious
+how to avoid calling -releaseGState here.
+
2013-10-24 Mark Rowe
Remove references to OS X 10.7 from Xcode configuration settings.
Modified: trunk/Source/WebKit/mac/Panels/WebAuthenticationPanel.m (158035 => 158036)
--- trunk/Source/WebKit/mac/Panels/WebAuthenticationPanel.m 2013-10-25 19:55:14 UTC (rev 158035)
+++ trunk/Source/WebKit/mac/Panels/WebAuthenticationPanel.m 2013-10-25 20:16:56 UTC (rev 158036)
@@ -77,7 +77,11 @@
[panel close];
if (usingSheet) {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+[panel.sheetParent endSheet:panel returnCode:NSModalResponseCancel];
+#else
[[NSApplication sharedApplication] endSheet:panel returnCode:1];
+#endif
} else {
[[NSApplication sharedApplication] stopModalWithCode:1];
}
@@ -93,7 +97,11 @@
[panel close];
if (usingSheet) {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+[panel.sheetParent endSheet:panel returnCode:NSModalResponseOK];
+#else
[[NSApplication sharedApplication] endSheet:panel returnCode:0];
+#endif
} else {
[[NSApplication sharedApplication] stopModalWithCode:0];
}
@@ -245,8 +253,15 @@
usingSheet = TRUE;
challenge = [chall retain];
-
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+[window beginSheet:panel completionHandler:^(NSModalResponse modalResponse) {
+int returnCode = (modalResponse == NSModalResponseCancel) ? 1 : 0;
+[self sheetDidEnd:panel returnCode:returnCode contextInfo:NULL];
+}];
+#else
[[NSApplication sharedApplication] beginSheet:panel modalForWindow:window modalDelegate:self didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:NULL];
+#endif
}
- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
Modified: trunk/Source/WebKit/mac/WebView/WebClipView.mm (158035 => 158036)
--- trunk/Source/WebKit/mac/WebView/WebClipView.mm 2013-10-25 19:55:14 UTC (rev 158035)
+++ trunk/Source/WebKit/mac/WebView/WebClipView.mm 2013-10-25 20:16:56 UTC (rev 158036)
@@ -64,7 +64,9 @@
self = [super initWithFrame:frame];
if (!self)
return nil;
-
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// In WebHTMLView, we set a clip. This is not typical to do in an
// NSView, and while correct for any one invocation of drawRect:,
// it causes some bad problems if that clip is cached between calls.
@@ -75,7 +77,8 @@
// See these bugs for more information:
// : REGRESSSION (7B58-7B60)?: Safari draws blank frames on macosx.apple.com perf page
[self releaseGState];
-
+#pragma clang diagnostic pop
+
return self;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [157846] trunk/Source/WebKit2
Title: [157846] trunk/Source/WebKit2 Revision 157846 Author mr...@apple.com Date 2013-10-22 21:04:00 -0700 (Tue, 22 Oct 2013) Log Message Fix build failures after r157842. * WebProcess/WebProcess.h: Don't try to #include a file that was deleted. It won't work. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/WebProcess.h Diff Modified: trunk/Source/WebKit2/ChangeLog (157845 => 157846) --- trunk/Source/WebKit2/ChangeLog 2013-10-23 03:39:25 UTC (rev 157845) +++ trunk/Source/WebKit2/ChangeLog 2013-10-23 04:04:00 UTC (rev 157846) @@ -1,3 +1,10 @@ +2013-10-22 Mark Rowe + +Fix build failures after r157842. + +* WebProcess/WebProcess.h: Don't try to #include a file that was deleted. +It won't work. + 2013-10-22 Brady Eidson Get rid of IDBObjectStoreBackendLevelDB Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (157845 => 157846) --- trunk/Source/WebKit2/WebProcess/WebProcess.h 2013-10-23 03:39:25 UTC (rev 157845) +++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2013-10-23 04:04:00 UTC (rev 157846) @@ -35,7 +35,6 @@ #include "SharedMemory.h" #include "TextCheckerState.h" #include "VisitedLinkTable.h" -#include #include #include #include ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [157771] trunk/WebKitLibraries/libWebKitSystemInterfaceMavericks.a
Title: [157771] trunk/WebKitLibraries/libWebKitSystemInterfaceMavericks.a Revision 157771 Author mr...@apple.com Date 2013-10-21 18:31:08 -0700 (Mon, 21 Oct 2013) Log Message Set svn:mime-type on libWebKitSystemInterfaceMavericks.a so that future changes don't generate giant commit emails. Property Changed trunk/WebKitLibraries/libWebKitSystemInterfaceMavericks.a Diff Property changes: trunk/WebKitLibraries/libWebKitSystemInterfaceMavericks.a Added: svn:mime-type ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [157561] trunk/Source/WebKit2
Title: [157561] trunk/Source/WebKit2 Revision 157561 Author mr...@apple.com Date 2013-10-17 00:28:37 -0700 (Thu, 17 Oct 2013) Log Message WebKit2 XPC services load the wrong frameworks when running from the staged frameworks location. Build the XPC services with DYLD_VERSIONED_FRAMEWORK_PATH when USE_STAGING_INSTALL_PATH is set to YES. This is necessary because there's no way to specify environment variables to be used when an XPC service is launched. Reviewed by Anders Carlsson. * Configurations/BaseTarget.xcconfig: Set OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH to contain the DYLD_VERSIONED_FRAMEWORK_PATH value when USE_STAGING_INSTALL_PATH is YES. * Configurations/BaseXPCService.xcconfig: Include OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH in the value of OTHER_LDFLAGS. * Configurations/PluginService.32.xcconfig: Ditto. * Configurations/PluginService.64.xcconfig: Ditto. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig Diff Modified: trunk/Source/WebKit2/ChangeLog (157560 => 157561) --- trunk/Source/WebKit2/ChangeLog 2013-10-17 07:22:00 UTC (rev 157560) +++ trunk/Source/WebKit2/ChangeLog 2013-10-17 07:28:37 UTC (rev 157561) @@ -1,3 +1,21 @@ +2013-10-17 Mark Rowe + + WebKit2 XPC services load the wrong frameworks when running +from the staged frameworks location. + +Build the XPC services with DYLD_VERSIONED_FRAMEWORK_PATH when USE_STAGING_INSTALL_PATH +is set to YES. This is necessary because there's no way to specify environment variables +to be used when an XPC service is launched. + +Reviewed by Anders Carlsson. + +* Configurations/BaseTarget.xcconfig: Set OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH to contain the +DYLD_VERSIONED_FRAMEWORK_PATH value when USE_STAGING_INSTALL_PATH is YES. +* Configurations/BaseXPCService.xcconfig: Include OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH in the +value of OTHER_LDFLAGS. +* Configurations/PluginService.32.xcconfig: Ditto. +* Configurations/PluginService.64.xcconfig: Ditto. + 2013-10-16 Tim Horton Remote Layer Tree: Complete support for simple layer properties Modified: trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig (157560 => 157561) --- trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2013-10-17 07:22:00 UTC (rev 157560) +++ trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2013-10-17 07:28:37 UTC (rev 157561) @@ -51,3 +51,6 @@ UMBRELLA_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR); WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders; + +OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(USE_STAGING_INSTALL_PATH)); +OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env -Wl,DYLD_VERSIONED_FRAMEWORK_PATH=/System/Library/StagedFrameworks/Safari; Modified: trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig (157560 => 157561) --- trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2013-10-17 07:22:00 UTC (rev 157560) +++ trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2013-10-17 07:28:37 UTC (rev 157561) @@ -41,3 +41,5 @@ SKIP_INSTALL_1070 = YES; SKIP_INSTALL_1080 = NO; SKIP_INSTALL_1090 = NO; + +OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH); Modified: trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig (157560 => 157561) --- trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2013-10-17 07:22:00 UTC (rev 157560) +++ trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2013-10-17 07:28:37 UTC (rev 157561) @@ -36,6 +36,6 @@ FRAMEWORK_LDFLAGS_NO = -framework WebKit2; FRAMEWORK_LDFLAGS_YES = ; -OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS); +OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH); CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements; Modified: trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig (157560 => 157561) --- trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2013-10-17 07:22:00 UTC (rev 157560) +++ trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2013-10-17 07:28:37 UTC (rev 157561) @@ -36,6 +36,6 @@ FRAMEWORK_LDFLAGS_NO = -framework WebKit2; FRAMEWORK_LDFLAGS_YES = ; -OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS); +OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH); CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [157496] trunk/Source/WebCore
Title: [157496] trunk/Source/WebCore Revision 157496 Author mr...@apple.com Date 2013-10-16 00:32:42 -0700 (Wed, 16 Oct 2013) Log Message Fix the build after r157478. Rubber-stamped by Tim Horton. Due to the way WebCore.exp.in is used, it can't be used to export a differing set of symbols for different architectures. We often work around this by tweaking code slightly to avoid needing to export different symbols. However, in this case the symbol name itself encodes an architecture-specific detail and there's no clear way to avoid the requirement to export it. To deal with this case we turn to ld's support for wildcards in the symbol export list. * WebCore.exp.in: Use wildcards in place of the number that represents by how much "this" should be adjusted when calling through the vtable thunk. Also sort the remainder of the file. * make-export-file-generator: Don't attempt to verify symbol names that contain wildcard characters. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.exp.in trunk/Source/WebCore/make-export-file-generator Diff Modified: trunk/Source/WebCore/ChangeLog (157495 => 157496) --- trunk/Source/WebCore/ChangeLog 2013-10-16 06:56:04 UTC (rev 157495) +++ trunk/Source/WebCore/ChangeLog 2013-10-16 07:32:42 UTC (rev 157496) @@ -1,3 +1,20 @@ +2013-10-16 Mark Rowe + +Fix the build after r157478. + +Rubber-stamped by Tim Horton. + +Due to the way WebCore.exp.in is used, it can't be used to export a differing set of symbols +for different architectures. We often work around this by tweaking code slightly to avoid +needing to export different symbols. However, in this case the symbol name itself encodes an +architecture-specific detail and there's no clear way to avoid the requirement to export it. + +To deal with this case we turn to ld's support for wildcards in the symbol export list. + +* WebCore.exp.in: Use wildcards in place of the number that represents by how much "this" +should be adjusted when calling through the vtable thunk. Also sort the remainder of the file. +* make-export-file-generator: Don't attempt to verify symbol names that contain wildcard characters. + 2013-10-15 Tim Horton Two more exports for 32-bit build fix. Modified: trunk/Source/WebCore/WebCore.exp.in (157495 => 157496) --- trunk/Source/WebCore/WebCore.exp.in 2013-10-16 06:56:04 UTC (rev 157495) +++ trunk/Source/WebCore/WebCore.exp.in 2013-10-16 07:32:42 UTC (rev 157496) @@ -433,6 +433,10 @@ __ZN7WebCore15BackForwardList8capacityEv __ZN7WebCore15BackForwardList9goForwardEv __ZN7WebCore15BackForwardListC1EPNS_4PageE +__ZN7WebCore15CertificateInfo19setCertificateChainEPK9__CFArray +__ZN7WebCore15CertificateInfoC1EPK9__CFArray +__ZN7WebCore15CertificateInfoC1Ev +__ZN7WebCore15CertificateInfoD1Ev __ZN7WebCore15DOMWrapperWorld13clearWrappersEv __ZN7WebCore15DOMWrapperWorldD1Ev __ZN7WebCore15DatabaseManager10initializeERKN3WTF6StringE @@ -482,8 +486,6 @@ __ZN7WebCore15GraphicsContext9setShadowERKNS_9FloatSizeEfRKNS_5ColorENS_10ColorSpaceE __ZN7WebCore15GraphicsContext9translateEff __ZN7WebCore15GraphicsContextD1Ev -__ZN7WebCore15GraphicsLayerCAC2EPNS_19GraphicsLayerClientE -__ZN7WebCore15GraphicsLayerCAD2Ev __ZN7WebCore15GraphicsLayerCA10initializeEv __ZN7WebCore15GraphicsLayerCA10setFiltersERKNS_16FilterOperationsE __ZN7WebCore15GraphicsLayerCA10setOpacityEf @@ -542,11 +544,13 @@ __ZN7WebCore15GraphicsLayerCA7setNameERKN3WTF6StringE __ZN7WebCore15GraphicsLayerCA7setSizeERKNS_9FloatSizeE __ZN7WebCore15GraphicsLayerCA8addChildEPNS_13GraphicsLayerE -__ZN7WebCore15PlatformCALayerD2Ev +__ZN7WebCore15GraphicsLayerCAC2EPNS_19GraphicsLayerClientE +__ZN7WebCore15GraphicsLayerCAD2Ev __ZN7WebCore15HitTestLocation12rectForPointERKNS_11LayoutPointE __ZN7WebCore15JSDOMWindowBase8commonVMEv __ZN7WebCore15PasteboardImageC1Ev __ZN7WebCore15PasteboardImageD1Ev +__ZN7WebCore15PlatformCALayerD2Ev __ZN7WebCore15ProtectionSpaceC1ERKN3WTF6StringEiNS_25ProtectionSpaceServerTypeES4_NS_35ProtectionSpaceAuthenticationSchemeE __ZN7WebCore15ProtectionSpaceC1Ev __ZN7WebCore15ResourceRequest21httpPipeliningEnabledEv @@ -823,11 +827,6 @@ __ZN7WebCore23AuthenticationChallengeC1ERKNS_15ProtectionSpaceERKNS_10CredentialEjRKNS_16ResourceResponseERKNS_13ResourceErrorE __ZN7WebCore23MutableStylePropertySet25ensureCSSStyleDeclarationEv __ZN7WebCore23MutableStylePropertySetD1Ev -__ZN7WebCore15CertificateInfo19setCertificateChainEPK9__CFArray -__ZN7WebCore15CertificateInfoC1EPK9__CFArray -__ZN7WebCore15CertificateInfoC1Ev -__ZN7WebCore15CertificateInfoD1Ev -__ZNK7WebCore15CertificateInfo16certificateChainEv __ZN7WebCore23SynchronousLoaderClient24platformBadResponseErrorEv __ZN7WebCore23dataForURLComponentTypeEP5NSURLl __ZN7WebCore23decodeHostNameWithRangeEP8NSString8_NSRange @@ -1523,6 +1522,7 @@ __ZNK7WebCore15AffineTransform7mapRectERKNS_9FloatRectE __ZNK7WebCore15AffineTransform8mapPoin
[webkit-changes] [157239] trunk/Source
Title: [157239] trunk/Source
Revision 157239
Author mr...@apple.com
Date 2013-10-10 12:25:07 -0700 (Thu, 10 Oct 2013)
Log Message
Source/_javascript_Core: _javascript_Core fails to build with C++ 98 conformance changes
Reviewed by Andreas Kling.
* heap/VTableSpectrum.cpp:
(JSC::VTableSpectrum::dump): strrchr returns a const char* when passed one.
Update the type of the local variable to accommodate that.
Source/WebKit2: WebKit2 fails to build with C++ 98 conformance changes
Reviewed by Andreas Kling.
* Shared/mac/SandboxExtensionMac.mm:
(WebKit::resolveSymlinksInPath): strrchr returns a const char* when passed one.
Update the type of the local variable to accommodate that.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/heap/VTableSpectrum.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (157238 => 157239)
--- trunk/Source/_javascript_Core/ChangeLog 2013-10-10 19:22:57 UTC (rev 157238)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-10-10 19:25:07 UTC (rev 157239)
@@ -1,3 +1,13 @@
+2013-10-10 Mark Rowe
+
+ _javascript_Core fails to build with C++ 98 conformance changes
+
+Reviewed by Andreas Kling.
+
+* heap/VTableSpectrum.cpp:
+(JSC::VTableSpectrum::dump): strrchr returns a const char* when passed one.
+Update the type of the local variable to accommodate that.
+
2013-10-10 Mark Hahnenberg
Objective-C API: blocks aren't callable via 'new'
Modified: trunk/Source/_javascript_Core/heap/VTableSpectrum.cpp (157238 => 157239)
--- trunk/Source/_javascript_Core/heap/VTableSpectrum.cpp 2013-10-10 19:22:57 UTC (rev 157238)
+++ trunk/Source/_javascript_Core/heap/VTableSpectrum.cpp 2013-10-10 19:25:07 UTC (rev 157239)
@@ -68,7 +68,7 @@
#if PLATFORM(MAC)
Dl_info info;
if (dladdr(item.key, &info)) {
-char* findResult = strrchr(info.dli_fname, '/');
+const char* findResult = strrchr(info.dli_fname, '/');
const char* strippedFileName;
if (findResult)
Modified: trunk/Source/WebKit2/ChangeLog (157238 => 157239)
--- trunk/Source/WebKit2/ChangeLog 2013-10-10 19:22:57 UTC (rev 157238)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-10 19:25:07 UTC (rev 157239)
@@ -1,3 +1,13 @@
+2013-10-10 Mark Rowe
+
+ WebKit2 fails to build with C++ 98 conformance changes
+
+Reviewed by Andreas Kling.
+
+* Shared/mac/SandboxExtensionMac.mm:
+(WebKit::resolveSymlinksInPath): strrchr returns a const char* when passed one.
+Update the type of the local variable to accommodate that.
+
2013-10-10 Csaba Osztrogonác
Buildfix for non Mac platforms with enabled NetworkProcess
Modified: trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm (157238 => 157239)
--- trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm 2013-10-10 19:22:57 UTC (rev 157238)
+++ trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm 2013-10-10 19:25:07 UTC (rev 157239)
@@ -178,7 +178,7 @@
return realpath(path.data(), resolvedName);
}
-char* slashPtr = strrchr(path.data(), '/');
+const char* slashPtr = strrchr(path.data(), '/');
if (slashPtr == path.data())
return path;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156877] trunk/Source/WebKit2
Title: [156877] trunk/Source/WebKit2
Revision 156877
Author mr...@apple.com
Date 2013-10-03 21:11:43 -0700 (Thu, 03 Oct 2013)
Log Message
REGRESSION (r155787): WebKitTestRunner rebuilds from scratch when doing an incremental build
Reviewed by Dan Bernstein.
* WebKit2.xcodeproj/project.pbxproj: Have unifdef generate its output to a temporary file. If its exit status
indicates that the content did not change, remove the temporary file. If the content changed, moved the temporary file
over the destination. This avoids updating the modification date of the file when it has not changed.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/WebKit2/ChangeLog (156876 => 156877)
--- trunk/Source/WebKit2/ChangeLog 2013-10-04 04:04:35 UTC (rev 156876)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-04 04:11:43 UTC (rev 156877)
@@ -1,3 +1,13 @@
+2013-10-03 Mark Rowe
+
+REGRESSION (r155787): WebKitTestRunner rebuilds from scratch when doing an incremental build
+
+Reviewed by Dan Bernstein.
+
+* WebKit2.xcodeproj/project.pbxproj: Have unifdef generate its output to a temporary file. If its exit status
+indicates that the content did not change, remove the temporary file. If the content changed, moved the temporary file
+over the destination. This avoids updating the modification date of the file when it has not changed.
+
2013-10-03 Sam Weinig
Remove shouldRubberBandInDirection from the WKBundlePageUIClient
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (156876 => 156877)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-10-04 04:04:35 UTC (rev 156876)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-10-04 04:11:43 UTC (rev 156877)
@@ -5931,7 +5931,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UWTF_USE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H} ${WKBASE_H}\n\nif [[ $? > 1 ]]; then\nexit 1;\nfi";
+ shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UWTF_USE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H}.unifdef ${WKBASE_H}\n\ncase $? in\n0)\nrm ${WKBASE_H}.unifdef\n;;\n1)\nmv ${WKBASE_H}{.unifdef,}\n;;\n*)\nexit 1\nesac\n";
};
5D1A239215E760590023E981 /* Remove Compiled Python Files */ = {
isa = PBXShellScriptBuildPhase;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156873] trunk/Source/JavaScriptCore
Title: [156873] trunk/Source/_javascript_Core
Revision 156873
Author mr...@apple.com
Date 2013-10-03 20:19:44 -0700 (Thu, 03 Oct 2013)
Log Message
REGRESSION (r156811): WebCore rebuilds from scratch when doing an incremental build
The change in r156811 resulted in several public headers in the _javascript_Core framework having their modification
date touched on every build, even if their contents had not changed. This resulted in a large portion of WebCore
needing to rebuilt after an incremental build of _javascript_Core.
Reviewed by Dan Bernstein.
* _javascript_Core.xcodeproj/project.pbxproj: Have unifdef generate its output to a temporary file. If its exit status
indicates that the content did not change, remove the temporary file. If the content changed, moved the temporary file
over the destination.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (156872 => 156873)
--- trunk/Source/_javascript_Core/ChangeLog 2013-10-04 03:19:29 UTC (rev 156872)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-10-04 03:19:44 UTC (rev 156873)
@@ -1,3 +1,17 @@
+2013-10-03 Mark Rowe
+
+REGRESSION (r156811): WebCore rebuilds from scratch when doing an incremental build
+
+The change in r156811 resulted in several public headers in the _javascript_Core framework having their modification
+date touched on every build, even if their contents had not changed. This resulted in a large portion of WebCore
+needing to rebuilt after an incremental build of _javascript_Core.
+
+Reviewed by Dan Bernstein.
+
+* _javascript_Core.xcodeproj/project.pbxproj: Have unifdef generate its output to a temporary file. If its exit status
+indicates that the content did not change, remove the temporary file. If the content changed, moved the temporary file
+over the destination.
+
2013-10-03 Brent Fulgham
[Win] Unreviewed gardening.
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (156872 => 156873)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2013-10-04 03:19:29 UTC (rev 156872)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2013-10-04 03:19:44 UTC (rev 156873)
@@ -4749,7 +4749,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "cd \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\n\nif [[ ${TARGET_MAC_OS_X_VERSION_MAJOR} == \"1080\" ]]; then\nUNIFDEF_OPTION=\"-DJSC_OBJC_API_AVAILABLE_MAC_OS_X_1080\";\nelse\nUNIFDEF_OPTION=\"-UJSC_OBJC_API_AVAILABLE_MAC_OS_X_1080\";\nfi\n\nfor HEADER in JSBase.h JSContext.h JSManagedValue.h JSValue.h JSVirtualMachine.h; do\nunifdef -B ${UNIFDEF_OPTION} -o ${HEADER} ${HEADER}\nif [[ $? > 1 ]]; then\nexit 1;\nfi\ndone";
+ shellScript = "cd \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\n\nif [[ ${TARGET_MAC_OS_X_VERSION_MAJOR} == \"1080\" ]]; then\nUNIFDEF_OPTION=\"-DJSC_OBJC_API_AVAILABLE_MAC_OS_X_1080\";\nelse\nUNIFDEF_OPTION=\"-UJSC_OBJC_API_AVAILABLE_MAC_OS_X_1080\";\nfi\n\nfor HEADER in JSBase.h JSContext.h JSManagedValue.h JSValue.h JSVirtualMachine.h; do\nunifdef -B ${UNIFDEF_OPTION} -o ${HEADER}.unifdef ${HEADER}\ncase $? in\n0)\nrm ${HEADER}.unifdef\n;;\n1)\nmv ${HEADER}{.unifdef,}\n;;\n*)\nexit 1\nesac\ndone\n";
};
5D29D8BE0E9860B400C3D2D0 /* Check For Weak VTables and Externals */ = {
isa = PBXShellScriptBuildPhase;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156743] trunk/Source/WebKit2
Title: [156743] trunk/Source/WebKit2
Revision 156743
Author mr...@apple.com
Date 2013-10-01 15:52:52 -0700 (Tue, 01 Oct 2013)
Log Message
WebKit2 APIs returning CF and NS types should explicitly declare whether they return retained objects.
This make the APIs easier to use under ARC and can help out the static analyzer.
Reviewed by Anders Carlsson.
* Shared/API/c/cf/WKErrorCF.h:
* Shared/API/c/cf/WKStringCF.h:
* Shared/API/c/cf/WKURLCF.h:
* Shared/API/c/cg/WKImageCG.h:
* Shared/API/c/mac/WKURLRequestNS.h:
* Shared/API/c/mac/WKURLResponseNS.h:
* UIProcess/API/C/cg/WKIconDatabaseCG.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/API/c/cf/WKErrorCF.h
trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.h
trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.h
trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.h
trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.h
trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.h
trunk/Source/WebKit2/UIProcess/API/C/cg/WKIconDatabaseCG.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (156742 => 156743)
--- trunk/Source/WebKit2/ChangeLog 2013-10-01 22:47:49 UTC (rev 156742)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-01 22:52:52 UTC (rev 156743)
@@ -1,3 +1,19 @@
+2013-10-01 Mark Rowe
+
+ WebKit2 APIs returning CF and NS types should explicitly declare whether they return retained objects.
+
+This make the APIs easier to use under ARC and can help out the static analyzer.
+
+Reviewed by Anders Carlsson.
+
+* Shared/API/c/cf/WKErrorCF.h:
+* Shared/API/c/cf/WKStringCF.h:
+* Shared/API/c/cf/WKURLCF.h:
+* Shared/API/c/cg/WKImageCG.h:
+* Shared/API/c/mac/WKURLRequestNS.h:
+* Shared/API/c/mac/WKURLResponseNS.h:
+* UIProcess/API/C/cg/WKIconDatabaseCG.h:
+
2013-10-01 Gabor Abraham
[Qt][WK2] Fix build after r156688.
Modified: trunk/Source/WebKit2/Shared/API/c/cf/WKErrorCF.h (156742 => 156743)
--- trunk/Source/WebKit2/Shared/API/c/cf/WKErrorCF.h 2013-10-01 22:47:49 UTC (rev 156742)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKErrorCF.h 2013-10-01 22:52:52 UTC (rev 156743)
@@ -34,7 +34,7 @@
#endif
WK_EXPORT WKErrorRef WKErrorCreateWithCFError(CFErrorRef error);
-WK_EXPORT CFErrorRef WKErrorCopyCFError(CFAllocatorRef alloc, WKErrorRef error);
+WK_EXPORT CFErrorRef WKErrorCopyCFError(CFAllocatorRef alloc, WKErrorRef error) CF_RETURNS_RETAINED;
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.h (156742 => 156743)
--- trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.h 2013-10-01 22:47:49 UTC (rev 156742)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.h 2013-10-01 22:52:52 UTC (rev 156743)
@@ -34,7 +34,7 @@
#endif
WK_EXPORT WKStringRef WKStringCreateWithCFString(CFStringRef string);
-WK_EXPORT CFStringRef WKStringCopyCFString(CFAllocatorRef alloc, WKStringRef string);
+WK_EXPORT CFStringRef WKStringCopyCFString(CFAllocatorRef alloc, WKStringRef string) CF_RETURNS_RETAINED;
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.h (156742 => 156743)
--- trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.h 2013-10-01 22:47:49 UTC (rev 156742)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.h 2013-10-01 22:52:52 UTC (rev 156743)
@@ -34,7 +34,7 @@
#endif
WK_EXPORT WKURLRef WKURLCreateWithCFURL(CFURLRef URL);
-WK_EXPORT CFURLRef WKURLCopyCFURL(CFAllocatorRef alloc, WKURLRef URL);
+WK_EXPORT CFURLRef WKURLCopyCFURL(CFAllocatorRef alloc, WKURLRef URL) CF_RETURNS_RETAINED;
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.h (156742 => 156743)
--- trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.h 2013-10-01 22:47:49 UTC (rev 156742)
+++ trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.h 2013-10-01 22:52:52 UTC (rev 156743)
@@ -34,7 +34,7 @@
extern "C" {
#endif
-WK_EXPORT CGImageRef WKImageCreateCGImage(WKImageRef image);
+WK_EXPORT CGImageRef WKImageCreateCGImage(WKImageRef image) CF_RETURNS_RETAINED;
WK_EXPORT WKImageRef WKImageCreateFromCGImage(CGImageRef imageRef, WKImageOptions options);
Modified: trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.h (156742 => 156743)
--- trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.h 2013-10-01 22:47:49 UTC (rev 156742)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.h 2013-10-01 22:52:52 UTC (rev 156743)
@@ -34,7 +34,7 @@
#endif
WK_EXPORT WKURLRequestRef WKURLRequestCreateWithNSURLRequest(NSURLRequest* urlRequest);
-WK_EXPORT NSURLRequest* WKURLRequestCopyNSURLRequest(WKURLRequestRef urlRequest);
+WK_EXPORT NSURLRequest* WKURLRequestCopyNSURLRequest(WKURLRequestRef urlRequest) NS_RETURNS_RETAINED;
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.h (156742 => 156743)
--- trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.h 2013-10-01 22:47:49 UTC (rev 156742)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.h 2013-10-01 22:52:52 UTC (re
[webkit-changes] [156689] trunk/Tools
Title: [156689] trunk/Tools Revision 156689 Author mr...@apple.com Date 2013-09-30 18:24:00 -0700 (Mon, 30 Sep 2013) Log Message More build fixage for builds with SDKs. * WebKitTestRunner/Configurations/Base.xcconfig: * WebKitTestRunner/Configurations/BaseTarget.xcconfig: Modified Paths trunk/Tools/ChangeLog trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig Diff Modified: trunk/Tools/ChangeLog (156688 => 156689) --- trunk/Tools/ChangeLog 2013-10-01 00:59:12 UTC (rev 156688) +++ trunk/Tools/ChangeLog 2013-10-01 01:24:00 UTC (rev 156689) @@ -1,3 +1,10 @@ +2013-09-30 Mark Rowe + +More build fixage for builds with SDKs. + +* WebKitTestRunner/Configurations/Base.xcconfig: +* WebKitTestRunner/Configurations/BaseTarget.xcconfig: + 2013-09-30 Timothy Hatcher Add initial version of a new Buildbot dashboard view. Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (156688 => 156689) --- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2013-10-01 00:59:12 UTC (rev 156688) +++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2013-10-01 01:24:00 UTC (rev 156689) @@ -60,6 +60,8 @@ WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(SDKROOT)$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks; WEBCORE_PRIVATE_HEADERS_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders; +FRAMEWORK_SEARCH_PATHS = $(inherited) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; + WEBKIT_SYSTEM_INTERFACE_LIBRARY = WebKitSystemInterface TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)); Modified: trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig (156688 => 156689) --- trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig 2013-10-01 00:59:12 UTC (rev 156688) +++ trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig 2013-10-01 01:24:00 UTC (rev 156689) @@ -21,5 +21,5 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; +OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks; OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156666] trunk
Title: [15] trunk Revision 15 Author mr...@apple.com Date 2013-09-30 11:09:55 -0700 (Mon, 30 Sep 2013) Log Message Fix the build when building against an SDK. Xcode helpfully prepends $(SDKROOT) to the paths in FRAMEWORK_SEARCH_PATHS when generating the compiler command lines. It can't know to do this for the system framework search paths we add manually via OTHER_CFLAGS though, so we need to prefix them with $(SDKROOT) ourself. Source/WebCore: * Configurations/WebCore.xcconfig: Source/WebKit/mac: * Configurations/WebKit.xcconfig: Source/WebKit2: * Configurations/BaseTarget.xcconfig: Tools: * DumpRenderTree/mac/Configurations/BaseTarget.xcconfig: * WebKitTestRunner/Configurations/BaseTarget.xcconfig: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig trunk/Source/WebKit/mac/ChangeLog trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig Diff Modified: trunk/Source/WebCore/ChangeLog (156665 => 15) --- trunk/Source/WebCore/ChangeLog 2013-09-30 17:58:27 UTC (rev 156665) +++ trunk/Source/WebCore/ChangeLog 2013-09-30 18:09:55 UTC (rev 15) @@ -1,3 +1,13 @@ +2013-09-30 Mark Rowe + +Fix the build when building against an SDK. + +Xcode helpfully prepends $(SDKROOT) to the paths in FRAMEWORK_SEARCH_PATHS when generating +the compiler command lines. It can't know to do this for the system framework search paths +we add manually via OTHER_CFLAGS though, so we need to prefix them with $(SDKROOT) ourself. + +* Configurations/WebCore.xcconfig: + 2013-09-30 Brent Fulgham [Windows] Unreviewed build fix. Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (156665 => 15) --- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2013-09-30 17:58:27 UTC (rev 156665) +++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2013-09-30 18:09:55 UTC (rev 15) @@ -43,7 +43,7 @@ FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION)); FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(FRAMEWORK_SEARCH_PATHS); -OTHER_CFLAGS = $(inherited) -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks; +OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks; OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS); STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH)); Modified: trunk/Source/WebKit/mac/ChangeLog (156665 => 15) --- trunk/Source/WebKit/mac/ChangeLog 2013-09-30 17:58:27 UTC (rev 156665) +++ trunk/Source/WebKit/mac/ChangeLog 2013-09-30 18:09:55 UTC (rev 15) @@ -1,3 +1,13 @@ +2013-09-30 Mark Rowe + +Fix the build when building against an SDK. + +Xcode helpfully prepends $(SDKROOT) to the paths in FRAMEWORK_SEARCH_PATHS when generating +the compiler command lines. It can't know to do this for the system framework search paths +we add manually via OTHER_CFLAGS though, so we need to prefix them with $(SDKROOT) ourself. + +* Configurations/WebKit.xcconfig: + 2013-09-29 Mark Rowe Fix the Lion build. Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (156665 => 15) --- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2013-09-30 17:58:27 UTC (rev 156665) +++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2013-09-30 18:09:55 UTC (rev 15) @@ -48,7 +48,7 @@ STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari; OTHER_CFLAGS = $(OTHER_CFLAGS_$(PLATFORM_NAME)); -OTHER_CFLAGS_macosx = $(OTHER_CFLAGS) -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; +OTHER_CFLAGS_macosx = $(OTHER_CFLAGS) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/F
[webkit-changes] [156631] trunk
Title: [156631] trunk Revision 156631 Author mr...@apple.com Date 2013-09-29 22:30:50 -0700 (Sun, 29 Sep 2013) Log Message Fix the Lion build. Ensure that C++ and Objective-C++ files build with the right compiler flags. Source/WebCore: * Configurations/WebCore.xcconfig: Source/WebKit/mac: * Configurations/WebKit.xcconfig: Source/WebKit2: * Configurations/BaseTarget.xcconfig: Tools: * DumpRenderTree/mac/Configurations/BaseTarget.xcconfig: * WebKitTestRunner/Configurations/BaseTarget.xcconfig: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig trunk/Source/WebKit/mac/ChangeLog trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig Diff Modified: trunk/Source/WebCore/ChangeLog (156630 => 156631) --- trunk/Source/WebCore/ChangeLog 2013-09-30 05:28:58 UTC (rev 156630) +++ trunk/Source/WebCore/ChangeLog 2013-09-30 05:30:50 UTC (rev 156631) @@ -1,3 +1,11 @@ +2013-09-29 Mark Rowe + +Fix the Lion build. + +Ensure that C++ and Objective-C++ files build with the right compiler flags. + +* Configurations/WebCore.xcconfig: + 2013-09-29 Gyuyoung Kim Generate toCSSFooValue() for CSSLineBoxContainValue Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (156630 => 156631) --- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2013-09-30 05:28:58 UTC (rev 156630) +++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2013-09-30 05:30:50 UTC (rev 156631) @@ -44,6 +44,7 @@ FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(FRAMEWORK_SEARCH_PATHS); OTHER_CFLAGS = $(inherited) -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks; +OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS); STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH)); STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari; Modified: trunk/Source/WebKit/mac/ChangeLog (156630 => 156631) --- trunk/Source/WebKit/mac/ChangeLog 2013-09-30 05:28:58 UTC (rev 156630) +++ trunk/Source/WebKit/mac/ChangeLog 2013-09-30 05:30:50 UTC (rev 156631) @@ -1,3 +1,11 @@ +2013-09-29 Mark Rowe + +Fix the Lion build. + +Ensure that C++ and Objective-C++ files build with the right compiler flags. + +* Configurations/WebKit.xcconfig: + 2013-09-28 Mark Rowe Fix some failures with newer versions of clang. Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (156630 => 156631) --- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2013-09-30 05:28:58 UTC (rev 156630) +++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2013-09-30 05:30:50 UTC (rev 156631) @@ -49,6 +49,7 @@ OTHER_CFLAGS = $(OTHER_CFLAGS_$(PLATFORM_NAME)); OTHER_CFLAGS_macosx = $(OTHER_CFLAGS) -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; +OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS); GCC_PREFIX_HEADER = mac/WebKitPrefix.h; GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS); Modified: trunk/Source/WebKit2/ChangeLog (156630 => 156631) --- trunk/Source/WebKit2/ChangeLog 2013-09-30 05:28:58 UTC (rev 156630) +++ trunk/Source/WebKit2/ChangeLog 2013-09-30 05:30:50 UTC (rev 156631) @@ -1,3 +1,11 @@ +2013-09-29 Mark Rowe + +Fix the Lion build. + +Ensure that C++ and Objective-C++ files build with the right compiler flags. + +* Configurations/BaseTarget.xcconfig: + 2013-09-29 Sam Weinig Fix the build. Modified: trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig (156630 => 156631) --- trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2013-09-30 05:28:58 UTC (rev 156630) +++ trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2013-09-30 05:30:50 UTC (rev 156631) @@ -30,6 +30,7 @@ HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(HEADER_SEARCH_PATHS); OTHER_CFLAGS = $(inherited) -iframework $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SYSTEM_LIBRARY_D
[webkit-changes] [156611] trunk
Title: [156611] trunk Revision 156611 Author mr...@apple.com Date 2013-09-28 13:01:30 -0700 (Sat, 28 Sep 2013) Log Message Fix some failures with newer versions of clang. Some CoreGraphics headers generate warnings under newer versions of clang. Since they're system headers the warnings would usually be suppressed, but we're adding the frameworks to the non-system framework search path so they're no longer treated as system headers. We address this by removing the system paths from FRAMEWORK_SEARCH_PATHS and using the -iframework compiler flag in OTHER_CFLAGS to add the paths to the system framework search path. We have to set OTHER_CFLAGS at the target level in order for it to coexist with the ASAN-related OTHER_CFLAGS that's set in DebugRelease.xcconfig. Reviewed by Dan Bernstein. Source/WebCore: * Configurations/WebCore.xcconfig: Source/WebKit/mac: * Configurations/DebugRelease.xcconfig: * Configurations/WebKit.xcconfig: Source/WebKit2: * Configurations/BaseTarget.xcconfig: * Configurations/DebugRelease.xcconfig: Tools: * DumpRenderTree/mac/Configurations/Base.xcconfig: * DumpRenderTree/mac/Configurations/BaseTarget.xcconfig: A new .xcconfig file that's included by all target-specific .xcconfig files. * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig: * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig: * DumpRenderTree/mac/Configurations/ImageDiff.xcconfig: * DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig: * WebKitTestRunner/Configurations/Base.xcconfig: * WebKitTestRunner/Configurations/BaseTarget.xcconfig: A new .xcconfig file that's included by all target-specific .xcconfig files. * WebKitTestRunner/Configurations/DebugRelease.xcconfig: * WebKitTestRunner/Configurations/InjectedBundle.xcconfig: * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig trunk/Source/WebKit/mac/ChangeLog trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig trunk/Tools/DumpRenderTree/mac/Configurations/ImageDiff.xcconfig trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig Added Paths trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig Diff Modified: trunk/Source/WebCore/ChangeLog (156610 => 156611) --- trunk/Source/WebCore/ChangeLog 2013-09-28 19:15:48 UTC (rev 156610) +++ trunk/Source/WebCore/ChangeLog 2013-09-28 20:01:30 UTC (rev 156611) @@ -1,5 +1,19 @@ 2013-09-28 Mark Rowe +Fix some failures with newer versions of clang. + +Some CoreGraphics headers generate warnings under newer versions of clang. Since they're system headers the warnings would +usually be suppressed, but we're adding the frameworks to the non-system framework search path so they're no longer treated +as system headers. We address this by removing the system paths from FRAMEWORK_SEARCH_PATHS and using the -iframework compiler +flag in OTHER_CFLAGS to add the paths to the system framework search path. We have to set OTHER_CFLAGS at the target level +in order for it to coexist with the ASAN-related OTHER_CFLAGS that's set in DebugRelease.xcconfig. + +Reviewed by Dan Bernstein. + +* Configurations/WebCore.xcconfig: + +2013-09-28 Mark Rowe + Take Xcode's advice and enable some extra warnings. Reviewed by Sam Weinig. Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (156610 => 156611) --- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2013-09-28 19:15:48 UTC (rev 156610) +++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2013-09-28 20:01:30 UTC (rev 156611) @@ -41,8 +41,10 @@ FRAMEWORK_SEARCH_PATHS_iphoneos_Release = $(FRAMEWORK_SEARCH_PATHS_iphoneos_Debug); FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR); FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION)); -FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks $(FRAMEWOR
[webkit-changes] [156610] trunk/Source
Title: [156610] trunk/Source
Revision 156610
Author mr...@apple.com
Date 2013-09-28 12:15:48 -0700 (Sat, 28 Sep 2013)
Log Message
Take Xcode's advice and enable some extra warnings.
Reviewed by Sam Weinig.
Source/_javascript_Core:
* Configurations/Base.xcconfig:
* _javascript_Core.xcodeproj/project.pbxproj:
Source/WebCore:
* Configurations/Base.xcconfig:
* WebCore.xcodeproj/project.pbxproj:
* dom/NamedNodeMap.cpp:
(WebCore::NamedNodeMap::removeNamedItemNS): Use the correct constant.
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Source/WebKit/mac:
* Configurations/Base.xcconfig:
Source/WebKit2:
* Configurations/Base.xcconfig:
* WebKit2.xcodeproj/project.pbxproj:
Source/WTF:
* Configurations/Base.xcconfig:
* WTF.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/Base.xcconfig
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/Configurations/Base.xcconfig
trunk/Source/WTF/WTF.xcodeproj/project.pbxproj
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/Base.xcconfig
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/dom/NamedNodeMap.cpp
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/Configurations/Base.xcconfig
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Configurations/Base.xcconfig
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (156609 => 156610)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-28 19:10:00 UTC (rev 156609)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-28 19:15:48 UTC (rev 156610)
@@ -1,3 +1,12 @@
+2013-09-28 Mark Rowe
+
+Take Xcode's advice and enable some extra warnings.
+
+Reviewed by Sam Weinig.
+
+* Configurations/Base.xcconfig:
+* _javascript_Core.xcodeproj/project.pbxproj:
+
2013-09-28 Andreas Kling
Pass VM instead of ExecState to JSFunction constructors.
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (156609 => 156610)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2013-09-28 19:10:00 UTC (rev 156609)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2013-09-28 19:15:48 UTC (rev 156610)
@@ -23,7 +23,13 @@
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_EMPTY_BODY = YES;
+CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INT_CONVERSION = YES;
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DEBUGGING_SYMBOLS = default;
@@ -58,8 +64,13 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_SIGN_COMPARE = YES;
+GCC_WARN_UNDECLARED_SELECTOR = YES;
+GCC_WARN_UNINITIALIZED_AUTOS = YES;
+GCC_WARN_UNUSED_FUNCTION = YES;
+GCC_WARN_UNUSED_VARIABLE = YES;
LINKER_DISPLAYS_MANGLED_NAMES = YES;
PREBINDING = NO;
VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (156609 => 156610)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2013-09-28 19:10:00 UTC (rev 156609)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2013-09-28 19:15:48 UTC (rev 156610)
@@ -4644,7 +4644,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
-LastUpgradeCheck = 0440;
+LastUpgradeCheck = 0500;
};
buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "_javascript_Core" */;
compatibilityVersion = "Xcode 3.2";
Modified: trunk/Source/WTF/ChangeLog (156609 => 156610)
--- trunk/Source/WTF/ChangeLog 2013-09-28 19:10:00 UTC (rev 156609)
+++ trunk/Source/WTF/ChangeLog 2013-09-28 19:15:48 UTC (rev 156610)
@@ -1,5 +1,14 @@
2013-09-28 Mark Rowe
+Take Xcode's advice and enable some extra warnings.
+
+Reviewed by Sam Weinig.
+
+* Configurations/Base.xcconfig:
+* WTF.xcodeproj/project.pbxproj:
+
+2013-09-28 Mark Rowe
+
WTF fails to build with newer versions of clang.
Reviewed by Sam Weinig.
Modified: trunk/Source/WTF/Configurations/Base.xcconfig (156609 => 156610)
--- trunk/Source/WTF/Configurations/Base.xcconfig 2013-09-28 19:10:00 UTC (rev 156609)
+++ trunk/Source/WTF/Configurations/Base.xcconfig 2013-09-28 19:15:48 UTC (rev 156610)
@@ -25,7 +25,13 @@
CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
CLANG_CXX_LIBRARY = libc++;
+CLANG_WARN_BOOL_CONVERSION = YES;
+CLANG_WARN_CONSTANT_CONVE
[webkit-changes] [156600] trunk/Source/WebCore
Title: [156600] trunk/Source/WebCore Revision 156600 Author mr...@apple.com Date 2013-09-28 03:26:17 -0700 (Sat, 28 Sep 2013) Log Message WebCore fails to build with newer versions of clang. Reviewed by Sam Weinig. * Modules/indexeddb/IDBIndex.cpp: Remove an unused constant. * Modules/indexeddb/IDBObjectStore.cpp: Ditto. * Modules/webaudio/AudioContext.cpp: Ditto. * Modules/webaudio/ScriptProcessorNode.cpp: Ditto. * Modules/webdatabase/SQLResultSet.cpp: Ditto. * Modules/webdatabase/SQLTransactionBackend.cpp: Ditto. * Modules/websockets/WebSocketHandshake.cpp: Ditto. * bindings/objc/DOM.mm: Disable a warning about overriding a protocol method in a cateogry around the one place we do it. I don't understand why this generates a warning, nor can I see a different approach that would not result in the warning being emitted. * css/CSSGrammar.y.in: #if a function that's only used inside an #if. * html/track/TextTrackCue.cpp: Remove an unused constant. * loader/TextResourceDecoder.cpp: Remove two unused functions. * page/ContentSecurityPolicy.cpp: Add #if's around constants and functions that are only used when CSP_NEXT is enabled. (WebCore::CSPDirectiveList::checkSourceAndReportViolation): Reorder the ifs slightly to make the #if'ing easier. * page/ContentSecurityPolicy.h: Add #if's around functions that are only used when CSP_NEXT is enabled. * page/DOMSecurityPolicy.cpp: Ditto. * page/DOMSecurityPolicy.h: Ditto. * page/animation/CSSPropertyAnimation.cpp: Remove an unused function. * platform/mac/DisplaySleepDisabler.cpp: Add an #if around a constant that's only used on iOS. * platform/mac/WebCoreFullScreenWarningView.mm: Remove three unused constants. * rendering/RenderLayer.cpp: Remove two unused constants. * rendering/RenderLayerCompositor.cpp: (WebCore::compositingLogEnabled): Move the #if around the function definition. * svg/SVGAnimatedAngle.cpp: Remove an unused function. * svg/SVGUseElement.cpp: #if a function that's only used inside an ASSERT. * xml/XPathStep.cpp: Ditto. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Modules/indexeddb/IDBIndex.cpp trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp trunk/Source/WebCore/Modules/webdatabase/SQLResultSet.cpp trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp trunk/Source/WebCore/bindings/objc/DOM.mm trunk/Source/WebCore/css/CSSGrammar.y.in trunk/Source/WebCore/html/track/TextTrackCue.cpp trunk/Source/WebCore/loader/TextResourceDecoder.cpp trunk/Source/WebCore/page/ContentSecurityPolicy.cpp trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp trunk/Source/WebCore/platform/mac/DisplaySleepDisabler.cpp trunk/Source/WebCore/platform/mac/WebCoreFullScreenWarningView.mm trunk/Source/WebCore/rendering/RenderLayer.cpp trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp trunk/Source/WebCore/svg/SVGAnimatedAngle.cpp trunk/Source/WebCore/svg/SVGUseElement.cpp trunk/Source/WebCore/xml/XPathStep.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (156599 => 156600) --- trunk/Source/WebCore/ChangeLog 2013-09-28 10:25:30 UTC (rev 156599) +++ trunk/Source/WebCore/ChangeLog 2013-09-28 10:26:17 UTC (rev 156600) @@ -1,3 +1,37 @@ +2013-09-28 Mark Rowe + +WebCore fails to build with newer versions of clang. + +Reviewed by Sam Weinig. + +* Modules/indexeddb/IDBIndex.cpp: Remove an unused constant. +* Modules/indexeddb/IDBObjectStore.cpp: Ditto. +* Modules/webaudio/AudioContext.cpp: Ditto. +* Modules/webaudio/ScriptProcessorNode.cpp: Ditto. +* Modules/webdatabase/SQLResultSet.cpp: Ditto. +* Modules/webdatabase/SQLTransactionBackend.cpp: Ditto. +* Modules/websockets/WebSocketHandshake.cpp: Ditto. +* bindings/objc/DOM.mm: Disable a warning about overriding a protocol method in a cateogry around the one +place we do it. I don't understand why this generates a warning, nor can I see a different approach that +would not result in the warning being emitted. +* css/CSSGrammar.y.in: #if a function that's only used inside an #if. +* html/track/TextTrackCue.cpp: Remove an unused constant. +* loader/TextResourceDecoder.cpp: Remove two unused functions. +* page/ContentSecurityPolicy.cpp: Add #if's around constants and functions that are only used when CSP_NEXT is enabled. +(WebCore::CSPDirectiveList::checkSourceAndReportViolation): Reorder the ifs slightly to make the #if'ing easier. +* page/ContentSecurityPolicy.h: Add #if's around functions that are only used when CSP_NEXT is enabled. +* page/DOMSecurityPolicy.cpp: Ditto. +* page/DOMSecurityPolicy.h: Ditto. +* page/animation/CSSPropertyAnimation.cpp: Remove an unused function. +* platform/mac/DisplaySleepDisabler.c
[webkit-changes] [156599] trunk/Source/WebKit/mac
Title: [156599] trunk/Source/WebKit/mac
Revision 156599
Author mr...@apple.com
Date 2013-09-28 03:25:30 -0700 (Sat, 28 Sep 2013)
Log Message
WebKit fails to build with newer versions of clang.
Reviewed by Sam Weinig.
* Carbon/HIWebView.mm: Remove an unused function.
* History/BinaryPropertyList.cpp: #if a constant that's only used in 64-bit.
* Misc/WebIconDatabase.mm: Remove two unused constants.
* Plugins/WebBaseNetscapePluginView.mm: Remove an unused constant.
* WebCoreSupport/WebEditorClient.mm: Ditto.
Modified Paths
trunk/Source/WebKit/mac/Carbon/HIWebView.mm
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp
trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm
trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm
Diff
Modified: trunk/Source/WebKit/mac/Carbon/HIWebView.mm (156598 => 156599)
--- trunk/Source/WebKit/mac/Carbon/HIWebView.mm 2013-09-28 10:23:32 UTC (rev 156598)
+++ trunk/Source/WebKit/mac/Carbon/HIWebView.mm 2013-09-28 10:25:30 UTC (rev 156599)
@@ -191,14 +191,6 @@
static voidStartUpdateObserver( HIWebView* view );
static voidStopUpdateObserver( HIWebView* view );
-static inline void HIRectToQDRect( const HIRect* inRect, Rect* outRect )
-{
-outRect->top = (SInt16)CGRectGetMinY( *inRect );
-outRect->left = (SInt16)CGRectGetMinX( *inRect );
-outRect->bottom = (SInt16)CGRectGetMaxY( *inRect );
-outRect->right = (SInt16)CGRectGetMaxX( *inRect );
-}
-
//--
// HIWebViewCreate
//--
Modified: trunk/Source/WebKit/mac/ChangeLog (156598 => 156599)
--- trunk/Source/WebKit/mac/ChangeLog 2013-09-28 10:23:32 UTC (rev 156598)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-09-28 10:25:30 UTC (rev 156599)
@@ -1,3 +1,15 @@
+2013-09-28 Mark Rowe
+
+WebKit fails to build with newer versions of clang.
+
+Reviewed by Sam Weinig.
+
+* Carbon/HIWebView.mm: Remove an unused function.
+* History/BinaryPropertyList.cpp: #if a constant that's only used in 64-bit.
+* Misc/WebIconDatabase.mm: Remove two unused constants.
+* Plugins/WebBaseNetscapePluginView.mm: Remove an unused constant.
+* WebCoreSupport/WebEditorClient.mm: Ditto.
+
2013-09-27 Enrica Casucci
Upstream changes to Pasteboard implementation for iOS.
Modified: trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp (156598 => 156599)
--- trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp 2013-09-28 10:23:32 UTC (rev 156598)
+++ trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp 2013-09-28 10:25:30 UTC (rev 156599)
@@ -37,7 +37,10 @@
static const UInt8 _oneByteIntegerMarkerByte_ = 0x10;
static const UInt8 twoByteIntegerMarkerByte = 0x11;
static const UInt8 fourByteIntegerMarkerByte = 0x12;
+#ifdef __LP64__
static const UInt8 eightByteIntegerMarkerByte = 0x13;
+#endif
+
static const UInt8 asciiStringMarkerByte = 0x50;
static const UInt8 asciiStringWithSeparateLengthMarkerByte = 0x5F;
static const UInt8 unicodeStringMarkerByte = 0x60;
Modified: trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm (156598 => 156599)
--- trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm 2013-09-28 10:23:32 UTC (rev 156598)
+++ trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm 2013-09-28 10:25:30 UTC (rev 156599)
@@ -48,9 +48,6 @@
using namespace WebCore;
-NSString * const WebIconDatabaseVersionKey =@"WebIconDatabaseVersion";
-NSString * const WebURLToIconURLKey = @"WebSiteURLToIconURLKey";
-
NSString *WebIconDatabaseDidAddIconNotification = @"WebIconDatabaseDidAddIconNotification";
NSString *WebIconNotificationUserInfoURLKey = @"WebIconNotificationUserInfoURLKey";
NSString *WebIconDatabaseDidRemoveAllIconsNotification = @"WebIconDatabaseDidRemoveAllIconsNotification";
Modified: trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm (156598 => 156599)
--- trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2013-09-28 10:23:32 UTC (rev 156598)
+++ trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2013-09-28 10:25:30 UTC (rev 156599)
@@ -67,8 +67,6 @@
#define LoginWindowDidSwitchFromUserNotification@"WebLoginWindowDidSwitchFromUserNotification"
#define LoginWindowDidSwitchToUserNotification @"WebLoginWindowDidSwitchToUserNotification"
-static const NSTimeInterval ClearSubstituteImageDelay = 0.5;
-
using namespace WebCore;
@implementation WebBaseNetscapePluginView
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (156598 => 156599)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2013-09-28 10:23:32 UTC (rev 156598)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2013-09-28 10:25:30 UTC (rev 156599)
@@ -91,9 +91,6 @@
return static_cast(coreAction);
}
-
[webkit-changes] [156598] trunk/Source/WebKit2
Title: [156598] trunk/Source/WebKit2
Revision 156598
Author mr...@apple.com
Date 2013-09-28 03:23:32 -0700 (Sat, 28 Sep 2013)
Log Message
WebKit2 fails to build with newer versions of clang.
Reviewed by Anders Carlsson.
* Shared/VisitedLinkTable.cpp: #if a function that's only used inside an ASSERT.
* UIProcess/Plugins/mac/PluginInfoStoreMac.mm: Remove an unused constant.
* UIProcess/mac/WKFullScreenWindowController.mm: Ditto.
* WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm: Ditto.
* WebProcess/WebPage/FindController.cpp: Ditto.
* WebProcess/WebPage/WebBackForwardListProxy.cpp: Remove two unused constants.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/VisitedLinkTable.cpp
trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (156597 => 156598)
--- trunk/Source/WebKit2/ChangeLog 2013-09-28 10:22:06 UTC (rev 156597)
+++ trunk/Source/WebKit2/ChangeLog 2013-09-28 10:23:32 UTC (rev 156598)
@@ -1,3 +1,16 @@
+2013-09-28 Mark Rowe
+
+WebKit2 fails to build with newer versions of clang.
+
+Reviewed by Anders Carlsson.
+
+* Shared/VisitedLinkTable.cpp: #if a function that's only used inside an ASSERT.
+* UIProcess/Plugins/mac/PluginInfoStoreMac.mm: Remove an unused constant.
+* UIProcess/mac/WKFullScreenWindowController.mm: Ditto.
+* WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm: Ditto.
+* WebProcess/WebPage/FindController.cpp: Ditto.
+* WebProcess/WebPage/WebBackForwardListProxy.cpp: Remove two unused constants.
+
2013-09-27 Csaba Osztrogonác
CookieStorageShim should be PLATFORM(MAC) guarded
Modified: trunk/Source/WebKit2/Shared/VisitedLinkTable.cpp (156597 => 156598)
--- trunk/Source/WebKit2/Shared/VisitedLinkTable.cpp 2013-09-28 10:22:06 UTC (rev 156597)
+++ trunk/Source/WebKit2/Shared/VisitedLinkTable.cpp 2013-09-28 10:23:32 UTC (rev 156598)
@@ -42,12 +42,14 @@
{
}
+#if !ASSERT_DISABLED
static inline bool isPowerOf2(unsigned v)
{
// Taken from http://www.cs.utk.edu/~vose/c-stuff/bithacks.html
return !(v & (v - 1)) && v;
}
+#endif
void VisitedLinkTable::setSharedMemory(PassRefPtr sharedMemory)
{
Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm (156597 => 156598)
--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2013-09-28 10:22:06 UTC (rev 156597)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2013-09-28 10:23:32 UTC (rev 156598)
@@ -36,8 +36,6 @@
using namespace WebCore;
-static const char* const oracleJavaAppletPluginBundleIdentifier = "com.oracle.java.JavaAppletPlugin";
-
namespace WebKit {
Vector PluginInfoStore::pluginsDirectories()
Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (156597 => 156598)
--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2013-09-28 10:22:06 UTC (rev 156597)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2013-09-28 10:23:32 UTC (rev 156598)
@@ -51,7 +51,6 @@
static RetainPtr createBackgroundFullscreenWindow(NSRect frame);
-static const CFTimeInterval defaultAnimationDuration = 0.5;
static const NSTimeInterval DefaultWatchdogTimerInterval = 1;
enum FullScreenState : NSInteger {
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (156597 => 156598)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2013-09-28 10:22:06 UTC (rev 156597)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2013-09-28 10:23:32 UTC (rev 156598)
@@ -43,7 +43,6 @@
#ifndef NP_NO_CARBON
static const double nullEventIntervalActive = 0.02;
-static const double nullEventIntervalNotActive = 0.25;
static unsigned buttonStateFromLastMouseEvent;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp (156597 => 156598)
--- trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2013-09-28 10:22:06 UTC (rev 156597)
+++ trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2013-09-28 10:23:32 UTC (rev 156598)
@@ -387,7 +387,6 @@
static const float shadowOffsetX = 0.0;
static const float shadowOffsetY = 1.0;
static const float shadowBlurRadius = 2.0;
-static const float whiteFrameThickness = 1.0;
static const float overlayBackgroundRed = 0.1;
static const float overlayBackgroundGreen = 0.1;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp (156597 => 156598)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp 2013-09-28 10:22:06 UTC (rev 156597)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebB
[webkit-changes] [156597] trunk/Source/JavaScriptCore
Title: [156597] trunk/Source/_javascript_Core
Revision 156597
Author mr...@apple.com
Date 2013-09-28 03:22:06 -0700 (Sat, 28 Sep 2013)
Log Message
_javascript_Core fails to build with newer versions of clang.
Reviewed by Sam Weinig.
* interpreter/Interpreter.cpp: Remove an unused function.
* parser/SourceProvider.cpp: Ditto.
* runtime/GCActivityCallback.cpp: #if a constant that's only used on non-CF platforms.
* runtime/JSCJSValue.cpp: Remove an unused constant.
* runtime/JSString.cpp: Ditto.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/interpreter/Interpreter.cpp
trunk/Source/_javascript_Core/parser/SourceProvider.cpp
trunk/Source/_javascript_Core/runtime/GCActivityCallback.cpp
trunk/Source/_javascript_Core/runtime/JSCJSValue.cpp
trunk/Source/_javascript_Core/runtime/JSString.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (156596 => 156597)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-28 10:19:40 UTC (rev 156596)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-28 10:22:06 UTC (rev 156597)
@@ -1,3 +1,15 @@
+2013-09-28 Mark Rowe
+
+_javascript_Core fails to build with newer versions of clang.
+
+Reviewed by Sam Weinig.
+
+* interpreter/Interpreter.cpp: Remove an unused function.
+* parser/SourceProvider.cpp: Ditto.
+* runtime/GCActivityCallback.cpp: #if a constant that's only used on non-CF platforms.
+* runtime/JSCJSValue.cpp: Remove an unused constant.
+* runtime/JSString.cpp: Ditto.
+
2013-09-27 Filip Pizlo
Get rid of SetMyScope/SetCallee; use normal variables for the scope and callee of inlined call frames of closures
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (156596 => 156597)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2013-09-28 10:19:40 UTC (rev 156596)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2013-09-28 10:22:06 UTC (rev 156597)
@@ -433,12 +433,6 @@
return !callerFrame->hasHostCallFrameFlag();
}
-static ALWAYS_INLINE const String getSourceURLFromCallFrame(CallFrame* callFrame)
-{
-ASSERT(!callFrame->hasHostCallFrameFlag());
-return callFrame->codeBlock()->ownerExecutable()->sourceURL();
-}
-
static StackFrameCodeType getStackFrameCodeType(StackVisitor& visitor)
{
switch (visitor->codeType()) {
Modified: trunk/Source/_javascript_Core/parser/SourceProvider.cpp (156596 => 156597)
--- trunk/Source/_javascript_Core/parser/SourceProvider.cpp 2013-09-28 10:19:40 UTC (rev 156596)
+++ trunk/Source/_javascript_Core/parser/SourceProvider.cpp 2013-09-28 10:22:06 UTC (rev 156597)
@@ -42,11 +42,6 @@
{
}
-static inline size_t charPositionExtractor(const size_t* value)
-{
-return *value;
-}
-
static TCMalloc_SpinLock providerIdLock = SPINLOCK_INITIALIZER;
void SourceProvider::getID()
Modified: trunk/Source/_javascript_Core/runtime/GCActivityCallback.cpp (156596 => 156597)
--- trunk/Source/_javascript_Core/runtime/GCActivityCallback.cpp 2013-09-28 10:19:40 UTC (rev 156596)
+++ trunk/Source/_javascript_Core/runtime/GCActivityCallback.cpp 2013-09-28 10:22:06 UTC (rev 156597)
@@ -50,7 +50,10 @@
const double maxGCTimeSlice = 0.05; // The maximum amount of CPU time we want to use for opportunistic timer-triggered collections.
const double timerSlop = 2.0; // Fudge factor to avoid performance cost of resetting timer.
const double pagingTimeOut = 0.1; // Time in seconds to allow opportunistic timer to iterate over all blocks to see if the Heap is paged out.
+
+#if !USE(CF)
const double hour = 60 * 60;
+#endif
#if USE(CF)
DefaultGCActivityCallback::DefaultGCActivityCallback(Heap* heap)
Modified: trunk/Source/_javascript_Core/runtime/JSCJSValue.cpp (156596 => 156597)
--- trunk/Source/_javascript_Core/runtime/JSCJSValue.cpp 2013-09-28 10:19:40 UTC (rev 156596)
+++ trunk/Source/_javascript_Core/runtime/JSCJSValue.cpp 2013-09-28 10:22:06 UTC (rev 156597)
@@ -38,8 +38,6 @@
namespace JSC {
-static const double D32 = 4294967296.0;
-
// ECMA 9.4
double JSValue::toInteger(ExecState* exec) const
{
Modified: trunk/Source/_javascript_Core/runtime/JSString.cpp (156596 => 156597)
--- trunk/Source/_javascript_Core/runtime/JSString.cpp 2013-09-28 10:19:40 UTC (rev 156596)
+++ trunk/Source/_javascript_Core/runtime/JSString.cpp 2013-09-28 10:22:06 UTC (rev 156597)
@@ -32,8 +32,6 @@
namespace JSC {
-static const unsigned substringFromRopeCutoff = 4;
-
const ClassInfo JSString::s_info = { "string", 0, 0, 0, CREATE_METHOD_TABLE(JSString) };
void JSRopeString::RopeBuilder::expand()
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156596] trunk/Source/WTF
Title: [156596] trunk/Source/WTF
Revision 156596
Author mr...@apple.com
Date 2013-09-28 03:19:40 -0700 (Sat, 28 Sep 2013)
Log Message
WTF fails to build with newer versions of clang.
Reviewed by Sam Weinig.
* wtf/DateMath.cpp: Remove some unused constants.
* wtf/FastMalloc.cpp: #if some constants and functions that are unused in some configurations.
Remove a function that's unused on all platforms.
* wtf/TCSystemAlloc.cpp: Remove some unused constants.
(TCMalloc_SystemRelease): Remove an if whose body is never executed.
* wtf/dtoa.cpp: #if things such that storeInc is only defined when USE_LONG_LONG is undefined.
Remove an unused constant.
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/DateMath.cpp
trunk/Source/WTF/wtf/FastMalloc.cpp
trunk/Source/WTF/wtf/TCSystemAlloc.cpp
trunk/Source/WTF/wtf/dtoa.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (156595 => 156596)
--- trunk/Source/WTF/ChangeLog 2013-09-28 05:35:03 UTC (rev 156595)
+++ trunk/Source/WTF/ChangeLog 2013-09-28 10:19:40 UTC (rev 156596)
@@ -1,3 +1,17 @@
+2013-09-28 Mark Rowe
+
+ WTF fails to build with newer versions of clang.
+
+Reviewed by Sam Weinig.
+
+* wtf/DateMath.cpp: Remove some unused constants.
+* wtf/FastMalloc.cpp: #if some constants and functions that are unused in some configurations.
+Remove a function that's unused on all platforms.
+* wtf/TCSystemAlloc.cpp: Remove some unused constants.
+(TCMalloc_SystemRelease): Remove an if whose body is never executed.
+* wtf/dtoa.cpp: #if things such that storeInc is only defined when USE_LONG_LONG is undefined.
+Remove an unused constant.
+
2013-09-27 Thiago de Barros Lacerda
[Nix] Updating Nix trunk files
Modified: trunk/Source/WTF/wtf/DateMath.cpp (156595 => 156596)
--- trunk/Source/WTF/wtf/DateMath.cpp 2013-09-28 05:35:03 UTC (rev 156595)
+++ trunk/Source/WTF/wtf/DateMath.cpp 2013-09-28 10:19:40 UTC (rev 156596)
@@ -113,11 +113,6 @@
/* Constants */
-static const double minutesPerDay = 24.0 * 60.0;
-static const double secondsPerYear = 24.0 * 60.0 * 60.0 * 365.0;
-
-static const double usecPerSec = 100.0;
-
static const double maxUnixTime = 2145859200.0; // 12/31/2037
// ECMAScript asks not to support for a date of which total
// millisecond value is larger than the following value.
Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (156595 => 156596)
--- trunk/Source/WTF/wtf/FastMalloc.cpp 2013-09-28 05:35:03 UTC (rev 156595)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2013-09-28 10:19:40 UTC (rev 156596)
@@ -515,7 +515,10 @@
#define MESSAGE LOG_ERROR
#define CHECK_CONDITION ASSERT
+#if !OS(DARWIN)
static const char kLLHardeningMask = 0;
+#endif
+
template struct EntropySource;
template <> struct EntropySource<4> {
static uint32_t value()
@@ -881,15 +884,6 @@
*head = start;
}
-static ALWAYS_INLINE size_t SLL_Size(HardenedSLL head, uintptr_t entropy) {
- int count = 0;
- while (head) {
-count++;
-head = SLL_Next(head, entropy);
- }
- return count;
-}
-
// Setup helper functions.
static ALWAYS_INLINE size_t SizeClass(size_t size) {
@@ -4009,12 +4003,14 @@
}
#endif
+#if !ASSERT_DISABLED
static inline bool CheckCachedSizeClass(void *ptr) {
PageID p = reinterpret_cast(ptr) >> kPageShift;
size_t cached_value = pageheap->GetSizeClassIfCached(p);
return cached_value == 0 ||
cached_value == pageheap->GetDescriptor(p)->sizeclass;
}
+#endif
static inline void* CheckedMallocResult(void *result)
{
@@ -4193,11 +4189,11 @@
static inline void do_malloc_stats() {
PrintStats(1);
}
-#endif
static inline int do_mallopt(int, int) {
return 1; // Indicates error
}
+#endif
#ifdef HAVE_STRUCT_MALLINFO // mallinfo isn't defined on freebsd, for instance
static inline struct mallinfo do_mallinfo() {
Modified: trunk/Source/WTF/wtf/TCSystemAlloc.cpp (156595 => 156596)
--- trunk/Source/WTF/wtf/TCSystemAlloc.cpp 2013-09-28 05:35:03 UTC (rev 156595)
+++ trunk/Source/WTF/wtf/TCSystemAlloc.cpp 2013-09-28 10:19:40 UTC (rev 156596)
@@ -99,9 +99,6 @@
DEFINE_int32(malloc_devmem_limit, 0,
"Physical memory limit location in MB for /dev/mem allocation."
" Setting this to 0 means no limit.");
-#else
-static const int32_t FLAGS_malloc_devmem_start = 0;
-static const int32_t FLAGS_malloc_devmem_limit = 0;
#endif
#ifndef WTF_CHANGES
@@ -402,11 +399,6 @@
#else
const int advice = MADV_DONTNEED;
#endif
- if (FLAGS_malloc_devmem_start) {
-// It's not safe to use MADV_DONTNEED if we've been mapping
-// /dev/mem for heap memory
-return;
- }
if (pagesize == 0) pagesize = getpagesize();
const size_t pagemask = pagesize - 1;
Modified: trunk/Source/WTF/wtf/dtoa.cpp (156595 => 156596)
--- trunk/Source/WTF/wtf/dtoa.cpp 2013-09-28 05:35:03 UTC (rev 156595)
+++ trunk/Source/WTF/wtf/dtoa.cpp 2013-09-28 10:19:40 UTC (rev 156596)
@@ -46,6 +46,12 @@
#pragma warning(disa
[webkit-changes] [156348] trunk
Title: [156348] trunk Revision 156348 Author mr...@apple.com Date 2013-09-24 12:18:46 -0700 (Tue, 24 Sep 2013) Log Message WebKit should build against the Xcode default toolchain when targeting OS X 10.8 Reviewed by Dan Bernstein. Source/_javascript_Core: * Configurations/Base.xcconfig: Source/ThirdParty/ANGLE: * Configurations/Base.xcconfig: Source/WebCore: * Configurations/Base.xcconfig: Source/WebInspectorUI: * Configurations/Base.xcconfig: Source/WebKit/mac: * Configurations/Base.xcconfig: Source/WebKit2: * Configurations/Base.xcconfig: Source/WTF: * Configurations/Base.xcconfig: Tools: * DumpRenderTree/mac/Configurations/Base.xcconfig: * MiniBrowser/Configurations/Base.xcconfig: * TestWebKitAPI/Configurations/Base.xcconfig: * WebKitLauncher/Configurations/Base.xcconfig: * WebKitTestRunner/Configurations/Base.xcconfig: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/Base.xcconfig trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig trunk/Source/WTF/ChangeLog trunk/Source/WTF/Configurations/Base.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/Base.xcconfig trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/Configurations/Base.xcconfig trunk/Source/WebKit/mac/ChangeLog trunk/Source/WebKit/mac/Configurations/Base.xcconfig trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Configurations/Base.xcconfig trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig trunk/Tools/MiniBrowser/Configurations/Base.xcconfig trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig Diff Modified: trunk/Source/_javascript_Core/ChangeLog (156347 => 156348) --- trunk/Source/_javascript_Core/ChangeLog 2013-09-24 19:14:42 UTC (rev 156347) +++ trunk/Source/_javascript_Core/ChangeLog 2013-09-24 19:18:46 UTC (rev 156348) @@ -1,3 +1,11 @@ +2013-09-24 Mark Rowe + + WebKit should build against the Xcode default toolchain when targeting OS X 10.8 + +Reviewed by Dan Bernstein. + +* Configurations/Base.xcconfig: + 2013-09-23 Patrick Gansterer use NOMINMAX instead of #define min min Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (156347 => 156348) --- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2013-09-24 19:14:42 UTC (rev 156347) +++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2013-09-24 19:18:46 UTC (rev 156348) @@ -125,3 +125,11 @@ INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL); HAVE_DTRACE = 1; + +TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)); +TOOLCHAINS_iphoneos = $(TOOLCHAINS); +TOOLCHAINS_iphonesimulator = $(TOOLCHAINS); +TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR)); +TOOLCHAINS_macosx_1070 = $(TOOLCHAINS); +TOOLCHAINS_macosx_1080 = default; +TOOLCHAINS_macosx_1090 = $(TOOLCHAINS); Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (156347 => 156348) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-09-24 19:14:42 UTC (rev 156347) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-09-24 19:18:46 UTC (rev 156348) @@ -1,3 +1,11 @@ +2013-09-24 Mark Rowe + + WebKit should build against the Xcode default toolchain when targeting OS X 10.8 + +Reviewed by Dan Bernstein. + +* Configurations/Base.xcconfig: + 2013-09-06 pe...@outlook.com [Win][WebGL] WebGL rendering is slow. Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (156347 => 156348) --- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2013-09-24 19:14:42 UTC (rev 156347) +++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2013-09-24 19:18:46 UTC (rev 156348) @@ -46,3 +46,11 @@ // Don't build against an SDK unless we're targeting an older OS version. SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION)); SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx; + +TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)); +TOOLCHAINS_iphoneos = $(TOOLCHAINS); +TOOLCHAINS_iphonesimulator = $(TOOLCHAINS); +TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR)); +TOOLCHAINS_macosx_1070 = $(TOOLCHAINS); +TOOLCHAINS_macosx_1080 = default; +TOOLCHAINS_macosx_1090 = $(TOOLCHAINS); Modified: trunk/Source/WTF/ChangeLog (156347 => 156348) --- trunk/Source/WTF/ChangeLog 2013-09-24 19:14:42 UTC (rev 156347) +++ trunk/Source/WTF/ChangeLog 2013-09-24 19:18:46 UTC (rev 156348) @@ -1,3 +1,11 @@ +2013-09-24 Mark Rowe + + WebKit should build against the Xcode default toolchain when targeting OS X 10.8 + +Reviewed by Dan Bernstein. + +* Configurations/Base.xcconfig: + 2013-09-23 Anders Carlsson Remove WTF_USE_SCROLLBAR_PAINTER #define Modified: trunk/Source/WTF/Configurations/Base.xcconfig (156347 => 156348) --- t
[webkit-changes] [156218] trunk/WebKitLibraries
Title: [156218] trunk/WebKitLibraries Revision 156218 Author mr...@apple.com Date 2013-09-20 18:25:51 -0700 (Fri, 20 Sep 2013) Log Message Fix link errors for external users when building WebKit with Xcode 5. Reviewed by Oliver Hunt. * libWebKitSystemInterfaceLion.a: * libWebKitSystemInterfaceMountainLion.a: Modified Paths trunk/WebKitLibraries/ChangeLog trunk/WebKitLibraries/libWebKitSystemInterfaceLion.a trunk/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a Diff Modified: trunk/WebKitLibraries/ChangeLog (156217 => 156218) --- trunk/WebKitLibraries/ChangeLog 2013-09-21 00:57:02 UTC (rev 156217) +++ trunk/WebKitLibraries/ChangeLog 2013-09-21 01:25:51 UTC (rev 156218) @@ -1,3 +1,12 @@ +2013-09-20 Mark Rowe + +Fix link errors for external users when building WebKit with Xcode 5. + +Reviewed by Oliver Hunt. + +* libWebKitSystemInterfaceLion.a: +* libWebKitSystemInterfaceMountainLion.a: + 2013-09-19 Bear Travis CSS_SHAPES not supported on AppleWin port Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLion.a (Binary files differ) Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a (Binary files differ) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156208] trunk
Title: [156208] trunk
Revision 156208
Author mr...@apple.com
Date 2013-09-20 16:01:37 -0700 (Fri, 20 Sep 2013)
Log Message
build-webkit should verify that your tools are up-to-date
Tools:
Enforce a minimum OS version of 10.7.5 and Xcode version of 4.6.
Reviewed by David Kilzer.
* Scripts/webkitdirs.pm:
(checkRequiredSystemConfig):
Websites/webkit.org:
Update references on webkit.org to mention Xcode 4.6 as the minimum version.
Reviewed by David Kilzer.
* building/debug-mac-uiprocess.html:
* building/tools.html:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitdirs.pm
trunk/Websites/webkit.org/ChangeLog
trunk/Websites/webkit.org/building/debug-mac-uiprocess.html
trunk/Websites/webkit.org/building/tools.html
Diff
Modified: trunk/Tools/ChangeLog (156207 => 156208)
--- trunk/Tools/ChangeLog 2013-09-20 22:52:23 UTC (rev 156207)
+++ trunk/Tools/ChangeLog 2013-09-20 23:01:37 UTC (rev 156208)
@@ -1,3 +1,14 @@
+2013-09-20 Mark Rowe
+
+ build-webkit should verify that your tools are up-to-date
+
+Enforce a minimum OS version of 10.7.5 and Xcode version of 4.6.
+
+Reviewed by David Kilzer.
+
+* Scripts/webkitdirs.pm:
+(checkRequiredSystemConfig):
+
2013-09-20 Mario Sanchez Prada
[ATK] Do not expose aria-help in ATK based platforms
Modified: trunk/Tools/Scripts/webkitdirs.pm (156207 => 156208)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-09-20 22:52:23 UTC (rev 156207)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-09-20 23:01:37 UTC (rev 156208)
@@ -1505,23 +1505,19 @@
{
if (isDarwin()) {
chomp(my $productVersion = `sw_vers -productVersion`);
-if (eval "v$productVersion" lt v10.4) {
+if (eval "v$productVersion" lt v10.7.5) {
print "*\n";
-print "Mac OS X Version 10.4.0 or later is required to build WebKit.\n";
+print "Mac OS X Version 10.7.5 or later is required to build WebKit.\n";
print "You have " . $productVersion . ", thus the build will most likely fail.\n";
print "*\n";
}
my $xcodebuildVersionOutput = `xcodebuild -version`;
-my $devToolsCoreVersion = ($xcodebuildVersionOutput =~ /DevToolsCore-(\d+)/) ? $1 : undef;
my $xcodeVersion = ($xcodebuildVersionOutput =~ /Xcode ([0-9](\.[0-9]+)*)/) ? $1 : undef;
-if (!$devToolsCoreVersion && !$xcodeVersion
-|| $devToolsCoreVersion && $devToolsCoreVersion < 747
-|| $xcodeVersion && eval "v$xcodeVersion" lt v2.3) {
+if (!$xcodeVersion || $xcodeVersion && eval "v$xcodeVersion" lt v4.6) {
print "*\n";
-print "Xcode Version 2.3 or later is required to build WebKit.\n";
+print "Xcode Version 4.6 or later is required to build WebKit.\n";
print "You have an earlier version of Xcode, thus the build will\n";
-print "most likely fail. The latest Xcode is available from the web:\n";
-print "http://developer.apple.com/tools/xcode\n";
+print "most likely fail. The latest Xcode is available from the App Store.\n";
print "*\n";
}
} elsif (isGtk() or isQt() or isEfl()) {
Modified: trunk/Websites/webkit.org/ChangeLog (156207 => 156208)
--- trunk/Websites/webkit.org/ChangeLog 2013-09-20 22:52:23 UTC (rev 156207)
+++ trunk/Websites/webkit.org/ChangeLog 2013-09-20 23:01:37 UTC (rev 156208)
@@ -1,3 +1,14 @@
+2013-09-20 Mark Rowe
+
+ build-webkit should verify that your tools are up-to-date
+
+Update references on webkit.org to mention Xcode 4.6 as the minimum version.
+
+Reviewed by David Kilzer.
+
+* building/debug-mac-uiprocess.html:
+* building/tools.html:
+
2013-09-19 Dan Bernstein
Add a style guideline regarding spacing in range-based for loops
Modified: trunk/Websites/webkit.org/building/debug-mac-uiprocess.html (156207 => 156208)
--- trunk/Websites/webkit.org/building/debug-mac-uiprocess.html 2013-09-20 22:52:23 UTC (rev 156207)
+++ trunk/Websites/webkit.org/building/debug-mac-uiprocess.html 2013-09-20 23:01:37 UTC (rev 156208)
@@ -8,7 +8,7 @@
Open the WebKit2 Xcode project
-Note, the Xcode project file depends on the build location specified in the project itself. In Xcode 4.3.2, choose Xcode > Preferences > Locations, click Locations, click the Advanced button, and ensure that the build location is Legacy.
+Note, the Xcode project file depends on the build location specified in the project itself. Choose Xcode > Preferences > Locations, click Locations, click the Advanced button, and ensure that the build location is Legacy.
Set the project's build products location
To find the WebKit you built, Xcode ne
[webkit-changes] [155166] trunk/Source/JavaScriptCore
Title: [155166] trunk/Source/_javascript_Core
Revision 155166
Author mr...@apple.com
Date 2013-09-05 18:08:48 -0700 (Thu, 05 Sep 2013)
Log Message
Roll out r155149 since it broke the build.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h
trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp
trunk/Source/_javascript_Core/dfg/DFGFixupPhase.cpp
trunk/Source/_javascript_Core/dfg/DFGSafeToExecute.h
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp
trunk/Source/_javascript_Core/dfg/DFGUseKind.cpp
trunk/Source/_javascript_Core/dfg/DFGUseKind.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (155165 => 155166)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-06 00:55:42 UTC (rev 155165)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-06 01:08:48 UTC (rev 155166)
@@ -23,46 +23,6 @@
(JSC::CodeBlock::printLocationAndOp):
(JSC::CodeBlock::printLocationOpAndRegisterOperand):
-2013-09-05 Filip Pizlo
-
-REGRESSION(149636, merged in 153145): ToThis conversion doesn't work in the DFG
-https://bugs.webkit.org/show_bug.cgi?id=120781
-
-Reviewed by Mark Hahnenberg.
-
-- Use some method table hacks to detect if the CheckStructure optimization is
- valid for to_this.
-
-- Introduce a FinalObjectUse and use it for ToThis->Identity conversion.
-
-This looks like it might be perf-neutral on the major benchmarks, but it
-introduces some horrible performance cliffs. For example if you add methods to
-the Array prototype, you'll get horrible performance cliffs. As in virtual calls
-to C++ every time you call a JS function even if it's inlined.
-LongSpider/3d-cube appears to hit this.
-
-* dfg/DFGAbstractInterpreterInlines.h:
-(JSC::DFGexecuteEffects):
-* dfg/DFGByteCodeParser.cpp:
-(JSC::DFG::ByteCodeParser::parseBlock):
-* dfg/DFGFixupPhase.cpp:
-(JSC::DFG::FixupPhase::fixupNode):
-* dfg/DFGSafeToExecute.h:
-(JSC::DFG::SafeToExecuteEdge::operator()):
-* dfg/DFGSpeculativeJIT.cpp:
-(JSC::DFG::SpeculativeJIT::speculateFinalObject):
-(JSC::DFG::SpeculativeJIT::speculate):
-* dfg/DFGSpeculativeJIT.h:
-* dfg/DFGSpeculativeJIT32_64.cpp:
-(JSC::DFG::SpeculativeJIT::compile):
-* dfg/DFGSpeculativeJIT64.cpp:
-(JSC::DFG::SpeculativeJIT::compile):
-* dfg/DFGUseKind.cpp:
-(WTF::printInternal):
-* dfg/DFGUseKind.h:
-(JSC::DFG::typeFilterFor):
-(JSC::DFG::isCell):
-
2013-09-05 Anders Carlsson
GCAssertions.h should use STL type traits and static_assert
Modified: trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h (155165 => 155166)
--- trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h 2013-09-06 00:55:42 UTC (rev 155165)
+++ trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h 2013-09-06 01:08:48 UTC (rev 155166)
@@ -1086,7 +1086,7 @@
AbstractValue& destination = forNode(node);
destination = source;
-destination.merge(SpecObject);
+destination.merge(SpecObjectOther);
break;
}
Modified: trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (155165 => 155166)
--- trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2013-09-06 00:55:42 UTC (rev 155165)
+++ trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2013-09-06 01:08:48 UTC (rev 155166)
@@ -1902,8 +1902,7 @@
if (profile->m_singletonValueIsTop
|| !profile->m_singletonValue
|| !profile->m_singletonValue.isCell()
-|| profile->m_singletonValue.asCell()->classInfo() != Structure::info()
-|| static_cast(profile->m_singletonValue.asCell())->classInfo()->methodTable.toThis != JSObject::info()->methodTable.toThis)
+|| profile->m_singletonValue.asCell()->classInfo() != Structure::info())
setThis(addToGraph(ToThis, op1));
else {
addToGraph(
Modified: trunk/Source/_javascript_Core/dfg/DFGFixupPhase.cpp (155165 => 155166)
--- trunk/Source/_javascript_Core/dfg/DFGFixupPhase.cpp 2013-09-06 00:55:42 UTC (rev 155165)
+++ trunk/Source/_javascript_Core/dfg/DFGFixupPhase.cpp 2013-09-06 01:08:48 UTC (rev 155166)
@@ -706,7 +706,7 @@
}
if (isFinalObjectSpeculation(node->child1()->prediction())) {
-setUseKindAndUnboxIfProfitable(node->child1());
+setUseKindAndUnboxIfProfitable(node->child1());
node->convertToIdentity();
[webkit-changes] [155087] trunk/Source/WTF
Title: [155087] trunk/Source/WTF
Revision 155087
Author mr...@apple.com
Date 2013-09-04 19:44:28 -0700 (Wed, 04 Sep 2013)
Log Message
Fix AutodrainedPool.h to compile without errors under ARC.
Rubber-stamped by Anders Carlsson.
* wtf/AutodrainedPool.h: Some versions of Clang complain about any use of NSAutoreleasePool under ARC.
Change the type of the member variable to id to work around this. Since the implementation file is compiled
under manual reference counting, everything will work fine.
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/AutodrainedPool.h
Diff
Modified: trunk/Source/WTF/ChangeLog (155086 => 155087)
--- trunk/Source/WTF/ChangeLog 2013-09-05 01:41:18 UTC (rev 155086)
+++ trunk/Source/WTF/ChangeLog 2013-09-05 02:44:28 UTC (rev 155087)
@@ -1,3 +1,13 @@
+2013-09-04 Mark Rowe
+
+Fix AutodrainedPool.h to compile without errors under ARC.
+
+Rubber-stamped by Anders Carlsson.
+
+* wtf/AutodrainedPool.h: Some versions of Clang complain about any use of NSAutoreleasePool under ARC.
+Change the type of the member variable to id to work around this. Since the implementation file is compiled
+under manual reference counting, everything will work fine.
+
2013-09-04 Anders Carlsson
De-indent Vector.h.
Modified: trunk/Source/WTF/wtf/AutodrainedPool.h (155086 => 155087)
--- trunk/Source/WTF/wtf/AutodrainedPool.h 2013-09-05 01:41:18 UTC (rev 155086)
+++ trunk/Source/WTF/wtf/AutodrainedPool.h 2013-09-05 02:44:28 UTC (rev 155087)
@@ -31,7 +31,9 @@
#include
-OBJC_CLASS NSAutoreleasePool;
+#if PLATFORM(MAC) && !defined(__OBJC__)
+typedef struct objc_object *id;
+#endif
namespace WTF {
@@ -48,7 +50,7 @@
private:
#if PLATFORM(MAC)
-NSAutoreleasePool* m_pool;
+id m_pool;
#endif
};
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [155082] trunk/Source/WebKit/mac
Title: [155082] trunk/Source/WebKit/mac
Revision 155082
Author mr...@apple.com
Date 2013-09-04 17:49:56 -0700 (Wed, 04 Sep 2013)
Log Message
Make WebKit's localizable strings mechanism usable under ARC
WebKit's localizable strings mechanism is also used outside of WebKit so it needs to work
both with and without ARC.
Reviewed by Anders Carlsson.
* Misc/WebLocalizableStrings.h: Mark the bundle member as unretained. This matches how the
member is used within WebLocalizableStrings.mm.
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (155081 => 155082)
--- trunk/Source/WebKit/mac/ChangeLog 2013-09-05 00:40:15 UTC (rev 155081)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-09-05 00:49:56 UTC (rev 155082)
@@ -1,3 +1,15 @@
+2013-09-04 Mark Rowe
+
+ Make WebKit's localizable strings mechanism usable under ARC
+
+WebKit's localizable strings mechanism is also used outside of WebKit so it needs to work
+both with and without ARC.
+
+Reviewed by Anders Carlsson.
+
+* Misc/WebLocalizableStrings.h: Mark the bundle member as unretained. This matches how the
+member is used within WebLocalizableStrings.mm.
+
2013-09-02 Darin Adler
[Mac] No need for HardAutorelease, which is same as CFBridgingRelease
Modified: trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h (155081 => 155082)
--- trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h 2013-09-05 00:40:15 UTC (rev 155081)
+++ trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h 2013-09-05 00:49:56 UTC (rev 155082)
@@ -36,7 +36,7 @@
typedef struct {
const char *identifier;
-NSBundle *bundle;
+__unsafe_unretained NSBundle *bundle;
} WebLocalizableStringsBundle;
#ifdef __cplusplus
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [154537] trunk/Source/WTF
Title: [154537] trunk/Source/WTF
Revision 154537
Author mr...@apple.com
Date 2013-08-23 21:07:07 -0700 (Fri, 23 Aug 2013)
Log Message
Revert r153637.
It didn't work with ARC like it said it would. We'll need to take a slightly different approach.
Rubber-stamped by Anders Carlsson.
* wtf/RetainPtr.h:
(WTF::RetainPtr::RetainPtr):
(WTF::RetainPtr::~RetainPtr):
(WTF::RetainPtr::operator UnspecifiedBoolType):
(WTFRetainPtr):
(WTFclear):
(WTF::=):
(WTF::adoptCF):
(WTF::adoptNS):
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/RetainPtr.h
Diff
Modified: trunk/Source/WTF/ChangeLog (154536 => 154537)
--- trunk/Source/WTF/ChangeLog 2013-08-24 00:30:38 UTC (rev 154536)
+++ trunk/Source/WTF/ChangeLog 2013-08-24 04:07:07 UTC (rev 154537)
@@ -1,3 +1,21 @@
+2013-08-21 Mark Rowe
+
+Revert r153637.
+
+It didn't work with ARC like it said it would. We'll need to take a slightly different approach.
+
+Rubber-stamped by Anders Carlsson.
+
+* wtf/RetainPtr.h:
+(WTF::RetainPtr::RetainPtr):
+(WTF::RetainPtr::~RetainPtr):
+(WTF::RetainPtr::operator UnspecifiedBoolType):
+(WTFRetainPtr):
+(WTFclear):
+(WTF::=):
+(WTF::adoptCF):
+(WTF::adoptNS):
+
2013-08-23 Brent Fulgham
[Windows] Unreviewed build correction after r154513.
Modified: trunk/Source/WTF/wtf/RetainPtr.h (154536 => 154537)
--- trunk/Source/WTF/wtf/RetainPtr.h 2013-08-24 00:30:38 UTC (rev 154536)
+++ trunk/Source/WTF/wtf/RetainPtr.h 2013-08-24 04:07:07 UTC (rev 154537)
@@ -51,28 +51,8 @@
enum AdoptCFTag { AdoptCF };
enum AdoptNSTag { AdoptNS };
-
-#if USE(CF)
-inline void retain(CFTypeRef ptr) { CFRetain(ptr); }
-inline void release(CFTypeRef ptr) { CFRelease(ptr); }
-#endif
-
+
#ifdef __OBJC__
-#if __has_feature(objc_arc)
-inline void adoptNSReference(id) { }
-inline void retain(id ptr) { }
-inline void release(id ptr) { }
-#else
-inline void retain(id ptr)
-{
-CFRetain(ptr);
-}
-
-inline void release(id ptr)
-{
-CFRelease(ptr);
-}
-
#ifdef OBJC_NO_GC
inline void adoptNSReference(id)
{
@@ -86,17 +66,15 @@
}
}
#endif
-#endif // __has_feature(objc_arc)
-#endif // __OBJC__
+#endif
-
template class RetainPtr {
public:
typedef typename RemovePointer::Type ValueType;
typedef ValueType* PtrType;
RetainPtr() : m_ptr(0) {}
-RetainPtr(PtrType ptr) : m_ptr(ptr) { if (ptr) retain(ptr); }
+RetainPtr(PtrType ptr) : m_ptr(ptr) { if (ptr) CFRetain(ptr); }
RetainPtr(AdoptCFTag, PtrType ptr)
: m_ptr(ptr)
@@ -112,7 +90,7 @@
adoptNSReference(ptr);
}
-RetainPtr(const RetainPtr& o) : m_ptr(o.m_ptr) { if (PtrType ptr = m_ptr) retain(ptr); }
+RetainPtr(const RetainPtr& o) : m_ptr(o.m_ptr) { if (PtrType ptr = m_ptr) CFRetain(ptr); }
#if COMPILER_SUPPORTS(CXX_RVALUE_REFERENCES)
RetainPtr(RetainPtr&& o) : m_ptr(o.leakRef()) { }
@@ -122,7 +100,7 @@
RetainPtr(HashTableDeletedValueType) : m_ptr(hashTableDeletedValue()) { }
bool isHashTableDeletedValue() const { return m_ptr == hashTableDeletedValue(); }
-~RetainPtr() { if (PtrType ptr = m_ptr) release(ptr); }
+~RetainPtr() { if (PtrType ptr = m_ptr) CFRelease(ptr); }
template RetainPtr(const RetainPtr&);
@@ -138,9 +116,8 @@
bool operator!() const { return !m_ptr; }
// This conversion operator allows implicit conversion to bool but not to other integer types.
-typedef void (RetainPtr::*UnspecifiedBoolType)() const;
-void ImplicitConversionToBoolIsNotAllowed() const { }
-operator UnspecifiedBoolType() const { return m_ptr ? &RetainPtr::ImplicitConversionToBoolIsNotAllowed : 0; }
+typedef PtrType RetainPtr::*UnspecifiedBoolType;
+operator UnspecifiedBoolType() const { return m_ptr ? &RetainPtr::m_ptr : 0; }
RetainPtr& operator=(const RetainPtr&);
template RetainPtr& operator=(const RetainPtr&);
@@ -168,14 +145,14 @@
: m_ptr(o.get())
{
if (PtrType ptr = m_ptr)
-retain(ptr);
+CFRetain(ptr);
}
template inline void RetainPtr::clear()
{
if (PtrType ptr = m_ptr) {
m_ptr = 0;
-release(ptr);
+CFRelease(ptr);
}
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [154538] trunk/Source/WTF
Title: [154538] trunk/Source/WTF
Revision 154538
Author mr...@apple.com
Date 2013-08-23 21:07:20 -0700 (Fri, 23 Aug 2013)
Log Message
Make RetainPtr work with ARC.
Have RetainPtr store the object its managing as a CFTypeRef and manage its lifetime with
CFRetain / CFRelease. This is necessary to have explicit control over the lifetime of
Objective-C objects when automatic reference counting is in use. Two helper methods are
introduced to convert between the pointer type that the RetainPtr manages and the CFTypeRef
that the pointer is stored as. For CF types and Objective-C types with ARC disabled,
these methods are simply casts. For Objective-C types under ARC they need to use the
special bridging casts to keep the compiler happy.
Reviewed by Anders Carlsson.
* wtf/RetainPtr.h:
(WTF::RetainPtr::RetainPtr): Use the helper methods to convert to and from the storage
types when necessary.
(WTF::RetainPtr::~RetainPtr): Ditto.
(WTF::RetainPtr::get): Ditto.
(WTF::RetainPtr::operator->): Ditto.
(WTF::RetainPtr::operator PtrType): Ditto.
(WTFRetainPtr): Ditto.
(WTFclear): Ditto.
(WTFleakRef): Ditto.
(WTF::=): Ditto.
(WTF::RetainPtr::fromStorageTypeHelper): Use crazy template magic to determine whether to use
a bridging cast or not depending on the desired return type.
(WTF::RetainPtr::fromStorageType):
(WTF::RetainPtr::toStorageType): Overloading is sufficient here.
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/RetainPtr.h
Diff
Modified: trunk/Source/WTF/ChangeLog (154537 => 154538)
--- trunk/Source/WTF/ChangeLog 2013-08-24 04:07:07 UTC (rev 154537)
+++ trunk/Source/WTF/ChangeLog 2013-08-24 04:07:20 UTC (rev 154538)
@@ -1,5 +1,36 @@
2013-08-21 Mark Rowe
+ Make RetainPtr work with ARC.
+
+Have RetainPtr store the object its managing as a CFTypeRef and manage its lifetime with
+CFRetain / CFRelease. This is necessary to have explicit control over the lifetime of
+Objective-C objects when automatic reference counting is in use. Two helper methods are
+introduced to convert between the pointer type that the RetainPtr manages and the CFTypeRef
+that the pointer is stored as. For CF types and Objective-C types with ARC disabled,
+these methods are simply casts. For Objective-C types under ARC they need to use the
+special bridging casts to keep the compiler happy.
+
+Reviewed by Anders Carlsson.
+
+* wtf/RetainPtr.h:
+(WTF::RetainPtr::RetainPtr): Use the helper methods to convert to and from the storage
+types when necessary.
+(WTF::RetainPtr::~RetainPtr): Ditto.
+(WTF::RetainPtr::get): Ditto.
+(WTF::RetainPtr::operator->): Ditto.
+(WTF::RetainPtr::operator PtrType): Ditto.
+(WTFRetainPtr): Ditto.
+(WTFclear): Ditto.
+(WTFleakRef): Ditto.
+(WTF::=): Ditto.
+
+(WTF::RetainPtr::fromStorageTypeHelper): Use crazy template magic to determine whether to use
+a bridging cast or not depending on the desired return type.
+(WTF::RetainPtr::fromStorageType):
+(WTF::RetainPtr::toStorageType): Overloading is sufficient here.
+
+2013-08-21 Mark Rowe
+
Revert r153637.
It didn't work with ARC like it said it would. We'll need to take a slightly different approach.
Modified: trunk/Source/WTF/wtf/RetainPtr.h (154537 => 154538)
--- trunk/Source/WTF/wtf/RetainPtr.h 2013-08-24 04:07:07 UTC (rev 154537)
+++ trunk/Source/WTF/wtf/RetainPtr.h 2013-08-24 04:07:20 UTC (rev 154538)
@@ -52,7 +52,7 @@
enum AdoptCFTag { AdoptCF };
enum AdoptNSTag { AdoptNS };
-#ifdef __OBJC__
+#if defined(__OBJC__) && !__has_feature(objc_arc)
#ifdef OBJC_NO_GC
inline void adoptNSReference(id)
{
@@ -72,51 +72,56 @@
public:
typedef typename RemovePointer::Type ValueType;
typedef ValueType* PtrType;
+typedef CFTypeRef StorageType;
RetainPtr() : m_ptr(0) {}
-RetainPtr(PtrType ptr) : m_ptr(ptr) { if (ptr) CFRetain(ptr); }
+RetainPtr(PtrType ptr) : m_ptr(toStorageType(ptr)) { if (m_ptr) CFRetain(m_ptr); }
RetainPtr(AdoptCFTag, PtrType ptr)
-: m_ptr(ptr)
+: m_ptr(toStorageType(ptr))
{
#ifdef __OBJC__
static_assert((!std::is_convertible::value), "Don't use adoptCF with Objective-C pointer types, use adoptNS.");
#endif
}
+#if __has_feature(objc_arc)
+RetainPtr(AdoptNSTag, PtrType ptr) : m_ptr(toStorageType(ptr)) { if (m_ptr) CFRetain(m_ptr); }
+#else
RetainPtr(AdoptNSTag, PtrType ptr)
-: m_ptr(ptr)
+: m_ptr(toStorageType(ptr))
{
adoptNSReference(ptr);
}
+#endif
-RetainPtr(const RetainPtr& o) : m_ptr(o.m_ptr) { if (PtrType ptr = m_ptr) CFRetain(ptr); }
+RetainPtr(const RetainPtr& o) : m_ptr(o.m_ptr) { if (StorageType ptr = m_ptr) CFRetain(ptr); }
[webkit-changes] [153767] trunk/Source/WTF
Title: [153767] trunk/Source/WTF
Revision 153767
Author mr...@apple.com
Date 2013-08-06 15:10:02 -0700 (Tue, 06 Aug 2013)
Log Message
FastMalloc should support MallocStackLogging
Call the malloc stack logging function from within the various entry points to FastMalloc
when stack logging is enabled.
Reviewed by Oliver Hunt and Geoff Garen.
* wtf/FastMalloc.cpp:
Call in to MallocHook::InvokeNewHook / MallocHook::InvokeDeleteHook at the appropriate entry
points to FastMalloc. The naming comes from TCMalloc's existing, unused concept of malloc hooks.
(WTF::MallocHook::record): Call the stack logging function with appropriate argument types.
(WTF::MallocHook::recordAllocation): Out-of-line slow path for when stack logging is enabled
that calls record with the values in the right arguments.
(WTF::MallocHook::recordDeallocation): Ditto.
(WTF::MallocHook::init): Stack logging is enabled if the system allocator has enabled stack logging.
(WTF::MallocHook::InvokeNewHook): Call recordAllocation in the unlikely event that stack logging is
enabled.
(WTF::MallocHook::InvokeDeleteHook): Ditto for recordDeallocation.
(WTF::TCMalloc_ThreadCache::InitModule): Initialize the malloc hook.
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/FastMalloc.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (153766 => 153767)
--- trunk/Source/WTF/ChangeLog 2013-08-06 21:55:42 UTC (rev 153766)
+++ trunk/Source/WTF/ChangeLog 2013-08-06 22:10:02 UTC (rev 153767)
@@ -1,3 +1,25 @@
+2013-08-05 Mark Rowe
+
+ FastMalloc should support MallocStackLogging
+
+Call the malloc stack logging function from within the various entry points to FastMalloc
+when stack logging is enabled.
+
+Reviewed by Oliver Hunt and Geoff Garen.
+
+* wtf/FastMalloc.cpp:
+Call in to MallocHook::InvokeNewHook / MallocHook::InvokeDeleteHook at the appropriate entry
+points to FastMalloc. The naming comes from TCMalloc's existing, unused concept of malloc hooks.
+(WTF::MallocHook::record): Call the stack logging function with appropriate argument types.
+(WTF::MallocHook::recordAllocation): Out-of-line slow path for when stack logging is enabled
+that calls record with the values in the right arguments.
+(WTF::MallocHook::recordDeallocation): Ditto.
+(WTF::MallocHook::init): Stack logging is enabled if the system allocator has enabled stack logging.
+(WTF::MallocHook::InvokeNewHook): Call recordAllocation in the unlikely event that stack logging is
+enabled.
+(WTF::MallocHook::InvokeDeleteHook): Ditto for recordDeallocation.
+(WTF::TCMalloc_ThreadCache::InitModule): Initialize the malloc hook.
+
2013-08-06 Brent Fulgham
[Windows] Unreviewed build correction after r153754 and r153757.
Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (153766 => 153767)
--- trunk/Source/WTF/wtf/FastMalloc.cpp 2013-08-06 21:55:42 UTC (rev 153766)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2013-08-06 22:10:02 UTC (rev 153767)
@@ -1509,10 +1509,72 @@
PageHeapAllocator* m_pageHeapAllocator;
};
+// This method declaration, and the constants below, are taken from Libc/gen/malloc.c.
+extern "C" void (*malloc_logger)(uint32_t typeFlags, uintptr_t zone, uintptr_t size, uintptr_t pointer, uintptr_t returnValue, uint32_t numberOfFramesToSkip);
+
#endif
+class MallocHook {
+static bool stackLoggingEnabled;
+
+#if OS(DARWIN)
+
+enum StackLoggingType {
+StackLoggingTypeAlloc = 2,
+StackLoggingTypeDealloc = 4,
+};
+
+static void record(uint32_t typeFlags, uintptr_t zone, uintptr_t size, void* pointer, void* returnValue, uint32_t numberOfFramesToSkip)
+{
+malloc_logger(typeFlags, zone, size, reinterpret_cast(pointer), reinterpret_cast(returnValue), numberOfFramesToSkip);
+}
+
+static NEVER_INLINE void recordAllocation(void* pointer, size_t size)
+{
+// StackLoggingTypeAlloc takes the newly-allocated address in the returnValue argument, the size of the allocation
+// in the size argument and ignores all other arguments.
+record(StackLoggingTypeAlloc, 0, size, 0, pointer, 0);
+}
+
+static NEVER_INLINE void recordDeallocation(void* pointer)
+{
+// StackLoggingTypeDealloc takes the pointer in the size argument and ignores all other arguments.
+record(StackLoggingTypeDealloc, 0, reinterpret_cast(pointer), 0, 0, 0);
+}
+
#endif
+public:
+static void init()
+{
+#if OS(DARWIN)
+// If the system allocator's malloc_logger has been set up then stack logging is enabled.
+stackLoggingEnabled = malloc_logger;
+#endif
+}
+
+#if OS(DARWIN)
+static ALWAYS_INLINE void InvokeNewHook(void* pointer, size_t size)
+{
+if (UNLIKELY(stackLoggingEnabled))
+recordAllocation(pointer, size);
+}
+
+static ALWAYS_INLINE void InvokeDeleteHook(void* pointer)
+{
+
+if (
[webkit-changes] [153739] trunk/Source/WebKit/win
Title: [153739] trunk/Source/WebKit/win
Revision 153739
Author mr...@apple.com
Date 2013-08-05 20:16:02 -0700 (Mon, 05 Aug 2013)
Log Message
Another Windows release build fix.
* WebKitLogging.cpp: Wrap the implementation file in !LOG_DISABLED #if's too.
Modified Paths
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebKitLogging.cpp
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (153738 => 153739)
--- trunk/Source/WebKit/win/ChangeLog 2013-08-06 03:10:18 UTC (rev 153738)
+++ trunk/Source/WebKit/win/ChangeLog 2013-08-06 03:16:02 UTC (rev 153739)
@@ -1,5 +1,11 @@
2013-08-05 Mark Rowe
+Another Windows release build fix.
+
+* WebKitLogging.cpp: Wrap the implementation file in !LOG_DISABLED #if's too.
+
+2013-08-05 Mark Rowe
+
Build fix for Windows release build.
* WebKitLogging.h: Wrap things in !LOG_DISABLED so that we don't attempt to use macros that have not been defined.
Modified: trunk/Source/WebKit/win/WebKitLogging.cpp (153738 => 153739)
--- trunk/Source/WebKit/win/WebKitLogging.cpp 2013-08-06 03:10:18 UTC (rev 153738)
+++ trunk/Source/WebKit/win/WebKitLogging.cpp 2013-08-06 03:16:02 UTC (rev 153739)
@@ -28,6 +28,8 @@
#include "config.h"
#include "WebKitLogging.h"
+#if !LOG_DISABLED
+
#define DEFINE_LOG_CHANNEL(name) \
WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name) = { WTFLogChannelOff, #name };
WEBKIT_LOG_CHANNELS(DEFINE_LOG_CHANNEL)
@@ -49,3 +51,5 @@
// FIXME: Get the log channel string from somewhere so people don't have to hardcode it here.
WTFInitializeLogChannelStatesFromString(logChannels, logChannelCount, "");
}
+
+#endif // !LOG_DISABLED
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [153738] trunk/Source/WTF
Title: [153738] trunk/Source/WTF Revision 153738 Author mr...@apple.com Date 2013-08-05 20:10:18 -0700 (Mon, 05 Aug 2013) Log Message Build fix for Windows. * wtf/Assertions.cpp: Include StringExtras.h rather than StdLibExtras.h, since the former is where strncasecmp is declared. Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Assertions.cpp Diff Modified: trunk/Source/WTF/ChangeLog (153737 => 153738) --- trunk/Source/WTF/ChangeLog 2013-08-06 03:03:06 UTC (rev 153737) +++ trunk/Source/WTF/ChangeLog 2013-08-06 03:10:18 UTC (rev 153738) @@ -1,3 +1,10 @@ +2013-08-05 Mark Rowe + +Build fix for Qt Windows. + +* wtf/Assertions.cpp: Include StringExtras.h rather than StdLibExtras.h, since the former is where +strncasecmp is declared. + 2013-07-26 Mark Rowe Logging should be configurable using human-readable channel names rather than crazy bitmasks Modified: trunk/Source/WTF/wtf/Assertions.cpp (153737 => 153738) --- trunk/Source/WTF/wtf/Assertions.cpp 2013-08-06 03:03:06 UTC (rev 153737) +++ trunk/Source/WTF/wtf/Assertions.cpp 2013-08-06 03:10:18 UTC (rev 153738) @@ -36,7 +36,7 @@ #include "Compiler.h" #include "OwnArrayPtr.h" -#include +#include #include #include ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [153737] trunk/Source/WebKit/win
Title: [153737] trunk/Source/WebKit/win Revision 153737 Author mr...@apple.com Date 2013-08-05 20:03:06 -0700 (Mon, 05 Aug 2013) Log Message Build fix for Windows release build. * WebKitLogging.h: Wrap things in !LOG_DISABLED so that we don't attempt to use macros that have not been defined. Modified Paths trunk/Source/WebKit/win/ChangeLog trunk/Source/WebKit/win/WebKitLogging.h Diff Modified: trunk/Source/WebKit/win/ChangeLog (153736 => 153737) --- trunk/Source/WebKit/win/ChangeLog 2013-08-06 02:53:49 UTC (rev 153736) +++ trunk/Source/WebKit/win/ChangeLog 2013-08-06 03:03:06 UTC (rev 153737) @@ -1,3 +1,9 @@ +2013-08-05 Mark Rowe + +Build fix for Windows release build. + +* WebKitLogging.h: Wrap things in !LOG_DISABLED so that we don't attempt to use macros that have not been defined. + 2013-07-26 Mark Rowe Logging should be configurable using human-readable channel names rather than crazy bitmasks Modified: trunk/Source/WebKit/win/WebKitLogging.h (153736 => 153737) --- trunk/Source/WebKit/win/WebKitLogging.h 2013-08-06 02:53:49 UTC (rev 153736) +++ trunk/Source/WebKit/win/WebKitLogging.h 2013-08-06 03:03:06 UTC (rev 153737) @@ -30,6 +30,8 @@ #include +#if !LOG_DISABLED + #ifndef LOG_CHANNEL_PREFIX #define LOG_CHANNEL_PREFIX WebKitLog #endif @@ -69,4 +71,6 @@ void WebKitInitializeLoggingChannelsIfNecessary(void); +#endif // !LOG_DISABLED + #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [153637] trunk/Source/WTF
Title: [153637] trunk/Source/WTF
Revision 153637
Author mr...@apple.com
Date 2013-08-02 00:51:49 -0700 (Fri, 02 Aug 2013)
Log Message
RetainPtr should support ARC for Objective-C objects.
While RetainPtr is not necessary under ARC, having it available makes it easier to transition
existing code from manual retain / release to ARC.
Under ARC, the object member of RetainPtr is treated as a strong reference by the compiler.
This means that merely assigning to the member variable is sufficient to retain the object,
and clearing the member variable is sufficient to release it. We still need to explicitly
CFRetain / CFRelease CoreFoundation types so the explicit calls to these functions are
moved in to helper functions and overloading is used to have the Objective-C object versions
of them be no-ops under ARC.
Reviewed by Anders Carlsson.
* wtf/RetainPtr.h:
(WTF::retain): Continue to always CFRetain / CFRelease CoreFoundation objects. Only CFRetain / CFRelease
Objective-C objects when using manual retain / release.
(WTF::release): Ditto.
(WTF::adoptNSReference): Adopting references will be handled automatically by the compiler
when possible under ARC by eliminating redundant retain / release pairs.
(WTF::RetainPtr::ImplicitConversionToBoolIsNotAllowed): A new method that exists only to be used by the
conversion to the unspecified bool type.
(WTF::RetainPtr::operator UnspecifiedBoolType): Switch to using a pointer to a member function as the
unspecified bool type to avoid warnings from the compiler when casting Objective-C object types under ARC.
(WTF::RetainPtr::RetainPtr): Switch to our retain / release helper functions.
(WTF::RetainPtr::~RetainPtr): Ditto.
(WTFRetainPtr): Ditto.
(WTFclear): Ditto.
(WTF::=): Ditto.
(WTF::adoptCF): Annotate the argument with CF_RELEASES_ARGUMENT on both the declaration and the definition.
(WTF::adoptNS): Ditto for NS_RELEASES_ARGUMENT.
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/RetainPtr.h
Diff
Modified: trunk/Source/WTF/ChangeLog (153636 => 153637)
--- trunk/Source/WTF/ChangeLog 2013-08-02 06:09:05 UTC (rev 153636)
+++ trunk/Source/WTF/ChangeLog 2013-08-02 07:51:49 UTC (rev 153637)
@@ -1,3 +1,38 @@
+2013-07-26 Mark Rowe
+
+ RetainPtr should support ARC for Objective-C objects.
+
+While RetainPtr is not necessary under ARC, having it available makes it easier to transition
+existing code from manual retain / release to ARC.
+
+Under ARC, the object member of RetainPtr is treated as a strong reference by the compiler.
+This means that merely assigning to the member variable is sufficient to retain the object,
+and clearing the member variable is sufficient to release it. We still need to explicitly
+CFRetain / CFRelease CoreFoundation types so the explicit calls to these functions are
+moved in to helper functions and overloading is used to have the Objective-C object versions
+of them be no-ops under ARC.
+
+Reviewed by Anders Carlsson.
+
+* wtf/RetainPtr.h:
+(WTF::retain): Continue to always CFRetain / CFRelease CoreFoundation objects. Only CFRetain / CFRelease
+Objective-C objects when using manual retain / release.
+(WTF::release): Ditto.
+(WTF::adoptNSReference): Adopting references will be handled automatically by the compiler
+when possible under ARC by eliminating redundant retain / release pairs.
+(WTF::RetainPtr::ImplicitConversionToBoolIsNotAllowed): A new method that exists only to be used by the
+conversion to the unspecified bool type.
+(WTF::RetainPtr::operator UnspecifiedBoolType): Switch to using a pointer to a member function as the
+unspecified bool type to avoid warnings from the compiler when casting Objective-C object types under ARC.
+
+(WTF::RetainPtr::RetainPtr): Switch to our retain / release helper functions.
+(WTF::RetainPtr::~RetainPtr): Ditto.
+(WTFRetainPtr): Ditto.
+(WTFclear): Ditto.
+(WTF::=): Ditto.
+(WTF::adoptCF): Annotate the argument with CF_RELEASES_ARGUMENT on both the declaration and the definition.
+(WTF::adoptNS): Ditto for NS_RELEASES_ARGUMENT.
+
2013-08-01 Mark Rowe
FastMalloc zone enumerator responding to MALLOC_PTR_REGION_RANGE_TYPE with individual allocations
Modified: trunk/Source/WTF/wtf/RetainPtr.h (153636 => 153637)
--- trunk/Source/WTF/wtf/RetainPtr.h 2013-08-02 06:09:05 UTC (rev 153636)
+++ trunk/Source/WTF/wtf/RetainPtr.h 2013-08-02 07:51:49 UTC (rev 153637)
@@ -21,6 +21,8 @@
#ifndef RetainPtr_h
#define RetainPtr_h
+#if USE(CF) || defined(__OBJC__)
+
#include
#include
#include
@@ -49,8 +51,28 @@
enum AdoptCFTag { AdoptCF };
enum AdoptNSTag { AdoptNS };
-
+
+#if USE(CF)
+inline void retain(CFTypeRef ptr) { CFRetain(ptr); }
+inline void release(CFTypeRef ptr) { CFRelease(ptr); }
+#endif
+
#ifdef __OB
