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

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
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 2871 matching lines...) Expand 10 before | Expand all | Expand 10 after
2882 mediaURL = source->getNonEmptyURLAttribute(srcAttr); 2882 mediaURL = source->getNonEmptyURLAttribute(srcAttr);
2883 #if !LOG_DISABLED 2883 #if !LOG_DISABLED
2884 if (shouldLog) 2884 if (shouldLog)
2885 LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'src' is %s", urlForLoggingMedia(mediaURL).utf8().data()); 2885 LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'src' is %s", urlForLoggingMedia(mediaURL).utf8().data());
2886 #endif 2886 #endif
2887 if (mediaURL.isEmpty()) 2887 if (mediaURL.isEmpty())
2888 goto check_again; 2888 goto check_again;
2889 2889
2890 if (source->fastHasAttribute(mediaAttr)) { 2890 if (source->fastHasAttribute(mediaAttr)) {
2891 MediaQueryEvaluator screenEval("screen", document()->frame(), render er() ? renderer()->style() : 0); 2891 MediaQueryEvaluator screenEval("screen", document()->frame(), render er() ? renderer()->style() : 0);
2892 RefPtr<MediaQuerySet> media = MediaQuerySet::createAllowingDescripti onSyntax(source->media()); 2892 RefPtr<MediaQuerySet> media = MediaQuerySet::create(source->media()) ;
2893 #if !LOG_DISABLED 2893 #if !LOG_DISABLED
2894 if (shouldLog) 2894 if (shouldLog)
2895 LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'media' is %s", source->media().utf8().data()); 2895 LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'media' is %s", source->media().utf8().data());
2896 #endif 2896 #endif
2897 if (!screenEval.eval(media.get())) 2897 if (!screenEval.eval(media.get()))
2898 goto check_again; 2898 goto check_again;
2899 } 2899 }
2900 2900
2901 type = source->type(); 2901 type = source->type();
2902 // FIXME(82965): Add support for keySystem in <source> and set system fr om source. 2902 // FIXME(82965): Add support for keySystem in <source> and set system fr om source.
(...skipping 1117 matching lines...) Expand 10 before | Expand all | Expand 10 after
4020 info.addMember(m_mediaGroup, "mediaGroup"); 4020 info.addMember(m_mediaGroup, "mediaGroup");
4021 info.addMember(m_mediaController, "mediaController"); 4021 info.addMember(m_mediaController, "mediaController");
4022 4022
4023 #if ENABLE(WEB_AUDIO) 4023 #if ENABLE(WEB_AUDIO)
4024 info.addMember(m_audioSourceNode, "audioSourceNode"); 4024 info.addMember(m_audioSourceNode, "audioSourceNode");
4025 #endif 4025 #endif
4026 4026
4027 } 4027 }
4028 4028
4029 } 4029 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698