Do we have to leave for a THIRD country?

We are U.S. citizens, want to travel from Tokyo to Shanghai, do some sightseeing and return to Tokyo, where we're eligible for 90-day Japan visitor stamps at the airport. (So we won't have Japanese visas as such when we get to Shanghai because actual advance Japan entry permit are not required in our cases.) Does this fit the Shanghai 144-hour rules?