| Index: Source/core/dom/DocumentInitializer.cpp
|
| diff --git a/Source/core/dom/DocumentOrderedList.h b/Source/core/dom/DocumentInitializer.cpp
|
| similarity index 62%
|
| copy from Source/core/dom/DocumentOrderedList.h
|
| copy to Source/core/dom/DocumentInitializer.cpp
|
| index 8dde172864e28b463855a252fcc75ff453bc6312..8a588fed485ef178b4e949e5ee56699dd03dedd8 100644
|
| --- a/Source/core/dom/DocumentOrderedList.h
|
| +++ b/Source/core/dom/DocumentInitializer.cpp
|
| @@ -25,36 +25,41 @@
|
| *
|
| */
|
|
|
| -#ifndef DocumentOrderedList_h
|
| -#define DocumentOrderedList_h
|
| +#include "config.h"
|
| +#include "core/dom/DocumentInitializer.h"
|
|
|
| -#include "wtf/FastAllocBase.h"
|
| -#include "wtf/ListHashSet.h"
|
| +#include "core/html/HTMLImportsController.h"
|
| +#include "core/page/Frame.h"
|
|
|
| namespace WebCore {
|
|
|
| -class Node;
|
| -
|
| -class DocumentOrderedList {
|
| - WTF_MAKE_NONCOPYABLE(DocumentOrderedList); WTF_MAKE_FAST_ALLOCATED;
|
| -public:
|
| - DocumentOrderedList() { }
|
| -
|
| - void add(Node*);
|
| - void parserAdd(Node*);
|
| - void remove(Node*);
|
| - bool isEmpty() const { return m_nodes.isEmpty(); }
|
| - void clear() { m_nodes.clear(); }
|
| +bool DocumentInitializer::shouldSetURL() const
|
| +{
|
| + return (m_frame && m_frame->ownerElement()) || !m_url.isEmpty();
|
| +}
|
|
|
| - typedef ListHashSet<Node*, 32>::iterator iterator;
|
| +bool DocumentInitializer::shouldTreatURLAsSrcdocDocument() const
|
| +{
|
| + return m_frame->loader()->shouldTreatURLAsSrcdocDocument(m_url);
|
| +}
|
|
|
| - iterator begin() { return m_nodes.begin(); }
|
| - iterator end() { return m_nodes.end(); }
|
| +SandboxFlags DocumentInitializer::sandboxFlags() const
|
| +{
|
| + return m_frame->loader()->effectiveSandboxFlags();
|
| +}
|
|
|
| -private:
|
| - ListHashSet<Node*, 32> m_nodes;
|
| -};
|
| +Settings* DocumentInitializer::settings() const
|
| +{
|
| + return m_frame->settings();
|
| +}
|
|
|
| +Frame* DocumentInitializer::ownerFrame() const
|
| +{
|
| + Frame* ownerFrame = m_frame->tree()->parent();
|
| + if (!ownerFrame)
|
| + ownerFrame = m_frame->loader()->opener();
|
| + return ownerFrame;
|
| }
|
|
|
| -#endif
|
| +} // namespace WebCore
|
| +
|
|
|