Revert 170347 "Convert HTMLFrameOwnerElement and FocusController..."

Source/core/frame/LocalFrame.h

Index: Source/core/frame/LocalFrame.h
===================================================================
--- Source/core/frame/LocalFrame.h	(revision 170478)
+++ Source/core/frame/LocalFrame.h	(working copy)
@@ -72,7 +72,10 @@
 
         virtual void willDetachFrameHost() OVERRIDE;
         virtual void detachFromFrameHost() OVERRIDE;
+        void disconnectOwnerElement();
 
+        HTMLFrameOwnerElement* ownerElement() const;
+
         virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>) OVERRIDE;
         FrameView* view() const;
 
@@ -209,6 +212,11 @@
         return *m_inputMethodController;
     }
 
+    inline HTMLFrameOwnerElement* LocalFrame::ownerElement() const
+    {
+        return m_ownerElement;
+    }
+
     inline bool LocalFrame::inViewSourceMode() const
     {
         return m_inViewSourceMode;
@@ -234,9 +242,4 @@
 
 } // namespace WebCore
 
-// During refactoring, there are some places where we need to do type conversions that
-// will not be needed once all instances of LocalFrame and RemoteFrame are sorted out.
-// At that time this #define will be removed and all the uses of it will need to be corrected.
-#define toLocalFrameTemporary toLocalFrame
-
 #endif // LocalFrame_h