Changeset 152143 in webkit

Timestamp:

Jun 27, 2013 5:33:21 PM (11 years ago)

Author:

andersca@apple.com

Message:

Get rid of the last uses of deprecatedCharactersWithNullTermination()
​https://bugs.webkit.org/show_bug.cgi?id=118159

Reviewed by Andreas Kling.

Replace calls to deprecatedCharactersWithNullTermination() with charactersWithNullTermination().data().

Source/WebKit/win:

• COMPropertyBag.h:

(::GetPropertyInfo):

• WebCoreSupport/WebChromeClient.cpp:

(WebChromeClient::runOpenPanel):

• WebCoreSupport/WebInspectorClient.cpp:

(WebInspectorFrontendClient::updateWindowTitle):

• WebDownloadCFNet.cpp:

(WebDownload::didFinish):

• WebKitSystemBits.cpp:

(WebVolumeFreeSize):

• WebLocalizableStrings.cpp:

(LocalizedString::operator LPCTSTR):

• WebView.cpp:

(WebView::setToolTip):

Tools:

• DumpRenderTree/win/DumpRenderTree.cpp:

(findFontFallback):

Location:

trunk

Files:

• Source/WebKit/win/COMPropertyBag.h (modified) (1 diff)
• Source/WebKit/win/ChangeLog (modified) (1 diff)
• Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (modified) (1 diff)
• Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp (modified) (1 diff)
• Source/WebKit/win/WebDownloadCFNet.cpp (modified) (2 diffs)
• Source/WebKit/win/WebKitSystemBits.cpp (modified) (1 diff)
• Source/WebKit/win/WebLocalizableStrings.cpp (modified) (2 diffs)
• Source/WebKit/win/WebView.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/win/DumpRenderTree.cpp (modified) (2 diffs)

trunk/Source/WebKit/win/COMPropertyBag.h

@@ -223 +223 @@
         if (!pPropBag[j].pstrName)
             return E_OUTOFMEMORY;
-        wcscpy_s(pPropBag[j].pstrName, current->key.length()+1, static_cast<String>(current->key).deprecatedCharactersWithNullTermination());
+        wcscpy_s(pPropBag[j].pstrName, current->key.length()+1, static_cast<String>(current->key).charactersWithNullTermination().data());
         ++*pcProperties;
     }

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2013-06-27  Anders Carlsson  <andersca@apple.com>
+
+        Get rid of the last uses of deprecatedCharactersWithNullTermination()
+        https://bugs.webkit.org/show_bug.cgi?id=118159
+
+        Reviewed by Andreas Kling.
+
+        Replace calls to deprecatedCharactersWithNullTermination() with charactersWithNullTermination().data().
+
+        * COMPropertyBag.h:
+        (::GetPropertyInfo):
+        * WebCoreSupport/WebChromeClient.cpp:
+        (WebChromeClient::runOpenPanel):
+        * WebCoreSupport/WebInspectorClient.cpp:
+        (WebInspectorFrontendClient::updateWindowTitle):
+        * WebDownloadCFNet.cpp:
+        (WebDownload::didFinish):
+        * WebKitSystemBits.cpp:
+        (WebVolumeFreeSize):
+        * WebLocalizableStrings.cpp:
+        (LocalizedString::operator LPCTSTR):
+        * WebView.cpp:
+        (WebView::setToolTip):
+
 2013-06-26  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp

@@ -671 +671 @@
     String allFiles = allFilesText();
     allFiles.append(L"\0*.*\0\0", 6);
-    ofn.lpstrFilter = allFiles.deprecatedCharactersWithNullTermination();
+    ofn.lpstrFilter = allFiles.charactersWithNullTermination().data();
     ofn.lpstrFile = fileBuf.data();
     ofn.nMaxFile = fileBuf.size();
     String dialogTitle = uploadFileText();
-    ofn.lpstrTitle = dialogTitle.deprecatedCharactersWithNullTermination();
+    ofn.lpstrTitle = dialogTitle.charactersWithNullTermination().data();
     ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_EXPLORER;
     if (multiFile)

trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp

@@ -449 +449 @@
 {
     String title = makeString("Web Inspector ", static_cast<UChar>(0x2014), ' ', m_inspectedURL);
-    ::SetWindowText(m_frontendHwnd, title.deprecatedCharactersWithNullTermination());
+    ::SetWindowText(m_frontendHwnd, title.charactersWithNullTermination().data());
 }
 

