diff options
| author | Steve Block <steveblock@google.com> | 2009-09-03 12:44:53 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-09-07 17:40:09 +0100 |
| commit | f7c85443494ce473356737433ddf02bb70ebc264 (patch) | |
| tree | 771f8079a12b373a7cf2d10f298cbc11ef369274 | |
| parent | bc2cb6973923b5560298950bd824d9627d6ed765 (diff) | |
| download | external_webkit-f7c85443494ce473356737433ddf02bb70ebc264.zip external_webkit-f7c85443494ce473356737433ddf02bb70ebc264.tar.gz external_webkit-f7c85443494ce473356737433ddf02bb70ebc264.tar.bz2 | |
Fixes Coordinates::toString to not print optional parameters that are not specified.
This fixes http://b/issue?id=2103855.
Change-Id: Ie540c7adc056ea0f285b7558b2f33acfcc1ecab2
| -rw-r--r-- | WebCore/page/Coordinates.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/WebCore/page/Coordinates.cpp b/WebCore/page/Coordinates.cpp index 728882a..220c04d 100644 --- a/WebCore/page/Coordinates.cpp +++ b/WebCore/page/Coordinates.cpp @@ -30,9 +30,13 @@ namespace WebCore { String Coordinates::toString() const { - return String::format("coordinate(%.6lg, %.6lg, %.6lg, %.6lg, %.6lg, %.6lg, %.6lg)", - m_latitude, m_longitude, m_altitude, m_accuracy, - m_altitudeAccuracy, m_heading, m_speed); + return String::format("coordinates(latitude: %.6lg, longitude: %.6lg", m_latitude, m_longitude) + + (m_canProvideAltitude ? String::format(", altitude: %.6lg", m_altitude) : "") + + String::format(", accuracy: %.6lg", m_accuracy) + + (m_canProvideAltitudeAccuracy ? String::format(", altitudeAccuracy: %.6lg", m_altitudeAccuracy) : "") + + (m_canProvideHeading ? String::format(", heading: %.6lg", m_heading) : "") + + (m_canProvideSpeed ? String::format(", speed: %.6lg", m_speed) : "") + + ")"; } } // namespace WebCore |