Diff
Modified: trunk/Source/WebCore/ChangeLog (105861 => 105862)
--- trunk/Source/WebCore/ChangeLog 2012-01-25 11:44:06 UTC (rev 105861)
+++ trunk/Source/WebCore/ChangeLog 2012-01-25 11:44:55 UTC (rev 105862)
@@ -1,3 +1,23 @@
+2012-01-25 Anton Muhin <[email protected]>
+
+ Unreview manual revert of r105843.
+
+ * fileapi/EntryBase.cpp:
+ (WebCore::EntryBase::toURL):
+ * page/SecurityOrigin.cpp:
+ (WebCore::extractInnerURL):
+ * platform/KURL.h:
+ (KURL):
+ * platform/KURLGoogle.cpp:
+ (WebCore):
+ (WebCore::KURLGooglePrivate::setUtf8):
+ (WebCore::KURLGooglePrivate::setAscii):
+ (WebCore::KURLGooglePrivate::initProtocolIsInHTTPFamily):
+ (WebCore::KURLGooglePrivate::copyTo):
+ (WebCore::encodeWithURLEscapeSequences):
+ * platform/KURLGooglePrivate.h:
+ (KURLGooglePrivate):
+
2012-01-25 Noel Gordon <[email protected]>
Use maximum image dimension definition from libwebp
Modified: trunk/Source/WebCore/fileapi/EntryBase.cpp (105861 => 105862)
--- trunk/Source/WebCore/fileapi/EntryBase.cpp 2012-01-25 11:44:06 UTC (rev 105861)
+++ trunk/Source/WebCore/fileapi/EntryBase.cpp 2012-01-25 11:44:55 UTC (rev 105862)
@@ -75,7 +75,7 @@
result.append(DOMFileSystemBase::kExternalPathPrefix);
break;
}
- result.append(encodeWithURLEscapeSequences(m_fullPath));
+ result.append(m_fullPath);
return result.toString();
}
Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (105861 => 105862)
--- trunk/Source/WebCore/page/SecurityOrigin.cpp 2012-01-25 11:44:06 UTC (rev 105861)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp 2012-01-25 11:44:55 UTC (rev 105862)
@@ -82,8 +82,6 @@
// security origin can be parsed using this algorithm.
static KURL extractInnerURL(const KURL& url)
{
- if (url.innerURL())
- return *url.innerURL();
// FIXME: Update this callsite to use the innerURL member function when
// we finish implementing it.
return KURL(ParsedURLString, decodeURLEscapeSequences(url.path()));
Modified: trunk/Source/WebCore/platform/KURL.h (105861 => 105862)
--- trunk/Source/WebCore/platform/KURL.h 2012-01-25 11:44:06 UTC (rev 105861)
+++ trunk/Source/WebCore/platform/KURL.h 2012-01-25 11:44:55 UTC (rev 105862)
@@ -218,13 +218,6 @@
const CString& utf8String() const { return m_url.utf8String(); }
#endif
-
-#if USE(GOOGLEURL)
- const KURL* innerURL() const { return m_url.innerURL(); }
-#else
- const KURL* innerURL() const { return 0; }
-#endif
-
#ifndef NDEBUG
void print() const;
#endif
Modified: trunk/Source/WebCore/platform/KURLGoogle.cpp (105861 => 105862)
--- trunk/Source/WebCore/platform/KURLGoogle.cpp 2012-01-25 11:44:06 UTC (rev 105861)
+++ trunk/Source/WebCore/platform/KURLGoogle.cpp 2012-01-25 11:44:55 UTC (rev 105862)
@@ -174,35 +174,6 @@
{
}
-KURLGooglePrivate::KURLGooglePrivate(const KURLGooglePrivate& o)
- : m_isValid(o.m_isValid)
- , m_protocolIsInHTTPFamily(o.m_protocolIsInHTTPFamily)
- , m_parsed(o.m_parsed)
- , m_utf8(o.m_utf8)
- , m_utf8IsASCII(o.m_utf8IsASCII)
- , m_stringIsValid(o.m_stringIsValid)
- , m_string(o.m_string)
-{
- if (o.m_innerURL.get())
- m_innerURL = adoptPtr(new KURL(o.m_innerURL->copy()));
-}
-
-KURLGooglePrivate& KURLGooglePrivate::operator=(const KURLGooglePrivate& o)
-{
- m_isValid = o.m_isValid;
- m_protocolIsInHTTPFamily = o.m_protocolIsInHTTPFamily;
- m_parsed = o.m_parsed;
- m_utf8 = o.m_utf8;
- m_utf8IsASCII = o.m_utf8IsASCII;
- m_stringIsValid = o.m_stringIsValid;
- m_string = o.m_string;
- if (o.m_innerURL.get())
- m_innerURL = adoptPtr(new KURL(o.m_innerURL->copy()));
- else
- m_innerURL.clear();
- return *this;
-}
-
// Setters for the data. Using the ASCII version when you know the
// data is ASCII will be slightly more efficient. The UTF-8 version
// will always be correct if the caller is unsure.
@@ -226,7 +197,6 @@
m_utf8 = str;
m_stringIsValid = false;
initProtocolIsInHTTPFamily();
- initInnerURL();
}
void KURLGooglePrivate::setAscii(const CString& str)
@@ -235,7 +205,6 @@
m_utf8IsASCII = true;
m_stringIsValid = false;
initProtocolIsInHTTPFamily();
- initInnerURL();
}
void KURLGooglePrivate::init(const KURL& base,
@@ -289,21 +258,6 @@
}
}
-void KURLGooglePrivate::initInnerURL()
-{
- if (!m_isValid) {
- m_innerURL.clear();
- return;
- }
- url_parse::Parsed* innerParsed = m_parsed.inner_parsed();
- if (innerParsed)
- m_innerURL = adoptPtr(new KURL(
- ParsedURLString,
- String(m_utf8.data() + innerParsed->scheme.begin, innerParsed->Length() - innerParsed->scheme.begin)));
- else
- m_innerURL.clear();
-}
-
void KURLGooglePrivate::initProtocolIsInHTTPFamily()
{
if (!m_isValid) {
@@ -331,10 +285,6 @@
dest->m_utf8IsASCII = m_utf8IsASCII;
dest->m_stringIsValid = false;
dest->m_string = String(); // Clear the invalid string to avoid cross thread ref counting.
- if (m_innerURL)
- dest->m_innerURL = adoptPtr(new KURL(m_innerURL->copy()));
- else
- dest->m_innerURL.clear();
}
String KURLGooglePrivate::componentString(const url_parse::Component& comp) const
@@ -877,10 +827,7 @@
buffer.Resize(inputLength * 3);
url_util::EncodeURIComponent(input, inputLength, &buffer);
- String escaped(buffer.data(), buffer.length());
- // Unescape '/'; it's safe and much prettier.
- escaped.replace("%2F", "/");
- return escaped;
+ return String(buffer.data(), buffer.length());
}
bool KURL::isHierarchical() const
Modified: trunk/Source/WebCore/platform/KURLGooglePrivate.h (105861 => 105862)
--- trunk/Source/WebCore/platform/KURLGooglePrivate.h 2012-01-25 11:44:06 UTC (rev 105861)
+++ trunk/Source/WebCore/platform/KURLGooglePrivate.h 2012-01-25 11:44:55 UTC (rev 105862)
@@ -31,7 +31,6 @@
#ifndef KURLGooglePrivate_h
#define KURLGooglePrivate_h
-#include <wtf/OwnPtr.h>
#include <wtf/text/CString.h>
#include <googleurl/src/url_parse.h>
@@ -50,8 +49,6 @@
KURLGooglePrivate();
KURLGooglePrivate(const url_parse::Parsed&, bool isValid);
KURLGooglePrivate(WTF::HashTableDeletedValueType);
- KURLGooglePrivate(const KURLGooglePrivate&);
- KURLGooglePrivate& operator=(const KURLGooglePrivate&);
// Initializes the object. This will call through the backend initializer
// below.
@@ -97,10 +94,7 @@
bool m_protocolIsInHTTPFamily;
url_parse::Parsed m_parsed; // Indexes into the UTF-8 version of the string.
- KURL* innerURL() const { return m_innerURL.get(); }
-
private:
- void initInnerURL();
void initProtocolIsInHTTPFamily();
CString m_utf8;
@@ -113,8 +107,6 @@
mutable bool m_stringIsValid;
mutable String m_string;
-
- OwnPtr<KURL> m_innerURL;
};
} // namespace WebCore
