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

Side by Side Diff: Source/core/html/HTMLMediaElement.cpp

Issue 16325005: Remove the Media Query "forward compatibly syntax" support in alignment with HTML5 spec (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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/core/html/HTMLLinkElement.cpp ('k') | Source/core/html/HTMLStyleElement.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) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 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
(...skipping 2885 matching lines...) Expand 10 before | Expand all | Expand 10 after
2896 mediaURL = source->getNonEmptyURLAttribute(srcAttr); 2896 mediaURL = source->getNonEmptyURLAttribute(srcAttr);
2897 #if !LOG_DISABLED 2897 #if !LOG_DISABLED
2898 if (shouldLog) 2898 if (shouldLog)
2899 LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'src' is %s", urlForLoggingMedia(mediaURL).utf8().data()); 2899 LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'src' is %s", urlForLoggingMedia(mediaURL).utf8().data());
2900 #endif 2900 #endif
2901 if (mediaURL.isEmpty()) 2901 if (mediaURL.isEmpty())
2902 goto check_again; 2902 goto check_again;
2903 2903
2904 if (source->fastHasAttribute(mediaAttr)) { 2904 if (source->fastHasAttribute(mediaAttr)) {
2905 MediaQueryEvaluator screenEval("screen", document()->frame(), render er() ? renderer()->style() : 0); 2905 MediaQueryEvaluator screenEval("screen", document()->frame(), render er() ? renderer()->style() : 0);
2906 RefPtr<MediaQuerySet> media = MediaQuerySet::createAllowingDescripti onSyntax(source->media()); 2906 RefPtr<MediaQuerySet> media = MediaQuerySet::create(source->media()) ;
2907 #if !LOG_DISABLED 2907 #if !LOG_DISABLED
2908 if (shouldLog) 2908 if (shouldLog)
2909 LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'media' is %s", source->media().utf8().data()); 2909 LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'media' is %s", source->media().utf8().data());
2910 #endif 2910 #endif
2911 if (!screenEval.eval(media.get())) 2911 if (!screenEval.eval(media.get()))
2912 goto check_again; 2912 goto check_again;
2913 } 2913 }
2914 2914
2915 type = source->type(); 2915 type = source->type();
2916 // FIXME(82965): Add support for keySystem in <source> and set system fr om source. 2916 // FIXME(82965): Add support for keySystem in <source> and set system fr om source.
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
3953 info.addMember(m_mediaGroup, "mediaGroup"); 3953 info.addMember(m_mediaGroup, "mediaGroup");
3954 info.addMember(m_mediaController, "mediaController"); 3954 info.addMember(m_mediaController, "mediaController");
3955 3955
3956 #if ENABLE(WEB_AUDIO) 3956 #if ENABLE(WEB_AUDIO)
3957 info.addMember(m_audioSourceNode, "audioSourceNode"); 3957 info.addMember(m_audioSourceNode, "audioSourceNode");
3958 #endif 3958 #endif
3959 3959
3960 } 3960 }
3961 3961
3962 } 3962 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLLinkElement.cpp ('k') | Source/core/html/HTMLStyleElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698