Revert 225054 "linux_aura: Implement most of DesktopScreenX11."

Compiled on linux_chromeos, but doesn't compile in cros.

> linux_aura: Implement most of DesktopScreenX11.
> 
> The linux_aura port didn't deal with multiple monitors very well because
> it was treating the X root window as one big display. When xrandr is
> present, get the screen areas from it, and exposes this data back to
> chrome.
> 
> This patch also factors out the EDID parser than chromeos was using into
> a common directory. Like chromeos, we use it to assign stable display
> IDs.
> 
> BUG=287972
> R=brettw@chromium.org, derat@chromium.org, sky@chromium.org
> 
> Review URL: https://codereview.chromium.org/23536057

TBR=erg@chromium.org

Review URL: https://codereview.chromium.org/24365012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225061 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 0 insertions, 436 deletions

diff --git a/base/base.gyp b/base/base.gyp
index 4611f62..39f6015 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -77,14 +77,6 @@
             '../build/linux/system.gyp:x11',
           ],
         }],
-        ['use_aura==1 and use_x11==1', {
-          'dependencies': [
-            '../build/linux/system.gyp:xrandr',
-          ],
-          'export_dependent_settings': [
-            '../build/linux/system.gyp:xrandr',
-          ],
-        }],
         ['OS == "android" and _toolset == "host"', {
           # Always build base as a static_library for host toolset, even if
           # we're doing a component build. Specifically, we only care about the
@@ -817,11 +809,6 @@
             'win/win_util_unittest.cc',
           ],
         }],
