Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I086d8da31c6016b7fa8f68bd66c7e6c675744b0e
diff --git a/Source/core/svg/SVGFEGaussianBlurElement.cpp b/Source/core/svg/SVGFEGaussianBlurElement.cpp
index 4c232d9..8564767 100644
--- a/Source/core/svg/SVGFEGaussianBlurElement.cpp
+++ b/Source/core/svg/SVGFEGaussianBlurElement.cpp
@@ -22,14 +22,14 @@
 
 #include "core/svg/SVGFEGaussianBlurElement.h"
 
-#include "SVGNames.h"
+#include "core/SVGNames.h"
 #include "platform/graphics/filters/FilterEffect.h"
 #include "core/svg/SVGParserUtilities.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
 
 namespace WebCore {
 
-SVGFEGaussianBlurElement::SVGFEGaussianBlurElement(Document& document)
+inline SVGFEGaussianBlurElement::SVGFEGaussianBlurElement(Document& document)
     : SVGFilterPrimitiveStandardAttributes(SVGNames::feGaussianBlurTag, document)
     , m_stdDeviation(SVGAnimatedNumberOptionalNumber::create(this, SVGNames::stdDeviationAttr, 0, 0))
     , m_in1(SVGAnimatedString::create(this, SVGNames::inAttr, SVGString::create()))
@@ -40,6 +40,8 @@
     addToPropertyMap(m_in1);
 }
 
+DEFINE_NODE_FACTORY(SVGFEGaussianBlurElement)
+
 void SVGFEGaussianBlurElement::setStdDeviation(float x, float y)
 {
     stdDeviationX()->baseValue()->setValue(x);