The correct answer is Ukiyo-e.
Kabuki and Noh are two types of traditional Japanese drama, Kabuki being famous for the masks that are often known as kabuki masks in the western hemisphere. Haiku is a type of poetry. Ukiyo-e is what you described, and there's the really famous painting of waves that represents it well.
