Chromium Code Reviews Chromium Code Reviews
Issue
1685563002:
Revert of Roll src/third_party/skia/ 629f25a7e..81bb79b7b (23 commits). (Closed)
DescriptionRevert of Roll src/third_party/skia/ 629f25a7e..81bb79b7b (23 commits). (patchset #1 id:1 of https://codereview.chromium.org/1680563005/ )
Reason for revert:
Still breaks clang/win bots:
In file included from
..\..\third_party\skia\src\ports\SkRemotableFontMgr_win_dw.cpp:11:
In file included from
..\..\third_party\skia\src\utils\win\SkDWriteFontFileStream.h:14:
In file included from ..\..\third_party\skia\include\core\SkStream.h:225:
In file included from ..\..\third_party\skia\include\core\SkString.h:14:
..\..\third_party\skia\include\core\SkTArray.h(417,39) : error: no matching
constructor for initialization of 'SkRemotableFontMgr_DirectWrite::DataId'
new (dst + sizeof(T) * i) T(std::move(fItemArray[i]));
^ ~~~~~~~~~~~~~~~~~~~~~~~~
..\..\third_party\skia\include\core\SkTArray.h(458,19) : note: in instantiation
of function template specialization
'SkTArray<SkRemotableFontMgr_DirectWrite::DataId, false>::move<false>' requested
here
this->move(newMemArray);
^
..\..\third_party\skia\include\core\SkTArray.h(427,15) : note: in instantiation
of member function 'SkTArray<SkRemotableFontMgr_DirectWrite::DataId,
false>::checkRealloc' requested here
this->checkRealloc(n);
^
..\..\third_party\skia\include\core\SkTArray.h(147,46) : note: in instantiation
of member function 'SkTArray<SkRemotableFontMgr_DirectWrite::DataId,
false>::push_back_raw' requested here
T* newT = reinterpret_cast<T*>(this->push_back_raw(1));
^
..\..\third_party\skia\src\ports\SkRemotableFontMgr_win_dw.cpp(75,38) : note:
in instantiation of member function
'SkTArray<SkRemotableFontMgr_DirectWrite::DataId, false>::push_back' requested
here
DataId& added = fDataIdCache.push_back();
^
..\..\third_party\skia\src\ports\SkRemotableFontMgr_win_dw.cpp(36,18) : note:
candidate constructor not viable: expects an l-value for 1st argument
explicit DataId(DataId& that)
^
..\..\third_party\skia\src\ports\SkRemotableFontMgr_win_dw.cpp(33,9) : note:
candidate constructor not viable: requires 0 arguments, but 1 was provided
DataId() { }
^.
I hit "Stop" on autoroll.skia.org until this is resolved.
Original issue's description:
> Roll src/third_party/skia/ 629f25a7e..81bb79b7b (23 commits).
>
> https://chromium.googlesource.com/skia.git/+log/629f25a7ef22..81bb79b7b979
>
> $ git log 629f25a7e..81bb79b7b --date=short --no-merges --format='%ad %ae %s'
> 2016-02-08 mtklein Remove SkNx AVX code. It is not really used. Getting in the way of refactoring.
> 2016-02-08 scroggo Optionally run RAW images serially
> 2016-02-08 mtklein DM: this must have been missing from the previous CL
> 2016-02-08 joshualitt Skia serve now supports favicon correctly
> 2016-02-08 brianosman Support --dryRun in nanobench to get a list of benchmarks.
> 2016-02-08 msarett Optimize CMYK->RGBA (BGRA) transform for jpeg decodes
> 2016-02-08 reed extend modecolorfilter to 4f
> 2016-02-08 mtklein dm: simplify parallel/serial decisions
> 2016-02-08 sheyang Reland of whitespace change to test bugdroid (patchset #1 id:1 of https://codereview.chromium.org/1673083003/ )
> 2016-02-08 reed remove dead SK_SUPPORT_LEGACY_NEG_SCALE_HQ flag
> 2016-02-08 msarett Blacklist RAW images on GPU tests
> 2016-02-08 ethannicholas Revert of Moved Canvas->JSON and JSON->Canvas functionality into SkDebugCanvas. (patchset #2 id:20001 of https://codereview.chromium.org/1681643002/ )
> 2016-02-08 ethannicholas Moved Canvas->JSON and JSON->Canvas functionality into SkDebugCanvas. SkJSONCanvas and SkJSONRenderer will be deleted once the debug server has been updated. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1681643002
> 2016-02-08 kjlubick Reland of SkTArray to move when moving. (patchset #1 id:1 of https://codereview.chromium.org/1677103002/ )
> 2016-02-08 cdalton Improve GLSL integer support
> 2016-02-08 kjlubick Revert of SkTArray to move when moving. (patchset #3 id:40001 of https://codereview.chromium.org/1672063002/ )
> 2016-02-08 mtklein msan: define BREAK_IF_DEBUGGING_AND_OUT_OF_RANGE in piex
> 2016-02-08 halcanary SkDeflateWStream: support gzip output
> 2016-02-08 msarett Test CodecImageGenerator on GPU bots
> 2016-02-08 bungeman SkTArray to move when moving.
> 2016-02-08 bsalomon Replace GrGLInterface's function pointers with std::functions.
> 2016-02-08 joshualitt Create image cache for use by json canvas
> 2016-02-08 mtklein simplify piex.gyp
>
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
> TBR=kjlubick@google.com
>
> Committed: https://crrev.com/25634af9690a239e3f51b683eb2e303aae4d8136
> Cr-Commit-Position: refs/heads/master@{#374323}
TBR=kjlubick@google.com,skia-deps-roller@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Committed: https://crrev.com/eb9253066048c2f8210416b7ddc9d163f7f5b439
Cr-Commit-Position: refs/heads/master@{#374361}
Patch Set 1 #Messages
Total messages: 6 (2 generated)
|
