1 files changed, 9 insertions, 6 deletions
diff --git a/chromium/third_party/WebKit/Source/web/ValidationMessageClientImpl.h b/chromium/third_party/WebKit/Source/web/ValidationMessageClientImpl.h
index 85d21f15987..83967859d84 100644
--- a/chromium/third_party/WebKit/Source/web/ValidationMessageClientImpl.h
+++ b/chromium/third_party/WebKit/Source/web/ValidationMessageClientImpl.h
@@ -29,6 +29,7 @@
 #include "core/page/ValidationMessageClient.h"
 #include "platform/Timer.h"
 #include "platform/geometry/IntRect.h"
+#include "platform/heap/Handle.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
@@ -37,16 +38,18 @@ class FrameView;
 
 namespace blink {
 
-class WebValidationMessageClient;
 class WebViewImpl;
 
-class ValidationMessageClientImpl : public WebCore::ValidationMessageClient {
+class ValidationMessageClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<ValidationMessageClientImpl>, public WebCore::ValidationMessageClient {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ValidationMessageClientImpl);
 public:
-    static PassOwnPtr<ValidationMessageClientImpl> create(WebViewImpl&, WebValidationMessageClient*);
+    static PassOwnPtrWillBeRawPtr<ValidationMessageClientImpl> create(WebViewImpl&);
     virtual ~ValidationMessageClientImpl();
 
+    virtual void trace(WebCore::Visitor*) OVERRIDE;
+
 private:
-    ValidationMessageClientImpl(WebViewImpl&, WebValidationMessageClient*);
+    ValidationMessageClientImpl(WebViewImpl&);
     void checkAnchorStatus(WebCore::Timer<ValidationMessageClientImpl>*);
     WebCore::FrameView* currentView();
 
@@ -54,10 +57,10 @@ private:
     virtual void hideValidationMessage(const WebCore::Element& anchor) OVERRIDE;
     virtual bool isValidationMessageVisible(const WebCore::Element& anchor) OVERRIDE;
     virtual void documentDetached(const WebCore::Document&) OVERRIDE;
+    virtual void willBeDestroyed() OVERRIDE;
 
     WebViewImpl& m_webView;
-    WebValidationMessageClient* m_client;
-    const WebCore::Element* m_currentAnchor;
+    RawPtrWillBeMember<const WebCore::Element> m_currentAnchor;
     String m_message;
     WebCore::IntRect m_lastAnchorRectInScreen;
     float m_lastPageScaleFactor;