diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/page/Location.cpp | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/page/Location.cpp')
| -rw-r--r-- | WebCore/page/Location.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/page/Location.cpp b/WebCore/page/Location.cpp index 5adc48d..5754357 100644 --- a/WebCore/page/Location.cpp +++ b/WebCore/page/Location.cpp @@ -82,7 +82,7 @@ String Location::host() const // Note: this is the IE spec. The NS spec swaps the two, it says // "The hostname property is the concatenation of the host and port properties, separated by a colon." const KURL& url = this->url(); - return url.port() ? url.host() + ":" + String::number((static_cast<int>(url.port()))) : url.host(); + return url.port() ? url.host() + ":" + String::number(url.port()) : url.host(); } String Location::hostname() const @@ -99,7 +99,7 @@ String Location::port() const return String(); const KURL& url = this->url(); - return url.port() ? String::number(static_cast<int>(url.port())) : ""; + return url.port() ? String::number(url.port()) : ""; } String Location::pathname() const |