| Index: third_party/WebKit/Source/core/layout/LayoutPart.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutPart.h b/third_party/WebKit/Source/core/layout/LayoutPart.h
|
| index 0a42bcde8492917be84502be29c512b7da39d35f..f34be6d49115bb6701e31befc2b1f717ee119d85 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutPart.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutPart.h
|
| @@ -25,11 +25,12 @@
|
|
|
| #include "core/CoreExport.h"
|
| #include "core/layout/LayoutReplaced.h"
|
| -#include "core/plugins/PluginView.h"
|
| -#include "platform/FrameViewBase.h"
|
|
|
| namespace blink {
|
|
|
| +class FrameOrPlugin;
|
| +class PluginView;
|
| +
|
| // LayoutObject for frames via LayoutFrame and LayoutIFrame, and plugins via
|
| // LayoutEmbeddedObject.
|
| class CORE_EXPORT LayoutPart : public LayoutReplaced {
|
| @@ -55,7 +56,7 @@ class CORE_EXPORT LayoutPart : public LayoutReplaced {
|
| // the FrameView associated with the root Document Frame.
|
| FrameView* ChildFrameView() const;
|
| PluginView* Plugin() const;
|
| - FrameViewBase* PluginOrFrame() const;
|
| + FrameOrPlugin* GetFrameOrPlugin() const;
|
|
|
| LayoutRect ReplacedContentRect() const final;
|
|
|
| @@ -80,7 +81,7 @@ class CORE_EXPORT LayoutPart : public LayoutReplaced {
|
| const PaintInvalidationState&) override;
|
|
|
| private:
|
| - void UpdateGeometryInternal(FrameViewBase&);
|
| + void UpdateGeometryInternal(FrameOrPlugin&);
|
| CompositingReasons AdditionalCompositingReasons() const override;
|
|
|
| void WillBeDestroyed() final;
|
|
|