Diff
Modified: trunk/Source/WebCore/ChangeLog (111346 => 111347)
--- trunk/Source/WebCore/ChangeLog 2012-03-20 04:04:28 UTC (rev 111346)
+++ trunk/Source/WebCore/ChangeLog 2012-03-20 04:25:21 UTC (rev 111347)
@@ -4,7 +4,25 @@
https://bugs.webkit.org/show_bug.cgi?id=81281
Unreviewed build fix.
+ I also fixed similarly incorrect wtf/ includes for other ports
+ (which aren't yet as strict as Chromium about wtf includes).
+ * platform/blackberry/CookieManager.cpp:
+ * platform/blackberry/CookieParser.cpp:
+ * platform/blackberry/ParsedCookie.cpp:
+ * platform/blackberry/SharedTimerBlackBerry.cpp:
+ * platform/graphics/qt/GraphicsLayerQt.cpp:
+ * platform/graphics/texmap/TextureMapperAnimation.cpp:
+ * rendering/RenderThemeChromiumWin.cpp:
+ (WebCore):
+
+2012-03-19 Eric Seidel <[email protected]>
+
+ Fix CrWin build after r111258.
+ https://bugs.webkit.org/show_bug.cgi?id=81281
+
+ Unreviewed build fix.
+
* platform/graphics/chromium/FontCacheChromiumWin.cpp:
* platform/graphics/chromium/FontPlatformDataChromiumWin.cpp:
* platform/graphics/texmap/TextureMapperAnimation.h:
Modified: trunk/Source/WebCore/platform/blackberry/CookieManager.cpp (111346 => 111347)
--- trunk/Source/WebCore/platform/blackberry/CookieManager.cpp 2012-03-20 04:04:28 UTC (rev 111346)
+++ trunk/Source/WebCore/platform/blackberry/CookieManager.cpp 2012-03-20 04:25:21 UTC (rev 111347)
@@ -33,7 +33,6 @@
#include "CookieDatabaseBackingStore.h"
#include "CookieParser.h"
-#include "CurrentTime.h"
#include "FileSystem.h"
#include "Logging.h"
#include "WebSettings.h"
@@ -42,6 +41,7 @@
#include <BlackBerryPlatformMessageClient.h>
#include <BlackBerryPlatformNavigatorHandler.h>
#include <stdlib.h>
+#include <wtf/CurrentTime.h>
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/platform/blackberry/CookieParser.cpp (111346 => 111347)
--- trunk/Source/WebCore/platform/blackberry/CookieParser.cpp 2012-03-20 04:04:28 UTC (rev 111346)
+++ trunk/Source/WebCore/platform/blackberry/CookieParser.cpp 2012-03-20 04:25:21 UTC (rev 111347)
@@ -27,9 +27,9 @@
#include "config.h"
#include "CookieParser.h"
-#include "CurrentTime.h"
#include "Logging.h"
#include "ParsedCookie.h"
+#include <wtf/CurrentTime.h>
#include <wtf/text/CString.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/blackberry/ParsedCookie.cpp (111346 => 111347)
--- trunk/Source/WebCore/platform/blackberry/ParsedCookie.cpp 2012-03-20 04:04:28 UTC (rev 111346)
+++ trunk/Source/WebCore/platform/blackberry/ParsedCookie.cpp 2012-03-20 04:25:21 UTC (rev 111347)
@@ -28,7 +28,7 @@
#include "ParsedCookie.h"
#include "CookieManager.h"
-#include "CurrentTime.h"
+#include <wtf/CurrentTime.h>
#include "KURL.h"
#include "Logging.h"
#include <curl/curl.h>
Modified: trunk/Source/WebCore/platform/blackberry/SharedTimerBlackBerry.cpp (111346 => 111347)
--- trunk/Source/WebCore/platform/blackberry/SharedTimerBlackBerry.cpp 2012-03-20 04:04:28 UTC (rev 111346)
+++ trunk/Source/WebCore/platform/blackberry/SharedTimerBlackBerry.cpp 2012-03-20 04:25:21 UTC (rev 111347)
@@ -19,7 +19,7 @@
#include "config.h"
#include "SharedTimer.h"
-#include "CurrentTime.h"
+#include <wtf/CurrentTime.h>
#include <BlackBerryPlatformTimer.h>
Modified: trunk/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp (111346 => 111347)
--- trunk/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp 2012-03-20 04:04:28 UTC (rev 111346)
+++ trunk/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp 2012-03-20 04:25:21 UTC (rev 111347)
@@ -22,11 +22,9 @@
#if !defined(QT_NO_GRAPHICSVIEW)
-#include "CurrentTime.h"
#include "FloatRect.h"
#include "GraphicsContext.h"
#include "Image.h"
-#include "RefCounted.h"
#include "TranslateTransformOperation.h"
#include "UnitBezier.h"
#include <qgraphicseffect.h>
@@ -45,6 +43,8 @@
#include <QtGui/qpainter.h>
#include <QtGui/qpixmap.h>
#include <QtGui/qpixmapcache.h>
+#include <wtf/CurrentTime.h>
+#include <wtf/RefCounted.h>
#if USE(TILED_BACKING_STORE)
#include "TiledBackingStore.h"
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp (111346 => 111347)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp 2012-03-20 04:04:28 UTC (rev 111346)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp 2012-03-20 04:25:21 UTC (rev 111347)
@@ -20,8 +20,8 @@
#include "config.h"
#include "TextureMapperAnimation.h"
-#include "CurrentTime.h"
#include "UnitBezier.h"
+#include <wtf/CurrentTime.h>
#if USE(TEXTURE_MAPPER)
namespace WebCore {
Modified: trunk/Source/WebCore/rendering/RenderThemeChromiumWin.cpp (111346 => 111347)
--- trunk/Source/WebCore/rendering/RenderThemeChromiumWin.cpp 2012-03-20 04:04:28 UTC (rev 111346)
+++ trunk/Source/WebCore/rendering/RenderThemeChromiumWin.cpp 2012-03-20 04:25:21 UTC (rev 111347)
@@ -30,7 +30,6 @@
#include <vssym32.h>
#include "CSSValueKeywords.h"
-#include "CurrentTime.h"
#include "FontSelector.h"
#include "FontUtilsChromiumWin.h"
#include "GraphicsContext.h"
@@ -46,7 +45,9 @@
#include "ScrollbarTheme.h"
#include "SystemInfo.h"
#include "TransparencyWin.h"
+#include <wtf/CurrentTime.h>
+
// FIXME: This dependency should eventually be removed.
#include <skia/ext/skia_utils_win.h>
