third_party/WebKit/Source/web/RemoteBridgeFrameOwner.h - Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: third_party/WebKit/Source/web/RemoteBridgeFrameOwner.h

Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3

Patch Set: get-names-4: Created 4 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

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be found	2 // Use of this source code is governed by a BSD-style license that can be found

3 // in the LICENSE file.	3 // in the LICENSE file.

4	4

5 #ifndef RemoteBridgeFrameOwner_h	5 #ifndef RemoteBridgeFrameOwner_h

6 #define RemoteBridgeFrameOwner_h	6 #define RemoteBridgeFrameOwner_h

7	7

8 #include "core/frame/FrameOwner.h"	8 #include "core/frame/FrameOwner.h"

9 #include "platform/scroll/ScrollTypes.h"	9 #include "platform/scroll/ScrollTypes.h"

10 #include "public/web/WebFrameOwnerProperties.h"	10 #include "public/web/WebFrameOwnerProperties.h"

(...skipping 12 matching lines...) Expand all Loading...
23 static PassOwnPtrWillBeRawPtr<RemoteBridgeFrameOwner> create(PassRefPtrWillB eRawPtr<WebLocalFrameImpl> frame, SandboxFlags flags, const WebFrameOwnerPropert ies& frameOwnerProperties)	23 static PassOwnPtrWillBeRawPtr<RemoteBridgeFrameOwner> create(PassRefPtrWillB eRawPtr<WebLocalFrameImpl> frame, SandboxFlags flags, const WebFrameOwnerPropert ies& frameOwnerProperties)

24 {	24 {

25 return adoptPtrWillBeNoop(new RemoteBridgeFrameOwner(frame, flags, frame OwnerProperties));	25 return adoptPtrWillBeNoop(new RemoteBridgeFrameOwner(frame, flags, frame OwnerProperties));

26 }	26 }

27	27

28 bool isLocal() const override	28 bool isLocal() const override

29 {	29 {

30 return false;	30 return false;

31 }	31 }

32	32

33 SandboxFlags sandboxFlags() const override	33 SandboxFlags getSandboxFlags() const override

34 {	34 {

35 return m_sandboxFlags;	35 return m_sandboxFlags;

36 }	36 }

37	37

38 void setSandboxFlags(SandboxFlags flags)	38 void setSandboxFlags(SandboxFlags flags)

39 {	39 {

40 m_sandboxFlags = flags;	40 m_sandboxFlags = flags;

41 }	41 }

42	42

43 void setContentFrame(PassRefPtrWillBeRawPtr<WebLocalFrameImpl> frame)	43 void setContentFrame(PassRefPtrWillBeRawPtr<WebLocalFrameImpl> frame)

(...skipping 26 matching lines...) Expand all Loading...
70 ScrollbarMode m_scrolling;	70 ScrollbarMode m_scrolling;

71 int m_marginWidth;	71 int m_marginWidth;

72 int m_marginHeight;	72 int m_marginHeight;

73 };	73 };

74	74

75 DEFINE_TYPE_CASTS(RemoteBridgeFrameOwner, FrameOwner, owner, !owner->isLocal(), !owner.isLocal());	75 DEFINE_TYPE_CASTS(RemoteBridgeFrameOwner, FrameOwner, owner, !owner->isLocal(), !owner.isLocal());

76	76

77 } // namespace blink	77 } // namespace blink

78	78

79 #endif // RemoteBridgeFrameOwner_h	79 #endif // RemoteBridgeFrameOwner_h

OLD	NEW