Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: Id50fcfa40590db3bd322348190cb5192c432eadf
diff --git a/Source/core/svg/SVGFontFaceFormatElement.idl b/Source/core/svg/SVGFontFaceFormatElement.idl
index 837402c..e468579 100644
--- a/Source/core/svg/SVGFontFaceFormatElement.idl
+++ b/Source/core/svg/SVGFontFaceFormatElement.idl
@@ -24,7 +24,7 @@
  */
 
 [
-    Conditional=SVG&SVG_FONTS
+    Conditional=SVG_FONTS
 ] interface SVGFontFaceFormatElement : SVGElement {
 };