Revert "gpu: Ensure consistent GrContextOptions between GPU and OOPR."

This reverts commit cbce6f73.

Reason for revert: 

This change has caused skia_renderer_gl_blink_web_tests and vulkan_native_blink_web_tests to consistenly fail on both Nvidia and Intel Vulkan GPU builders.

It could be that the failures are expected/acceptable image diffs, and new baselines are needed. However this should be manually checked in case there are bugs being introduced/uncovered.

Dry runs can be manually triggered vs 'gpu-fyi-try-linux-nvidia-skv' and 'gpu-fyi-try-linux-intel-skv'

As the bots have been failing consistently I'm reverting so we don't mask other failures.

First failing build

https://ci.chromium.org/ui/p/chromium/builders/ci/Linux%20FYI%20SkiaRenderer%20Vulkan%20(NVIDIA)/31309/overview




Original change's description:
> gpu: Ensure consistent GrContextOptions between GPU and OOPR.
>
> R=​bsalomon@google.com
>
> Change-Id: I72615b36891e9e5ee568a8332bf0b6344b8188da
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545684
> Commit-Queue: Khushal <khushalsagar@chromium.org>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Cr-Commit-Position: refs/heads/master@{#836396}

TBR=bsalomon@google.com,reed@google.com,khushalsagar@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I7fe40b0bfdac2053b868e0b4bc78218a938d07b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2590057Reviewed-by: Jonathan Ross <jonross@chromium.org>
Commit-Queue: Jonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836662}

components/viz/service/gl/gpu_service_impl.cc

@@ -349,8 +349,8 @@ GpuServiceImpl::GpuServiceImpl(
   protected_buffer_manager_ = new arc::ProtectedBufferManager();
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
-  GrContextOptions context_options = GetDefaultGrContextOptions(
-      gpu_preferences_.gr_context_type, gpu_preferences_);
+  GrContextOptions context_options =
+      GetDefaultGrContextOptions(gpu_preferences_.gr_context_type);
   if (gpu_preferences_.force_max_texture_size) {
     context_options.fMaxTextureSizeOverride =
         gpu_preferences_.force_max_texture_size;

gpu/command_buffer/service/shared_context_state.cc

@@ -270,8 +270,7 @@ bool SharedContextState::InitializeGrContext(
   // affect text rendering, make sure to match the capabilities initialized
   // in GetCapabilities and ensuring these are also used by the
   // PaintOpBufferSerializer.
-  GrContextOptions options =
-      GetDefaultGrContextOptions(gr_context_type_, gpu_preferences);
+  GrContextOptions options = GetDefaultGrContextOptions(gr_context_type_);
   options.fPersistentCache = cache;
   options.fShaderErrorHandler = this;
   if (gpu_preferences.force_max_texture_size)

gpu/command_buffer/service/skia_utils.cc

@@ -71,8 +71,7 @@ void DeleteSkObject(SharedContextState* context_state, sk_sp<T> sk_object) {
 
 }  // namespace
 
-GrContextOptions GetDefaultGrContextOptions(GrContextType type,
-                                            const GpuPreferences& gpu_prefs) {
+GrContextOptions GetDefaultGrContextOptions(GrContextType type) {
   // If you make any changes to the GrContext::Options here that could affect
   // text rendering, make sure to match the capabilities initialized in
   // GetCapabilities and ensuring these are also used by the
@@ -94,11 +93,6 @@ GrContextOptions GetDefaultGrContextOptions(GrContextType type,
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableMipmapGeneration);
 
-  options.fAllowPathMaskCaching = false;
-  // TODO(penghuang) : Use this consistently for swiftshader vulkan backend.
-  options.fSharpenMipmappedTextures =
-      gpu_prefs.use_vulkan != VulkanImplementationName::kSwiftshader;
-
   return options;
 }
 

gpu/command_buffer/service/skia_utils.h

@@ -46,7 +46,7 @@ class SharedContextState;
 
 // Returns default GrContextOptions.
 GPU_GLES2_EXPORT GrContextOptions
-GetDefaultGrContextOptions(GrContextType type, const GpuPreferences& gpu_prefs);
+GetDefaultGrContextOptions(GrContextType type);
 
 // Returns internal gl format of texture for Skia
 GPU_GLES2_EXPORT GLuint

third_party/blink/web_tests/platform/mac-mac10.13/virtual/threaded-composited-iframes/external/wpt/is-input-pending/tentative/same-origin-subframe.sub-expected.txt

+This is a testharness.js-based test.
+PASS can detect same-origin iframe events in parent
+PASS can detect same-origin iframe events in subframe
+Harness: the test ran to completion.
+