Revert 111040 - Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buf...

ui/gfx/surface/accelerated_surface_win.cc

 // Copyright (c) 2011 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/gfx/surface/accelerated_surface_win.h"
 
 #include <windows.h>
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread.h"
 #include "base/tracked_objects.h"
 #include "base/win/wrapped_window_proc.h"
 #include "ipc/ipc_message.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 #pragma comment(lib, "d3d9.lib")
 
 namespace {
 
-typedef HRESULT (WINAPI *Direct3DCreate9ExFunc)(UINT sdk_version,
-                                                IDirect3D9Ex **d3d);
-
 const int64 kPollQueryInterval = 1;
 
-const wchar_t kD3D9ModuleName[] = L"d3d9.dll";
-const char kCreate3D9DeviceExName[] = "Direct3DCreate9Ex";
-
 class QuerySyncThread
     : public base::Thread,
       public base::RefCounted<QuerySyncThread> {
  public:
   explicit QuerySyncThread(const char* name);
   virtual ~QuerySyncThread();
 
   // Invoke the completion task when the query completes.
   void AcknowledgeQuery(const base::win::ScopedComPtr<IDirect3DQuery9>& query,
                         const base::Closure& completion_task);
@@ skipping 281 matching lines @@
         Sleep(0);
     } while (hr == S_FALSE);
   }
 }
 
 void AcceleratedSurface::DoInitialize() {
   TRACE_EVENT0("surface", "DoInitialize");
 
   HRESULT hr;
 
-  HMODULE module = GetModuleHandle(kD3D9ModuleName);
-  if (!module)
-    return;
-
-  Direct3DCreate9ExFunc create_func = reinterpret_cast<Direct3DCreate9ExFunc>(
-      GetProcAddress(module, kCreate3D9DeviceExName));
-  if (!create_func)
-    return;
-
   base::win::ScopedComPtr<IDirect3D9Ex> d3d;
-  hr = create_func(D3D_SDK_VERSION, d3d.Receive());
+  hr = Direct3DCreate9Ex(D3D_SDK_VERSION, d3d.Receive());
   if (FAILED(hr))
     return;
 
   D3DPRESENT_PARAMETERS parameters = { 0 };
   parameters.BackBufferWidth = 1;
   parameters.BackBufferHeight = 1;
   parameters.BackBufferCount = 1;
   parameters.BackBufferFormat = D3DFMT_A8R8G8B8;
   parameters.hDeviceWindow = window_;
   parameters.Windowed = TRUE;
@@ skipping 151 matching lines @@
                                                       completion_task);
   }
 
   {
     TRACE_EVENT0("surface", "Present");
     hr = device_->Present(&rect, &rect, NULL, NULL);
     if (FAILED(hr))
       return;
   }
 }