Bug 737149 - Fix build of nsTreeSanitizer.cpp (error: 'video' is not a member of 'nsGkAtoms') with undefined MOZ_MEDIA. r=bzbarsky
authoraceman <acelists@atlas.sk>
Mon, 19 Mar 2012 18:52:08 -0400
changeset 89765 b3e48b6d942bcded59024847320f223443fbb7f5
parent 89764 d4fa7d697295c14fa625d7568316ddbe4e891945
child 89766 1025245219840696fc75cb92d6586c4c4033d7c9
push id7311
push userryanvm@gmail.com
push dateMon, 19 Mar 2012 22:52:14 +0000
treeherdermozilla-inbound@b3e48b6d942b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbzbarsky
bugs737149
milestone14.0a1
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
Bug 737149 - Fix build of nsTreeSanitizer.cpp (error: 'video' is not a member of 'nsGkAtoms') with undefined MOZ_MEDIA. r=bzbarsky
content/base/src/nsTreeSanitizer.cpp
--- a/content/base/src/nsTreeSanitizer.cpp
+++ b/content/base/src/nsTreeSanitizer.cpp
@@ -1093,20 +1093,24 @@ nsTreeSanitizer::MustPrune(PRInt32 aName
       // emulate the quirks of the old parser
       return true;
     }
     if (mDropForms && (nsGkAtoms::select == aLocal ||
                        nsGkAtoms::button == aLocal ||
                        nsGkAtoms::datalist == aLocal)) {
       return true;
     }
-    if (mDropMedia && (nsGkAtoms::img == aLocal ||
+    if (mDropMedia && (nsGkAtoms::img == aLocal
+#ifdef MOZ_MEDIA
+                       ||
                        nsGkAtoms::video == aLocal ||
                        nsGkAtoms::audio == aLocal ||
-                       nsGkAtoms::source == aLocal)) {
+                       nsGkAtoms::source == aLocal
+#endif
+                       )) {
       return true;
     }
     if (nsGkAtoms::meta == aLocal &&
         (aElement->HasAttr(kNameSpaceID_None, nsGkAtoms::charset) ||
          aElement->HasAttr(kNameSpaceID_None, nsGkAtoms::httpEquiv))) {
       // Throw away charset declarations even if they also have microdata
       // which they can't validly have.
       return true;