Title: [141622] trunk
Revision
141622
Author
[email protected]
Date
2013-02-01 12:06:55 -0800 (Fri, 01 Feb 2013)

Log Message

[GTK] Add WTFURL source files to the build
https://bugs.webkit.org/show_bug.cgi?id=108215

Reviewed by Benjamin Poulain.

.: 

* Source/autotools/symbols.filter: Force the export of the KURL::string() symbol.
This is required when using the WTFURL backend but otherwise doesn't affect the build.

Source/WebCore: 

* platform/KURLWTFURL.cpp:
(WebCore): Only use the stub implementation of the fileSystemPath method for the
Apple ports, other ports should for now still rely on their platform-specific implementations.

Source/WTF: 

The WTFURL implementation sources are all still guarded by the USE(WTFURL) guard,
meaning that the GTK port still uses the default KURL backend. To use the WTFURL
backend instead, one would have to define WTF_USE_WTFURL in Platform.h.

* GNUmakefile.am: List the directories from which source headers will be included.
Plenty of WTFURL code currently just includes the required header by name rather
than specifying the header path as relative to Source/WTF. In the future all the inclusions
should probaby be changed to include the header through the path relative to Source/WTF.
* GNUmakefile.list.am: Add build targets for the WTFURL source files.
* wtf/url/api/ParsedURL.cpp: Specify the complete path to the required headers and
reorder the inclusions.
* wtf/url/src/URLCanon.h: Ditto.

Modified Paths

Diff

Modified: trunk/ChangeLog (141621 => 141622)


--- trunk/ChangeLog	2013-02-01 19:58:47 UTC (rev 141621)
+++ trunk/ChangeLog	2013-02-01 20:06:55 UTC (rev 141622)
@@ -1,3 +1,13 @@
+2013-02-01  Zan Dobersek  <[email protected]>
+
+        [GTK] Add WTFURL source files to the build
+        https://bugs.webkit.org/show_bug.cgi?id=108215
+
+        Reviewed by Benjamin Poulain.
+
+        * Source/autotools/symbols.filter: Force the export of the KURL::string() symbol.
+        This is required when using the WTFURL backend but otherwise doesn't affect the build.
+
 2013-02-01  Alexis Menard  <[email protected]>
 
         Enable unprefixed CSS transitions by default.

Modified: trunk/Source/WTF/ChangeLog (141621 => 141622)


--- trunk/Source/WTF/ChangeLog	2013-02-01 19:58:47 UTC (rev 141621)
+++ trunk/Source/WTF/ChangeLog	2013-02-01 20:06:55 UTC (rev 141622)
@@ -1,3 +1,23 @@
+2013-02-01  Zan Dobersek  <[email protected]>
+
+        [GTK] Add WTFURL source files to the build
+        https://bugs.webkit.org/show_bug.cgi?id=108215
+
+        Reviewed by Benjamin Poulain.
+
+        The WTFURL implementation sources are all still guarded by the USE(WTFURL) guard,
+        meaning that the GTK port still uses the default KURL backend. To use the WTFURL
+        backend instead, one would have to define WTF_USE_WTFURL in Platform.h.
+
+        * GNUmakefile.am: List the directories from which source headers will be included.
+        Plenty of WTFURL code currently just includes the required header by name rather
+        than specifying the header path as relative to Source/WTF. In the future all the inclusions
+        should probaby be changed to include the header through the path relative to Source/WTF.
+        * GNUmakefile.list.am: Add build targets for the WTFURL source files.
+        * wtf/url/api/ParsedURL.cpp: Specify the complete path to the required headers and
+        reorder the inclusions.
+        * wtf/url/src/URLCanon.h: Ditto.
+
 2013-01-18  Ilya Tikhonovsky  <[email protected]>
 
         Web Inspector: Native Memory Instrumentation: provide edge names and class names for WTF containers and strings

Modified: trunk/Source/WTF/GNUmakefile.am (141621 => 141622)


