Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / weborigin / KURL.cpp

diff --git a/src/third_party/WebKit/Source/platform/weborigin/KURL.cpp b/src/third_party/WebKit/Source/platform/weborigin/KURL.cpp
index b1901b0..907f877 100644 (file)
--- a/src/third_party/WebKit/Source/platform/weborigin/KURL.cpp
+++ b/src/third_party/WebKit/Source/platform/weborigin/KURL.cpp
@@ -93,7 +93,7 @@ static bool isUnicodeEncoding(const WTF::TextEncoding* encoding)
 
 namespace {
 
-class KURLCharsetConverter FINAL : public url::CharsetConverter {
+class KURLCharsetConverter final : public url::CharsetConverter {
 public:
     // The encoding parameter may be 0, but in this case the object must not be called.
     explicit KURLCharsetConverter(const WTF::TextEncoding* encoding)
@@ -101,7 +101,7 @@ public:
     {
     }
 
-    virtual void ConvertFromUTF16(const url::UTF16Char* input, int inputLength, url::CanonOutput* output) OVERRIDE
+    virtual void ConvertFromUTF16(const url::UTF16Char* input, int inputLength, url::CanonOutput* output) override
     {
         CString encoded = m_encoding->normalizeAndEncode(String(input, inputLength), WTF::URLEncodedEntitiesForUnencodables);
         output->Append(encoded.data(), static_cast<int>(encoded.length()));
@@ -261,31 +261,6 @@ KURL& KURL::operator=(const KURL& other)
     return *this;
 }
 
-#if COMPILER_SUPPORTS(CXX_RVALUE_REFERENCES)
-KURL::KURL(KURL&& other)
-    : m_isValid(other.m_isValid)
-    , m_protocolIsInHTTPFamily(other.m_protocolIsInHTTPFamily)
-    , m_parsed(other.m_parsed)
-    // FIXME: Instead of explicitly casting to String&& here, we should use std::move, but that requires us to
-    // have a standard library that supports move semantics.
-    , m_string(static_cast<String&&>(other.m_string))
-    , m_innerURL(other.m_innerURL.release())
-{
-}
-
-KURL& KURL::operator=(KURL&& other)
-{
-    m_isValid = other.m_isValid;
-    m_protocolIsInHTTPFamily = other.m_protocolIsInHTTPFamily;
-    m_parsed = other.m_parsed;
-    // FIXME: Instead of explicitly casting to String&& here, we should use std::move, but that requires us to
-    // have a standard library that supports move semantics.
-    m_string = static_cast<String&&>(other.m_string);
-    m_innerURL = other.m_innerURL.release();
-    return *this;
-}
-#endif
-
 KURL KURL::copy() const
 {
     KURL result;