summaryrefslogtreecommitdiffstats
path: root/WebKit/win/WebElementPropertyBag.cpp
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2010-11-04 12:00:17 -0700
committerJohn Reck <jreck@google.com>2010-11-09 11:35:04 -0800
commite14391e94c850b8bd03680c23b38978db68687a8 (patch)
tree3fed87e6620fecaf3edc7259ae58a11662bedcb2 /WebKit/win/WebElementPropertyBag.cpp
parent1bd705833a68f07850cf7e204b26f8d328d16951 (diff)
downloadexternal_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip
external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz
external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'WebKit/win/WebElementPropertyBag.cpp')
-rw-r--r--WebKit/win/WebElementPropertyBag.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/WebKit/win/WebElementPropertyBag.cpp b/WebKit/win/WebElementPropertyBag.cpp
index e68b92e..e68360c 100644
--- a/WebKit/win/WebElementPropertyBag.cpp
+++ b/WebKit/win/WebElementPropertyBag.cpp
@@ -159,7 +159,10 @@ HRESULT STDMETHODCALLTYPE WebElementPropertyBag::Read(LPCOLESTR pszPropName, VAR
else
V_BOOL(pVar) = VARIANT_FALSE;
return S_OK;
- } else if (isEqual(WebElementSpellingToolTipKey, key)) {
+ }
+ if (isEqual(WebElementMediaURLKey, key))
+ return convertStringToVariant(pVar, m_result->absoluteMediaURL().string());
+ if (isEqual(WebElementSpellingToolTipKey, key)) {
TextDirection dir;
return convertStringToVariant(pVar, m_result->spellingToolTip(dir));
} else if (isEqual(WebElementTitleKey, key)) {