third_party/WebKit/Source/core/layout/LayoutBlockFlow.h - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlow.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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:

Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.h

diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h

index 4734a256b2c10ec09f4f7c63175e3f9a8088259c..55c9f49a3a713a27b412adc3ffaf4f101c48eecc 100644

--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h

+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h

@@ -43,7 +43,6 @@

#include "core/layout/line/LineBoxList.h"

#include "core/layout/line/RootInlineBox.h"

#include "core/layout/line/TrailingObjects.h"

-#include <memory>

namespace blink {

@@ -616,8 +615,8 @@ private:

bool checkIfIsSelfCollapsingBlock() const;

protected:

- std::unique_ptr<LayoutBlockFlowRareData> m_rareData;

- std::unique_ptr<FloatingObjects> m_floatingObjects;

+ OwnPtr<LayoutBlockFlowRareData> m_rareData;

+ OwnPtr<FloatingObjects> m_floatingObjects;

friend class MarginInfo;

friend class LineWidth; // needs to know FloatingObject