Title: [120076] trunk/Source
- Revision
- 120076
- Author
- jocelyn.turco...@nokia.com
- Date
- 2012-06-12 08:04:41 -0700 (Tue, 12 Jun 2012)
Log Message
Using extrernal ICU library on case unsensitive drives will not work
https://bugs.webkit.org/show_bug.cgi?id=70913
Reviewed by Csaba Osztrogonác.
Source/WebCore:
* platform/graphics/surfaces/GraphicsSurface.h:
Source/WebKit2:
* WebProcess/WebPage/UpdateAtlas.cpp:
Source/WTF:
Properly set the include path for the WTF module and for modules using it.
The path should include Source/WTF/wtf only when building WTF itself. Other
modules are expected to include the headers as #include <wtf/Header.h>, so
only add Source/WTF to their include path.
"unicode/utf8.h" should now then always reference to ICU in the include path
and "wtf/unicode/UTF8.h" reference to the WTF version.
This will work as long as WTF object files don't depend on ICU themselves.
Removed gobject, qt and unicode from the include path as those directories
don't exist anymore.
* WTF.pri:
* WTF.pro:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (120075 => 120076)
--- trunk/Source/WTF/ChangeLog 2012-06-12 14:55:14 UTC (rev 120075)
+++ trunk/Source/WTF/ChangeLog 2012-06-12 15:04:41 UTC (rev 120076)
@@ -1,3 +1,25 @@
+2012-06-11 Jocelyn Turcotte <jocelyn.turco...@nokia.com>
+
+ Using extrernal ICU library on case unsensitive drives will not work
+ https://bugs.webkit.org/show_bug.cgi?id=70913
+
+ Reviewed by Csaba Osztrogonác.
+
+ Properly set the include path for the WTF module and for modules using it.
+ The path should include Source/WTF/wtf only when building WTF itself. Other
+ modules are expected to include the headers as #include <wtf/Header.h>, so
+ only add Source/WTF to their include path.
+
+ "unicode/utf8.h" should now then always reference to ICU in the include path
+ and "wtf/unicode/UTF8.h" reference to the WTF version.
+ This will work as long as WTF object files don't depend on ICU themselves.
+
+ Removed gobject, qt and unicode from the include path as those directories
+ don't exist anymore.
+
+ * WTF.pri:
+ * WTF.pro:
+
2012-06-11 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Fix make distcheck issues.
Modified: trunk/Source/WTF/WTF.pri (120075 => 120076)
--- trunk/Source/WTF/WTF.pri 2012-06-12 14:55:14 UTC (rev 120075)
+++ trunk/Source/WTF/WTF.pri 2012-06-12 15:04:41 UTC (rev 120076)
@@ -7,18 +7,9 @@
load(features)
-SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WTF
+# All external modules should include WTF headers by prefixing with "wtf" (#include <wtf/some/thing.h>).
+INCLUDEPATH += $$PWD
-# FIXME: Including the root directory is a bad idea, likewise
-# no other project besides WTF should need to include WTF sub directories to build!
-INCLUDEPATH += \
- $$SOURCE_DIR/.. \
- $$SOURCE_DIR \
- $$SOURCE_DIR/gobject \
- $$SOURCE_DIR/qt \
- $$SOURCE_DIR/unicode \
- $$SOURCE_DIR/wtf
-
haveQt(5) {
mac {
# Mac OS does ship libicu but not the associated header files.
Modified: trunk/Source/WTF/WTF.pro (120075 => 120076)
--- trunk/Source/WTF/WTF.pro 2012-06-12 14:55:14 UTC (rev 120075)
+++ trunk/Source/WTF/WTF.pro 2012-06-12 15:04:41 UTC (rev 120076)
@@ -12,6 +12,8 @@
VPATH += $$PWD/wtf
+INCLUDEPATH += $$PWD/wtf
+
HEADERS += \
Alignment.h \
AlwaysInline.h \
Modified: trunk/Source/WebCore/ChangeLog (120075 => 120076)
--- trunk/Source/WebCore/ChangeLog 2012-06-12 14:55:14 UTC (rev 120075)
+++ trunk/Source/WebCore/ChangeLog 2012-06-12 15:04:41 UTC (rev 120076)
@@ -1,3 +1,12 @@
+2012-06-11 Jocelyn Turcotte <jocelyn.turco...@nokia.com>
+
+ Using extrernal ICU library on case unsensitive drives will not work
+ https://bugs.webkit.org/show_bug.cgi?id=70913
+
+ Reviewed by Csaba Osztrogonác.
+
+ * platform/graphics/surfaces/GraphicsSurface.h:
+
2012-06-11 Dana Jansens <dan...@chromium.org>
[chromium] Use TextureDrawQuad for video layer output when it produces a single GL texture
Modified: trunk/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h (120075 => 120076)
--- trunk/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h 2012-06-12 14:55:14 UTC (rev 120075)
+++ trunk/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h 2012-06-12 15:04:41 UTC (rev 120076)
@@ -22,10 +22,10 @@
#include "GraphicsContext.h"
#include "IntRect.h"
-#include "OwnPtr.h"
-#include "PassOwnPtr.h"
-#include "RefCounted.h"
-#include "RefPtr.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
+#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
#if USE(GRAPHICS_SURFACE)
Modified: trunk/Source/WebKit2/ChangeLog (120075 => 120076)
--- trunk/Source/WebKit2/ChangeLog 2012-06-12 14:55:14 UTC (rev 120075)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-12 15:04:41 UTC (rev 120076)
@@ -1,3 +1,12 @@
+2012-06-11 Jocelyn Turcotte <jocelyn.turco...@nokia.com>
+
+ Using extrernal ICU library on case unsensitive drives will not work
+ https://bugs.webkit.org/show_bug.cgi?id=70913
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WebProcess/WebPage/UpdateAtlas.cpp:
+
2012-06-12 Kenneth Rohde Christiansen <kenn...@webkit.org>
[Qt] Do not move/scale content while the user is interacting with it
Modified: trunk/Source/WebKit2/WebProcess/WebPage/UpdateAtlas.cpp (120075 => 120076)
--- trunk/Source/WebKit2/WebProcess/WebPage/UpdateAtlas.cpp 2012-06-12 14:55:14 UTC (rev 120075)
+++ trunk/Source/WebKit2/WebProcess/WebPage/UpdateAtlas.cpp 2012-06-12 15:04:41 UTC (rev 120076)
@@ -24,7 +24,7 @@
#include "GraphicsContext.h"
#include "IntRect.h"
-#include "MathExtras.h"
+#include <wtf/MathExtras.h>
using namespace WebCore;
namespace WebKit {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
