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

Unified Diff: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h

Issue 2845583002: Remove FrameViewBase as base class of RemoteFrameView. (Closed)
Patch Set: ConvertSelfToChild take FrameOrPlugin as arg Created 3 years, 7 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
Index: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
index c31ab53ff7e85eb90f1be7f79a8832b260de0151..9cb154427fb56f397c53e0d0076b7d07cff818c5 100644
--- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
@@ -37,7 +37,6 @@ namespace blink {
class ExceptionState;
class Frame;
class FrameOrPlugin;
-class FrameViewBase;
class LayoutPart;
class CORE_EXPORT HTMLFrameOwnerElement : public HTMLElement,
@@ -62,9 +61,9 @@ class CORE_EXPORT HTMLFrameOwnerElement : public HTMLElement,
virtual bool LoadedNonEmptyDocument() const { return false; }
virtual void DidLoadNonEmptyDocument() {}
- void SetWidget(FrameViewBase*);
- FrameViewBase* ReleaseWidget();
- FrameViewBase* OwnedWidget() const;
+ void SetWidget(FrameOrPlugin*);
+ FrameOrPlugin* ReleaseWidget();
+ FrameOrPlugin* OwnedWidget() const { return widget_; }
class UpdateSuspendScope {
STACK_ALLOCATED();
@@ -141,7 +140,7 @@ class CORE_EXPORT HTMLFrameOwnerElement : public HTMLElement,
}
Member<Frame> content_frame_;
- Member<FrameViewBase> widget_;
+ Member<FrameOrPlugin> widget_;
SandboxFlags sandbox_flags_;
WebParsedFeaturePolicy container_policy_;

Powered by Google App Engine
This is Rietveld 408576698