Fix HDCP in mirror mode.

ui/display/chromeos/display_configurator.cc

 // Copyright 2014 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 "ui/display/chromeos/display_configurator.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 203 matching lines @@
   const bool success =
       EnterStateOrFallBackToSoftwareMirroring(new_state, power_state_);
 
   // Force the DPMS on chrome startup as the driver doesn't always detect
   // that all displays are on when signing out.
   native_display_delegate_->ForceDPMSOn();
   native_display_delegate_->UngrabServer();
   NotifyObservers(success, new_state);
 }
 
+bool DisplayConfigurator::IsMirroring() const {
+  return display_state_ == MULTIPLE_DISPLAY_STATE_DUAL_MIRROR ||
+    (mirroring_controller_ &&

[Daniel Erat, 2014/05/15 14:04:25]

wrapped line should be indented four spaces, not two

[kcwu, 2014/05/16 04:36:39]

Done.

+     mirroring_controller_->software_mirroring_enabled());
+}
+
 bool DisplayConfigurator::ApplyProtections(const ContentProtections& requests) {
   for (DisplayStateList::const_iterator it = cached_displays_.begin();
        it != cached_displays_.end();
        ++it) {
     uint32_t all_desired = 0;
-    ContentProtections::const_iterator request_it =
-        requests.find(it->display->display_id());
-    if (request_it != requests.end())
-      all_desired = request_it->second;
+
+    // In mirror mode, protection request of all displays need to be fulfilled.
+    // In non-mirror mode, only request of client's display needs to be
+    // fulfilled.
+    ContentProtections::const_iterator request_it;
+    if (IsMirroring()) {
+      for (request_it = requests.begin(); request_it != requests.end();
+          ++request_it)

[Daniel Erat, 2014/05/15 14:04:25]

fix indenting

[kcwu, 2014/05/16 04:36:39]

Done.

+        all_desired |= request_it->second;
+    } else {
+      request_it = requests.find(it->display->display_id());
+      if (request_it != requests.end())
+        all_desired = request_it->second;
+    }
+
     switch (it->display->type()) {
       case DISPLAY_CONNECTION_TYPE_UNKNOWN:
         return false;
       // DisplayPort, DVI, and HDMI all support HDCP.
       case DISPLAY_CONNECTION_TYPE_DISPLAYPORT:
       case DISPLAY_CONNECTION_TYPE_DVI:
       case DISPLAY_CONNECTION_TYPE_HDMI: {
         HDCPState new_desired_state =
             (all_desired & CONTENT_PROTECTION_METHOD_HDCP) ?
                 HDCP_STATE_DESIRED : HDCP_STATE_UNDESIRED;
         if (!native_display_delegate_->SetHDCPState(*it->display,
                                                     new_desired_state))
           return false;
         break;
       }
       case DISPLAY_CONNECTION_TYPE_INTERNAL:
       case DISPLAY_CONNECTION_TYPE_VGA:
       case DISPLAY_CONNECTION_TYPE_NETWORK:
         // No protections for these types. Do nothing.

[dnicoara, 2014/05/15 14:39:49]

Perhaps I've misunderstood the bug, but is this correct in the bug's context? If
we're supposed to have HDCP protection, shouldn't these cases return false when
HDCP protection is requested?

[kcwu1, 2014/05/15 15:02:42]

This method could be understood as "protect if you can". The caller will call
QueryContentProtectionStatus to verify the it's successful or not.

         break;
       case DISPLAY_CONNECTION_TYPE_NONE:
         NOTREACHED();
         break;
     }
   }
 
   return true;
 }
 
@@ skipping 31 matching lines @@
     uint32_t* protection_mask) {
   if (!configure_display_)
     return false;
 
   uint32_t enabled = 0;
   uint32_t unfulfilled = 0;
   *link_mask = 0;
   for (DisplayStateList::const_iterator it = cached_displays_.begin();
        it != cached_displays_.end();
        ++it) {
-    if (it->display->display_id() != display_id)
+
+    // Query display if it is in mirror mode or client on the same display.
+    if (!IsMirroring() && it->display->display_id() != display_id)
       continue;
+
     *link_mask |= it->display->type();
     switch (it->display->type()) {
       case DISPLAY_CONNECTION_TYPE_UNKNOWN:
         return false;
       // DisplayPort, DVI, and HDMI all support HDCP.
       case DISPLAY_CONNECTION_TYPE_DISPLAYPORT:
       case DISPLAY_CONNECTION_TYPE_DVI:
       case DISPLAY_CONNECTION_TYPE_HDMI: {
         HDCPState state;
         if (!native_display_delegate_->GetHDCPState(*it->display, &state))
@@ skipping 722 matching lines @@
   float width_ratio = static_cast<float>(mirror_mode_info->size().width()) /
                       static_cast<float>(native_mode_info->size().width());
   float height_ratio = static_cast<float>(mirror_mode_info->size().height()) /
                        static_cast<float>(native_mode_info->size().height());
 
   area_ratio = width_ratio * height_ratio;
   return area_ratio;
 }
 
 }  // namespace ui