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

Side by Side Diff: sky/engine/core/html/HTMLIFrameElement.h

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « sky/engine/core/html/HTMLElement.idl ('k') | sky/engine/core/html/HTMLIFrameElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef SKY_ENGINE_CORE_HTML_HTMLIFRAMEELEMENT_H_ 5 #ifndef SKY_ENGINE_CORE_HTML_HTMLIFRAMEELEMENT_H_
6 #define SKY_ENGINE_CORE_HTML_HTMLIFRAMEELEMENT_H_ 6 #define SKY_ENGINE_CORE_HTML_HTMLIFRAMEELEMENT_H_
7 7
8 #include "gen/sky/core/HTMLNames.h" 8 #include "gen/sky/core/HTMLNames.h"
9 #include "mojo/services/view_manager/public/cpp/view_observer.h" 9 #include "mojo/services/view_manager/public/cpp/view_observer.h"
10 #include "sky/engine/core/dom/DOMURLUtils.h" 10 #include "sky/engine/core/dom/DOMURLUtils.h"
11 #include "sky/engine/core/dom/Document.h" 11 #include "sky/engine/core/dom/Document.h"
12 #include "sky/engine/core/html/HTMLElement.h" 12 #include "sky/engine/core/html/HTMLElement.h"
13 #include "sky/engine/wtf/OwnPtr.h" 13 #include "sky/engine/wtf/OwnPtr.h"
14 14
15 namespace blink { 15 namespace blink {
16 16
17 class RemoteFrame; 17 class RemoteFrame;
18 18
19 class HTMLIFrameElement : public HTMLElement, 19 class HTMLIFrameElement : public HTMLElement,
20 public mojo::ViewObserver { 20 public mojo::ViewObserver {
21 DEFINE_WRAPPERTYPEINFO(); 21 DEFINE_WRAPPERTYPEINFO();
22 public: 22 public:
23 static PassRefPtr<HTMLIFrameElement> create(Document&); 23 static PassRefPtr<HTMLIFrameElement> create(Document&);
24 24
25 ~HTMLIFrameElement() override; 25 ~HTMLIFrameElement() override;
26 26
27 mojo::View* contentView() const { return m_contentView; } 27 mojo::View* contentView() const { return m_contentView; }
28 28
29 ScriptValue takeServicesHandle(ScriptState*); 29 PassRefPtr<DartValue> takeServicesHandle(DartState*);
30 ScriptValue takeExposedServicesHandle(ScriptState*); 30 PassRefPtr<DartValue> takeExposedServicesHandle(DartState*);
31 void embedViewManagerClient(const ScriptValue& client); 31 void embedViewManagerClient(DartValue* client);
32 32
33 private: 33 private:
34 explicit HTMLIFrameElement(Document&); 34 explicit HTMLIFrameElement(Document&);
35 35
36 // HTMLElement methods: 36 // HTMLElement methods:
37 RenderObject* createRenderer(RenderStyle* style) override; 37 RenderObject* createRenderer(RenderStyle* style) override;
38 38
39 void insertedInto(ContainerNode*) override; 39 void insertedInto(ContainerNode*) override;
40 void removedFrom(ContainerNode*) override; 40 void removedFrom(ContainerNode*) override;
41 void parseAttribute(const QualifiedName& name, const AtomicString& value) ov erride; 41 void parseAttribute(const QualifiedName& name, const AtomicString& value) ov erride;
42 42
43 // ViewObserver methods: 43 // ViewObserver methods:
44 void OnViewDestroyed(mojo::View* view) override; 44 void OnViewDestroyed(mojo::View* view) override;
45 45
46 void createView(); 46 void createView();
47 void navigateView(); 47 void navigateView();
48 48
49 mojo::View* m_contentView; 49 mojo::View* m_contentView;
50 mojo::ServiceProviderPtr m_services; 50 mojo::ServiceProviderPtr m_services;
51 mojo::ScopedMessagePipeHandle m_exposedServices; 51 mojo::ScopedMessagePipeHandle m_exposedServices;
52 }; 52 };
53 53
54 } // namespace blink 54 } // namespace blink
55 55
56 #endif // SKY_ENGINE_CORE_HTML_HTMLIFRAMEELEMENT_H_ 56 #endif // SKY_ENGINE_CORE_HTML_HTMLIFRAMEELEMENT_H_
OLDNEW
« no previous file with comments | « sky/engine/core/html/HTMLElement.idl ('k') | sky/engine/core/html/HTMLIFrameElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698