Add back some code that's lost in an incorrect merge.

The mistake happened in r200315.

BUG=
TEST=content_unittests
TBR=apatrick

Review URL: https://codereview.chromium.org/14914013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200676 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 75 insertions, 42 deletions

diff --git a/content/browser/gpu/gpu_driver_bug_list_json.cc b/content/browser/gpu/gpu_driver_bug_list_json.cc
index df28c40..7cb6b0c 100644
--- a/content/browser/gpu/gpu_driver_bug_list_json.cc
+++ b/content/browser/gpu/gpu_driver_bug_list_json.cc
@@ -34,24 +34,25 @@
 //    The version is interpreted as "year.month.day".
 // 10. "gl_vendor" is a STRING structure (defined below).
 // 11. "gl_renderer" is a STRING structure (defined below).
-// 12. "perf_graphics" is a FLOAT structure (defined below).
-// 13. "perf_gaming" is a FLOAT structure (defined below).
-// 14. "perf_overall" is a FLOAT structure (defined below).
-// 15. "machine_model" contais "name" and an optional "version".  "name" is a 
+// 12. "gl_extensions" is a STRING structure (defined below).
+// 13. "perf_graphics" is a FLOAT structure (defined below).
+// 14. "perf_gaming" is a FLOAT structure (defined below).
+// 15. "perf_overall" is a FLOAT structure (defined below).
+// 16. "machine_model" contais "name" and an optional "version".  "name" is a
 //     STRING structure and "version" is a VERSION structure (defined below).
-// 16. "gpu_count" is a INT structure (defined below).
-// 17  "cpu_info" is a STRING structure (defined below).
-// 18. "exceptions" is a list of entries.
-// 19. "features" is a list of driver bug types. For a list of supported types,
+// 17. "gpu_count" is a INT structure (defined below).
+// 18  "cpu_info" is a STRING structure (defined below).
+// 19. "exceptions" is a list of entries.
+// 20. "features" is a list of driver bug types. For a list of supported types,
 //     see src/gpu/command_buffer/service/gpu_driver_bug_workaround_type.h
 //     This field is mandatory.
-// 20. "description" has the description of the entry.
-// 21. "webkit_bugs" is an array of associated webkit bug numbers.
-// 22. "cr_bugs" is an array of associated chromium bug numbers.
-// 23. "browser_version" is a VERSION structure (defined below).  If this
+// 21. "description" has the description of the entry.
+// 22. "webkit_bugs" is an array of associated webkit bug numbers.
+// 23. "cr_bugs" is an array of associated chromium bug numbers.
+// 24. "browser_version" is a VERSION structure (defined below).  If this
 //     condition is not satisfied, the entry will be ignored.  If it is not
 //     present, then the entry applies to all versions of the browser.
-// 24. "disabled" is a boolean. If it is present, the entry will be skipped.
+// 25. "disabled" is a boolean. If it is present, the entry will be skipped.
 //     This can not be used in exceptions.
 //
 // VERSION includes "op", "style", "number", and "number2".  "op" can be any of
@@ -84,7 +85,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
 {
   "name": "gpu driver bug list",
   // Please update the version number whenever you change this file.
-  "version": "1.3",
+  "version": "2.0",
   "entries": [
     {
       "id": 1,
@@ -312,6 +313,36 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
       "features": [
         "disable_ext_draw_buffers"
       ]
+    },
+    {
+      "id": 21,
+      "description": "Vivante GPUs are buggy with context switching.",
+      "cr_bugs": [179250, 235935],
+      "os": {
+        "type": "android"
+      },
+      "gl_extensions": {
+        "op": "contains",
+        "value": "GL_VIV_shader_binary"
+      },
+      "features": [
+        "unbind_fbo_on_context_switch"
+      ]
+    },
+    {
+      "id": 22,
+      "description": "Imagination drivers are buggy with context switching.",
+      "cr_bugs": [230896],
+      "os": {
+        "type": "android"
+      },
+      "gl_vendor": {
+        "op": "beginwith",
+        "value": "Imagination"
+      },
+      "features": [
+        "unbind_fbo_on_context_switch"
+      ]
     }
   ]
 }
diff --git a/content/browser/gpu/gpu_switching_list_json.cc b/content/browser/gpu/gpu_switching_list_json.cc
index ea6ab5c..2d15752 100644
--- a/content/browser/gpu/gpu_switching_list_json.cc
+++ b/content/browser/gpu/gpu_switching_list_json.cc
@@ -34,24 +34,25 @@
 //    The version is interpreted as "year.month.day".
 // 10. "gl_vendor" is a STRING structure (defined below).
 // 11. "gl_renderer" is a STRING structure (defined below).
-// 12. "perf_graphics" is a FLOAT structure (defined below).
-// 13. "perf_gaming" is a FLOAT structure (defined below).
-// 14. "perf_overall" is a FLOAT structure (defined below).
-// 15. "machine_model" contais "name" and an optional "version".  "name" is a 
+// 12. "gl_extensions" is a STRING structure (defined below).
+// 13. "perf_graphics" is a FLOAT structure (defined below).
+// 14. "perf_gaming" is a FLOAT structure (defined below).
+// 15. "perf_overall" is a FLOAT structure (defined below).
+// 16. "machine_model" contais "name" and an optional "version".  "name" is a
 //     STRING structure and "version" is a VERSION structure (defined below).
