Merge "Set GR_GL_IGNORE_ES3_MSAA to 0. DO NOT MERGE" into m33
diff --git a/include/core/SkUserConfig.h b/include/core/SkUserConfig.h
index 6446d83..f7dba9e 100644
--- a/include/core/SkUserConfig.h
+++ b/include/core/SkUserConfig.h
@@ -240,4 +240,6 @@
*/
//#define SK_PDF_USE_PATHOPS
+#define SK_REF_CNT_MIXIN_INCLUDE "../ports/SkRefCnt_android.h"
+
#endif
diff --git a/include/ports/SkRefCnt_android.h b/include/ports/SkRefCnt_android.h
new file mode 100644
index 0000000..efe2379
--- /dev/null
+++ b/include/ports/SkRefCnt_android.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkRefCnt_android_DEFINED
+#define SkRefCnt_android_DEFINED
+
+/**
+ * Android's version of SkRefCnt.
+ *
+ * Needed so that Chromium Webview, based on a release version of Chromium
+ * that calls SkRefCnt::deref(), can link against the system's copy of Skia.
+ */
+class SK_API SkRefCnt : public SkRefCntBase {
+public:
+ void deref() const { SkRefCntBase::unref(); }
+};
+#endif // SkRefCnt_android_DEFINED