--- trunk/Source/WTF/GNUmakefile.am	2013-02-01 19:58:47 UTC (rev 141621)
+++ trunk/Source/WTF/GNUmakefile.am	2013-02-01 20:06:55 UTC (rev 141622)
@@ -35,4 +35,6 @@
 	$(global_cppflags) \
 	-I$(srcdir)/Source \
 	-I$(srcdir)/Source/WTF \
-	-I$(srcdir)/Source/WTF/wtf
+	-I$(srcdir)/Source/WTF/wtf \
+	-I$(srcdir)/Source/WTF/wtf/url/api \
+	-I$(srcdir)/Source/WTF/wtf/url/src

Modified: trunk/Source/WTF/GNUmakefile.list.am (141621 => 141622)


--- trunk/Source/WTF/GNUmakefile.list.am	2013-02-01 19:58:47 UTC (rev 141621)
+++ trunk/Source/WTF/GNUmakefile.list.am	2013-02-01 20:06:55 UTC (rev 141622)
@@ -263,6 +263,39 @@
     Source/WTF/wtf/unicode/glib/UnicodeGLib.cpp \
     Source/WTF/wtf/unicode/icu/CollatorICU.cpp \
     Source/WTF/wtf/unicode/icu/UnicodeIcu.h \
+    Source/WTF/wtf/url/api/ParsedURL.cpp \
+    Source/WTF/wtf/url/api/ParsedURL.h \
     Source/WTF/wtf/url/api/URLBuffer.h \
     Source/WTF/wtf/url/api/URLQueryCharsetConverter.h \
+    Source/WTF/wtf/url/api/URLString.cpp \
+    Source/WTF/wtf/url/api/URLString.h \
+    Source/WTF/wtf/url/src/RawURLBuffer.h \
+    Source/WTF/wtf/url/src/URLCanonEtc.cpp \
+    Source/WTF/wtf/url/src/URLCanonFilesystemurl.cpp \
+    Source/WTF/wtf/url/src/URLCanonFileurl.cpp \
+    Source/WTF/wtf/url/src/URLCanonHost.cpp \
+    Source/WTF/wtf/url/src/URLCanonICU.cpp \
+    Source/WTF/wtf/url/src/URLCanonInternal.cpp \
+    Source/WTF/wtf/url/src/URLCanonInternal.h \
+    Source/WTF/wtf/url/src/URLCanonIP.cpp \
+    Source/WTF/wtf/url/src/URLCanonMailto.cpp \
+    Source/WTF/wtf/url/src/URLCanonPath.cpp \
+    Source/WTF/wtf/url/src/URLCanonPathurl.cpp \
+    Source/WTF/wtf/url/src/URLCanonQuery.cpp \
+    Source/WTF/wtf/url/src/URLCanonRelative.cpp \
+    Source/WTF/wtf/url/src/URLCanonStdURL.cpp \
+    Source/WTF/wtf/url/src/URLCanon.h \
+    Source/WTF/wtf/url/src/URLCharacterTypes.cpp \
+    Source/WTF/wtf/url/src/URLCharacterTypes.h \
+    Source/WTF/wtf/url/src/URLComponent.h \
+    Source/WTF/wtf/url/src/URLFile.h \
+    Source/WTF/wtf/url/src/URLParse.cpp \
+    Source/WTF/wtf/url/src/URLParseFile.cpp \
+    Source/WTF/wtf/url/src/URLParseInternal.h \
+    Source/WTF/wtf/url/src/URLParse.h \
+    Source/WTF/wtf/url/src/URLSegments.cpp \
+    Source/WTF/wtf/url/src/URLSegments.h \
+    Source/WTF/wtf/url/src/URLUtil.cpp \
+    Source/WTF/wtf/url/src/URLUtil.h \
+    Source/WTF/wtf/url/src/URLUtilInternal.h \
     Source/WTF/wtf/win/OwnPtrWin.cpp

