Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1462)

Unified Diff: Source/core/rendering/RenderFullScreen.h

Issue 142703011: Revert "Retry "Replace RenderFullScreen with top layer"" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLPlugInElement.cpp ('k') | Source/core/rendering/RenderFullScreen.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderFullScreen.h
diff --git a/Source/modules/mediastream/MediaStreamTrackEvent.h b/Source/core/rendering/RenderFullScreen.h
similarity index 58%
copy from Source/modules/mediastream/MediaStreamTrackEvent.h
copy to Source/core/rendering/RenderFullScreen.h
index eda894a016b2041e7ee73aee469e36d6daf931d6..285dbd21a70bb6d039efcec2e58f1f54fe0ecd9c 100644
--- a/Source/modules/mediastream/MediaStreamTrackEvent.h
+++ b/Source/core/rendering/RenderFullScreen.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -22,35 +22,39 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef MediaStreamTrackEvent_h
-#define MediaStreamTrackEvent_h
+#ifndef RenderFullScreen_h
+#define RenderFullScreen_h
-#include "core/events/Event.h"
-#include "wtf/text/AtomicString.h"
+#include "core/rendering/RenderFlexibleBox.h"
+#include "core/rendering/style/StyleInheritedData.h"
namespace WebCore {
-class MediaStreamTrack;
-
-class MediaStreamTrackEvent FINAL : public Event {
+class RenderFullScreen FINAL : public RenderFlexibleBox {
public:
- virtual ~MediaStreamTrackEvent();
+ static RenderFullScreen* createAnonymous(Document*);
+
+ virtual bool isRenderFullScreen() const OVERRIDE { return true; }
+ virtual const char* renderName() const OVERRIDE { return "RenderFullScreen"; }
- static PassRefPtr<MediaStreamTrackEvent> create();
- static PassRefPtr<MediaStreamTrackEvent> create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStreamTrack>);
+ void setPlaceholder(RenderBlock*);
+ RenderBlock* placeholder() { return m_placeholder; }
+ void createPlaceholder(PassRefPtr<RenderStyle>, const LayoutRect& frameRect);
- MediaStreamTrack* track() const;
- // Event
- virtual const AtomicString& interfaceName() const OVERRIDE;
+ static RenderObject* wrapRenderer(RenderObject*, RenderObject*, Document*);
+ void unwrapRenderer();
private:
- MediaStreamTrackEvent();
- MediaStreamTrackEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStreamTrack>);
+ RenderFullScreen();
+ virtual void willBeDestroyed() OVERRIDE;
- RefPtr<MediaStreamTrack> m_track;
+protected:
+ RenderBlock* m_placeholder;
};
-} // namespace WebCore
+DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFullScreen, isRenderFullScreen());
+
+}
-#endif // MediaStreamTrackEvent_h
+#endif
« no previous file with comments | « Source/core/html/HTMLPlugInElement.cpp ('k') | Source/core/rendering/RenderFullScreen.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698