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

Side by Side Diff: Source/core/dom/Element.cpp

Issue 603443002: Don't add '(' to FUNCTION token names (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@internalsetshadowunused
Patch Set: Created 6 years, 3 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
« no previous file with comments | « Source/core/css/parser/CSSTokenizer-in.cpp ('k') | Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
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 2348 matching lines...) Expand 10 before | Expand all | Expand 10 after
2359 { 2359 {
2360 if (ShadowRoot* root = containingShadowRoot()) { 2360 if (ShadowRoot* root = containingShadowRoot()) {
2361 if (root->type() == ShadowRoot::UserAgentShadowRoot) 2361 if (root->type() == ShadowRoot::UserAgentShadowRoot)
2362 return fastGetAttribute(pseudoAttr); 2362 return fastGetAttribute(pseudoAttr);
2363 } 2363 }
2364 return nullAtom; 2364 return nullAtom;
2365 } 2365 }
2366 2366
2367 void Element::setShadowPseudoId(const AtomicString& id) 2367 void Element::setShadowPseudoId(const AtomicString& id)
2368 { 2368 {
2369 ASSERT(CSSSelector::parsePseudoType(id) == CSSSelector::PseudoWebKitCustomEl ement || CSSSelector::parsePseudoType(id) == CSSSelector::PseudoUserAgentCustomE lement); 2369 ASSERT(CSSSelector::parsePseudoType(id, false) == CSSSelector::PseudoWebKitC ustomElement || CSSSelector::parsePseudoType(id, false) == CSSSelector::PseudoUs erAgentCustomElement);
2370 setAttribute(pseudoAttr, id); 2370 setAttribute(pseudoAttr, id);
2371 } 2371 }
2372 2372
2373 bool Element::isInDescendantTreeOf(const Element* shadowHost) const 2373 bool Element::isInDescendantTreeOf(const Element* shadowHost) const
2374 { 2374 {
2375 ASSERT(shadowHost); 2375 ASSERT(shadowHost);
2376 ASSERT(isShadowHost(shadowHost)); 2376 ASSERT(isShadowHost(shadowHost));
2377 2377
2378 const ShadowRoot* shadowRoot = containingShadowRoot(); 2378 const ShadowRoot* shadowRoot = containingShadowRoot();
2379 while (shadowRoot) { 2379 while (shadowRoot) {
(...skipping 881 matching lines...) Expand 10 before | Expand all | Expand 10 after
3261 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext , wrapperType, toScriptWrappableBase(), isolate); 3261 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext , wrapperType, toScriptWrappableBase(), isolate);
3262 if (wrapper.IsEmpty()) 3262 if (wrapper.IsEmpty())
3263 return v8::Handle<v8::Object>(); 3263 return v8::Handle<v8::Object>();
3264 3264
3265 wrapper->SetPrototype(binding->prototype()); 3265 wrapper->SetPrototype(binding->prototype());
3266 3266
3267 return V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType , wrapper, isolate); 3267 return V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType , wrapper, isolate);
3268 } 3268 }
3269 3269
3270 } // namespace blink 3270 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/parser/CSSTokenizer-in.cpp ('k') | Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698