Revert "Slavi's patch #2 from https://codereview.chromium.org/25478007"

This reverts commit 61278eebde640d6753839321e4ff87f187c54fe1.
Revert "Revert "Slavi's patch #2 from https://codereview.chromium.org/25478007""

This reverts commit 843353308995ca362368107c591860244960e286.
Revert "Revert "Revert "Slavi's patch #2 from https://codereview.chromium.org/25478007"""

This reverts commit 53994396062bf445f380aa7011416c4740a6816a.
Updating up to Slavi's patch #6
Fixed scissor_rect leak