diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 14:01:09 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 14:01:09 +0200 |
| commit | 6dbcd09121fe266c7704a524b5cbd7f2754659c0 (patch) | |
| tree | 5ae0d16cec0cc61f576d51c57b3a4613c7e91e22 /Source/WebKit/win/WebNotificationCenter.cpp | |
| parent | 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (diff) | |
| download | qtwebkit-6dbcd09121fe266c7704a524b5cbd7f2754659c0.tar.gz | |
Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (http://svn.webkit.org/repository/webkit/trunk@129119)
New snapshot with prospective build fix for incorrect QtWebKit master module header file creation
Diffstat (limited to 'Source/WebKit/win/WebNotificationCenter.cpp')
| -rw-r--r-- | Source/WebKit/win/WebNotificationCenter.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebKit/win/WebNotificationCenter.cpp b/Source/WebKit/win/WebNotificationCenter.cpp index 23de1c1c9..e02abd593 100644 --- a/Source/WebKit/win/WebNotificationCenter.cpp +++ b/Source/WebKit/win/WebNotificationCenter.cpp @@ -28,6 +28,7 @@ #include "WebNotificationCenter.h" #include "WebNotification.h" +#include <WebCore/BString.h> #include <WebCore/COMPtr.h> #include <utility> #include <wchar.h> @@ -38,6 +39,8 @@ #include <wtf/text/StringHash.h> #include <wtf/text/WTFString.h> +using namespace WebCore; + typedef std::pair<COMPtr<IUnknown>, COMPtr<IWebNotificationObserver> > ObjectObserverPair; typedef Vector<ObjectObserverPair> ObjectObserverList; typedef ObjectObserverList::iterator ObserverListIterator; @@ -160,7 +163,7 @@ HRESULT STDMETHODCALLTYPE WebNotificationCenter::addObserver( HRESULT STDMETHODCALLTYPE WebNotificationCenter::postNotification( /* [in] */ IWebNotification* notification) { - BSTR name; + BString name; HRESULT hr = notification->name(&name); if (FAILED(hr)) return hr; @@ -171,7 +174,6 @@ HRESULT STDMETHODCALLTYPE WebNotificationCenter::postNotification( return hr; postNotificationInternal(notification, name, obj.get()); - SysFreeString(name); return hr; } |