Snapshot of all changes to get jumbo in blink and content.

content/renderer/pepper/pepper_video_encoder_host.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/pepper_video_encoder_host.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 146 matching lines @@
     PP_Bool hardware_accelerated) {
   PP_VideoProfileDescription pp_profile;
   pp_profile.profile = PP_FromMediaVideoProfile(profile.profile);
   pp_profile.max_resolution = PP_FromGfxSize(profile.max_resolution);
   pp_profile.max_framerate_numerator = profile.max_framerate_numerator;
   pp_profile.max_framerate_denominator = profile.max_framerate_denominator;
   pp_profile.hardware_accelerated = hardware_accelerated;
   return pp_profile;
 }
 
-bool PP_HardwareAccelerationCompatible(bool accelerated,
+bool PP_HardwareAccelerationCompatibleVideo(bool accelerated,
                                        PP_HardwareAcceleration requested) {
   switch (requested) {
     case PP_HARDWAREACCELERATION_ONLY:
       return accelerated;
     case PP_HARDWAREACCELERATION_NONE:
       return !accelerated;
     case PP_HARDWAREACCELERATION_WITHFALLBACK:
       return true;
     // No default case, to catch unhandled PP_HardwareAcceleration values.
   }
@@ skipping 324 matching lines @@
     PP_HardwareAcceleration acceleration) {
   DCHECK(RenderThreadImpl::current());
 
   std::vector<PP_VideoProfileDescription> profiles;
   GetSupportedProfiles(&profiles);
 
   for (const PP_VideoProfileDescription& profile : profiles) {
     if (output_profile == profile.profile &&
         input_size.width <= profile.max_resolution.width &&
         input_size.height <= profile.max_resolution.height &&
-        PP_HardwareAccelerationCompatible(
+        PP_HardwareAccelerationCompatibleVideo(
             profile.hardware_accelerated == PP_TRUE, acceleration))
       return true;
   }
 
   return false;
 }
 
 bool PepperVideoEncoderHost::EnsureGpuChannel() {
   DCHECK(RenderThreadImpl::current());
 
@@ skipping 157 matching lines @@
 }
 
 uint8_t* PepperVideoEncoderHost::ShmHandleToAddress(int32_t buffer_id) {
   DCHECK(RenderThreadImpl::current());
   DCHECK_GE(buffer_id, 0);
   DCHECK_LT(buffer_id, static_cast<int32_t>(shm_buffers_.size()));
   return static_cast<uint8_t*>(shm_buffers_[buffer_id]->shm->memory());
 }
 
 }  // namespace content