Pepper API implementation for output protection.

chromeos/display/output_configurator.cc

 // Copyright (c) 2012 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 "chromeos/display/output_configurator.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 #include <X11/extensions/XInput2.h>
 
@@ skipping 216 matching lines @@
       new_state, power_state_, outputs);
 
   // Force the DPMS on chrome startup as the driver doesn't always detect
   // that all displays are on when signing out.
   delegate_->ForceDPMSOn();
   delegate_->UngrabServer();
   delegate_->SendProjectingStateToPowerManager(IsProjecting(outputs));
   NotifyObservers(success, new_state);
 }
 
+uint64_t OutputConfigurator::RegisterOutputProtectionClient() {
+  if (!configure_display_)
+    return 0;
+
+  return delegate_->RegisterOutputProtectionClient();
+}
+
+void OutputConfigurator::UnregisterOutputProtectionClient(uint64_t client_id) {
+  if (!configure_display_)
+    return;
+
+  delegate_->GrabServer();
+  delegate_->UnregisterOutputProtectionClient(client_id);
+  delegate_->UngrabServer();
+}
+
+bool OutputConfigurator::QueryOutputProtectionStatus(
+    uint64_t client_id,
+    uint32_t* link_mask,
+    uint32_t* protection_mask) {
+  if (!configure_display_)
+    return false;
+
+  delegate_->GrabServer();

[Daniel Erat, 2013/09/18 22:39:16]

the delegate isn't checking these server grabs. are they necessary?

i'm concerned about all of these calls to GrabServer(). each of them calls
XRRGetScreenResources(), which will block the UI thread for 60 seconds.

[marcheu, 2013/09/18 23:21:35]

Yup this grab isn't strictly required, as we are just checking properties. The
other grab below is probably required though, to ensure consistency between the
outputs which exist and the ones we want to set HDCP on. However "enable"
doesn't happen nearly as often as "query" so that should be ok.

[kcwu, 2013/09/20 03:03:47]

Done.

+  bool result = delegate_->QueryOutputProtectionStatus(client_id, link_mask,
+                                                       protection_mask);
+  delegate_->UngrabServer();
+  return result;
+}
+
+bool OutputConfigurator::EnableOutputProtection(
+    uint64_t client_id,
+    uint32_t desired_method_mask) {
+  if (!configure_display_)
+    return false;
+
+  delegate_->GrabServer();
+  bool result = delegate_->EnableOutputProtection(client_id,
+                                                  desired_method_mask);
+  delegate_->UngrabServer();
+  return result;
+}
+
 void OutputConfigurator::Stop() {
   configure_display_ = false;
 }
 
 bool OutputConfigurator::SetDisplayPower(DisplayPowerState power_state,
                                          int flags) {
   if (!configure_display_)
     return false;
 
   VLOG(1) << "SetDisplayPower: power_state="
@@ skipping 452 matching lines @@
   float width_ratio = static_cast<float>(mirror_mode_info->width) /
       static_cast<float>(native_mode_info->width);
   float height_ratio = static_cast<float>(mirror_mode_info->height) /
       static_cast<float>(native_mode_info->height);
 
   area_ratio = width_ratio * height_ratio;
   return area_ratio;
 }
 
 }  // namespace chromeos