servo: Merge #4829 - Revert "Using Color equality operators to streamline code" (from servo:revert-4825-usingColorOperators01); r=jdm

Reverts servo/servo#4825

I merged this incorrectly via the big green button and busted the tree pretty badly. Adenilson has committed to fixing the issue in rust-azure and then relanding this in a fixed state.

Source-Repo: https://github.com/servo/servo
Source-Revision: e48eb87eb40545f361c62d2e81118435430d0adb

UltraBlame original commit: bc0d9c031de4c09d6549097c3f946b95b7d237e1

Author: marco-c

servo/components/gfx/paint_context.rs

@@ -4902,11 +4902,53 @@ black
 )
 ;
 ;
+/
+/
+TODO
+(
+Savago
+)
+:
+Use
+equality
+operators
+when
+we
+sync
+with
+rust
+-
+azure
+.
 if
 color
+.
+r
+!
+=
+darker_color
+.
+r
+|
+|
+color
+.
+g
+!
+=
+darker_color
+.
+g
+|
+|
+color
+.
+b
 !
 =
 darker_color
+.
+b
 {
 darker_color
 =
@@ -5251,9 +5293,33 @@ black
 ;
 if
 color
+.
+r
 !
 =
 scaled_color
+.
+r
+|
+|
+color
+.
+g
+!
+=
+scaled_color
+.
+g
+|
+|
+color
+.
+b
+!
+=
+scaled_color
+.
+b
 {
 scaled_color
 =

servo/components/layout/layout_task.rs

@@ -4485,11 +4485,60 @@ black
 (
 )
 ;
+/
+/
+TODO
+:
+Use
+equality
+operators
+when
+we
+sync
+with
+rust
+-
+azure
+.
 if
 element_bg_color
+.
+r
 !
 =
 black
+.
+r
+|
+|
+element_bg_color
+.
+g
+!
+=
+black
+.
+g
+|
+|
+element_bg_color
+.
+b
+!
+=
+black
+.
+b
+|
+|
+element_bg_color
+.
+a
+!
+=
+black
+.
+a
 {
 color
 =