For the Direct2D 1.1 Moz2D backend there's a couple of functions currently inside the Direct2D 1.0 backend that could simply be reused. Those should be factored out of the Direct2D 1.0 backend.

We can share this code too so we should.

Comment on attachment 762448 [details] [diff] [review] Factor out partial bitmap uploading and scaling. Review of attachment 762448 [details] [diff] [review]: ----------------------------------------------------------------- ::: BaseRect.h @@ +91,5 @@ > Sub result; > + result.x = std::max<T>(x, aRect.x); > + result.y = std::max<T>(y, aRect.y); > + result.width = std::min<T>(XMost(), aRect.XMost()) - result.x; > + result.height = std::min<T>(YMost(), aRect.YMost()) - result.y; This seems unrelated?

(In reply to Jeff Muizelaar [:jrmuizel] from comment #3) > Comment on attachment 762448 [details] [diff] [review] > Factor out partial bitmap uploading and scaling. > > Review of attachment 762448 [details] [diff] [review]: > ----------------------------------------------------------------- > > ::: BaseRect.h > @@ +91,5 @@ > > Sub result; > > + result.x = std::max<T>(x, aRect.x); > > + result.y = std::max<T>(y, aRect.y); > > + result.width = std::min<T>(XMost(), aRect.XMost()) - result.x; > > + result.height = std::min<T>(YMost(), aRect.YMost()) - result.y; > > This seems unrelated? I could put it in a separate patch but I didn't bother to. It's a dependency for this bug. This change caused the Helpers2D file to be included in ScaledFontDWrite which caused this to cause compile errors.

Backed out because of Windows build bustage: https://hg.mozilla.org/integration/mozilla-inbound/rev/5b3196ad66f4

https://hg.mozilla.org/mozilla-central/rev/4267a8556659 https://hg.mozilla.org/mozilla-central/rev/6ee152636ad4