Modified: trunk/Source/WebKit2/ChangeLog (152204 => 152205)
--- trunk/Source/WebKit2/ChangeLog 2013-06-29 02:55:52 UTC (rev 152204)
+++ trunk/Source/WebKit2/ChangeLog 2013-06-29 05:53:23 UTC (rev 152205)
@@ -1,3 +1,10 @@
+2013-06-28 Andreas Kling <[email protected]>
+
+ Fix Windows builds after deprecatedCharactersWithNullTermination() removal.
+
+ * Platform/CoreIPC/win/ConnectionWin.cpp:
+ (CoreIPC::Connection::createServerAndClientIdentifiers):
+
2013-06-28 Tim Horton <[email protected]>
[wk2] WKView shouldn't force scrolling off if shouldClipToVisibleRect is set
Modified: trunk/Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp (152204 => 152205)
--- trunk/Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp 2013-06-29 02:55:52 UTC (rev 152204)
+++ trunk/Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp 2013-06-29 05:53:23 UTC (rev 152205)
@@ -47,7 +47,7 @@
unsigned uniqueID = randomNumber() * std::numeric_limits<unsigned>::max();
pipeName = String::format("\\\\.\\pipe\\com.apple.WebKit.%x", uniqueID);
- serverIdentifier = ::CreateNamedPipe(pipeName.deprecatedCharactersWithNullTermination(),
+ serverIdentifier = ::CreateNamedPipe(pipeName.charactersWithNullTermination().data(),
PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE | FILE_FLAG_OVERLAPPED,
PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, 1, inlineMessageMaxSize, inlineMessageMaxSize,
0, 0);
@@ -62,7 +62,7 @@
if (!serverIdentifier)
return false;
- clientIdentifier = ::CreateFileW(pipeName.deprecatedCharactersWithNullTermination(), GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0);
+ clientIdentifier = ::CreateFileW(pipeName.charactersWithNullTermination().data(), GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0);
if (!clientIdentifier) {
::CloseHandle(serverIdentifier);
return false;
Modified: trunk/Tools/ChangeLog (152204 => 152205)
--- trunk/Tools/ChangeLog 2013-06-29 02:55:52 UTC (rev 152204)
+++ trunk/Tools/ChangeLog 2013-06-29 05:53:23 UTC (rev 152205)
@@ -1,3 +1,11 @@
+2013-06-28 Andreas Kling <[email protected]>
+
+ Fix Windows builds after deprecatedCharactersWithNullTermination() removal.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (addFontFallbackIfPresent):
+ (removeFontFallbackIfPresent):
+
2013-06-28 Anders Carlsson <[email protected]>
Remove String::deprecatedCharactersWithNullTermination() and related code
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (152204 => 152205)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2013-06-29 02:55:52 UTC (rev 152204)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2013-06-29 05:53:23 UTC (rev 152205)
@@ -1009,7 +1009,7 @@
String fontFallback = WebCore::pathByAppendingComponent(fontFallbackPath, "Mac-compatible-font-fallback.css");
- if (!::PathFileExistsW(fontFallback.deprecatedCharactersWithNullTermination()))
+ if (!::PathFileExistsW(fontFallback.charactersWithNullTermination().data()))
return;
::setPersistentUserStyleSheetLocation(fontFallback.createCFString().get());
@@ -1022,7 +1022,7 @@
String fontFallback = WebCore::pathByAppendingComponent(fontFallbackPath, "Mac-compatible-font-fallback.css");
- if (!::PathFileExistsW(fontFallback.deprecatedCharactersWithNullTermination()))
+ if (!::PathFileExistsW(fontFallback.charactersWithNullTermination().data()))
return;
::setPersistentUserStyleSheetLocation(0);
