1 files changed, 24 insertions, 2 deletions
diff --git a/chromium/third_party/WebKit/Source/core/css/resolver/MediaQueryResult.h b/chromium/third_party/WebKit/Source/core/css/resolver/MediaQueryResult.h
index 1dc00f42dc3..86adebd50d4 100644
--- a/chromium/third_party/WebKit/Source/core/css/resolver/MediaQueryResult.h
+++ b/chromium/third_party/WebKit/Source/core/css/resolver/MediaQueryResult.h
@@ -29,16 +29,38 @@
 
 namespace WebCore {
 
-class MediaQueryResult : public RefCounted<MediaQueryResult> {
-    WTF_MAKE_NONCOPYABLE(MediaQueryResult); WTF_MAKE_FAST_ALLOCATED;
+class MediaQueryResult : public RefCountedWillBeGarbageCollectedFinalized<MediaQueryResult> {
+    WTF_MAKE_NONCOPYABLE(MediaQueryResult); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
     MediaQueryResult(const MediaQueryExp& expr, bool result)
+#if ENABLE(OILPAN)
+        : m_expression(&expr)
+#else
         : m_expression(expr)
+#endif
         , m_result(result)
     {
     }
 
+    void trace(Visitor* visitor) { visitor->trace(m_expression); }
+
+    const MediaQueryExp* expression() const
+    {
+#if ENABLE(OILPAN)
+        return m_expression;
+#else
+        return &m_expression;
+#endif
+    }
+
+    bool result() const { return m_result; }
+
+private:
+#if ENABLE(OILPAN)
+    Member<const MediaQueryExp> m_expression;
+#else
     MediaQueryExp m_expression;
+#endif
     bool m_result;
 };