Bug 1176124 introduced some unnecessary surface lookups in SurfaceCacheImpl::Insert(), because Insert() calls Lookup() to check if there's an existing surface or placeholder, but if there *is* a placeholder, we remove it with Remove(), which needs to do a second lookup. That's because Insert() and Remove() are implementations of the public API. We need a private API that can do the lookup and the removal of the placeholder, if needed, in a single pass.

Ack, meant RemoveSurface() in comment 0, not Remove().