webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 15 insertions, 24 deletions

diff --git a/Source/WebCore/rendering/RenderSnapshottedPlugIn.h b/Source/WebCore/rendering/RenderSnapshottedPlugIn.h
index edf5751ad..4e417f039 100644
--- a/Source/WebCore/rendering/RenderSnapshottedPlugIn.h
+++ b/Source/WebCore/rendering/RenderSnapshottedPlugIn.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,48 +23,39 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef RenderSnapshottedPlugIn_h
-#define RenderSnapshottedPlugIn_h
+#pragma once
 
 #include "RenderEmbeddedObject.h"
-#include "RenderImageResource.h"
-#include "Timer.h"
 
 namespace WebCore {
 
 class HTMLPlugInImageElement;
+class RenderImageResource;
 
 class RenderSnapshottedPlugIn final : public RenderEmbeddedObject {
 public:
-    RenderSnapshottedPlugIn(HTMLPlugInImageElement&, PassRef<RenderStyle>);
+    RenderSnapshottedPlugIn(HTMLPlugInImageElement&, RenderStyle&&);
     virtual ~RenderSnapshottedPlugIn();
 
     HTMLPlugInImageElement& plugInImageElement() const;
-
-    void updateSnapshot(PassRefPtr<Image>);
-
-    void handleEvent(Event*);
+    void updateSnapshot(Image*);
+    void handleEvent(Event&);
 
 private:
+    void willBeDestroyed() override;
     void frameOwnerElement() const = delete;
-    virtual const char* renderName() const { return "RenderSnapshottedPlugIn"; }
-
-    virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const override final;
-    virtual bool isSnapshottedPlugIn() const override final { return true; }
-    virtual void paint(PaintInfo&, const LayoutPoint&) override;
-    
-    virtual bool canHaveWidget() const override final { return false; }
-
+    const char* renderName() const final { return "RenderSnapshottedPlugIn"; }
+    CursorDirective getCursor(const LayoutPoint&, Cursor&) const final;
+    bool isSnapshottedPlugIn() const final { return true; }
+    void paint(PaintInfo&, const LayoutPoint&) final;
+    bool canHaveWidget() const final { return false; }
     void paintSnapshot(PaintInfo&, const LayoutPoint&);
-
-    virtual void layout() override;
+    void layout() final;
 
     std::unique_ptr<RenderImageResource> m_snapshotResource;
-    bool m_isPotentialMouseActivation;
+    bool m_isPotentialMouseActivation { false };
 };
 
-RENDER_OBJECT_TYPE_CASTS(RenderSnapshottedPlugIn, isSnapshottedPlugIn())
-
 } // namespace WebCore
 
-#endif // RenderSnapshottedPlugIn_h
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderSnapshottedPlugIn, isSnapshottedPlugIn())