Rename Document::ownerElement to localOwner and fix main frame checks.

third_party/WebKit/Source/core/dom/Document.h

Index: third_party/WebKit/Source/core/dom/Document.h
diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h
index dd523dfa00ab5e83a64f738a0c6a963b9379ad2d..d411d626e96fe9cced25cfa3687aea48a4480dce 100644
--- a/third_party/WebKit/Source/core/dom/Document.h
+++ b/third_party/WebKit/Source/core/dom/Document.h
@@ -694,9 +694,9 @@ public:
     void updateViewportDescription();
     void processReferrerPolicy(const String& policy);
 
-    // Returns the owning element in the parent document.
-    // Returns nullptr if this is the top level document.
-    HTMLFrameOwnerElement* ownerElement() const;
+    // Returns the owning element in the parent document. Returns nullptr if
+    // this is the top level document or the owner is remote.
+    HTMLFrameOwnerElement* localOwnerElement() const;

[dcheng, 2016/05/07 06:09:08]

Thinking about this more, 'Element' ought to imply (and be redundant with)
local. Would calling this localOwner() makes things clearer? It'd also be more
consistent with how Frame naming currently works.

[bokan, 2016/05/09 20:43:58]

sgtm, done.

 
     // Returns true if this document belongs to a frame that the parent document
     // made invisible (for instance by setting as style display:none).
@@ -1071,6 +1071,8 @@ public:
     void setRootScroller(Element*, ExceptionState&);
     Element* rootScroller();
 
+    bool isInMainFrame() const;
+
 protected:
     Document(const DocumentInit&, DocumentClassFlags = DefaultDocumentClass);