Merge "Disable optimizations for chromium m33." into m33
diff --git a/include/core/SkUserConfig.h b/include/core/SkUserConfig.h
index 89575be..afc92ab 100644
--- a/include/core/SkUserConfig.h
+++ b/include/core/SkUserConfig.h
@@ -244,4 +244,6 @@
*/
//#define SK_PDF_USE_PATHOPS
+#define SK_REF_CNT_MIXIN_INCLUDE "../ports/SkRefCnt_android.h"
+
#endif
diff --git a/include/gpu/gl/GrGLConfig_chrome.h b/include/gpu/gl/GrGLConfig_chrome.h
index acad904..134b403 100644
--- a/include/gpu/gl/GrGLConfig_chrome.h
+++ b/include/gpu/gl/GrGLConfig_chrome.h
@@ -48,7 +48,7 @@
#define GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE 1
#if !defined(GR_GL_IGNORE_ES3_MSAA)
- #define GR_GL_IGNORE_ES3_MSAA 1
+ #define GR_GL_IGNORE_ES3_MSAA 0
#endif
#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
