diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-15 17:31:21 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-15 17:31:21 +0000 |
commit | bce89e6ed2c32bf287ebc1852770d7861f68bf3a (patch) | |
tree | 6bb5d8ba52e47532d0761627180ef6ecbbca4701 /webkit/pending | |
parent | 6e66e46982f98d7351b2e2a804e71d76fbaa1053 (diff) | |
download | chromium_src-bce89e6ed2c32bf287ebc1852770d7861f68bf3a.zip chromium_src-bce89e6ed2c32bf287ebc1852770d7861f68bf3a.tar.gz chromium_src-bce89e6ed2c32bf287ebc1852770d7861f68bf3a.tar.bz2 |
Eliminate port/platform/win directory. Stop building a fork of BString, and
stop depending on COMPtr.h. I avoided BString by definining a bastard shim in
AccessibleBase.cpp. I did that because the one from WebCore's platform/win
would require #if !USE(JSC) to avoid UString issues. Eventually,
AccessibleBase.cpp is going to be rewritten to not use COM, so this issue will
go away.
R=dglazkov
Review URL: http://codereview.chromium.org/13808
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/pending')
-rw-r--r-- | webkit/pending/AccessibleBase.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/webkit/pending/AccessibleBase.cpp b/webkit/pending/AccessibleBase.cpp index e123ae3..2bca2eb 100644 --- a/webkit/pending/AccessibleBase.cpp +++ b/webkit/pending/AccessibleBase.cpp @@ -29,7 +29,6 @@ #include <oleacc.h> #include "AccessibilityObject.h" #include "AXObjectCache.h" -#include "BString.h" #include "Element.h" #include "EventHandler.h" #include "FrameView.h" @@ -46,6 +45,25 @@ using namespace WebCore; +namespace { + +// TODO(darin): Eliminate use of COM in this file, and then this class can die. +class BString { +public: + BString(const String& s) + { + if (s.isNull()) + m_bstr = 0; + else + m_bstr = SysAllocStringLen(s.characters(), s.length()); + } + BSTR release() { BSTR s = m_bstr; m_bstr = 0; return s; } +private: + BSTR m_bstr; +}; + +} + AccessibleBase::AccessibleBase(AccessibilityObject* obj) : AccessibilityObjectWrapper(obj) { |