diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/platform/wince | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/platform/wince')
-rw-r--r-- | Source/WebCore/platform/wince/DragDataWinCE.cpp | 5 | ||||
-rw-r--r-- | Source/WebCore/platform/wince/KeygenWinCE.cpp | 5 | ||||
-rw-r--r-- | Source/WebCore/platform/wince/MIMETypeRegistryWinCE.cpp | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/Source/WebCore/platform/wince/DragDataWinCE.cpp b/Source/WebCore/platform/wince/DragDataWinCE.cpp index 8f531c7..679229d 100644 --- a/Source/WebCore/platform/wince/DragDataWinCE.cpp +++ b/Source/WebCore/platform/wince/DragDataWinCE.cpp @@ -32,6 +32,11 @@ bool DragData::containsURL(Frame*, FilenameConversionPolicy filenamePolicy) cons return false; } +const DragDataMap& DragData::dragDataMap() +{ + return m_dragDataMap; +} + String DragData::asURL(Frame*, FilenameConversionPolicy filenamePolicy, String* title) const { return String(); diff --git a/Source/WebCore/platform/wince/KeygenWinCE.cpp b/Source/WebCore/platform/wince/KeygenWinCE.cpp index 0c1b3c6..8537f44 100644 --- a/Source/WebCore/platform/wince/KeygenWinCE.cpp +++ b/Source/WebCore/platform/wince/KeygenWinCE.cpp @@ -80,10 +80,7 @@ String WebCore::signedPublicKeyAndChallengeString(unsigned index, const String& if (!CryptSignAndEncodeCertificate(hContext, AT_KEYEXCHANGE, X509_ASN_ENCODING, X509_KEYGEN_REQUEST_TO_BE_SIGNED, &requestInfo, &signAlgo, 0, reinterpret_cast<LPBYTE>(binary.data()), &dwEncodedLength)) break; - Vector<char> base64; - base64Encode(binary, base64); - keyString = String(base64.data(), base64.size()); - + keyString = base64Encode(binary); } while(0); if (pPubInfo) diff --git a/Source/WebCore/platform/wince/MIMETypeRegistryWinCE.cpp b/Source/WebCore/platform/wince/MIMETypeRegistryWinCE.cpp index 7534b91..8a7ac8f 100644 --- a/Source/WebCore/platform/wince/MIMETypeRegistryWinCE.cpp +++ b/Source/WebCore/platform/wince/MIMETypeRegistryWinCE.cpp @@ -27,7 +27,9 @@ #include "config.h" #include "MIMETypeRegistry.h" +#include <wtf/Assertions.h> #include <wtf/HashMap.h> +#include <wtf/MainThread.h> #include <windows.h> #include <winreg.h> @@ -119,6 +121,8 @@ String MIMETypeRegistry::getPreferredExtensionForMIMEType(const String& type) String MIMETypeRegistry::getMIMETypeForExtension(const String &ext) { + ASSERT(isMainThread()); + if (ext.isEmpty()) return String(); |