Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / CSSFontFaceSrcValue.h

diff --git a/src/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.h b/src/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.h
index 208feed..3d89f31 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.h
+++ b/src/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.h
@@ -39,13 +39,13 @@ class SVGFontFaceElement;
 
 class CSSFontFaceSrcValue : public CSSValue {
 public:
-    static PassRefPtr<CSSFontFaceSrcValue> create(const String& resource)
+    static PassRefPtrWillBeRawPtr<CSSFontFaceSrcValue> create(const String& resource)
     {
-        return adoptRef(new CSSFontFaceSrcValue(resource, false));
+        return adoptRefWillBeNoop(new CSSFontFaceSrcValue(resource, false));
     }
-    static PassRefPtr<CSSFontFaceSrcValue> createLocal(const String& resource)
+    static PassRefPtrWillBeRawPtr<CSSFontFaceSrcValue> createLocal(const String& resource)
     {
-        return adoptRef(new CSSFontFaceSrcValue(resource, true));
+        return adoptRefWillBeNoop(new CSSFontFaceSrcValue(resource, true));
     }
 
     const String& resource() const { return m_resource; }
@@ -53,6 +53,7 @@ public:
     bool isLocal() const { return m_isLocal; }
 
     void setFormat(const String& format) { m_format = format; }
+    void setReferrer(const String& referrer) { m_referrer = referrer; }
 
     bool isSupportedFormat() const;
 
@@ -71,6 +72,8 @@ public:
 
     bool equals(const CSSFontFaceSrcValue&) const;
 
+    void traceAfterDispatch(Visitor* visitor) { CSSValue::traceAfterDispatch(visitor); }
+
 private:
     CSSFontFaceSrcValue(const String& resource, bool local)
         : CSSValue(FontFaceSrcClass)
@@ -82,8 +85,12 @@ private:
     {
     }
 
+    void restoreCachedResourceIfNeeded(Document*);
+    bool shouldSetCrossOriginAccessControl(const KURL& resource, SecurityOrigin*);
+
     String m_resource;
     String m_format;
+    String m_referrer;
     bool m_isLocal;
 
     ResourcePtr<FontResource> m_fetched;