1387325 - Add wr support for nsDisplayXULImage

Status: RESOLVED FIXED

(Core :: Graphics: WebRender, enhancement, P1)

Description

[Ethan Lin[:ethlin]]

If we want to use wr to paint chrome ui, this one should be needed. For layers-free mode, we also need this to prevent the fallback.

Comment 1

[Ethan Lin[:ethlin]]

Attachment: Bug 1387325 - Part1. Refactor nsImageBoxFrame::PaintImage to make it easier to add WR support.

Review commit: https://reviewboard.mozilla.org/r/164756/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/164756/

Comment 2

[Ethan Lin[:ethlin]]

Comment on attachment 8893669 [details]
Bug 1387325 - Part1. Refactor nsImageBoxFrame::PaintImage to make it easier to add WR support.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/164756/diff/1-2/

Comment 3

[Ethan Lin[:ethlin]]

Comment on attachment 8893669 [details]
Bug 1387325 - Part1. Refactor nsImageBoxFrame::PaintImage to make it easier to add WR support.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/164756/diff/2-3/

Comment 4

[Ethan Lin[:ethlin]]

try result: https://treeherder.mozilla.org/#/jobs?repo=try&revision=9cd49d4f09d24e138a4f633fd24c44b3ee814230&selectedJob=123767952

Comment 5

[Ethan Lin[:ethlin]]

Attachment: Bug 1387325 - Part2. Add WR support for nsDisplayXULImage.

Review commit: https://reviewboard.mozilla.org/r/169584/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/169584/

Comment 6

[Ethan Lin[:ethlin]]

Attachment: Bug 1387325 - Part3. Add annotations for reftests after adding WR support for XUL image.

Review commit: https://reviewboard.mozilla.org/r/169586/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/169586/

Comment 7

[Ethan Lin[:ethlin]]

Comment on attachment 8893669 [details]
Bug 1387325 - Part1. Refactor nsImageBoxFrame::PaintImage to make it easier to add WR support.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/164756/diff/3-4/

Comment 8

[Matt Woodrow (:mattwoodrow)]

Comment on attachment 8893669 [details]
Bug 1387325 - Part1. Refactor nsImageBoxFrame::PaintImage to make it easier to add WR support.

https://reviewboard.mozilla.org/r/164756/#review175664

Comment 9

[Matt Woodrow (:mattwoodrow)]

Comment on attachment 8898225 [details]
Bug 1387325 - Part2. Add WR support for nsDisplayXULImage.

https://reviewboard.mozilla.org/r/169584/#review175666

Comment 10

[Matt Woodrow (:mattwoodrow)]

Comment on attachment 8898226 [details]
Bug 1387325 - Part3. Add annotations for reftests after adding WR support for XUL image.

https://reviewboard.mozilla.org/r/169586/#review175668

Comment 11

[Mozilla Autoland]

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s 0cd4bb51c6ac -d 10bbe3749f10: rebasing 418784:0cd4bb51c6ac "Bug 1387325 - Part1. Refactor nsImageBoxFrame::PaintImage to make it easier to add WR support. r=mattwoodrow"
merging layout/xul/nsImageBoxFrame.cpp
rebasing 418785:c3ebd8b025c9 "Bug 1387325 - Part2. Add WR support for nsDisplayXULImage. r=mattwoodrow"
merging layout/xul/nsImageBoxFrame.cpp
rebasing 418786:1e8bf6751e3c "Bug 1387325 - Part3. Add annotations for reftests after adding WR support for XUL image. r=mattwoodrow" (tip)
merging layout/reftests/bugs/reftest.list
warning: conflicts while merging layout/reftests/bugs/reftest.list! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)

Comment 12

[Ethan Lin[:ethlin]]

Comment on attachment 8893669 [details]
Bug 1387325 - Part1. Refactor nsImageBoxFrame::PaintImage to make it easier to add WR support.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/164756/diff/4-5/

Comment 13

[Ethan Lin[:ethlin]]

Comment on attachment 8898225 [details]
Bug 1387325 - Part2. Add WR support for nsDisplayXULImage.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/169584/diff/1-2/

Comment 14

[Ethan Lin[:ethlin]]

Comment on attachment 8898226 [details]
Bug 1387325 - Part3. Add annotations for reftests after adding WR support for XUL image.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/169586/diff/1-2/

Comment 15

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/9cbb90abba0d
Part1. Refactor nsImageBoxFrame::PaintImage to make it easier to add WR support. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/d25d3c15d149
Part2. Add WR support for nsDisplayXULImage. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/cae034ec1d40
Part3. Add annotations for reftests after adding WR support for XUL image. r=mattwoodrow

Comment 16

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

Backed out for build bustage on Windows at layout/xul/nsImageBoxFrame.cpp(250): 'LoadImageW': is not a member of 'nsContentUtils':

