diff options
| author | erg <erg@chromium.org> | 2016-01-22 11:11:30 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-22 19:13:45 +0000 |
| commit | 3537f56b3e87d722b1e7caa3d996874f3199f750 (patch) | |
| tree | f539a80b6dc8c224b338f2649995bdbdae64077e /base/threading | |
| parent | ce56df4e76af412e75b758fe33b304bc4971ab7a (diff) | |
| download | chromium_src-3537f56b3e87d722b1e7caa3d996874f3199f750.zip chromium_src-3537f56b3e87d722b1e7caa3d996874f3199f750.tar.gz chromium_src-3537f56b3e87d722b1e7caa3d996874f3199f750.tar.bz2 | |
Revert of Start of display management for mus (patchset #5 id:80001 of https://codereview.chromium.org/1615023004/ )
Reason for revert:
Consistently causing crashes on mash startup:
[0122/110054:FATAL:default_logger_impl.cc(51)] Check failed: ptr_.
#0 0x7fc46007507e base::debug::StackTrace::StackTrace()
#1 0x7fc4600c0bcf logging::LogMessage::~LogMessage()
#2 0x7fc45fe9ac30 mojo::internal::(anonymous namespace)::LogMessage()
#3 0x7fc45fe9a2e5 mojo::internal::LogMessage::~LogMessage()
#4 0x7fc45de1a33c mojo::StructPtr<>::operator->()
#5 0x7fc45fff3fc7 mus::ws::ConnectionManager::AddObserver()
#6 0x7fc45fe327f3 mus::mojom::DisplayManagerStub::Accept()
#7 0x7fc45fe07f64 mojo::internal::Router::HandleIncomingMessage()
#8 0x7fc45fe07b41 mojo::internal::Router::HandleIncomingMessageThunk::Accept()
#9 0x7fc45fe32a9e mus::mojom::DisplayManagerRequestValidator::Accept()
Original issue's description:
> Start of display management for mus
>
> This adds a DisplayManager interface that you get from mus. You can
> then attach an observer to observe display related changes.
>
> BUG=548429
> TEST=none
> R=ben@chromium.org
>
> Committed: https://crrev.com/bc2281a7a7576f5b4da85986298322b3c9d2234e
> Cr-Commit-Position: refs/heads/master@{#370880}
TBR=ben@chromium.org,sky@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=548429
Review URL: https://codereview.chromium.org/1618963005
Cr-Commit-Position: refs/heads/master@{#371005}
Diffstat (limited to 'base/threading')
| -rw-r--r-- | base/threading/thread_restrictions.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h index ec380b8..eec00fb 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h @@ -81,7 +81,6 @@ class WindowResizeHelperMac; } namespace views { -class ScreenMus; class WindowManagerConnection; } @@ -234,7 +233,6 @@ class BASE_EXPORT ThreadRestrictions { #if !defined(OFFICIAL_BUILD) friend class content::SoftwareOutputDeviceMus; // Interim non-production code #endif - friend class views::ScreenMus; friend class views::WindowManagerConnection; // END USAGE THAT NEEDS TO BE FIXED. |