am 4d9b822e: get rid of ISurface

* commit '4d9b822e2c18142e55fe2611aa6cd7dc7d4a62c6':
  get rid of ISurface