From cd44dc59cdfc39534aef4d417e9f3c412e3be139 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 3 Feb 2012 09:55:33 +0100
Subject: Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961
 (http://svn.webkit.org/repository/webkit/trunk@106560)

---
 Source/WebKit2/WebProcess/WebPage/WebFrame.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'Source/WebKit2/WebProcess/WebPage/WebFrame.cpp')

diff --git a/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp b/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp
index b32543eee..43f443829 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp
@@ -357,6 +357,14 @@ String WebFrame::innerText() const
     return m_coreFrame->document()->documentElement()->innerText();
 }
 
+WebFrame* WebFrame::parentFrame() const
+{
+    if (!m_coreFrame || !m_coreFrame->ownerElement() || !m_coreFrame->ownerElement()->document())
+        return 0;
+
+    return static_cast<WebFrameLoaderClient*>(m_coreFrame->ownerElement()->document()->frame()->loader()->client())->webFrame();
+}
+
 PassRefPtr<ImmutableArray> WebFrame::childFrames()
 {
     if (!m_coreFrame)
-- 
cgit v1.2.1