trunk/Source/WebKit/win/WebDownloadCFNet.cpp

@@ -473 +473 @@
     // We try to rename the bundle to the final file name.  If that fails, we give the delegate one more chance to chose
     // the final file name, then we just leave it
-    if (!MoveFileEx(m_bundlePath.deprecatedCharactersWithNullTermination(), m_destination.deprecatedCharactersWithNullTermination(), 0)) {
+    if (!MoveFileEx(m_bundlePath.charactersWithNullTermination().data(), m_destination.charactersWithNullTermination().data(), 0)) {
         LOG_ERROR("Failed to move bundle %s to %s on completion\nError - %i", m_bundlePath.ascii().data(), m_destination.ascii().data(), GetLastError());
         
@@ -485 +485 @@
         // one last time.
         if (!m_destination.isEmpty())
-            if (MoveFileEx(m_bundlePath.deprecatedCharactersWithNullTermination(), m_destination.deprecatedCharactersWithNullTermination(), 0))
+            if (MoveFileEx(m_bundlePath.charactersWithNullTermination().data(), m_destination.charactersWithNullTermination().data(), 0))
                 reportBundlePathAsFinalPath = false;
 

trunk/Source/WebKit/win/WebKitSystemBits.cpp

@@ -46 +46 @@
     WTF::String path(cfstringPath);
     ULARGE_INTEGER freeBytesToCaller;
-    BOOL result = GetDiskFreeSpaceExW((LPCWSTR)path.deprecatedCharactersWithNullTermination(), &freeBytesToCaller, 0, 0);
+    BOOL result = GetDiskFreeSpaceExW((LPCWSTR)path.charactersWithNullTermination().data(), &freeBytesToCaller, 0, 0);
     if (!result)
         return 0;

trunk/Source/WebKit/win/WebLocalizableStrings.cpp

@@ -89 +89 @@
 {
     if (!m_string.isEmpty())
-        return m_string.deprecatedCharactersWithNullTermination();
+        return m_string.charactersWithNullTermination().data();
 
     m_string = m_cfString;
@@ -97 +97 @@
             m_string.replace(i, 1, "s");
 
-    return m_string.deprecatedCharactersWithNullTermination();
+    return m_string.charactersWithNullTermination().data();
 }
 

trunk/Source/WebKit/win/WebView.cpp

@@ -2813 +2813 @@
         info.uFlags = TTF_IDISHWND;
         info.uId = reinterpret_cast<UINT_PTR>(m_viewWindow);
-        info.lpszText = const_cast<UChar*>(m_toolTip.deprecatedCharactersWithNullTermination());
+        info.lpszText = const_cast<UChar*>(m_toolTip.charactersWithNullTermination().data());
         ::SendMessage(m_toolTipHwnd, TTM_UPDATETIPTEXT, 0, reinterpret_cast<LPARAM>(&info));
     }

trunk/Tools/ChangeLog

@@ +1 @@
+2013-06-27  Anders Carlsson  <andersca@apple.com>
+
+        Get rid of the last uses of deprecatedCharactersWithNullTermination()
+        https://bugs.webkit.org/show_bug.cgi?id=118159
+
+        Reviewed by Andreas Kling.
+
+        Replace calls to deprecatedCharactersWithNullTermination() with charactersWithNullTermination().data().
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (findFontFallback):
+
 2013-06-27  Bem Jones-Bey  <bjonesbe@adobe.com>
 

trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp

@@ -965 +965 @@
 
     wchar_t fullPath[_MAX_PATH];
-    if (!_wfullpath(fullPath, pathToFontFallback.deprecatedCharactersWithNullTermination(), _MAX_PATH))
+    if (!_wfullpath(fullPath, pathToFontFallback.charactersWithNullTermination().data(), _MAX_PATH))
         return emptyString();
 
@@ -996 +996 @@
         pathToFontFallback = WebCore::pathByAppendingComponent(*pos, "resources\\"); 
 
-        if (::PathIsDirectoryW(pathToFontFallback.deprecatedCharactersWithNullTermination()))
+        if (::PathIsDirectoryW(pathToFontFallback.charactersWithNullTermination().data()))
             return pathToFontFallback;
     }