webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 4 insertions, 5 deletions

diff --git a/Source/WebCore/loader/cache/CachedResourceHandle.h b/Source/WebCore/loader/cache/CachedResourceHandle.h
index 5b6b42540..3dbbda6c1 100644
--- a/Source/WebCore/loader/cache/CachedResourceHandle.h
+++ b/Source/WebCore/loader/cache/CachedResourceHandle.h
@@ -23,9 +23,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef CachedResourceHandle_h
-#define CachedResourceHandle_h
+#pragma once
 
+#include "PlatformExportMacros.h"
 #include <wtf/Forward.h>
 
 namespace WebCore {
@@ -49,7 +49,7 @@ protected:
     CachedResourceHandleBase(CachedResource*);
     CachedResourceHandleBase(const CachedResourceHandleBase&);
 
-    void setResource(CachedResource*);
+    WEBCORE_EXPORT void setResource(CachedResource*);
     
 private:
     CachedResourceHandleBase& operator=(const CachedResourceHandleBase&) { return *this; } 
@@ -68,6 +68,7 @@ public:
 
     R* get() const { return reinterpret_cast<R*>(CachedResourceHandleBase::get()); }
     R* operator->() const { return get(); }
+    R& operator*() const { ASSERT(get()); return *get(); }
 
     CachedResourceHandle& operator=(R* res) { setResource(res); return *this; } 
     CachedResourceHandle& operator=(const CachedResourceHandle& o) { setResource(o.get()); return *this; }
@@ -95,5 +96,3 @@ template <class R, class RR> bool operator!=(const RR* res, const CachedResource
 }
 
 } // namespace WebCore
-
-#endif // CachedResourceHandle