Commit 5d030c93 authored by zmo's avatar zmo Committed by Commit bot

Revert of Roll src/third_party/skia a71aee6:958e962 (patchset #1 id:1 of...

Revert of Roll src/third_party/skia a71aee6:958e962 (patchset #1 id:1 of https://codereview.chromium.org/663133002/)

Reason for revert:
Broke all Mac GPU debug bots.

0   libbase.dylib                       0x0cc6b4bf base::debug::StackTrace::StackTrace() + 63
1   libbase.dylib                       0x0cc6b51b base::debug::StackTrace::StackTrace() + 43
2   libbase.dylib                       0x0cd197b2 logging::LogMessage::~LogMessage() + 82
3   libbase.dylib                       0x0cd1852b logging::LogMessage::~LogMessage() + 43
4   libskia.dylib                       0x24256d1b SkDebugf_FileLine(char const*, int, bool, char const*, ...) + 283
5   libskia.dylib                       0x24069f85 Sk4x<float>::store(float*) const + 213
6   libskia.dylib                       0x24068ea0 SkTileGrid::intersectsGrid(Sk4x<float> const&) const + 64
7   libskia.dylib                       0x24069099 SkTileGrid::insert(unsigned int, SkRect const&, bool) + 425
8   libskia.dylib                       0x23fe75a1 SkRecords::FillBounds::FillBounds(SkRecord const&, SkBBoxHierarchy*) + 753
9   libskia.dylib                       0x23fe42d7 SkRecords::FillBounds::FillBounds(SkRecord const&, SkBBoxHierarchy*) + 71
10  libskia.dylib                       0x23fe3ad1 SkRecordFillBounds(SkRecord const&, SkBBoxHierarchy*) + 65
11  libskia.dylib                       0x23faeb86 SkPicture::SkPicture(float, float, SkRecord*, SkBBoxHierarchy*) + 390
12  libskia.dylib                       0x23fadcc1 SkPicture::SkPicture(float, float, SkRecord*, SkBBoxHierarchy*) + 113
13  libskia.dylib                       0x23fd4d12 SkPictureRecorder::endRecording() + 162
14  libcc.dylib                         0x22402cbc cc::Picture::Record(cc::ContentLayerClient*, SkTileGridFactory::TileGridInfo const&, cc::Picture::RecordingMode) + 2188
15  libcc.dylib                         0x2240235e cc::Picture::Create(gfx::Rect const&, cc::ContentLayerClient*, SkTileGridFactory::TileGridInfo const&, bool, cc::Picture::RecordingMode) + 174
16  libcc.dylib                         0x2242bc3f cc::PicturePile::UpdateAndExpandInvalidation(cc::ContentLayerClient*, cc::Region*, unsigned int, bool, bool, gfx::Size const&, gfx::Rect const&, int, cc::Picture::RecordingMode, cc::RenderingStatsInstrumentation*) + 7391
17  libcc.dylib                         0x222e101f cc::PictureLayer::Update(cc::ResourceUpdateQueue*, cc::OcclusionTracker<cc::Layer> const*) + 1887
18  libcc.dylib                         0x22556174 cc::LayerTreeHost::PaintLayerContents(cc::RenderSurfaceLayerList const&, cc::ResourceUpdateQueue*, bool*, bool*) + 820
19  libcc.dylib                         0x225556c9 cc::LayerTreeHost::UpdateLayers(cc::Layer*, cc::ResourceUpdateQueue*) + 2665
20  libcc.dylib                         0x22554bc8 cc::LayerTreeHost::UpdateLayers(cc::ResourceUpdateQueue*) + 648
21  libcc.dylib                         0x225fce07 cc::ThreadProxy::BeginMainFrame(scoped_ptr<cc::ThreadProxy::BeginMainFrameAndCommitState, base::DefaultDeleter<cc::ThreadProxy::BeginMainFrameAndCommitState> >) + 2919
22  libcc.dylib                         0x2260e923 base::internal::RunnableAdapter<void (cc::ThreadProxy::*)(scoped_ptr<cc::ThreadProxy::BeginMainFrameAndCommitState, base::DefaultDeleter<cc::ThreadProxy::BeginMainFrameAndCommitState> >)>::Run(cc::ThreadProxy*, scoped_ptr<cc::ThreadProxy::BeginMainFrameAndCommitState, base::DefaultDeleter<cc::ThreadProxy::BeginMainFrameAndCommitState> >) + 179
23  libcc.dylib                         0x2260e7c7 base::internal::InvokeHelper<true, void, base::internal::RunnableAdapter<void (cc::ThreadProxy::*)(scoped_ptr<cc::ThreadProxy::BeginMainFrameAndCommitState, base::DefaultDeleter<cc::ThreadProxy::BeginMainFrameAndCommitState> >)>, void (base::WeakPtr<cc::ThreadProxy> const&, scoped_ptr<cc::ThreadProxy::BeginMainFrameAndCommitState, base::DefaultDeleter<cc::ThreadProxy::BeginMainFrameAndCommitState> >)>::MakeItSo(base::internal::RunnableAdapter<void (cc::ThreadProxy::*)(scoped_ptr<cc::ThreadProxy::BeginMainFrameAndCommitState, base::DefaultDeleter<cc::ThreadProxy::BeginMainFrameAndCommitState> >)>, base::WeakPtr<cc::ThreadProxy> const&, scoped_ptr<cc::ThreadProxy::BeginMainFrameAndCommitState, base::DefaultDeleter<cc::ThreadProxy::BeginMainFrameAndCommitState> >) + 151
24  libcc.dylib                         0x2260e607 base::internal::Invoker<2, base::internal::BindState<base::internal::RunnableAdapter<void (cc::ThreadProxy::*)(scoped_ptr<cc::ThreadProxy::BeginMainFrameAndCommitState, base::DefaultDeleter<cc::ThreadProxy::BeginMainFrameAndCommitState> >)>, void (cc::ThreadProxy*, scoped_ptr<cc::ThreadProxy::BeginMainFrameAndCommitState, base::DefaultDeleter<cc::ThreadProxy::BeginMainFrameAndCommitState> >), void (base::WeakPtr<cc::ThreadProxy>, base::internal::PassedWrapper<scoped_ptr<cc::ThreadProxy::BeginMainFrameAndCommitState, base::DefaultDeleter<cc::ThreadProxy::BeginMainFrameAndCommitState> > >)>, void (cc::ThreadProxy*, scoped_ptr<cc::ThreadProxy::BeginMainFrameAndCommitState, base::DefaultDeleter<cc::ThreadProxy::BeginMainFrameAndCommitState> >)>::Run(base::internal::BindStateBase*) + 215
25  libbase.dylib                       0x0cc5474f base::Callback<void ()>::Run() const + 63
26  libbase.dylib                       0x0cc6d9bc base::debug::TaskAnnotator::RunTask(char const*, char const*, base::PendingTask const&) + 1084
27  libbase.dylib                       0x0cd5a999 base::MessageLoop::RunTask(base::PendingTask const&) + 793
28  libbase.dylib                       0x0cd5ab42 base::MessageLoop::DeferOrRunPendingTask(base::PendingTask const&) + 98
29  libbase.dylib                       0x0cd5ae11 base::MessageLoop::DoWork() + 321
30  libbase.dylib                       0x0cc2c715 base::MessagePumpCFRunLoopBase::RunWork() + 101
31  libbase.dylib                       0x0cc2bb31 base::MessagePumpCFRunLoopBase::RunWorkSource(void*) + 49
32  CoreFoundation                      0x9bbd3b5f __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__ + 15
33  CoreFoundation                      0x9bbc495b __CFRunLoopDoSources0 + 235
34  CoreFoundation                      0x9bbc405e __CFRunLoopRun + 1022
35  CoreFoundation                      0x9bbc39ea CFRunLoopRunSpecific + 394
36  CoreFoundation                      0x9bbc384b CFRunLoopRunInMode + 123
37  Foundation                          0x902b85b9 -[NSRunLoop(NSRunLoop) runMode:beforeDate:] + 277
38  libbase.dylib                       0x0cc2d242 base::MessagePumpNSRunLoop::DoRun(base::MessagePump::Delegate*) + 162
39  libbase.dylib                       0x0cc2c328 base::MessagePumpCFRunLoopBase::Run(base::MessagePump::Delegate*) + 104
40  libbase.dylib                       0x0cd5a30c base::MessageLoop::RunHandler() + 300
41  libbase.dylib                       0x0cdcc5f3 base::RunLoop::Run() + 83
42  libbase.dylib                       0x0cd59617 base::MessageLoop::Run() + 55
43  libcontent.dylib                    0x1d021a35 content::RendererMain(content::MainFunctionParams const&) + 1925
44  libcontent.dylib                    0x1b9782ac content::RunNamedProcessTypeMain(std::string const&, content::MainFunctionParams const&, content::ContentMainDelegate*) + 268
45  libcontent.dylib                    0x1b97999b content::ContentMainRunnerImpl::Run() + 779
46  libcontent.dylib                    0x1b977745 content::ContentMain(content::ContentMainParams const&) + 133
47  libchrome_main_dll.dylib            0x0004155c ChromeMain + 92
48  Chromium Helper                     0x00038f7b main + 43
49  Chromium Helper                     0x00038f45 start + 53

Original issue's description:
> Roll src/third_party/skia a71aee6:958e962
>
> Summary of changes available at:
> https://chromium.googlesource.com/skia/+log/a71aee6..958e962
>
> CQ_EXTRA_TRYBOTS=tryserver.blink:linux_blink_rel,linux_blink_dbg
> TBR=mtklein@google.com
>
> Committed: https://crrev.com/fbf0dae317434cf09510db0da0e5b9126b5dfa9b
> Cr-Commit-Position: refs/heads/master@{#300273}

TBR=mtklein@google.com,skia-deps-roller@chromium.org
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/669743002

Cr-Commit-Position: refs/heads/master@{#300293}
parent c19bb4de
...@@ -44,7 +44,7 @@ vars = { ...@@ -44,7 +44,7 @@ vars = {
'boringssl_git': 'https://boringssl.googlesource.com', 'boringssl_git': 'https://boringssl.googlesource.com',
'libvpx_revision': 'efe9712d52c2d216fb3d1ceb508b8148847a7e4b', 'libvpx_revision': 'efe9712d52c2d216fb3d1ceb508b8148847a7e4b',
'sfntly_revision': '1bdaae8fc788a5ac8936d68bf24f37d977a13dac', 'sfntly_revision': '1bdaae8fc788a5ac8936d68bf24f37d977a13dac',
'skia_revision': '958e9628d5f9a81aeafa78572cb4afc4b19a455a', 'skia_revision': 'a71aee6afd209617f44ac6e76dcc024baab69d18',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia # the commit queue can handle CLs rolling Skia
# and V8 without interference from each other. # and V8 without interference from each other.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment