Skip to content

Commit

Permalink
Replace WTF_MAKE_NONCOPYABLE with DISALLOW_COPY_AND_ASSIGN in platfor…
Browse files Browse the repository at this point in the history
…m/text/*

This changes is for files in the path
//third_party/WebKit/Source/platform/text.

This CL introduces no logic changes.

Moved the macro to the end of the class as per the code guidelines
enforced by lint.

Bug: 565932

Signed-off-by: Yuhong Sha <yuhong.sha@samsung.com>
Change-Id: Ib26a7fafe8903df2829af1f17ba59ae2a3e22989
Reviewed-on: https://chromium-review.googlesource.com/936506
Reviewed-by: Emil A Eklund <eae@chromium.org>
Commit-Queue: srirama chandra sekhar <srirama.m@samsung.com>
Cr-Commit-Position: refs/heads/master@{#540477}
  • Loading branch information
webfulltct authored and Commit Bot committed Mar 2, 2018
1 parent 71e7418 commit 520ece6
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,7 @@ YoungKi Hong <simon.hong81@gmail.com>
Youngmin Yoo <youngmin.yoo@samsung.com>
Youngsoo Choi <kenshin.choi@samsung.com>
Youngsun Suh <zard17@gmail.com>
Yuhong Sha <yuhong.sha@samsung.com>
Yumikiyo Osanai <yumios.art@gmail.com>
Yunchao He <yunchao.he@intel.com>
Yunsik Jang <yunsik.jang@lge.com>
Expand Down
3 changes: 2 additions & 1 deletion third_party/WebKit/Source/platform/text/BidiResolver.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ class NoIsolatedRun {};
template <class Iterator, class Run, class IsolatedRun = NoIsolatedRun>
class BidiResolver final {
DISALLOW_NEW();
WTF_MAKE_NONCOPYABLE(BidiResolver);

public:
BidiResolver()
Expand Down Expand Up @@ -382,6 +381,8 @@ class BidiResolver final {

Vector<BidiEmbedding, 8> current_explicit_embedding_sequence_;
HashMap<Run*, MidpointState<Iterator>> midpoint_state_for_isolated_run_;

DISALLOW_COPY_AND_ASSIGN(BidiResolver);
};

#if DCHECK_IS_ON()
Expand Down
3 changes: 2 additions & 1 deletion third_party/WebKit/Source/platform/text/BidiRunList.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ namespace blink {
template <class Run>
class BidiRunList final {
DISALLOW_NEW();
WTF_MAKE_NONCOPYABLE(BidiRunList);

public:
BidiRunList()
Expand Down Expand Up @@ -70,6 +69,8 @@ class BidiRunList final {
Run* last_run_;
Run* logically_last_run_;
unsigned run_count_;

DISALLOW_COPY_AND_ASSIGN(BidiRunList);
};

template <class Run>
Expand Down
2 changes: 1 addition & 1 deletion third_party/WebKit/Source/platform/text/LineEnding.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace {

class OutputBuffer {
STACK_ALLOCATED();
WTF_MAKE_NONCOPYABLE(OutputBuffer);
DISALLOW_COPY_AND_ASSIGN(OutputBuffer);

public:
OutputBuffer() = default;
Expand Down
6 changes: 4 additions & 2 deletions third_party/WebKit/Source/platform/text/SuffixTree.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ class ASCIICodebook {
template <typename Codebook>
class SuffixTree {
USING_FAST_MALLOC(SuffixTree);
WTF_MAKE_NONCOPYABLE(SuffixTree);

public:
SuffixTree(const String& text, unsigned depth) : depth_(depth), leaf_(true) {
Expand All @@ -77,7 +76,6 @@ class SuffixTree {
private:
class Node {
USING_FAST_MALLOC(Node);
WTF_MAKE_NONCOPYABLE(Node);

public:
Node(bool is_leaf = false) : is_leaf_(is_leaf) {}
Expand Down Expand Up @@ -113,6 +111,8 @@ class SuffixTree {
// TODO(tsepez): convert to base::flat_map when allowed in blink.
Vector<std::pair<int, Node*>> children_;
const bool is_leaf_;

DISALLOW_COPY_AND_ASSIGN(Node);
};

void Build(const String& text) {
Expand All @@ -136,6 +136,8 @@ class SuffixTree {
// (there can be a lot of these), we alias all the leaves to this "static"
// leaf node.
Node leaf_;

DISALLOW_COPY_AND_ASSIGN(SuffixTree);
};

} // namespace blink
Expand Down

0 comments on commit 520ece6

Please sign in to comment.