Backed out changeset 9a5f8a7ad479 (bug 1145057) for B2G L Emulator opt/debug bustage on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 20 Mar 2015 16:56:58 +0100
changeset 263616 acf6c6ddfbb106917701758efbf260a6f18dc411
parent 263615 4113f4e7e3e3ee8f9dd079001f44dc9c9f72630f
child 263617 9c23e8ee3aae53ae2f71afb38a2873adeed3c55e
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1145057
milestone39.0a1
backs out9a5f8a7ad4791df6f6bdbbcbbcd0776098303527
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 9a5f8a7ad479 (bug 1145057) for B2G L Emulator opt/debug bustage on a CLOSED TREE
dom/canvas/CanvasRenderingContext2D.cpp
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -4213,21 +4213,16 @@ CanvasRenderingContext2D::DrawImage(cons
       gfxPlatform::GetPlatform()->GetSkiaGLGlue()) {
     mozilla::gl::GLContext* gl = gfxPlatform::GetPlatform()->GetSkiaGLGlue()->GetGLContext();
 
     HTMLVideoElement* video = &image.GetAsHTMLVideoElement();
     if (!video) {
       return;
     }
 
-    if (video->ContainsRestrictedContent()) {
-      error.Throw(NS_ERROR_NOT_AVAILABLE);
-      return;
-    }
-
     uint16_t readyState;
     if (NS_SUCCEEDED(video->GetReadyState(&readyState)) &&
         readyState < nsIDOMHTMLMediaElement::HAVE_CURRENT_DATA) {
       // still loading, just return
       return;
     }
 
     // If it doesn't have a principal, just bail