Merge changes I55c6d71a,Ifb3277d4,Ia1b847a2,I7ba9cf3f,Ida2b2a8a,I1280ec90,I72f818d5,I2e3b588b,I9a4e6289,Ia724c78b,Icd8612c8,Ie31b15d7,Ie125edae,I77941a88,I89dae78b,I3516e5ca,I1a4c17b5,I2c4ecc1a,I9c8e6537,Ifac13115,Ie1f80e09,Ia541ed77,I60ce9d78

* changes:
  Merge WebKit at r82507: Update ThirdPartyProject.prop
  Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
  Merge WebKit at r82507: Work around a V8 bug
  Merge WebKit at r82507: JNIType renamed to JavaType
  Merge WebKit at r82507: IconDatabaseClient interface expanded
  Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
  Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
  Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
  Merge WebKit at r82507: Node::isContentEditable() renamed
  Merge WebKit at r82507: Use icon database through IconDatabaseBase
  Merge WebKit at r82507: toInputElement() is now a member of Node
  Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changed
  Merge WebKit at r82507: StringImpl::computeHash() removed
  Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()
  Merge WebKit at r82507: Path::strokeBoundingRect() is now const
  Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCacheGroup.cpp
  Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
  Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
  Merge WebKit at r82507: Fix conflicts due to JNI refactoring
  Merge WebKit at r82507: Fix conflicts due to new StorageTracker
  Merge WebKit at r82507: Fix conflicts
  Merge WebKit at r82507: Fix makefiles
  Merge WebKit at r82507: Initial merge by git

1 files changed, 79 insertions, 79 deletions

diff --git a/Source/WebCore/loader/ThreadableLoaderClientWrapper.h b/Source/WebCore/loader/ThreadableLoaderClientWrapper.h
index 664e0b3..d765fa0 100644
--- a/Source/WebCore/loader/ThreadableLoaderClientWrapper.h
+++ b/Source/WebCore/loader/ThreadableLoaderClientWrapper.h
@@ -38,85 +38,85 @@
 
 namespace WebCore {
 
-    class ThreadableLoaderClientWrapper : public ThreadSafeShared<ThreadableLoaderClientWrapper> {
-    public:
-        static PassRefPtr<ThreadableLoaderClientWrapper> create(ThreadableLoaderClient* client)
-        {
-            return adoptRef(new ThreadableLoaderClientWrapper(client));
-        }
-
-        void clearClient()
-        {
-            m_done = true;
-            m_client = 0;
-        }
-
-        bool done() const
-        {
-            return m_done;
-        }
-
-        void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
-        {
-            if (m_client)
-                m_client->didSendData(bytesSent, totalBytesToBeSent);
-        }
-
-        void didReceiveResponse(const ResourceResponse& response)
-        {
-            if (m_client)
-                m_client->didReceiveResponse(response);
-        }
-
-        void didReceiveData(const char* data, int dataLength)
-        {
-            if (m_client)
-                m_client->didReceiveData(data, dataLength);
-        }
-
-        void didReceiveCachedMetadata(const char* data, int dataLength)
-        {
-            if (m_client)
-                m_client->didReceiveCachedMetadata(data, dataLength);
-        }
-
-        void didFinishLoading(unsigned long identifier, double finishTime)
-        {
-            m_done = true;
-            if (m_client)
-                m_client->didFinishLoading(identifier, finishTime);
-        }
-
-        void didFail(const ResourceError& error)
-        {
-            m_done = true;
-            if (m_client)
-                m_client->didFail(error);
-        }
-
-        void didFailRedirectCheck()
-        {
-            m_done = true;
-            if (m_client)
-                m_client->didFailRedirectCheck();
-        }
-
-        void didReceiveAuthenticationCancellation(const ResourceResponse& response)
-        {
-            if (m_client)
-                m_client->didReceiveResponse(response);
-        }
-
-    protected:
-        ThreadableLoaderClientWrapper(ThreadableLoaderClient* client)
-            : m_client(client)
-            , m_done(false)
-        {
-        }
-
-        ThreadableLoaderClient* m_client;
-        bool m_done;
-    };
+class ThreadableLoaderClientWrapper : public ThreadSafeRefCounted<ThreadableLoaderClientWrapper> {
+public:
+    static PassRefPtr<ThreadableLoaderClientWrapper> create(ThreadableLoaderClient* client)
+    {
+        return adoptRef(new ThreadableLoaderClientWrapper(client));
+    }
+
+    void clearClient()
+    {
+        m_done = true;
+        m_client = 0;
+    }
+
+    bool done() const
+    {
+        return m_done;
+    }
+
+    void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
+    {
+        if (m_client)
+            m_client->didSendData(bytesSent, totalBytesToBeSent);
+    }
+
+    void didReceiveResponse(const ResourceResponse& response)
+    {
+        if (m_client)
+            m_client->didReceiveResponse(response);
+    }
+
+    void didReceiveData(const char* data, int dataLength)
+    {
+        if (m_client)
+            m_client->didReceiveData(data, dataLength);
+    }
+
+    void didReceiveCachedMetadata(const char* data, int dataLength)
+    {
+        if (m_client)
+            m_client->didReceiveCachedMetadata(data, dataLength);
+    }
+
+    void didFinishLoading(unsigned long identifier, double finishTime)
+    {
+        m_done = true;
+        if (m_client)
+            m_client->didFinishLoading(identifier, finishTime);
+    }
+
+    void didFail(const ResourceError& error)
+    {
+        m_done = true;
+        if (m_client)
+            m_client->didFail(error);
+    }
+
+    void didFailRedirectCheck()
+    {
+        m_done = true;
+        if (m_client)
+            m_client->didFailRedirectCheck();
+    }
+
+    void didReceiveAuthenticationCancellation(const ResourceResponse& response)
+    {
+        if (m_client)
+            m_client->didReceiveResponse(response);
+    }
+
+protected:
+    ThreadableLoaderClientWrapper(ThreadableLoaderClient* client)
+        : m_client(client)
+        , m_done(false)
+    {
+    }
+
+    ThreadableLoaderClient* m_client;
+    bool m_done;
+};
 
 } // namespace WebCore