-        ['use_aura==1 and use_x11==1',  {
-          'sources': [
-            'x11/edid_parser_x11_unittest.cc',
-          ],
-        }],
         ['use_system_nspr==1', {
           'dependencies': [
             'third_party/nspr/nspr.gyp:nspr',
diff --git a/base/base.gypi b/base/base.gypi
index cafb10d..8caee68 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -669,12 +669,6 @@
           'win/wrapped_window_proc.h',
         ],
         'conditions': [
-          ['use_aura==1 and use_x11==1', {
-            'sources': [
-              'x11/edid_parser_x11.cc',
-              'x11/edid_parser_x11.h',
-            ],
-          }],
           ['google_tv==1', {
            'sources': [
              'android/context_types.cc',
diff --git a/base/x11/edid_parser_x11.cc b/base/x11/edid_parser_x11.cc
deleted file mode 100644
index 74b14b6..0000000
--- a/base/x11/edid_parser_x11.cc
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright (c) 2013 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 "base/x11/edid_parser_x11.h"
-
-#include <X11/extensions/Xrandr.h>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-
-#include "base/hash.h"
-#include "base/message_loop/message_loop.h"
-#include "base/strings/string_util.h"
-#include "base/sys_byteorder.h"
-
-namespace {
-
-// Returns 64-bit persistent ID for the specified manufacturer's ID and
-// product_code_hash, and the index of the output it is connected to.
-// |output_index| is used to distinguish the displays of the same type. For
-// example, swapping two identical display between two outputs will not be
-// treated as swap. The 'serial number' field in EDID isn't used here because
-// it is not guaranteed to have unique number and it may have the same fixed
-// value (like 0).
-int64 GetID(uint16 manufacturer_id,
-            uint32 product_code_hash,
-            uint8 output_index) {
-  return ((static_cast<int64>(manufacturer_id) << 40) |
-          (static_cast<int64>(product_code_hash) << 8) | output_index);
-}
-
-bool IsRandRAvailable() {
-  int randr_version_major = 0;
-  int randr_version_minor = 0;
-  static bool is_randr_available = XRRQueryVersion(
-      base::MessagePumpX11::GetDefaultXDisplay(),
-      &randr_version_major, &randr_version_minor);
-  return is_randr_available;
-}
-
-}  // namespace
-
-namespace base {
-
-bool GetEDIDProperty(XID output, unsigned long* nitems, unsigned char** prop) {
-  if (!IsRandRAvailable())
-    return false;
-
-  Display* display = base::MessagePumpX11::GetDefaultXDisplay();
-
-  static Atom edid_property = XInternAtom(
-      base::MessagePumpX11::GetDefaultXDisplay(),
-      RR_PROPERTY_RANDR_EDID, false);
-
-  bool has_edid_property = false;
-  int num_properties = 0;
-  Atom* properties = XRRListOutputProperties(display, output, &num_properties);
-  for (int i = 0; i < num_properties; ++i) {
-    if (properties[i] == edid_property) {
-      has_edid_property = true;
-      break;
-    }
-  }
-  XFree(properties);
-  if (!has_edid_property)
-    return false;
-
-  Atom actual_type;
-  int actual_format;
-  unsigned long bytes_after;
-  XRRGetOutputProperty(display,
-                       output,
-                       edid_property,
-                       0,                // offset
-                       128,              // length
-                       false,            // _delete
-                       false,            // pending
-                       AnyPropertyType,  // req_type
-                       &actual_type,
-                       &actual_format,
-                       nitems,
-                       &bytes_after,
-                       prop);
-  DCHECK_EQ(XA_INTEGER, actual_type);
-  DCHECK_EQ(8, actual_format);
-  return true;
-}
-
-bool GetDisplayId(XID output_id, size_t output_index, int64* display_id_out) {
-  unsigned long nitems = 0;
-  unsigned char* prop = NULL;
-  if (!GetEDIDProperty(output_id, &nitems, &prop))
-    return false;
-
-  bool result =
-      GetDisplayIdFromEDID(prop, nitems, output_index, display_id_out);
-  XFree(prop);
-  return result;
-}
-
-bool GetDisplayIdFromEDID(const unsigned char* prop,
-                          unsigned long nitems,
-                          size_t output_index,
-                          int64* display_id_out) {
-  uint16 manufacturer_id = 0;
-  std::string product_name;
-
-  // ParseOutputDeviceData fails if it doesn't have product_name.
-  ParseOutputDeviceData(prop, nitems, &manufacturer_id, &product_name);
-
-  // Generates product specific value from product_name instead of product code.
-  // See crbug.com/240341
-  uint32 product_code_hash = product_name.empty() ?
-      0 : base::Hash(product_name);
-  if (manufacturer_id != 0) {
-    // An ID based on display's index will be assigned later if this call
-    // fails.
-    *display_id_out = GetID(
-        manufacturer_id, product_code_hash, output_index);
-    return true;
-  }
-  return false;
-}
-
-bool ParseOutputDeviceData(const unsigned char* prop,
-                           unsigned long nitems,
-                           uint16* manufacturer_id,
-                           std::string* human_readable_name) {
-  // See http://en.wikipedia.org/wiki/Extended_display_identification_data
-  // for the details of EDID data format.  We use the following data:
-  //   bytes 8-9: manufacturer EISA ID, in big-endian
-  //   bytes 54-125: four descriptors (18-bytes each) which may contain
-  //     the display name.
-  const unsigned int kManufacturerOffset = 8;
-  const unsigned int kManufacturerLength = 2;
-  const unsigned int kDescriptorOffset = 54;
-  const unsigned int kNumDescriptors = 4;
-  const unsigned int kDescriptorLength = 18;
-  // The specifier types.
-  const unsigned char kMonitorNameDescriptor = 0xfc;
-
-  if (manufacturer_id) {
-    if (nitems < kManufacturerOffset + kManufacturerLength) {
-      LOG(ERROR) << "too short EDID data: manifacturer id";
-      return false;
-    }
-
-    *manufacturer_id =
-        *reinterpret_cast<const uint16*>(prop + kManufacturerOffset);
-#if defined(ARCH_CPU_LITTLE_ENDIAN)
-    *manufacturer_id = base::ByteSwap(*manufacturer_id);
-#endif
-  }
-
-  if (!human_readable_name)
-    return true;
-
-  human_readable_name->clear();
-  for (unsigned int i = 0; i < kNumDescriptors; ++i) {
-    if (nitems < kDescriptorOffset + (i + 1) * kDescriptorLength)
-      break;
-
-    const unsigned char* desc_buf =
-        prop + kDescriptorOffset + i * kDescriptorLength;
-    // If the descriptor contains the display name, it has the following
-    // structure:
-    //   bytes 0-2, 4: \0
-    //   byte 3: descriptor type, defined above.
-    //   bytes 5-17: text data, ending with \r, padding with spaces
-    // we should check bytes 0-2 and 4, since it may have other values in
-    // case that the descriptor contains other type of data.
-    if (desc_buf[0] == 0 && desc_buf[1] == 0 && desc_buf[2] == 0 &&
-        desc_buf[4] == 0) {
-      if (desc_buf[3] == kMonitorNameDescriptor) {
-        std::string found_name(
-            reinterpret_cast<const char*>(desc_buf + 5), kDescriptorLength - 5);
-        TrimWhitespaceASCII(found_name, TRIM_TRAILING, human_readable_name);
-        break;
-      }
-    }
-  }
-
-  // Verify if the |human_readable_name| consists of printable characters only.
-  for (size_t i = 0; i < human_readable_name->size(); ++i) {
-    char c = (*human_readable_name)[i];
-    if (!isascii(c) || !isprint(c)) {
-      human_readable_name->clear();
-      LOG(ERROR) << "invalid EDID: human unreadable char in name";
-      return false;
-    }
-  }
-
-  return true;
-}
-
-}  // namespace base
diff --git a/base/x11/edid_parser_x11.h b/base/x11/edid_parser_x11.h
deleted file mode 100644
index 0fba0b5..0000000
--- a/base/x11/edid_parser_x11.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) 2013 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.
-
-#ifndef BASE_X11_EDID_PARSER_X11_H_
-#define BASE_X11_EDID_PARSER_X11_H_
-
-#include <string>
-
-#include "base/base_export.h"
-#include "base/basictypes.h"
-
-typedef unsigned long XID;
-
-// EDID (Extended Display Identification Data) is a format for monitor
-// metadata. This provides a parser for the data and an interface to get it
-// from XRandR.
-
-namespace base {
-
-// Get the EDID data from the |output| and stores to |prop|. |nitem| will store
-// the number of characters |prop| will have. It doesn't take the ownership of
-// |prop|, so caller must release it by XFree().
-// Returns true if EDID property is successfully obtained. Otherwise returns
-// false and does not touch |prop| and |nitems|.
-BASE_EXPORT bool GetEDIDProperty(XID output,
-                                 unsigned long* nitems,
-                                 unsigned char** prop);
-
-// Gets the EDID data from |output| and generates the display id through
-// |GetDisplayIdFromEDID|.
-BASE_EXPORT bool GetDisplayId(XID output, size_t index,
-                              int64* display_id_out);
-
-// Generates the display id for the pair of |prop| with |nitems| length and
-// |index|, and store in |display_id_out|. Returns true if the display id is
-// successfully generated, or false otherwise.
-BASE_EXPORT bool GetDisplayIdFromEDID(const unsigned char* prop,
-                                      unsigned long nitems,
-                                      size_t index,
-                                      int64* display_id_out);
-
-// Parses |prop| as EDID data and stores extracted data into |manufacturer_id|
-// and |human_readable_name| and returns true. NULL can be passed for unwanted
-// output parameters. Some devices (especially internal displays) may not have
-// the field for |human_readable_name|, and it will return true in that case.
-BASE_EXPORT bool ParseOutputDeviceData(const unsigned char* prop,
-                                       unsigned long nitems,
-                                       uint16* manufacturer_id,
-                                       std::string* human_readable_name);
-
-}  // namespace base
-
-#endif  // BASE_X11_EDID_PARSER_X11_H_
diff --git a/base/x11/edid_parser_x11_unittest.cc b/base/x11/edid_parser_x11_unittest.cc
deleted file mode 100644
index 97e3ce1..0000000
--- a/base/x11/edid_parser_x11_unittest.cc
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) 2013 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 "base/x11/edid_parser_x11.h"
-
-#include "base/memory/scoped_ptr.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-#include <X11/extensions/Xrandr.h>
-
-namespace base {
-
-namespace {
-
-// Returns the number of characters in the string literal but doesn't count its
-// terminator NULL byte.
-#define charsize(str) (arraysize(str) - 1)
-
-// Sample EDID data extracted from real devices.
-const unsigned char kNormalDisplay[] =
-    "\x00\xff\xff\xff\xff\xff\xff\x00\x22\xf0\x6c\x28\x01\x01\x01\x01"
-    "\x02\x16\x01\x04\xb5\x40\x28\x78\xe2\x8d\x85\xad\x4f\x35\xb1\x25"
-    "\x0e\x50\x54\x00\x00\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
-    "\x01\x01\x01\x01\x01\x01\xe2\x68\x00\xa0\xa0\x40\x2e\x60\x30\x20"
-    "\x36\x00\x81\x90\x21\x00\x00\x1a\xbc\x1b\x00\xa0\x50\x20\x17\x30"
-    "\x30\x20\x36\x00\x81\x90\x21\x00\x00\x1a\x00\x00\x00\xfc\x00\x48"
-    "\x50\x20\x5a\x52\x33\x30\x77\x0a\x20\x20\x20\x20\x00\x00\x00\xff"
-    "\x00\x43\x4e\x34\x32\x30\x32\x31\x33\x37\x51\x0a\x20\x20\x00\x71";
-
-const unsigned char kInternalDisplay[] =
-    "\x00\xff\xff\xff\xff\xff\xff\x00\x4c\xa3\x42\x31\x00\x00\x00\x00"
-    "\x00\x15\x01\x03\x80\x1a\x10\x78\x0a\xd3\xe5\x95\x5c\x60\x90\x27"
-    "\x19\x50\x54\x00\x00\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
-    "\x01\x01\x01\x01\x01\x01\x9e\x1b\x00\xa0\x50\x20\x12\x30\x10\x30"
-    "\x13\x00\x05\xa3\x10\x00\x00\x19\x00\x00\x00\x0f\x00\x00\x00\x00"
-    "\x00\x00\x00\x00\x00\x23\x87\x02\x64\x00\x00\x00\x00\xfe\x00\x53"
-    "\x41\x4d\x53\x55\x4e\x47\x0a\x20\x20\x20\x20\x20\x00\x00\x00\xfe"
-    "\x00\x31\x32\x31\x41\x54\x31\x31\x2d\x38\x30\x31\x0a\x20\x00\x45";
-
-const unsigned char kOverscanDisplay[] =
-    "\x00\xff\xff\xff\xff\xff\xff\x00\x4c\x2d\xfe\x08\x00\x00\x00\x00"
-    "\x29\x15\x01\x03\x80\x10\x09\x78\x0a\xee\x91\xa3\x54\x4c\x99\x26"
-    "\x0f\x50\x54\xbd\xef\x80\x71\x4f\x81\xc0\x81\x00\x81\x80\x95\x00"
-    "\xa9\xc0\xb3\x00\x01\x01\x02\x3a\x80\x18\x71\x38\x2d\x40\x58\x2c"
-    "\x45\x00\xa0\x5a\x00\x00\x00\x1e\x66\x21\x56\xaa\x51\x00\x1e\x30"
-    "\x46\x8f\x33\x00\xa0\x5a\x00\x00\x00\x1e\x00\x00\x00\xfd\x00\x18"
-    "\x4b\x0f\x51\x17\x00\x0a\x20\x20\x20\x20\x20\x20\x00\x00\x00\xfc"
-    "\x00\x53\x41\x4d\x53\x55\x4e\x47\x0a\x20\x20\x20\x20\x20\x01\x1d"
-    "\x02\x03\x1f\xf1\x47\x90\x04\x05\x03\x20\x22\x07\x23\x09\x07\x07"
-    "\x83\x01\x00\x00\xe2\x00\x0f\x67\x03\x0c\x00\x20\x00\xb8\x2d\x01"
-    "\x1d\x80\x18\x71\x1c\x16\x20\x58\x2c\x25\x00\xa0\x5a\x00\x00\x00"
-    "\x9e\x01\x1d\x00\x72\x51\xd0\x1e\x20\x6e\x28\x55\x00\xa0\x5a\x00"
-    "\x00\x00\x1e\x8c\x0a\xd0\x8a\x20\xe0\x2d\x10\x10\x3e\x96\x00\xa0"
-    "\x5a\x00\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-    "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-    "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xc6";
-
-const unsigned char kLP2565A[] =
-    "\x00\xFF\xFF\xFF\xFF\xFF\xFF\x00\x22\xF0\x76\x26\x01\x01\x01\x01"
-    "\x02\x12\x01\x03\x80\x34\x21\x78\xEE\xEF\x95\xA3\x54\x4C\x9B\x26"
-    "\x0F\x50\x54\xA5\x6B\x80\x81\x40\x81\x80\x81\x99\x71\x00\xA9\x00"
-    "\xA9\x40\xB3\x00\xD1\x00\x28\x3C\x80\xA0\x70\xB0\x23\x40\x30\x20"
-    "\x36\x00\x07\x44\x21\x00\x00\x1A\x00\x00\x00\xFD\x00\x30\x55\x1E"
-    "\x5E\x11\x00\x0A\x20\x20\x20\x20\x20\x20\x00\x00\x00\xFC\x00\x48"
-    "\x50\x20\x4C\x50\x32\x34\x36\x35\x0A\x20\x20\x20\x00\x00\x00\xFF"
-    "\x00\x43\x4E\x4B\x38\x30\x32\x30\x34\x48\x4D\x0A\x20\x20\x00\xA4";
-
-const unsigned char kLP2565B[] =
-    "\x00\xFF\xFF\xFF\xFF\xFF\xFF\x00\x22\xF0\x75\x26\x01\x01\x01\x01"
-    "\x02\x12\x01\x03\x6E\x34\x21\x78\xEE\xEF\x95\xA3\x54\x4C\x9B\x26"
-    "\x0F\x50\x54\xA5\x6B\x80\x81\x40\x71\x00\xA9\x00\xA9\x40\xA9\x4F"
-    "\xB3\x00\xD1\xC0\xD1\x00\x28\x3C\x80\xA0\x70\xB0\x23\x40\x30\x20"
-    "\x36\x00\x07\x44\x21\x00\x00\x1A\x00\x00\x00\xFD\x00\x30\x55\x1E"
-    "\x5E\x15\x00\x0A\x20\x20\x20\x20\x20\x20\x00\x00\x00\xFC\x00\x48"
-    "\x50\x20\x4C\x50\x32\x34\x36\x35\x0A\x20\x20\x20\x00\x00\x00\xFF"
-    "\x00\x43\x4E\x4B\x38\x30\x32\x30\x34\x48\x4D\x0A\x20\x20\x00\x45";
-
-}  // namespace
-
-TEST(EdidParserX11Test, ParseEDID) {
-  uint16 manufacturer_id = 0;
-  std::string human_readable_name;
-  EXPECT_TRUE(ParseOutputDeviceData(
-      kNormalDisplay, charsize(kNormalDisplay),
-      &manufacturer_id, &human_readable_name));
-  EXPECT_EQ(0x22f0u, manufacturer_id);
-  EXPECT_EQ("HP ZR30w", human_readable_name);
-
-  manufacturer_id = 0;
-  human_readable_name.clear();
-  EXPECT_TRUE(ParseOutputDeviceData(
-      kInternalDisplay, charsize(kInternalDisplay),
-      &manufacturer_id, NULL));
-  EXPECT_EQ(0x4ca3u, manufacturer_id);
-  EXPECT_EQ("", human_readable_name);
-
-  // Internal display doesn't have name.
-  EXPECT_TRUE(ParseOutputDeviceData(
-      kInternalDisplay, charsize(kInternalDisplay),
-      NULL, &human_readable_name));
-  EXPECT_TRUE(human_readable_name.empty());
-
-  manufacturer_id = 0;
-  human_readable_name.clear();
-  EXPECT_TRUE(ParseOutputDeviceData(
-      kOverscanDisplay, charsize(kOverscanDisplay),
-      &manufacturer_id, &human_readable_name));
-  EXPECT_EQ(0x4c2du, manufacturer_id);
-  EXPECT_EQ("SAMSUNG", human_readable_name);
-}
-
-TEST(EdidParserX11Test, ParseBrokenEDID) {
-  uint16 manufacturer_id = 0;
-  std::string human_readable_name;
-
-  // length == 0
-  EXPECT_FALSE(ParseOutputDeviceData(
-      kNormalDisplay, 0,
-      &manufacturer_id, &human_readable_name));
-
-  // name is broken. Copying kNormalDisplay and substitute its name data by
-  // some control code.
-  std::string display_data(
-      reinterpret_cast<const char*>(kNormalDisplay), charsize(kNormalDisplay));
-
-  // display's name data is embedded in byte 95-107 in this specific example.
-  // Fix here too when the contents of kNormalDisplay is altered.
-  display_data[97] = '\x1b';
-  EXPECT_FALSE(ParseOutputDeviceData(
-      reinterpret_cast<const unsigned char*>(display_data.data()),
-      display_data.size(),
-      &manufacturer_id, &human_readable_name));
-
-  // If |human_readable_name| isn't specified, it skips parsing the name.
-  manufacturer_id = 0;
-  EXPECT_TRUE(ParseOutputDeviceData(
-      reinterpret_cast<const unsigned char*>(display_data.data()),
-      display_data.size(),
-      &manufacturer_id, NULL));
-  EXPECT_EQ(0x22f0u, manufacturer_id);
-}
-
-TEST(EdidParserX11Test, GetDisplayId) {
-  // EDID of kLP2565A and B are slightly different but actually the same device.
-  int64 id1 = -1;
-  int64 id2 = -1;
-  EXPECT_TRUE(GetDisplayIdFromEDID(kLP2565A, charsize(kLP2565A), 0, &id1));
-  EXPECT_TRUE(GetDisplayIdFromEDID(kLP2565B, charsize(kLP2565B), 0, &id2));
-  EXPECT_EQ(id1, id2);
-  EXPECT_NE(-1, id1);
-}
-
-TEST(EdidParserX11Test, GetDisplayIdFromInternal) {
-  int64 id = -1;
-  EXPECT_TRUE(GetDisplayIdFromEDID(
-      kInternalDisplay, charsize(kInternalDisplay), 0, &id));
-  EXPECT_NE(-1, id);
-}
-
-TEST(EdidParserX11Test, GetDisplayIdFailure) {
-  int64 id = -1;
-  EXPECT_FALSE(GetDisplayIdFromEDID(NULL, 0, 0, &id));
-  EXPECT_EQ(-1, id);
-}
-
-}   // namespace base