Pepper API implementation for output protection.

chromeos/display/output_configurator.cc

Index: chromeos/display/output_configurator.cc
diff --git a/chromeos/display/output_configurator.cc b/chromeos/display/output_configurator.cc
index 78cb31869d4bca60403cbc4c4909b547e95d431a..75a989e8db879c966900b42459ee6be0f90399a5 100644
--- a/chromeos/display/output_configurator.cc
+++ b/chromeos/display/output_configurator.cc
@@ -234,6 +234,49 @@ void OutputConfigurator::Start(uint32 background_color_argb) {
   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;
 }