Title: [154421] trunk/Source/WebKit/win
- Revision
- 154421
- Author
- [email protected]
- Date
- 2013-08-21 15:18:18 -0700 (Wed, 21 Aug 2013)
Log Message
<https://webkit.org/b/120125> [Windows] Correct Tooltip Text
Reviewed by Anders Carlsson.
* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::runOpenPanel): Make sure valid strings are passed to the File Open
API call.
* WebView.cpp:
(WebView::setToolTip): Correct tooltip text (avoid passing address to temporary
return value.)
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (154420 => 154421)
--- trunk/Source/WebKit/win/ChangeLog 2013-08-21 21:43:51 UTC (rev 154420)
+++ trunk/Source/WebKit/win/ChangeLog 2013-08-21 22:18:18 UTC (rev 154421)
@@ -1,3 +1,16 @@
+2013-08-21 Brent Fulgham <[email protected]>
+
+ <https://webkit.org/b/120125> [Windows] Correct Tooltip Text
+
+ Reviewed by Anders Carlsson.
+
+ * WebCoreSupport/WebChromeClient.cpp:
+ (WebChromeClient::runOpenPanel): Make sure valid strings are passed to the File Open
+ API call.
+ * WebView.cpp:
+ (WebView::setToolTip): Correct tooltip text (avoid passing address to temporary
+ return value.)
+
2013-08-20 Brent Fulgham <[email protected]>
<https://webkit.org/b/120098> [Windows] Enable the New Web Inspector
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (154420 => 154421)
--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2013-08-21 21:43:51 UTC (rev 154420)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2013-08-21 22:18:18 UTC (rev 154421)
@@ -670,11 +670,15 @@
ofn.hwndOwner = viewWindow;
String allFiles = allFilesText();
allFiles.append(L"\0*.*\0\0", 6);
- ofn.lpstrFilter = allFiles.charactersWithNullTermination().data();
+
+ Vector<UChar> filterCharacters = allFiles.charactersWithNullTermination(); // Retain buffer long enough to make the GetOpenFileName call
+ ofn.lpstrFilter = filterCharacters.data();
+
ofn.lpstrFile = fileBuf.data();
ofn.nMaxFile = fileBuf.size();
String dialogTitle = uploadFileText();
- ofn.lpstrTitle = dialogTitle.charactersWithNullTermination().data();
+ Vector<UChar> dialogTitleCharacters = dialogTitle.charactersWithNullTermination(); // Retain buffer long enough to make the GetOpenFileName call
+ ofn.lpstrTitle = dialogTitleCharacters.data();
ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_EXPLORER;
if (multiFile)
ofn.Flags = ofn.Flags | OFN_ALLOWMULTISELECT;
Modified: trunk/Source/WebKit/win/WebView.cpp (154420 => 154421)
--- trunk/Source/WebKit/win/WebView.cpp 2013-08-21 21:43:51 UTC (rev 154420)
+++ trunk/Source/WebKit/win/WebView.cpp 2013-08-21 22:18:18 UTC (rev 154421)
@@ -2811,7 +2811,8 @@
info.cbSize = sizeof(info);
info.uFlags = TTF_IDISHWND;
info.uId = reinterpret_cast<UINT_PTR>(m_viewWindow);
- info.lpszText = const_cast<UChar*>(m_toolTip.charactersWithNullTermination().data());
+ Vector<UChar> toolTipCharacters = m_toolTip.charactersWithNullTermination(); // Retain buffer long enough to make the SendMessage call
+ info.lpszText = const_cast<UChar*>(toolTipCharacters.data());
::SendMessage(m_toolTipHwnd, TTM_UPDATETIPTEXT, 0, reinterpret_cast<LPARAM>(&info));
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
