diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/platform/blackberry/ClipboardBlackBerry.cpp | |
parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/platform/blackberry/ClipboardBlackBerry.cpp')
-rw-r--r-- | Source/WebCore/platform/blackberry/ClipboardBlackBerry.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/platform/blackberry/ClipboardBlackBerry.cpp b/Source/WebCore/platform/blackberry/ClipboardBlackBerry.cpp index 2a31be862..ade22ef47 100644 --- a/Source/WebCore/platform/blackberry/ClipboardBlackBerry.cpp +++ b/Source/WebCore/platform/blackberry/ClipboardBlackBerry.cpp @@ -78,13 +78,13 @@ bool ClipboardBlackBerry::setData(const String& type, const String& text) return true; } -HashSet<String> ClipboardBlackBerry::types() const +ListHashSet<String> ClipboardBlackBerry::types() const { if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable) - return HashSet<String>(); + return ListHashSet<String>(); // We use hardcoded list here since there seems to be no API to get the list. - HashSet<String> ret; + ListHashSet<String> ret; ret.add("text/plain"); ret.add("text/html"); ret.add("text/url"); |