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

Side by Side Diff: third_party/WebKit/WebCore/bindings/js/JSStyleSheetCustom.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 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "JSStyleSheet.h" 27 #include "JSStyleSheet.h"
28 28
29 #include "CSSStyleSheet.h" 29 #include "CSSStyleSheet.h"
30 #include "Node.h"
31 #include "JSCSSStyleSheet.h" 30 #include "JSCSSStyleSheet.h"
32 #include "JSNode.h" 31 #include "JSNode.h"
33 32
34 using namespace JSC; 33 using namespace JSC;
35 34
36 namespace WebCore { 35 namespace WebCore {
37 36
38 JSValuePtr toJS(ExecState* exec, StyleSheet* styleSheet) 37 JSValuePtr toJS(ExecState* exec, StyleSheet* styleSheet)
39 { 38 {
40 if (!styleSheet) 39 if (!styleSheet)
(...skipping 22 matching lines...) Expand all
63 // a lot of disentangling of the CSS DOM objects that would need to happen f irst. 62 // a lot of disentangling of the CSS DOM objects that would need to happen f irst.
64 if (Node* ownerNode = impl()->ownerNode()) { 63 if (Node* ownerNode = impl()->ownerNode()) {
65 if (JSNode* ownerNodeWrapper = getCachedDOMNodeWrapper(ownerNode->docume nt(), ownerNode)) { 64 if (JSNode* ownerNodeWrapper = getCachedDOMNodeWrapper(ownerNode->docume nt(), ownerNode)) {
66 if (!ownerNodeWrapper->marked()) 65 if (!ownerNodeWrapper->marked())
67 ownerNodeWrapper->mark(); 66 ownerNodeWrapper->mark();
68 } 67 }
69 } 68 }
70 } 69 }
71 70
72 } // namespace WebCore 71 } // namespace WebCore
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/bindings/js/JSNodeCustom.cpp ('k') | third_party/WebKit/WebCore/bindings/js/ScriptControllerQt.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698