diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebKit/win/WebElementPropertyBag.cpp | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebKit/win/WebElementPropertyBag.cpp')
| -rw-r--r-- | WebKit/win/WebElementPropertyBag.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/WebKit/win/WebElementPropertyBag.cpp b/WebKit/win/WebElementPropertyBag.cpp index 9113f4d..151c9e1 100644 --- a/WebKit/win/WebElementPropertyBag.cpp +++ b/WebKit/win/WebElementPropertyBag.cpp @@ -156,10 +156,13 @@ HRESULT STDMETHODCALLTYPE WebElementPropertyBag::Read(LPCOLESTR pszPropName, VAR else V_BOOL(pVar) = VARIANT_FALSE; return S_OK; - } else if (isEqual(WebElementSpellingToolTipKey, key)) - return convertStringToVariant(pVar, m_result->spellingToolTip()); - else if (isEqual(WebElementTitleKey, key)) - return convertStringToVariant(pVar, m_result->title()); + } else if (isEqual(WebElementSpellingToolTipKey, key)) { + TextDirection dir; + return convertStringToVariant(pVar, m_result->spellingToolTip(dir)); + } else if (isEqual(WebElementTitleKey, key)) { + TextDirection dir; + return convertStringToVariant(pVar, m_result->title(dir)); + } else if (isEqual(WebElementLinkURLKey, key)) return convertStringToVariant(pVar, m_result->absoluteLinkURL().string()); else if (isEqual(WebElementLinkTargetFrameKey, key)) { |