Merge "changing result of layout-test for cherrypick from open-source webkit" into...