[Ozone-DRI] Re-enable GBM surface mode support

ui/ozone/platform/dri/dri_wrapper.h

 // 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.
 
 #ifndef UI_OZONE_PLATFORM_DRI_DRI_WRAPPER_H_
 #define UI_OZONE_PLATFORM_DRI_DRI_WRAPPER_H_
 
 #include <stdint.h>
 
 #include <vector>
@@ skipping 19 matching lines @@
 
 // Wraps DRM calls into a nice interface. Used to provide different
 // implementations of the DRM calls. For the actual implementation the DRM API
 // would be called. In unit tests this interface would be stubbed.
 class DriWrapper {
  public:
   typedef base::Callback<void(unsigned int /* frame */,
                               unsigned int /* seconds */,
                               unsigned int /* useconds */)> PageFlipCallback;
 
-  DriWrapper(const char* device_path, bool software_mode);
+  DriWrapper(const char* device_path, bool use_sync_flips);
   virtual ~DriWrapper();
 
   // Open device.
   virtual void Initialize();
 
   // Get the CRTC state. This is generally used to save state before using the
   // CRTC. When the user finishes using the CRTC, the user should restore the
   // CRTC to it's initial state. Use |SetCrtc| to restore the state.
   virtual ScopedDrmCrtcPtr GetCrtc(uint32_t crtc_id);
 
@@ skipping 105 matching lines @@
   // after the sandbox is up, thus the late initialization.
   virtual void InitializeIOWatcher();
 
   // The file descriptor associated with this wrapper. All DRM operations will
   // be performed using this FD.
   // TODO(dnicoara) Make this a base::File
   int fd_;
 
   scoped_ptr<HardwareDisplayPlaneManager> plane_manager_;
 
-  // If we're running in software mode this is true. In software mode we can't
-  // use the async page flip callbacks, so we need to block until the kernel
-  // responds to the page flip.
-  bool software_mode_;
+  // If we need to block when performing page flips this is set to true.
+  bool use_sync_flips_;
 
  private:
   class IOWatcher;
 
   // Path to DRM device.
   const char* device_path_;
 
   // Helper thread to perform IO listener operations.
   // TODO(dnicoara) This should really be supported by the main thread.
   // Alternatively we should have a way to access the IO thread's task runner.
   base::Thread io_thread_;
 
   // Watcher for |fd_| listening for page flip events.
   scoped_refptr<IOWatcher> watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(DriWrapper);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRI_DRI_WRAPPER_H_