Source/WebCore/dom/TreeScopeAdopter.h - Issue 12518022: Merge 143840

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Source/WebCore/dom/TreeScopeAdopter.h

Issue 12518022: Merge 143840 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

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

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

6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)	6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)

7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)	7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)

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

9 *	9 *

10 * This library is free software; you can redistribute it and/or	10 * This library is free software; you can redistribute it and/or

(...skipping 27 matching lines...) Expand all Loading...
38 void execute() const { moveTreeToNewScope(m_toAdopt); }	38 void execute() const { moveTreeToNewScope(m_toAdopt); }

39 bool needsScopeChange() const { return m_oldScope != m_newScope; }	39 bool needsScopeChange() const { return m_oldScope != m_newScope; }

40	40

41 #ifdef NDEBUG	41 #ifdef NDEBUG

42 static void ensureDidMoveToNewDocumentWasCalled(Document*) { }	42 static void ensureDidMoveToNewDocumentWasCalled(Document*) { }

43 #else	43 #else

44 static void ensureDidMoveToNewDocumentWasCalled(Document*);	44 static void ensureDidMoveToNewDocumentWasCalled(Document*);

45 #endif	45 #endif

46	46

47 private:	47 private:

	48 void updateTreeScope(Node*) const;

48 void moveTreeToNewScope(Node*) const;	49 void moveTreeToNewScope(Node*) const;

49 void moveTreeToNewDocument(Node, Document oldDocument, Document* newDocume nt) const;	50 void moveTreeToNewDocument(Node, Document oldDocument, Document* newDocume nt) const;

50 void moveNodeToNewDocument(Node, Document oldDocument, Document* newDocume nt) const;	51 void moveNodeToNewDocument(Node, Document oldDocument, Document* newDocume nt) const;

51	52

52 Node* m_toAdopt;	53 Node* m_toAdopt;

53 TreeScope* m_newScope;	54 TreeScope* m_newScope;

54 TreeScope* m_oldScope;	55 TreeScope* m_oldScope;

55 };	56 };

56	57

57 inline TreeScopeAdopter::TreeScopeAdopter(Node* toAdopt, TreeScope* newScope)	58 inline TreeScopeAdopter::TreeScopeAdopter(Node* toAdopt, TreeScope* newScope)

58 : m_toAdopt(toAdopt)	59 : m_toAdopt(toAdopt)

59 , m_newScope(newScope)	60 , m_newScope(newScope)

60 , m_oldScope(toAdopt->treeScope())	61 , m_oldScope(toAdopt->treeScope())

61 {	62 {

62 ASSERT(newScope);	63 ASSERT(newScope);

63 }	64 }

64	65

65 }	66 }

66	67

67 #endif	68 #endif

OLD	NEW

« no previous file with comments | « Source/WebCore/dom/TreeScope.cpp ('k') | Source/WebCore/dom/TreeScopeAdopter.cpp » ('j') | no next file with comments »