summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-05-08 08:49:41 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-08 08:49:41 -0700
commitc2749f95bc9ee83dd35c260da5be5c38a3a2ad45 (patch)
tree490788bc3e4c3d82a5feaf3cfd724f9a27717c54 /Source/WebCore
parentd65e985be95311ae46bfcb518b42721130469eb9 (diff)
parente38a6c283211dcfd3b1fb390e4c108a86481dd8a (diff)
downloadexternal_webkit-c2749f95bc9ee83dd35c260da5be5c38a3a2ad45.zip
external_webkit-c2749f95bc9ee83dd35c260da5be5c38a3a2ad45.tar.gz
external_webkit-c2749f95bc9ee83dd35c260da5be5c38a3a2ad45.tar.bz2
Merge "Delay creating Java objects for WebHistoryItem" into jb-dev
Diffstat (limited to 'Source/WebCore')
-rw-r--r--Source/WebCore/history/android/AndroidWebHistoryBridge.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/history/android/AndroidWebHistoryBridge.h b/Source/WebCore/history/android/AndroidWebHistoryBridge.h
index a827b4a..d82aa35 100644
--- a/Source/WebCore/history/android/AndroidWebHistoryBridge.h
+++ b/Source/WebCore/history/android/AndroidWebHistoryBridge.h
@@ -26,20 +26,20 @@
#ifndef AndroidWebHistoryBridge_h
#define AndroidWebHistoryBridge_h
-#include <wtf/RefCounted.h>
+#include <wtf/ThreadSafeRefCounted.h>
namespace WebCore {
class HistoryItem;
-class AndroidWebHistoryBridge : public RefCounted<AndroidWebHistoryBridge> {
+class AndroidWebHistoryBridge : public ThreadSafeRefCounted<AndroidWebHistoryBridge> {
public:
AndroidWebHistoryBridge(HistoryItem* item)
: m_scale(0)
, m_textWrapScale(0)
, m_active(false)
- , m_historyItem(item) { }
- virtual ~AndroidWebHistoryBridge() { }
+ , m_historyItem(item) {}
+ virtual ~AndroidWebHistoryBridge() {}
virtual void updateHistoryItem(HistoryItem* item) = 0;
void setScale(float s) { m_scale = s; }