From 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 8 Oct 2009 17:19:54 +0100 Subject: Merge webkit.org at R49305 : Automatic merge by git. Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7 --- WebCore/dom/ContainerNode.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'WebCore/dom/ContainerNode.h') diff --git a/WebCore/dom/ContainerNode.h b/WebCore/dom/ContainerNode.h index 3ad932c..9789f1f 100644 --- a/WebCore/dom/ContainerNode.h +++ b/WebCore/dom/ContainerNode.h @@ -2,7 +2,7 @@ * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2001 Dirk Mueller (mueller@kde.org) - * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2005, 2006, 2007, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -38,7 +38,6 @@ namespace Private { class ContainerNode : public Node { public: - ContainerNode(Document*, bool isElement = false); virtual ~ContainerNode(); Node* firstChild() const { return m_firstChild; } @@ -72,8 +71,12 @@ public: void removeAllChildren(); void cloneChildNodes(ContainerNode* clone); + + bool dispatchBeforeLoadEvent(const String& sourceURL); protected: + ContainerNode(Document*, ConstructionType = CreateContainer); + static void queuePostAttachCallback(NodeCallback, Node*); void suspendPostAttachCallbacks(); void resumePostAttachCallbacks(); @@ -97,8 +100,8 @@ private: Node* m_lastChild; }; -inline ContainerNode::ContainerNode(Document* document, bool isElement) - : Node(document, isElement, true) +inline ContainerNode::ContainerNode(Document* document, ConstructionType type) + : Node(document, type) , m_firstChild(0) , m_lastChild(0) { -- cgit v1.1