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

Side by Side Diff: Source/WebCore/css/CSSSelector.cpp

Issue 13646006: Remove the ENABLE_IFRAME_SEAMLESS compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebaseline. Created 7 years, 8 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
« no previous file with comments | « Source/WebCore/css/CSSSelector.h ('k') | Source/WebCore/css/SelectorChecker.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-2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * 1999 Waldo Bastian (bastian@kde.org) 3 * 1999 Waldo Bastian (bastian@kde.org)
4 * 2001 Andreas Schlapbach (schlpbch@iam.unibe.ch) 4 * 2001 Andreas Schlapbach (schlpbch@iam.unibe.ch)
5 * 2001-2003 Dirk Mueller (mueller@kde.org) 5 * 2001-2003 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2008 David Smith (catfish.man@gmail.com) 7 * Copyright (C) 2008 David Smith (catfish.man@gmail.com)
8 * Copyright (C) 2010 Google Inc. All rights reserved. 8 * Copyright (C) 2010 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 case PseudoRightPage: 232 case PseudoRightPage:
233 case PseudoInRange: 233 case PseudoInRange:
234 case PseudoOutOfRange: 234 case PseudoOutOfRange:
235 case PseudoUserAgentCustomElement: 235 case PseudoUserAgentCustomElement:
236 case PseudoWebKitCustomElement: 236 case PseudoWebKitCustomElement:
237 #if ENABLE(VIDEO_TRACK) 237 #if ENABLE(VIDEO_TRACK)
238 case PseudoCue: 238 case PseudoCue:
239 case PseudoFutureCue: 239 case PseudoFutureCue:
240 case PseudoPastCue: 240 case PseudoPastCue:
241 #endif 241 #endif
242 #if ENABLE(IFRAME_SEAMLESS)
243 case PseudoSeamlessDocument: 242 case PseudoSeamlessDocument:
244 #endif
245 #if ENABLE(SHADOW_DOM) 243 #if ENABLE(SHADOW_DOM)
246 case PseudoDistributed: 244 case PseudoDistributed:
247 #endif 245 #endif
248 return NOPSEUDO; 246 return NOPSEUDO;
249 case PseudoNotParsed: 247 case PseudoNotParsed:
250 ASSERT_NOT_REACHED(); 248 ASSERT_NOT_REACHED();
251 return NOPSEUDO; 249 return NOPSEUDO;
252 } 250 }
253 251
254 ASSERT_NOT_REACHED(); 252 ASSERT_NOT_REACHED();
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 DEFINE_STATIC_LOCAL(AtomicString, rightPage, ("right", AtomicString::Constru ctFromLiteral)); 321 DEFINE_STATIC_LOCAL(AtomicString, rightPage, ("right", AtomicString::Constru ctFromLiteral));
324 DEFINE_STATIC_LOCAL(AtomicString, fullScreen, ("-webkit-full-screen", Atomic String::ConstructFromLiteral)); 322 DEFINE_STATIC_LOCAL(AtomicString, fullScreen, ("-webkit-full-screen", Atomic String::ConstructFromLiteral));
325 DEFINE_STATIC_LOCAL(AtomicString, fullScreenDocument, ("-webkit-full-screen- document", AtomicString::ConstructFromLiteral)); 323 DEFINE_STATIC_LOCAL(AtomicString, fullScreenDocument, ("-webkit-full-screen- document", AtomicString::ConstructFromLiteral));
326 DEFINE_STATIC_LOCAL(AtomicString, fullScreenAncestor, ("-webkit-full-screen- ancestor", AtomicString::ConstructFromLiteral)); 324 DEFINE_STATIC_LOCAL(AtomicString, fullScreenAncestor, ("-webkit-full-screen- ancestor", AtomicString::ConstructFromLiteral));
327 DEFINE_STATIC_LOCAL(AtomicString, animatingFullScreenTransition, ("-webkit-a nimating-full-screen-transition", AtomicString::ConstructFromLiteral)); 325 DEFINE_STATIC_LOCAL(AtomicString, animatingFullScreenTransition, ("-webkit-a nimating-full-screen-transition", AtomicString::ConstructFromLiteral));
328 #if ENABLE(VIDEO_TRACK) 326 #if ENABLE(VIDEO_TRACK)
329 DEFINE_STATIC_LOCAL(AtomicString, cue, ("cue(", AtomicString::ConstructFromL iteral)); 327 DEFINE_STATIC_LOCAL(AtomicString, cue, ("cue(", AtomicString::ConstructFromL iteral));
330 DEFINE_STATIC_LOCAL(AtomicString, futureCue, ("future", AtomicString::Constr uctFromLiteral)); 328 DEFINE_STATIC_LOCAL(AtomicString, futureCue, ("future", AtomicString::Constr uctFromLiteral));
331 DEFINE_STATIC_LOCAL(AtomicString, pastCue, ("past", AtomicString::ConstructF romLiteral)); 329 DEFINE_STATIC_LOCAL(AtomicString, pastCue, ("past", AtomicString::ConstructF romLiteral));
332 #endif 330 #endif
333 #if ENABLE(IFRAME_SEAMLESS)
334 DEFINE_STATIC_LOCAL(AtomicString, seamlessDocument, ("-webkit-seamless-docum ent", AtomicString::ConstructFromLiteral)); 331 DEFINE_STATIC_LOCAL(AtomicString, seamlessDocument, ("-webkit-seamless-docum ent", AtomicString::ConstructFromLiteral));
335 #endif
336 #if ENABLE(SHADOW_DOM) 332 #if ENABLE(SHADOW_DOM)
337 DEFINE_STATIC_LOCAL(AtomicString, distributed, ("-webkit-distributed(", Atom icString::ConstructFromLiteral)); 333 DEFINE_STATIC_LOCAL(AtomicString, distributed, ("-webkit-distributed(", Atom icString::ConstructFromLiteral));
338 #endif 334 #endif
339 DEFINE_STATIC_LOCAL(AtomicString, inRange, ("in-range", AtomicString::Constr uctFromLiteral)); 335 DEFINE_STATIC_LOCAL(AtomicString, inRange, ("in-range", AtomicString::Constr uctFromLiteral));
340 DEFINE_STATIC_LOCAL(AtomicString, outOfRange, ("out-of-range", AtomicString: :ConstructFromLiteral)); 336 DEFINE_STATIC_LOCAL(AtomicString, outOfRange, ("out-of-range", AtomicString: :ConstructFromLiteral));
341 DEFINE_STATIC_LOCAL(AtomicString, scope, ("scope", AtomicString::ConstructFr omLiteral)); 337 DEFINE_STATIC_LOCAL(AtomicString, scope, ("scope", AtomicString::ConstructFr omLiteral));
342 338
343 static HashMap<AtomicStringImpl*, CSSSelector::PseudoType>* nameToPseudoType = 0; 339 static HashMap<AtomicStringImpl*, CSSSelector::PseudoType>* nameToPseudoType = 0;
344 if (!nameToPseudoType) { 340 if (!nameToPseudoType) {
345 nameToPseudoType = new HashMap<AtomicStringImpl*, CSSSelector::PseudoTyp e>; 341 nameToPseudoType = new HashMap<AtomicStringImpl*, CSSSelector::PseudoTyp e>;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 nameToPseudoType->set(rightPage.impl(), CSSSelector::PseudoRightPage); 405 nameToPseudoType->set(rightPage.impl(), CSSSelector::PseudoRightPage);
410 nameToPseudoType->set(fullScreen.impl(), CSSSelector::PseudoFullScreen); 406 nameToPseudoType->set(fullScreen.impl(), CSSSelector::PseudoFullScreen);
411 nameToPseudoType->set(fullScreenDocument.impl(), CSSSelector::PseudoFull ScreenDocument); 407 nameToPseudoType->set(fullScreenDocument.impl(), CSSSelector::PseudoFull ScreenDocument);
412 nameToPseudoType->set(fullScreenAncestor.impl(), CSSSelector::PseudoFull ScreenAncestor); 408 nameToPseudoType->set(fullScreenAncestor.impl(), CSSSelector::PseudoFull ScreenAncestor);
413 nameToPseudoType->set(animatingFullScreenTransition.impl(), CSSSelector: :PseudoAnimatingFullScreenTransition); 409 nameToPseudoType->set(animatingFullScreenTransition.impl(), CSSSelector: :PseudoAnimatingFullScreenTransition);
414 #if ENABLE(VIDEO_TRACK) 410 #if ENABLE(VIDEO_TRACK)
415 nameToPseudoType->set(cue.impl(), CSSSelector::PseudoCue); 411 nameToPseudoType->set(cue.impl(), CSSSelector::PseudoCue);
416 nameToPseudoType->set(futureCue.impl(), CSSSelector::PseudoFutureCue); 412 nameToPseudoType->set(futureCue.impl(), CSSSelector::PseudoFutureCue);
417 nameToPseudoType->set(pastCue.impl(), CSSSelector::PseudoPastCue); 413 nameToPseudoType->set(pastCue.impl(), CSSSelector::PseudoPastCue);
418 #endif 414 #endif
419 #if ENABLE(IFRAME_SEAMLESS)
420 nameToPseudoType->set(seamlessDocument.impl(), CSSSelector::PseudoSeamle ssDocument); 415 nameToPseudoType->set(seamlessDocument.impl(), CSSSelector::PseudoSeamle ssDocument);
421 #endif
422 #if ENABLE(SHADOW_DOM) 416 #if ENABLE(SHADOW_DOM)
423 nameToPseudoType->set(distributed.impl(), CSSSelector::PseudoDistributed ); 417 nameToPseudoType->set(distributed.impl(), CSSSelector::PseudoDistributed );
424 #endif 418 #endif
425 nameToPseudoType->set(inRange.impl(), CSSSelector::PseudoInRange); 419 nameToPseudoType->set(inRange.impl(), CSSSelector::PseudoInRange);
426 nameToPseudoType->set(outOfRange.impl(), CSSSelector::PseudoOutOfRange); 420 nameToPseudoType->set(outOfRange.impl(), CSSSelector::PseudoOutOfRange);
427 } 421 }
428 return nameToPseudoType; 422 return nameToPseudoType;
429 } 423 }
430 424
431 CSSSelector::PseudoType CSSSelector::parsePseudoType(const AtomicString& name) 425 CSSSelector::PseudoType CSSSelector::parsePseudoType(const AtomicString& name)
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 case PseudoStart: 530 case PseudoStart:
537 case PseudoEnd: 531 case PseudoEnd:
538 case PseudoDoubleButton: 532 case PseudoDoubleButton:
539 case PseudoSingleButton: 533 case PseudoSingleButton:
540 case PseudoNoButton: 534 case PseudoNoButton:
541 case PseudoNotParsed: 535 case PseudoNotParsed:
542 case PseudoFullScreen: 536 case PseudoFullScreen:
543 case PseudoFullScreenDocument: 537 case PseudoFullScreenDocument:
544 case PseudoFullScreenAncestor: 538 case PseudoFullScreenAncestor:
545 case PseudoAnimatingFullScreenTransition: 539 case PseudoAnimatingFullScreenTransition:
546 #if ENABLE(IFRAME_SEAMLESS)
547 case PseudoSeamlessDocument: 540 case PseudoSeamlessDocument:
548 #endif
549 case PseudoInRange: 541 case PseudoInRange:
550 case PseudoOutOfRange: 542 case PseudoOutOfRange:
551 #if ENABLE(VIDEO_TRACK) 543 #if ENABLE(VIDEO_TRACK)
552 case PseudoFutureCue: 544 case PseudoFutureCue:
553 case PseudoPastCue: 545 case PseudoPastCue:
554 #endif 546 #endif
555 break; 547 break;
556 case PseudoFirstPage: 548 case PseudoFirstPage:
557 case PseudoLeftPage: 549 case PseudoLeftPage:
558 case PseudoRightPage: 550 case PseudoRightPage:
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 return false; 817 return false;
826 return (count - m_b) % m_a == 0; 818 return (count - m_b) % m_a == 0;
827 } else { 819 } else {
828 if (count > m_b) 820 if (count > m_b)
829 return false; 821 return false;
830 return (m_b - count) % (-m_a) == 0; 822 return (m_b - count) % (-m_a) == 0;
831 } 823 }
832 } 824 }
833 825
834 } // namespace WebCore 826 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/css/CSSSelector.h ('k') | Source/WebCore/css/SelectorChecker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698