Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: third_party/WebKit/Source/core/dom/Document.h

Issue 2392773002: Reenable framebusting deprecation, change it to allow navigation if iframe has ever had a user gestu (Closed)
Patch Set: Fix faliing content_browsertest Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All
7 * rights reserved. 7 * rights reserved.
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 1261 matching lines...) Expand 10 before | Expand all | Expand 10 after
1272 RootScrollerController* rootScrollerController() const { 1272 RootScrollerController* rootScrollerController() const {
1273 return m_rootScrollerController.get(); 1273 return m_rootScrollerController.get();
1274 } 1274 }
1275 1275
1276 bool isInMainFrame() const; 1276 bool isInMainFrame() const;
1277 1277
1278 void onVisibilityMaybeChanged(bool visible); 1278 void onVisibilityMaybeChanged(bool visible);
1279 1279
1280 PropertyRegistry* propertyRegistry(); 1280 PropertyRegistry* propertyRegistry();
1281 1281
1282 void setHasReceivedUserGesture() { m_hasReceivedUserGesture = true; }
1283 bool hasReceivedUserGesture() const { return m_hasReceivedUserGesture; }
1284
1282 protected: 1285 protected:
1283 Document(const DocumentInit&, DocumentClassFlags = DefaultDocumentClass); 1286 Document(const DocumentInit&, DocumentClassFlags = DefaultDocumentClass);
1284 1287
1285 void didUpdateSecurityOrigin() final; 1288 void didUpdateSecurityOrigin() final;
1286 1289
1287 void clearXMLVersion() { m_xmlVersion = String(); } 1290 void clearXMLVersion() { m_xmlVersion = String(); }
1288 1291
1289 virtual Document* cloneDocumentWithoutChildren(); 1292 virtual Document* cloneDocumentWithoutChildren();
1290 1293
1291 bool importContainerNodeChildren(ContainerNode* oldContainerNode, 1294 bool importContainerNodeChildren(ContainerNode* oldContainerNode,
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
1515 String m_xmlVersion; 1518 String m_xmlVersion;
1516 unsigned m_xmlStandalone : 2; 1519 unsigned m_xmlStandalone : 2;
1517 unsigned m_hasXMLDeclaration : 1; 1520 unsigned m_hasXMLDeclaration : 1;
1518 1521
1519 AtomicString m_contentLanguage; 1522 AtomicString m_contentLanguage;
1520 1523
1521 DocumentEncodingData m_encodingData; 1524 DocumentEncodingData m_encodingData;
1522 1525
1523 bool m_designMode; 1526 bool m_designMode;
1524 bool m_isRunningExecCommand; 1527 bool m_isRunningExecCommand;
1528 bool m_hasReceivedUserGesture;
1525 1529
1526 HeapHashSet<WeakMember<const LiveNodeListBase>> m_listsInvalidatedAtDocument; 1530 HeapHashSet<WeakMember<const LiveNodeListBase>> m_listsInvalidatedAtDocument;
1527 // Oilpan keeps track of all registered NodeLists. 1531 // Oilpan keeps track of all registered NodeLists.
1528 // TODO(Oilpan): improve - only need to know if a NodeList 1532 // TODO(Oilpan): improve - only need to know if a NodeList
1529 // is currently alive or not for the different types. 1533 // is currently alive or not for the different types.
1530 HeapHashSet<WeakMember<const LiveNodeListBase>> 1534 HeapHashSet<WeakMember<const LiveNodeListBase>>
1531 m_nodeLists[numNodeListInvalidationTypes]; 1535 m_nodeLists[numNodeListInvalidationTypes];
1532 1536
1533 Member<SVGDocumentExtensions> m_svgExtensions; 1537 Member<SVGDocumentExtensions> m_svgExtensions;
1534 1538
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1679 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true); 1683 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true);
1680 1684
1681 } // namespace blink 1685 } // namespace blink
1682 1686
1683 #ifndef NDEBUG 1687 #ifndef NDEBUG
1684 // Outside the WebCore namespace for ease of invocation from gdb. 1688 // Outside the WebCore namespace for ease of invocation from gdb.
1685 CORE_EXPORT void showLiveDocumentInstances(); 1689 CORE_EXPORT void showLiveDocumentInstances();
1686 #endif 1690 #endif
1687 1691
1688 #endif // Document_h 1692 #endif // Document_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698