-// 16. "gpu_count" is a INT structure (defined below).
-// 17  "cpu_info" is a STRING structure (defined below).
-// 18. "exceptions" is a list of entries.
-// 19. "features" is a list of gpu switching options, including
+// 17. "gpu_count" is a INT structure (defined below).
+// 18  "cpu_info" is a STRING structure (defined below).
+// 19. "exceptions" is a list of entries.
+// 20. "features" is a list of gpu switching options, including
 //     "force_discrete" and "force_integrated".
 //     This field is mandatory.
-// 20. "description" has the description of the entry.
-// 21. "webkit_bugs" is an array of associated webkit bug numbers.
-// 22. "cr_bugs" is an array of associated webkit bug numbers.
-// 23. "browser_version" is a VERSION structure (defined below).  If this
+// 21. "description" has the description of the entry.
+// 22. "webkit_bugs" is an array of associated webkit bug numbers.
+// 23. "cr_bugs" is an array of associated webkit bug numbers.
+// 24. "browser_version" is a VERSION structure (defined below).  If this
 //     condition is not satisfied, the entry will be ignored.  If it is not
 //     present, then the entry applies to all versions of the browser.
-// 24. "disabled" is a boolean. If it is present, the entry will be skipped.
+// 25. "disabled" is a boolean. If it is present, the entry will be skipped.
 //     This can not be used in exceptions.
 //
 // VERSION includes "op", "style", "number", and "number2".  "op" can be any of
@@ -84,7 +85,7 @@ const char kGpuSwitchingListJson[] = LONG_STRING_CONST(
 {
   "name": "gpu switching list",
   // Please update the version number whenever you change this file.
-  "version": "1.0",
+  "version": "2.0",
   "entries": [
     {
       "id": 1,
diff --git a/content/browser/gpu/software_rendering_list_json.cc b/content/browser/gpu/software_rendering_list_json.cc
index 34d9106..a7795ea 100644
--- a/content/browser/gpu/software_rendering_list_json.cc
+++ b/content/browser/gpu/software_rendering_list_json.cc
@@ -34,27 +34,28 @@
 //    The version is interpreted as "year.month.day".
 // 10. "gl_vendor" is a STRING structure (defined below).
 // 11. "gl_renderer" is a STRING structure (defined below).
-// 12. "perf_graphics" is a FLOAT structure (defined below).
-// 13. "perf_gaming" is a FLOAT structure (defined below).
-// 14. "perf_overall" is a FLOAT structure (defined below).
-// 15. "machine_model" contais "name" and an optional "version".  "name" is a 
+// 12. "gl_extensions" is a STRING structure (defined below).
+// 13. "perf_graphics" is a FLOAT structure (defined below).
+// 14. "perf_gaming" is a FLOAT structure (defined below).
+// 15. "perf_overall" is a FLOAT structure (defined below).
+// 16. "machine_model" contais "name" and an optional "version".  "name" is a
 //     STRING structure and "version" is a VERSION structure (defined below).
-// 16. "gpu_count" is a INT structure (defined below).
-// 17  "cpu_info" is a STRING structure (defined below).
-// 18. "exceptions" is a list of entries.
-// 19. "features" is a list of gpu feature strings, valid values include
+// 17. "gpu_count" is a INT structure (defined below).
+// 18  "cpu_info" is a STRING structure (defined below).
+// 19. "exceptions" is a list of entries.
+// 20. "features" is a list of gpu feature strings, valid values include
 //     "accelerated_2d_canvas", "accelerated_compositing", "webgl",
 //     "multisampling", "flash_3d", "flash_stage3d", "texture_sharing",
 //     "accelerated_video", "accelerated_video_decode", "panel_fitting",
 //     "force_compositing_mode", and "all".
 //     This field is mandatory.
-// 20. "description" has the description of the entry.
-// 21. "webkit_bugs" is an array of associated webkit bug numbers.
-// 22. "cr_bugs" is an array of associated webkit bug numbers.
-// 23. "browser_version" is a VERSION structure (defined below).  If this
+// 21. "description" has the description of the entry.
+// 22. "webkit_bugs" is an array of associated webkit bug numbers.
+// 23. "cr_bugs" is an array of associated webkit bug numbers.
+// 24. "browser_version" is a VERSION structure (defined below).  If this
 //     condition is not satisfied, the entry will be ignored.  If it is not
 //     present, then the entry applies to all versions of the browser.
-// 24. "disabled" is a boolean. If it is present, the entry will be skipped.
+// 25. "disabled" is a boolean. If it is present, the entry will be skipped.
 //     This can not be used in exceptions.
 //
 // VERSION includes "op", "style", "number", and "number2".  "op" can be any of
@@ -87,7 +88,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
 {
   "name": "software rendering list",
   // Please update the version number whenever you change this file.
-  "version": "5.3",
+  "version": "6.0",
   "entries": [
     {
       "id": 1,