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

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: 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
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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 case PseudoDoubleButton: 229 case PseudoDoubleButton:
230 case PseudoSingleButton: 230 case PseudoSingleButton:
231 case PseudoNoButton: 231 case PseudoNoButton:
232 case PseudoFirstPage: 232 case PseudoFirstPage:
233 case PseudoLeftPage: 233 case PseudoLeftPage:
234 case PseudoRightPage: 234 case PseudoRightPage:
235 case PseudoInRange: 235 case PseudoInRange:
236 case PseudoOutOfRange: 236 case PseudoOutOfRange:
237 case PseudoUserAgentCustomElement: 237 case PseudoUserAgentCustomElement:
238 case PseudoWebKitCustomElement: 238 case PseudoWebKitCustomElement:
239 case PseudoSeamlessDocument:
239 #if ENABLE(VIDEO_TRACK) 240 #if ENABLE(VIDEO_TRACK)
240 case PseudoCue: 241 case PseudoCue:
241 case PseudoFutureCue: 242 case PseudoFutureCue:
242 case PseudoPastCue: 243 case PseudoPastCue:
243 #endif 244 #endif
244 #if ENABLE(IFRAME_SEAMLESS)
245 case PseudoSeamlessDocument:
246 #endif
247 #if ENABLE(SHADOW_DOM) 245 #if ENABLE(SHADOW_DOM)
248 case PseudoDistributed: 246 case PseudoDistributed:
249 #endif 247 #endif
250 return NOPSEUDO; 248 return NOPSEUDO;
251 case PseudoNotParsed: 249 case PseudoNotParsed:
252 ASSERT_NOT_REACHED(); 250 ASSERT_NOT_REACHED();
253 return NOPSEUDO; 251 return NOPSEUDO;
254 } 252 }
255 253
256 ASSERT_NOT_REACHED(); 254 ASSERT_NOT_REACHED();
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 DEFINE_STATIC_LOCAL(AtomicString, horizontal, ("horizontal", AtomicString::C onstructFromLiteral)); 314 DEFINE_STATIC_LOCAL(AtomicString, horizontal, ("horizontal", AtomicString::C onstructFromLiteral));
317 DEFINE_STATIC_LOCAL(AtomicString, vertical, ("vertical", AtomicString::Const ructFromLiteral)); 315 DEFINE_STATIC_LOCAL(AtomicString, vertical, ("vertical", AtomicString::Const ructFromLiteral));
318 DEFINE_STATIC_LOCAL(AtomicString, doubleButton, ("double-button", AtomicStri ng::ConstructFromLiteral)); 316 DEFINE_STATIC_LOCAL(AtomicString, doubleButton, ("double-button", AtomicStri ng::ConstructFromLiteral));
319 DEFINE_STATIC_LOCAL(AtomicString, singleButton, ("single-button", AtomicStri ng::ConstructFromLiteral)); 317 DEFINE_STATIC_LOCAL(AtomicString, singleButton, ("single-button", AtomicStri ng::ConstructFromLiteral));
320 DEFINE_STATIC_LOCAL(AtomicString, noButton, ("no-button", AtomicString::Cons tructFromLiteral)); 318 DEFINE_STATIC_LOCAL(AtomicString, noButton, ("no-button", AtomicString::Cons tructFromLiteral));
321 DEFINE_STATIC_LOCAL(AtomicString, cornerPresent, ("corner-present", AtomicSt ring::ConstructFromLiteral)); 319 DEFINE_STATIC_LOCAL(AtomicString, cornerPresent, ("corner-present", AtomicSt ring::ConstructFromLiteral));
322 // Paged Media pseudo-classes 320 // Paged Media pseudo-classes
323 DEFINE_STATIC_LOCAL(AtomicString, firstPage, ("first", AtomicString::Constru ctFromLiteral)); 321 DEFINE_STATIC_LOCAL(AtomicString, firstPage, ("first", AtomicString::Constru ctFromLiteral));
324 DEFINE_STATIC_LOCAL(AtomicString, leftPage, ("left", AtomicString::Construct FromLiteral)); 322 DEFINE_STATIC_LOCAL(AtomicString, leftPage, ("left", AtomicString::Construct FromLiteral));
325 DEFINE_STATIC_LOCAL(AtomicString, rightPage, ("right", AtomicString::Constru ctFromLiteral)); 323 DEFINE_STATIC_LOCAL(AtomicString, rightPage, ("right", AtomicString::Constru ctFromLiteral));
324 DEFINE_STATIC_LOCAL(AtomicString, seamlessDocument, ("-webkit-seamless-docum ent", AtomicString::ConstructFromLiteral));
326 #if ENABLE(FULLSCREEN_API) 325 #if ENABLE(FULLSCREEN_API)
327 DEFINE_STATIC_LOCAL(AtomicString, fullScreen, ("-webkit-full-screen", Atomic String::ConstructFromLiteral)); 326 DEFINE_STATIC_LOCAL(AtomicString, fullScreen, ("-webkit-full-screen", Atomic String::ConstructFromLiteral));
328 DEFINE_STATIC_LOCAL(AtomicString, fullScreenDocument, ("-webkit-full-screen- document", AtomicString::ConstructFromLiteral)); 327 DEFINE_STATIC_LOCAL(AtomicString, fullScreenDocument, ("-webkit-full-screen- document", AtomicString::ConstructFromLiteral));
329 DEFINE_STATIC_LOCAL(AtomicString, fullScreenAncestor, ("-webkit-full-screen- ancestor", AtomicString::ConstructFromLiteral)); 328 DEFINE_STATIC_LOCAL(AtomicString, fullScreenAncestor, ("-webkit-full-screen- ancestor", AtomicString::ConstructFromLiteral));
330 DEFINE_STATIC_LOCAL(AtomicString, animatingFullScreenTransition, ("-webkit-a nimating-full-screen-transition", AtomicString::ConstructFromLiteral)); 329 DEFINE_STATIC_LOCAL(AtomicString, animatingFullScreenTransition, ("-webkit-a nimating-full-screen-transition", AtomicString::ConstructFromLiteral));
331 #endif 330 #endif
332 #if ENABLE(VIDEO_TRACK) 331 #if ENABLE(VIDEO_TRACK)
333 DEFINE_STATIC_LOCAL(AtomicString, cue, ("cue(", AtomicString::ConstructFromL iteral)); 332 DEFINE_STATIC_LOCAL(AtomicString, cue, ("cue(", AtomicString::ConstructFromL iteral));
334 DEFINE_STATIC_LOCAL(AtomicString, futureCue, ("future", AtomicString::Constr uctFromLiteral)); 333 DEFINE_STATIC_LOCAL(AtomicString, futureCue, ("future", AtomicString::Constr uctFromLiteral));
335 DEFINE_STATIC_LOCAL(AtomicString, pastCue, ("past", AtomicString::ConstructF romLiteral)); 334 DEFINE_STATIC_LOCAL(AtomicString, pastCue, ("past", AtomicString::ConstructF romLiteral));
336 #endif 335 #endif
337 #if ENABLE(IFRAME_SEAMLESS)
338 DEFINE_STATIC_LOCAL(AtomicString, seamlessDocument, ("-webkit-seamless-docum ent", AtomicString::ConstructFromLiteral));
339 #endif
340 #if ENABLE(SHADOW_DOM) 336 #if ENABLE(SHADOW_DOM)
341 DEFINE_STATIC_LOCAL(AtomicString, distributed, ("-webkit-distributed(", Atom icString::ConstructFromLiteral)); 337 DEFINE_STATIC_LOCAL(AtomicString, distributed, ("-webkit-distributed(", Atom icString::ConstructFromLiteral));
342 #endif 338 #endif
343 DEFINE_STATIC_LOCAL(AtomicString, inRange, ("in-range", AtomicString::Constr uctFromLiteral)); 339 DEFINE_STATIC_LOCAL(AtomicString, inRange, ("in-range", AtomicString::Constr uctFromLiteral));
344 DEFINE_STATIC_LOCAL(AtomicString, outOfRange, ("out-of-range", AtomicString: :ConstructFromLiteral)); 340 DEFINE_STATIC_LOCAL(AtomicString, outOfRange, ("out-of-range", AtomicString: :ConstructFromLiteral));
345 DEFINE_STATIC_LOCAL(AtomicString, scope, ("scope", AtomicString::ConstructFr omLiteral)); 341 DEFINE_STATIC_LOCAL(AtomicString, scope, ("scope", AtomicString::ConstructFr omLiteral));
346 342
347 static HashMap<AtomicStringImpl*, CSSSelector::PseudoType>* nameToPseudoType = 0; 343 static HashMap<AtomicStringImpl*, CSSSelector::PseudoType>* nameToPseudoType = 0;
348 if (!nameToPseudoType) { 344 if (!nameToPseudoType) {
349 nameToPseudoType = new HashMap<AtomicStringImpl*, CSSSelector::PseudoTyp e>; 345 nameToPseudoType = new HashMap<AtomicStringImpl*, CSSSelector::PseudoTyp e>;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 nameToPseudoType->set(scrollbarThumb.impl(), CSSSelector::PseudoScrollba rThumb); 400 nameToPseudoType->set(scrollbarThumb.impl(), CSSSelector::PseudoScrollba rThumb);
405 nameToPseudoType->set(scrollbarTrack.impl(), CSSSelector::PseudoScrollba rTrack); 401 nameToPseudoType->set(scrollbarTrack.impl(), CSSSelector::PseudoScrollba rTrack);
406 nameToPseudoType->set(scrollbarTrackPiece.impl(), CSSSelector::PseudoScr ollbarTrackPiece); 402 nameToPseudoType->set(scrollbarTrackPiece.impl(), CSSSelector::PseudoScr ollbarTrackPiece);
407 nameToPseudoType->set(cornerPresent.impl(), CSSSelector::PseudoCornerPre sent); 403 nameToPseudoType->set(cornerPresent.impl(), CSSSelector::PseudoCornerPre sent);
408 nameToPseudoType->set(selection.impl(), CSSSelector::PseudoSelection); 404 nameToPseudoType->set(selection.impl(), CSSSelector::PseudoSelection);
409 nameToPseudoType->set(target.impl(), CSSSelector::PseudoTarget); 405 nameToPseudoType->set(target.impl(), CSSSelector::PseudoTarget);
410 nameToPseudoType->set(visited.impl(), CSSSelector::PseudoVisited); 406 nameToPseudoType->set(visited.impl(), CSSSelector::PseudoVisited);
411 nameToPseudoType->set(firstPage.impl(), CSSSelector::PseudoFirstPage); 407 nameToPseudoType->set(firstPage.impl(), CSSSelector::PseudoFirstPage);
412 nameToPseudoType->set(leftPage.impl(), CSSSelector::PseudoLeftPage); 408 nameToPseudoType->set(leftPage.impl(), CSSSelector::PseudoLeftPage);
413 nameToPseudoType->set(rightPage.impl(), CSSSelector::PseudoRightPage); 409 nameToPseudoType->set(rightPage.impl(), CSSSelector::PseudoRightPage);
410 nameToPseudoType->set(seamlessDocument.impl(), CSSSelector::PseudoSeamle ssDocument);
414 #if ENABLE(FULLSCREEN_API) 411 #if ENABLE(FULLSCREEN_API)
415 nameToPseudoType->set(fullScreen.impl(), CSSSelector::PseudoFullScreen); 412 nameToPseudoType->set(fullScreen.impl(), CSSSelector::PseudoFullScreen);
416 nameToPseudoType->set(fullScreenDocument.impl(), CSSSelector::PseudoFull ScreenDocument); 413 nameToPseudoType->set(fullScreenDocument.impl(), CSSSelector::PseudoFull ScreenDocument);
417 nameToPseudoType->set(fullScreenAncestor.impl(), CSSSelector::PseudoFull ScreenAncestor); 414 nameToPseudoType->set(fullScreenAncestor.impl(), CSSSelector::PseudoFull ScreenAncestor);
418 nameToPseudoType->set(animatingFullScreenTransition.impl(), CSSSelector: :PseudoAnimatingFullScreenTransition); 415 nameToPseudoType->set(animatingFullScreenTransition.impl(), CSSSelector: :PseudoAnimatingFullScreenTransition);
419 #endif 416 #endif
420 #if ENABLE(VIDEO_TRACK) 417 #if ENABLE(VIDEO_TRACK)
421 nameToPseudoType->set(cue.impl(), CSSSelector::PseudoCue); 418 nameToPseudoType->set(cue.impl(), CSSSelector::PseudoCue);
422 nameToPseudoType->set(futureCue.impl(), CSSSelector::PseudoFutureCue); 419 nameToPseudoType->set(futureCue.impl(), CSSSelector::PseudoFutureCue);
423 nameToPseudoType->set(pastCue.impl(), CSSSelector::PseudoPastCue); 420 nameToPseudoType->set(pastCue.impl(), CSSSelector::PseudoPastCue);
424 #endif 421 #endif
425 #if ENABLE(IFRAME_SEAMLESS)
426 nameToPseudoType->set(seamlessDocument.impl(), CSSSelector::PseudoSeamle ssDocument);
427 #endif
428 #if ENABLE(SHADOW_DOM) 422 #if ENABLE(SHADOW_DOM)
429 nameToPseudoType->set(distributed.impl(), CSSSelector::PseudoDistributed ); 423 nameToPseudoType->set(distributed.impl(), CSSSelector::PseudoDistributed );
430 #endif 424 #endif
431 nameToPseudoType->set(inRange.impl(), CSSSelector::PseudoInRange); 425 nameToPseudoType->set(inRange.impl(), CSSSelector::PseudoInRange);
432 nameToPseudoType->set(outOfRange.impl(), CSSSelector::PseudoOutOfRange); 426 nameToPseudoType->set(outOfRange.impl(), CSSSelector::PseudoOutOfRange);
433 } 427 }
434 return nameToPseudoType; 428 return nameToPseudoType;
435 } 429 }
436 430
437 CSSSelector::PseudoType CSSSelector::parsePseudoType(const AtomicString& name) 431 CSSSelector::PseudoType CSSSelector::parsePseudoType(const AtomicString& name)
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 case PseudoDoubleButton: 538 case PseudoDoubleButton:
545 case PseudoSingleButton: 539 case PseudoSingleButton:
546 case PseudoNoButton: 540 case PseudoNoButton:
547 case PseudoNotParsed: 541 case PseudoNotParsed:
548 #if ENABLE(FULLSCREEN_API) 542 #if ENABLE(FULLSCREEN_API)
549 case PseudoFullScreen: 543 case PseudoFullScreen:
550 case PseudoFullScreenDocument: 544 case PseudoFullScreenDocument:
551 case PseudoFullScreenAncestor: 545 case PseudoFullScreenAncestor:
552 case PseudoAnimatingFullScreenTransition: 546 case PseudoAnimatingFullScreenTransition:
553 #endif 547 #endif
554 #if ENABLE(IFRAME_SEAMLESS)
555 case PseudoSeamlessDocument: 548 case PseudoSeamlessDocument:
556 #endif
557 case PseudoInRange: 549 case PseudoInRange:
558 case PseudoOutOfRange: 550 case PseudoOutOfRange:
559 #if ENABLE(VIDEO_TRACK) 551 #if ENABLE(VIDEO_TRACK)
560 case PseudoFutureCue: 552 case PseudoFutureCue:
561 case PseudoPastCue: 553 case PseudoPastCue:
562 #endif 554 #endif
563 break; 555 break;
564 case PseudoFirstPage: 556 case PseudoFirstPage:
565 case PseudoLeftPage: 557 case PseudoLeftPage:
566 case PseudoRightPage: 558 case PseudoRightPage:
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 return false; 825 return false;
834 return (count - m_b) % m_a == 0; 826 return (count - m_b) % m_a == 0;
835 } else { 827 } else {
836 if (count > m_b) 828 if (count > m_b)
837 return false; 829 return false;
838 return (m_b - count) % (-m_a) == 0; 830 return (m_b - count) % (-m_a) == 0;
839 } 831 }
840 } 832 }
841 833
842 } // namespace WebCore 834 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698