Modified: trunk/Source/WTF/wtf/url/api/ParsedURL.cpp (141621 => 141622)


--- trunk/Source/WTF/wtf/url/api/ParsedURL.cpp	2013-02-01 19:58:47 UTC (rev 141621)
+++ trunk/Source/WTF/wtf/url/api/ParsedURL.cpp	2013-02-01 20:06:55 UTC (rev 141622)
@@ -30,11 +30,11 @@
 #if USE(WTFURL)
 
 #include <wtf/DataLog.h>
-#include <wtf/RawURLBuffer.h>
-#include <wtf/URLComponent.h>
-#include <wtf/URLUtil.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringImpl.h>
+#include <wtf/url/src/RawURLBuffer.h>
+#include <wtf/url/src/URLComponent.h>
+#include <wtf/url/src/URLUtil.h>
 
 namespace WTF {
 

Modified: trunk/Source/WTF/wtf/url/src/URLCanon.h (141621 => 141622)


--- trunk/Source/WTF/wtf/url/src/URLCanon.h	2013-02-01 19:58:47 UTC (rev 141621)
+++ trunk/Source/WTF/wtf/url/src/URLCanon.h	2013-02-01 20:06:55 UTC (rev 141622)
@@ -31,10 +31,10 @@
 #ifndef URLCanon_h
 #define URLCanon_h
 
-#include "URLBuffer.h"
-#include "URLParse.h"
 #include <stdlib.h>
 #include <wtf/unicode/Unicode.h>
+#include <wtf/url/api/URLBuffer.h>
+#include <wtf/url/src/URLParse.h>
 
 #if USE(WTFURL)
 

Modified: trunk/Source/WebCore/ChangeLog (141621 => 141622)


--- trunk/Source/WebCore/ChangeLog	2013-02-01 19:58:47 UTC (rev 141621)
+++ trunk/Source/WebCore/ChangeLog	2013-02-01 20:06:55 UTC (rev 141622)
@@ -1,3 +1,14 @@
+2013-02-01  Zan Dobersek  <[email protected]>
+
+        [GTK] Add WTFURL source files to the build
+        https://bugs.webkit.org/show_bug.cgi?id=108215
+
+        Reviewed by Benjamin Poulain.
+
+        * platform/KURLWTFURL.cpp:
+        (WebCore): Only use the stub implementation of the fileSystemPath method for the
+        Apple ports, other ports should for now still rely on their platform-specific implementations.
+
 2013-02-01  Mike West  <[email protected]>
 
         Remove call to SecurityOrigin::canAccessDatabase from IDB constructor.

Modified: trunk/Source/WebCore/platform/KURLWTFURL.cpp (141621 => 141622)


--- trunk/Source/WebCore/platform/KURLWTFURL.cpp	2013-02-01 19:58:47 UTC (rev 141621)
+++ trunk/Source/WebCore/platform/KURLWTFURL.cpp	2013-02-01 20:06:55 UTC (rev 141622)
@@ -281,10 +281,12 @@
 }
 
 // FIXME: Get rid of this function from KURL.
+#if PLATFORM(MAC) || PLATFORM(WIN)
 String KURL::fileSystemPath() const
 {
     return string();
 }
+#endif
 
 bool KURL::protocolIs(const char* testProtocol) const
 {

Modified: trunk/Source/autotools/symbols.filter (141621 => 141622)


--- trunk/Source/autotools/symbols.filter	2013-02-01 19:58:47 UTC (rev 141621)
+++ trunk/Source/autotools/symbols.filter	2013-02-01 20:06:55 UTC (rev 141622)
@@ -243,6 +243,7 @@
 _ZN6WebKit22WebGtkExtensionManager6sharedEv;
 _ZN7WebCore28InspectorFrontendClientLocal11isUnderTestEv;
 _ZN7WebCore7Element16createShadowRootERi;
+_ZNK7WebCore4KURL6stringEv;
 
 local:
 _Z*;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to