diff options
| author | Steve Block <steveblock@google.com> | 2009-11-05 09:23:40 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:12 +0000 |
| commit | cac0f67c402d107cdb10971b95719e2ff9c7c76b (patch) | |
| tree | d182c7f87211c6f201a5f038e332336493ebdbe7 /WebKit/win/WebElementPropertyBag.cpp | |
| parent | 4b2ef0f288e7c6c4602f621b7a0e9feed304b70e (diff) | |
| download | external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.zip external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.gz external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.bz2 | |
Merge webkit.org at r50258 : Initial merge by git.
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
Diffstat (limited to 'WebKit/win/WebElementPropertyBag.cpp')
| -rw-r--r-- | WebKit/win/WebElementPropertyBag.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebKit/win/WebElementPropertyBag.cpp b/WebKit/win/WebElementPropertyBag.cpp index 151c9e1..e68b92e 100644 --- a/WebKit/win/WebElementPropertyBag.cpp +++ b/WebKit/win/WebElementPropertyBag.cpp @@ -37,6 +37,7 @@ #include <WebCore/FrameLoader.h> #include <WebCore/Image.h> #include <WebCore/KURL.h> +#include <WebCore/RenderObject.h> #pragma warning(pop) using namespace WebCore; @@ -145,7 +146,9 @@ HRESULT STDMETHODCALLTYPE WebElementPropertyBag::Read(LPCOLESTR pszPropName, VAR return S_OK; } else if (isEqual(WebElementImageRectKey, key)) { V_VT(pVar) = VT_ARRAY; - V_ARRAY(pVar) = MarshallingHelpers::intRectToSafeArray(m_result->boundingBox()); + IntRect boundingBox = m_result->innerNonSharedNode() && m_result->innerNonSharedNode()->renderer() ? + m_result->innerNonSharedNode()->renderer()->absoluteBoundingBoxRect(true) : IntRect(); + V_ARRAY(pVar) = MarshallingHelpers::intRectToSafeArray(boundingBox); return S_OK; } else if (isEqual(WebElementImageURLKey, key)) return convertStringToVariant(pVar, m_result->absoluteImageURL().string()); |