Fix Windows builds after deprecatedCharactersWithNullTermination() removal.
authorakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 29 Jun 2013 05:53:23 +0000 (05:53 +0000)
committerakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 29 Jun 2013 05:53:23 +0000 (05:53 +0000)
Source/WebKit2:

* Platform/CoreIPC/win/ConnectionWin.cpp:
(CoreIPC::Connection::createServerAndClientIdentifiers):

Tools:

* DumpRenderTree/win/DumpRenderTree.cpp:
(addFontFallbackIfPresent):
(removeFontFallbackIfPresent):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@152205 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp
Tools/ChangeLog
Tools/DumpRenderTree/win/DumpRenderTree.cpp

index 0f0935b..96f4cbc 100644 (file)
@@ -1,3 +1,10 @@
+2013-06-28  Andreas Kling  <akling@apple.com>
+
+        Fix Windows builds after deprecatedCharactersWithNullTermination() removal.
+
+        * Platform/CoreIPC/win/ConnectionWin.cpp:
+        (CoreIPC::Connection::createServerAndClientIdentifiers):
+
 2013-06-28  Tim Horton  <timothy_horton@apple.com>
 
         [wk2] WKView shouldn't force scrolling off if shouldClipToVisibleRect is set
index fa8095a..15a0ed2 100644 (file)
@@ -47,7 +47,7 @@ bool Connection::createServerAndClientIdentifiers(HANDLE& serverIdentifier, HAND
         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 @@ bool Connection::createServerAndClientIdentifiers(HANDLE& serverIdentifier, HAND
     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;
index 2fa6461..35be32e 100644 (file)
@@ -1,3 +1,11 @@
+2013-06-28  Andreas Kling  <akling@apple.com>
+
+        Fix Windows builds after deprecatedCharactersWithNullTermination() removal.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (addFontFallbackIfPresent):
+        (removeFontFallbackIfPresent):
+
 2013-06-28  Anders Carlsson  <andersca@apple.com>
 
         Remove String::deprecatedCharactersWithNullTermination() and related code
index 2363f4e..46c528a 100644 (file)
@@ -1009,7 +1009,7 @@ static void addFontFallbackIfPresent(const String& fontFallbackPath)
 
     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 @@ static void removeFontFallbackIfPresent(const String& fontFallbackPath)
 
     String fontFallback = WebCore::pathByAppendingComponent(fontFallbackPath, "Mac-compatible-font-fallback.css");
 
-    if (!::PathFileExistsW(fontFallback.deprecatedCharactersWithNullTermination()))
+    if (!::PathFileExistsW(fontFallback.charactersWithNullTermination().data()))
         return;
 
     ::setPersistentUserStyleSheetLocation(0);