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

Side by Side Diff: third_party/WebKit/WebCore/bindings/js/JSDocumentCustom.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 26 matching lines...) Expand all
37 #include "JSSVGDocument.h" 37 #include "JSSVGDocument.h"
38 #include "SVGDocument.h" 38 #include "SVGDocument.h"
39 #endif 39 #endif
40 40
41 using namespace JSC; 41 using namespace JSC;
42 42
43 namespace WebCore { 43 namespace WebCore {
44 44
45 void JSDocument::mark() 45 void JSDocument::mark()
46 { 46 {
47 JSNode::mark(); 47 JSEventTargetNode::mark();
48 markDOMNodesForDocument(impl()); 48 markDOMNodesForDocument(impl());
49 markActiveObjectsForContext(*Heap::heap(this)->globalData(), impl()); 49 markActiveObjectsForContext(*Heap::heap(this)->globalData(), impl());
50 } 50 }
51 51
52 JSValuePtr JSDocument::location(ExecState* exec) const 52 JSValuePtr JSDocument::location(ExecState* exec) const
53 { 53 {
54 Frame* frame = static_cast<Document*>(impl())->frame(); 54 Frame* frame = static_cast<Document*>(impl())->frame();
55 if (!frame) 55 if (!frame)
56 return jsNull(); 56 return jsNull();
57 57
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 for (Node* n = document; n; n = n->traverseNextNode()) 101 for (Node* n = document; n; n = n->traverseNextNode())
102 nodeCount++; 102 nodeCount++;
103 103
104 exec->heap()->reportExtraMemoryCost(nodeCount * sizeof(Node)); 104 exec->heap()->reportExtraMemoryCost(nodeCount * sizeof(Node));
105 } 105 }
106 106
107 return wrapper; 107 return wrapper;
108 } 108 }
109 109
110 } // namespace WebCore 110 } // namespace WebCore
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/WebCoreSources.bkl ('k') | third_party/WebKit/WebCore/bindings/js/JSEventListener.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698