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

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

Issue 10536097: Merge 119742 - Plumb CORS attribute information from HTMLMediaElement to media players so it can be… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv ed.
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 4367 matching lines...) Expand 10 before | Expand all | Expand 10 after
4378 String HTMLMediaElement::mediaPlayerUserAgent() const 4378 String HTMLMediaElement::mediaPlayerUserAgent() const
4379 { 4379 {
4380 Frame* frame = document()->frame(); 4380 Frame* frame = document()->frame();
4381 if (!frame) 4381 if (!frame)
4382 return String(); 4382 return String();
4383 4383
4384 return frame->loader()->userAgent(m_currentSrc); 4384 return frame->loader()->userAgent(m_currentSrc);
4385 4385
4386 } 4386 }
4387 4387
4388 MediaPlayerClient::CORSMode HTMLMediaElement::mediaPlayerCORSMode() const
4389 {
4390 if (!fastHasAttribute(HTMLNames::crossoriginAttr))
4391 return Unspecified;
4392 if (equalIgnoringCase(fastGetAttribute(HTMLNames::crossoriginAttr), "use-cre dentials"))
4393 return UseCredentials;
4394 return Anonymous;
4395 }
4396
4388 void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture() 4397 void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture()
4389 { 4398 {
4390 m_restrictions = NoRestrictions; 4399 m_restrictions = NoRestrictions;
4391 } 4400 }
4392 4401
4393 } 4402 }
4394 #endif 4403 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/html/HTMLMediaElement.h ('k') | Source/WebCore/html/canvas/CanvasRenderingContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698