This is the O3D source tree's initial commit to the Chromium tree. It

is not built or referenced at all by the chrome build yet, and doesn't 
yet build in it's new home.  We'll change that shortly.

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

2 files changed, 146 insertions, 0 deletions

diff --git a/o3d/core/linux/display_window_linux.h b/o3d/core/linux/display_window_linux.h
new file mode 100644
index 0000000..86b05e2
--- /dev/null
+++ b/o3d/core/linux/display_window_linux.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2009, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#ifndef O3D_CORE_LINUX_DISPLAY_WINDOW_LINUX_H_
+#define O3D_CORE_LINUX_DISPLAY_WINDOW_LINUX_H_
+
+#include <GL/glx.h>
+
+#include "core/cross/display_window.h"
+
+namespace o3d {
+
+/**
+ * The DisplayWindowLinux class is a platform-specific representation
+ * of a platform's display window.  This implements the Linux subclass
+ * of the DisplayWindow.
+ */
+
+class DisplayWindowLinux : public DisplayWindow {
+ public:
+  DisplayWindowLinux() : display_(NULL), window_(0) {}
+  virtual ~DisplayWindowLinux() {}
+
+  Display* display() const { return display_; }
+  Window window() const { return window_; }
+  void set_window(Window window) { window_ = window; }
+  void set_display(Display* display) { display_ = display; }
+
+ private:
+  Display* display_;
+  Window window_;
+
+  DISALLOW_COPY_AND_ASSIGN(DisplayWindowLinux);
+};
+}  // end namespace o3d
+
+#endif  // O3D_CORE_LINUX_DISPLAY_WINDOW_LINUX_H_
diff --git a/o3d/core/linux/performance_timer.cc b/o3d/core/linux/performance_timer.cc
new file mode 100644
index 0000000..9929a48
--- /dev/null
+++ b/o3d/core/linux/performance_timer.cc
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2009, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+// The PerformanceTimer class measures elapsed time between Start and
+// Stop (using the highest resolution timer available on the
+// platform).
+
+#include "core/cross/precompile.h"
+
+#include "core/cross/performance_timer.h"
+
+#include <sys/time.h>
+#include <time.h>
+
+#include "base/logging.h"
+
+namespace o3d {
+
+static uint64_t GetCurrentTime() {
+  struct timeval tv;
+  gettimeofday(&tv, NULL);
+  return tv.tv_sec*1000000ULL + tv.tv_usec;
+}
+
+PerformanceTimer::PerformanceTimer(const char *name)
+    : name_(name),
+      start_time_(0),
+      accum_time_(0) {
+}
+
+void PerformanceTimer::Start() {
+  start_time_ = GetCurrentTime();
+}
+
+void PerformanceTimer::Stop() {
+  accum_time_ += GetCurrentTime() - start_time_;
+}
+
+double PerformanceTimer::GetElapsedTime() {
+  return static_cast<double>(accum_time_) / 1.E6;
+}
+
+void PerformanceTimer::Print() {
+  LOG(INFO) << name_.c_str() << " " << GetElapsedTime() << " seconds";
+}
+
+void PerformanceTimer::StopAndPrint() {
+  Stop();
+  Print();
+}
+}