Commit 33c0ad7d authored by Kramer Ge's avatar Kramer Ge Committed by Commit Bot

Revert "Reduce the size of frame.h"

This reverts commit ad354ace.

Reason for revert: suspect of compile failure on https://ci.chromium.org/p/chromium/builders/ci/GPU%20Mac%20Builder/195620?#blamelist-tab

Original change's description:
> Reduce the size of frame.h
> 
> This CL reduces the estimated pre-processed size of frame.h by 1.33MB.
> This CL has no behavior changes.
> 
> Bug: 242216
> Change-Id: Ibf3551b924b070664120bb04fce9706b0415975a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2309370
> Auto-Submit: Kent Tamura <tkent@chromium.org>
> Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
> Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#790698}

TBR=tkent@chromium.org,tikuta@chromium.org

Change-Id: Id93d84281c4ab37ddcde3cde94d21e5cc9bc86ac
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 242216
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2311622Reviewed-by: default avatarKramer Ge <fangzhoug@chromium.org>
Commit-Queue: Kramer Ge <fangzhoug@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790699}
parent ad354ace
...@@ -15,7 +15,6 @@ include_rules = [ ...@@ -15,7 +15,6 @@ include_rules = [
"+base/format_macros.h", "+base/format_macros.h",
"+base/gtest_prod_util.h", "+base/gtest_prod_util.h",
"+base/hash/hash.h", "+base/hash/hash.h",
"+base/i18n/rtl.h",
"+base/location.h", "+base/location.h",
"+base/logging.h", "+base/logging.h",
"+base/notreached.h", "+base/notreached.h",
......
...@@ -37,7 +37,6 @@ namespace blink { ...@@ -37,7 +37,6 @@ namespace blink {
class DataTransfer; class DataTransfer;
class EventDispatcher; class EventDispatcher;
class MouseEventInit; class MouseEventInit;
class WebPointerProperties;
class CORE_EXPORT MouseEvent : public UIEventWithKeyState { class CORE_EXPORT MouseEvent : public UIEventWithKeyState {
DEFINE_WRAPPERTYPEINFO(); DEFINE_WRAPPERTYPEINFO();
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_EVENTS_POINTER_EVENT_H_ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_EVENTS_POINTER_EVENT_H_
#define THIRD_PARTY_BLINK_RENDERER_CORE_EVENTS_POINTER_EVENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_EVENTS_POINTER_EVENT_H_
#include "third_party/blink/public/common/input/pointer_id.h"
#include "third_party/blink/renderer/core/events/mouse_event.h" #include "third_party/blink/renderer/core/events/mouse_event.h"
#include "third_party/blink/renderer/platform/wtf/casting.h" #include "third_party/blink/renderer/platform/wtf/casting.h"
......
...@@ -276,14 +276,6 @@ void Frame::SetOwner(FrameOwner* owner) { ...@@ -276,14 +276,6 @@ void Frame::SetOwner(FrameOwner* owner) {
UpdateInheritedEffectiveTouchActionIfPossible(); UpdateInheritedEffectiveTouchActionIfPossible();
} }
bool Frame::IsAdSubframe() const {
return ad_frame_type_ != mojom::blink::AdFrameType::kNonAd;
}
bool Frame::IsAdRoot() const {
return ad_frame_type_ == mojom::blink::AdFrameType::kRootAd;
}
void Frame::UpdateInertIfPossible() { void Frame::UpdateInertIfPossible() {
if (auto* frame_owner_element = if (auto* frame_owner_element =
DynamicTo<HTMLFrameOwnerElement>(owner_.Get())) { DynamicTo<HTMLFrameOwnerElement>(owner_.Get())) {
......
...@@ -29,16 +29,15 @@ ...@@ -29,16 +29,15 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_FRAME_H_ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_FRAME_H_
#define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_FRAME_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_FRAME_H_
#include "base/i18n/rtl.h"
#include "base/optional.h" #include "base/optional.h"
#include "base/unguessable_token.h" #include "base/unguessable_token.h"
#include "mojo/public/mojom/base/text_direction.mojom-blink-forward.h"
#include "third_party/blink/public/common/feature_policy/document_policy_features.h" #include "third_party/blink/public/common/feature_policy/document_policy_features.h"
#include "third_party/blink/public/common/feature_policy/feature_policy_features.h" #include "third_party/blink/public/common/feature_policy/feature_policy_features.h"
#include "third_party/blink/public/common/frame/user_activation_state.h" #include "third_party/blink/public/common/frame/user_activation_state.h"
#include "third_party/blink/public/common/frame/user_activation_update_source.h" #include "third_party/blink/public/common/frame/user_activation_update_source.h"
#include "third_party/blink/public/mojom/ad_tagging/ad_frame.mojom-blink-forward.h" #include "third_party/blink/public/mojom/ad_tagging/ad_frame.mojom-blink.h"
#include "third_party/blink/public/mojom/frame/frame_owner_properties.mojom-blink-forward.h" #include "third_party/blink/public/mojom/frame/frame_owner_properties.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/input/scroll_direction.mojom-blink-forward.h"
#include "third_party/blink/public/web/web_frame_load_type.h" #include "third_party/blink/public/web/web_frame_load_type.h"
#include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/frame/frame_lifecycle.h" #include "third_party/blink/renderer/core/frame/frame_lifecycle.h"
...@@ -46,15 +45,12 @@ ...@@ -46,15 +45,12 @@
#include "third_party/blink/renderer/core/frame/navigation_rate_limiter.h" #include "third_party/blink/renderer/core/frame/navigation_rate_limiter.h"
#include "third_party/blink/renderer/core/loader/frame_loader_types.h" #include "third_party/blink/renderer/core/loader/frame_loader_types.h"
#include "third_party/blink/renderer/core/page/frame_tree.h" #include "third_party/blink/renderer/core/page/frame_tree.h"
#include "third_party/blink/renderer/core/scroll/scroll_types.h"
#include "third_party/blink/renderer/platform/graphics/touch_action.h" #include "third_party/blink/renderer/platform/graphics/touch_action.h"
#include "third_party/blink/renderer/platform/heap/handle.h" #include "third_party/blink/renderer/platform/heap/handle.h"
#include "third_party/blink/renderer/platform/scheduler/public/post_cancellable_task.h" #include "third_party/blink/renderer/platform/scheduler/public/post_cancellable_task.h"
#include "third_party/blink/renderer/platform/wtf/forward.h" #include "third_party/blink/renderer/platform/wtf/forward.h"
namespace ui {
enum class ScrollGranularity : uint8_t;
} // namespace ui
namespace blink { namespace blink {
class ChromeClient; class ChromeClient;
...@@ -213,8 +209,13 @@ class CORE_EXPORT Frame : public GarbageCollected<Frame> { ...@@ -213,8 +209,13 @@ class CORE_EXPORT Frame : public GarbageCollected<Frame> {
} }
// Ad Tagging // Ad Tagging
bool IsAdSubframe() const; bool IsAdSubframe() const {
bool IsAdRoot() const; return ad_frame_type_ != mojom::blink::AdFrameType::kNonAd;
}
bool IsAdRoot() const {
return ad_frame_type_ == mojom::blink::AdFrameType::kRootAd;
}
// Called to make a frame inert or non-inert. A frame is inert when there // Called to make a frame inert or non-inert. A frame is inert when there
// is a modal dialog displayed within an ancestor frame, and this frame // is a modal dialog displayed within an ancestor frame, and this frame
...@@ -235,7 +236,7 @@ class CORE_EXPORT Frame : public GarbageCollected<Frame> { ...@@ -235,7 +236,7 @@ class CORE_EXPORT Frame : public GarbageCollected<Frame> {
// Returns true if the scroll was consumed locally. // Returns true if the scroll was consumed locally.
virtual bool BubbleLogicalScrollFromChildFrame( virtual bool BubbleLogicalScrollFromChildFrame(
mojom::blink::ScrollDirection direction, mojom::blink::ScrollDirection direction,
ui::ScrollGranularity granularity, ScrollGranularity granularity,
Frame* child) = 0; Frame* child) = 0;
const base::UnguessableToken& GetDevToolsFrameToken() const { const base::UnguessableToken& GetDevToolsFrameToken() const {
......
...@@ -18,10 +18,6 @@ ...@@ -18,10 +18,6 @@
namespace blink { namespace blink {
FrameView::FrameView(const IntRect& frame_rect)
: EmbeddedContentView(frame_rect),
frame_visibility_(blink::mojom::FrameVisibility::kRenderedInViewport) {}
Frame& FrameView::GetFrame() const { Frame& FrameView::GetFrame() const {
if (const LocalFrameView* lfv = DynamicTo<LocalFrameView>(this)) if (const LocalFrameView* lfv = DynamicTo<LocalFrameView>(this))
return lfv->GetFrame(); return lfv->GetFrame();
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_FRAME_VIEW_H_ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_FRAME_VIEW_H_
#define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_FRAME_VIEW_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_FRAME_VIEW_H_
#include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink-forward.h" #include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink.h"
#include "third_party/blink/public/platform/viewport_intersection_state.h" #include "third_party/blink/public/platform/viewport_intersection_state.h"
#include "third_party/blink/renderer/core/frame/embedded_content_view.h" #include "third_party/blink/renderer/core/frame/embedded_content_view.h"
#include "third_party/blink/renderer/core/layout/geometry/physical_rect.h" #include "third_party/blink/renderer/core/layout/geometry/physical_rect.h"
...@@ -18,7 +18,7 @@ struct IntrinsicSizingInfo; ...@@ -18,7 +18,7 @@ struct IntrinsicSizingInfo;
class CORE_EXPORT FrameView : public EmbeddedContentView { class CORE_EXPORT FrameView : public EmbeddedContentView {
public: public:
explicit FrameView(const IntRect& frame_rect); FrameView(const IntRect& frame_rect) : EmbeddedContentView(frame_rect) {}
~FrameView() override = default; ~FrameView() override = default;
// parent_flags is the result of calling GetIntersectionObservationFlags on // parent_flags is the result of calling GetIntersectionObservationFlags on
...@@ -74,7 +74,8 @@ class CORE_EXPORT FrameView : public EmbeddedContentView { ...@@ -74,7 +74,8 @@ class CORE_EXPORT FrameView : public EmbeddedContentView {
private: private:
PhysicalRect rect_in_parent_; PhysicalRect rect_in_parent_;
base::TimeTicks rect_in_parent_stable_since_; base::TimeTicks rect_in_parent_stable_since_;
blink::mojom::FrameVisibility frame_visibility_; blink::mojom::FrameVisibility frame_visibility_ =
blink::mojom::FrameVisibility::kRenderedInViewport;
bool hidden_for_throttling_; bool hidden_for_throttling_;
bool subtree_throttled_; bool subtree_throttled_;
}; };
......
...@@ -64,7 +64,7 @@ class CORE_EXPORT RemoteFrame final : public Frame, ...@@ -64,7 +64,7 @@ class CORE_EXPORT RemoteFrame final : public Frame,
void SetInheritedEffectiveTouchAction(TouchAction) override; void SetInheritedEffectiveTouchAction(TouchAction) override;
bool BubbleLogicalScrollFromChildFrame( bool BubbleLogicalScrollFromChildFrame(
mojom::blink::ScrollDirection direction, mojom::blink::ScrollDirection direction,
ui::ScrollGranularity granularity, ScrollGranularity granularity,
Frame* child) override; Frame* child) override;
void DidFocus() override; void DidFocus() override;
void AddResourceTimingFromChild( void AddResourceTimingFromChild(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment