third_party/WebKit/Source/core/dom/Document.h - Issue 1655413002: Merge updateSecurityOrigin() and setSecurityOrigin().

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

Issue 1655413002: Merge updateSecurityOrigin() and setSecurityOrigin(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« no previous file with comments | « no previous file | third_party/WebKit/Source/core/dom/Document.cpp » ('j') | no next file with comments »

OLD	NEW
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 r ights reserved.	6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.

7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)	7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)

8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)	8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)

9 * Copyright (C) 2011 Google Inc. All rights reserved.	9 * Copyright (C) 2011 Google Inc. All rights reserved.

10 *	10 *

(...skipping 991 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1002 bool isDetached() const { return m_lifecycle.state() >= DocumentLifecycle::S topping; }	1002 bool isDetached() const { return m_lifecycle.state() >= DocumentLifecycle::S topping; }

1003 bool isStopped() const { return m_lifecycle.state() == DocumentLifecycle::St opped; }	1003 bool isStopped() const { return m_lifecycle.state() == DocumentLifecycle::St opped; }

1004 bool isDisposed() const { return m_lifecycle.state() == DocumentLifecycle::D isposed; }	1004 bool isDisposed() const { return m_lifecycle.state() == DocumentLifecycle::D isposed; }

1005	1005

1006 enum HttpRefreshType {	1006 enum HttpRefreshType {

1007 HttpRefreshFromHeader,	1007 HttpRefreshFromHeader,

1008 HttpRefreshFromMetaTag	1008 HttpRefreshFromMetaTag

1009 };	1009 };

1010 void maybeHandleHttpRefresh(const String&, HttpRefreshType);	1010 void maybeHandleHttpRefresh(const String&, HttpRefreshType);

1011	1011

1012 void updateSecurityOrigin(PassRefPtr<SecurityOrigin>);

1013

1014 void setHasViewportUnits() { m_hasViewportUnits = true; }	1012 void setHasViewportUnits() { m_hasViewportUnits = true; }

1015 bool hasViewportUnits() const { return m_hasViewportUnits; }	1013 bool hasViewportUnits() const { return m_hasViewportUnits; }

1016 void notifyResizeForViewportUnits();	1014 void notifyResizeForViewportUnits();

1017	1015

1018 void registerVisibilityObserver(DocumentVisibilityObserver*);	1016 void registerVisibilityObserver(DocumentVisibilityObserver*);

1019 void unregisterVisibilityObserver(DocumentVisibilityObserver*);	1017 void unregisterVisibilityObserver(DocumentVisibilityObserver*);

1020	1018

1021 void updateStyleInvalidationIfNeeded();	1019 void updateStyleInvalidationIfNeeded();

1022	1020

1023 bool attemptedToDetermineEncodingFromContentSniffing() const;	1021 bool attemptedToDetermineEncodingFromContentSniffing() const;

(...skipping 426 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1450 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true);	1448 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true);

1451	1449

1452 } // namespace blink	1450 } // namespace blink

1453	1451

1454 #ifndef NDEBUG	1452 #ifndef NDEBUG

1455 // Outside the WebCore namespace for ease of invocation from gdb.	1453 // Outside the WebCore namespace for ease of invocation from gdb.

1456 CORE_EXPORT void showLiveDocumentInstances();	1454 CORE_EXPORT void showLiveDocumentInstances();

1457 #endif	1455 #endif

1458	1456

1459 #endif // Document_h	1457 #endif // Document_h

OLD	NEW