diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 16:35:04 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 16:35:04 +0000 |
| commit | 060448534ff6b708ec19220c63c4d86efbe87b50 (patch) | |
| tree | 047be1f580e7da573c772006cdd5290ba1cdf824 /cc/resources/prioritized_resource.cc | |
| parent | ed3e277f57affc9b369cb65e3720a1a8ee39b6e1 (diff) | |
| download | chromium_src-060448534ff6b708ec19220c63c4d86efbe87b50.zip chromium_src-060448534ff6b708ec19220c63c4d86efbe87b50.tar.gz chromium_src-060448534ff6b708ec19220c63c4d86efbe87b50.tar.bz2 | |
Revert 191364 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."
> cc: Add ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp
>
> And fix compile errors that it causes.
>
> Review URL: https://codereview.chromium.org/13206004
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/13316003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resources/prioritized_resource.cc')
| -rw-r--r-- | cc/resources/prioritized_resource.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cc/resources/prioritized_resource.cc b/cc/resources/prioritized_resource.cc index fdc20c3..f5ebf94 100644 --- a/cc/resources/prioritized_resource.cc +++ b/cc/resources/prioritized_resource.cc @@ -165,8 +165,7 @@ bool PrioritizedResource::Backing::CanBeRecycled() const { } void PrioritizedResource::Backing::UpdatePriority() { - DCHECK(!proxy() || - (proxy()->IsImplThread() && proxy()->IsMainThreadBlocked())); + DCHECK(!proxy() || proxy()->IsImplThread() && proxy()->IsMainThreadBlocked()); if (owner_) { priority_at_last_priority_update_ = owner_->request_priority(); was_above_priority_cutoff_at_last_priority_update_ = @@ -178,8 +177,7 @@ void PrioritizedResource::Backing::UpdatePriority() { } void PrioritizedResource::Backing::UpdateInDrawingImplTree() { - DCHECK(!proxy() || - (proxy()->IsImplThread() && proxy()->IsMainThreadBlocked())); + DCHECK(!proxy() || proxy()->IsImplThread() && proxy()->IsMainThreadBlocked()); in_drawing_impl_tree_ = !!owner(); if (!in_drawing_impl_tree_) { DCHECK_EQ(priority_at_last_priority_update_, |