Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 13 insertions, 14 deletions

diff --git a/Source/WebKit/chromium/src/IDBTransactionBackendProxy.h b/Source/WebKit/chromium/src/IDBTransactionBackendProxy.h
index 96d7293..103f552 100644
--- a/Source/WebKit/chromium/src/IDBTransactionBackendProxy.h
+++ b/Source/WebKit/chromium/src/IDBTransactionBackendProxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,38 +26,37 @@
 #ifndef IDBTransactionBackendProxy_h
 #define IDBTransactionBackendProxy_h
 
-#include "IDBTransactionBackendInterface.h"
-
 #if ENABLE(INDEXED_DATABASE)
 
+#include "IDBTransactionBackendInterface.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebKit { class WebIDBTransaction; }
+namespace WebKit {
 
-namespace WebCore {
+class WebIDBTransaction;
 
-class IDBTransactionBackendProxy : public IDBTransactionBackendInterface {
+class IDBTransactionBackendProxy : public WebCore::IDBTransactionBackendInterface {
 public:
-    static PassRefPtr<IDBTransactionBackendInterface> create(PassOwnPtr<WebKit::WebIDBTransaction>);
+    static PassRefPtr<IDBTransactionBackendInterface> create(PassOwnPtr<WebIDBTransaction>);
     virtual ~IDBTransactionBackendProxy();
 
-    virtual PassRefPtr<IDBObjectStoreBackendInterface> objectStore(const String& name, ExceptionCode&);
+    virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> objectStore(const String& name, WebCore::ExceptionCode&);
     virtual unsigned short mode() const;
     virtual void abort();
-    virtual bool scheduleTask(PassOwnPtr<ScriptExecutionContext::Task>, PassOwnPtr<ScriptExecutionContext::Task>);
+    virtual bool scheduleTask(PassOwnPtr<WebCore::ScriptExecutionContext::Task>, PassOwnPtr<WebCore::ScriptExecutionContext::Task>);
     virtual void didCompleteTaskEvents();
-    virtual void setCallbacks(IDBTransactionCallbacks*);
+    virtual void setCallbacks(WebCore::IDBTransactionCallbacks*);
 
-    WebKit::WebIDBTransaction* getWebIDBTransaction() const { return m_webIDBTransaction.get(); }
+    WebIDBTransaction* getWebIDBTransaction() const { return m_webIDBTransaction.get(); }
 
 private:
-    IDBTransactionBackendProxy(PassOwnPtr<WebKit::WebIDBTransaction>);
+    IDBTransactionBackendProxy(PassOwnPtr<WebIDBTransaction>);
 
-    OwnPtr<WebKit::WebIDBTransaction> m_webIDBTransaction;
+    OwnPtr<WebIDBTransaction> m_webIDBTransaction;
 };
 
-} // namespace WebCore
+} // namespace WebKit
 
 #endif