https://hg.mozilla.org/integration/autoland/rev/89755ca77e5d30642a1ac90bf3aa818f78268752
https://hg.mozilla.org/integration/autoland/rev/41c7be71c64f4ef3c237f408b4526e039a217e1b
https://hg.mozilla.org/integration/autoland/rev/7df0418c605dc7d749c1edc0efe3e7af998c8b46

Push with bustage: https://treeherder.mozilla.org/#/jobs?repo=autoland&revision=cae034ec1d40a07972cdfddf41f7328998544a1c&filter-resultStatus=testfailed&filter-resultStatus=busted&filter-resultStatus=exception&filter-resultStatus=retry&filter-resultStatus=usercancel&filter-resultStatus=runnable
Build log: https://treeherder.mozilla.org/logviewer.html#?job_id=129587049&repo=autoland

15:14:05     INFO -  z:/build/build/src/sccache2/sccache.exe z:/build/build/src/vs2015u3/VC/bin/amd64_x86/cl.exe -FoUnified_cpp_layout_xul0.obj -c -Iz:/build/build/src/obj-firefox/dist/stl_wrappers  -DNDEBUG=1 -DTRIMMED=1 -DWIN32_LEAN_AND_MEAN -D_WIN32 -DWIN32 -D_CRT_RAND_S -DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS -DOS_WIN=1 -D_UNICODE -DCHROMIUM_BUILD -DU_STATIC_IMPLEMENTATION -DUNICODE -D_WINDOWS -D_SECURE_ATL -DCOMPILER_MSVC -DSTATIC_EXPORTABLE_JS_API -DMOZ_HAS_MOZGLUE -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -Iz:/build/build/src/layout/xul -Iz:/build/build/src/obj-firefox/layout/xul -Iz:/build/build/src/obj-firefox/ipc/ipdl/_ipdlheaders -Iz:/build/build/src/ipc/chromium/src -Iz:/build/build/src/ipc/glue -Iz:/build/build/src/layout/base -Iz:/build/build/src/layout/generic -Iz:/build/build/src/layout/painting -Iz:/build/build/src/layout/style -Iz:/build/build/src/dom/base -Iz:/build/build/src/dom/xul -Iz:/build/build/src/obj-firefox/dist/include  -Iz:/build/build/src/obj-firefox/dist/include/nspr -Iz:/build/build/src/obj-firefox/dist/include/nss        -MD -FI z:/build/build/src/obj-firefox/mozilla-config.h -DMOZILLA_CLIENT -deps.deps/Unified_cpp_layout_xul0.obj.pp -utf-8 -TP -nologo -wd5026 -wd5027 -Zc:sizedDealloc- -wd4091 -wd4577 -D_HAS_EXCEPTIONS=0 -W3 -Gy -Zc:inline -arch:SSE2 -Gw -wd4251 -wd4244 -wd4267 -wd4800 -wd4595 -we4553 -GR-  -Z7 -O1 -Oi -Oy- -WX     z:/build/build/src/obj-firefox/layout/xul/Unified_cpp_layout_xul0.cpp
15:14:05     INFO -  Unified_cpp_layout_xul0.cpp
15:14:05     INFO -  z:/build/build/src/layout/xul/nsImageBoxFrame.cpp(250): error C2039: 'LoadImageW': is not a member of 'nsContentUtils'
15:14:05     INFO -  z:\build\build\src\dom\base\nsContentUtils.h(202): note: see declaration of 'nsContentUtils'
15:14:05     INFO -  z:/build/build/src/layout/xul/nsImageBoxFrame.cpp(254): error C2660: 'LoadImageW': function does not take 11 arguments
15:14:05     INFO -  z:/build/build/src/config/rules.mk:1064: recipe for target 'Unified_cpp_layout_xul0.obj' failed
15:14:05     INFO -  mozmake.EXE[5]: *** [Unified_cpp_layout_xul0.obj] Error 2

Comment 17

[Ethan Lin[:ethlin]]

The 'LoadImage' is redefined in windows platform. So I should undefine the 'LoadImage' for windows platform, like [1]. After doing this, try result[2] looks good.

[1] https://dxr.mozilla.org/mozilla-central/rev/37b95547f0d27565452136d16b2df2857be840f6/dom/base/nsContentUtils.cpp#232
[2] https://treeherder.mozilla.org/#/jobs?repo=try&revision=28be5067505a6cbce88c2d3b2d265a25e02d55d3&selectedJob=129821480

Comment 18

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/2fbb500ac8d0
Part1. Refactor nsImageBoxFrame::PaintImage to make it easier to add WR support. r=mattwoodrow
https://hg.mozilla.org/integration/mozilla-inbound/rev/cebb39d33eb5
Part2. Add WR support for nsDisplayXULImage. r=mattwoodrow
https://hg.mozilla.org/integration/mozilla-inbound/rev/899ca988e062
Part3. Add annotations for reftests after adding WR support for XUL image. r=mattwoodrow

Comment 19

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/2fbb500ac8d0
https://hg.mozilla.org/mozilla-central/rev/cebb39d33eb5
https://hg.mozilla.org/mozilla-central/rev/899ca988e062