Diff
Modified: trunk/Source/WebCore/ChangeLog (127039 => 127040)
--- trunk/Source/WebCore/ChangeLog 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Source/WebCore/ChangeLog 2012-08-29 20:26:05 UTC (rev 127040)
@@ -1,3 +1,14 @@
+2012-08-29 Rob Buis <rb...@rim.com>
+
+ [BlackBerry] Adjust wtf include header style
+ https://bugs.webkit.org/show_bug.cgi?id=95368
+
+ Reviewed by Yong Li.
+
+ Switch to #include <wtf/...> like the other ports.
+
+ * platform/graphics/blackberry/LayerFilterRenderer.h:
+
2012-08-29 Eugene Klyuchnikov <eustas....@gmail.com>
Web Inspector: Timeline: avoid "IPC message too big" on save/load
Modified: trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.h (127039 => 127040)
--- trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.h 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.h 2012-08-29 20:26:05 UTC (rev 127040)
@@ -23,7 +23,6 @@
#include "IntRect.h"
#include "LayerData.h"
-#include "OwnPtr.h"
#include "Texture.h"
#include "TransformationMatrix.h"
@@ -31,6 +30,7 @@
#include <BlackBerryPlatformIntRectRegion.h>
#include <wtf/HashSet.h>
#include <wtf/Noncopyable.h>
+#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/Vector.h>
Modified: trunk/Source/WebKit/blackberry/Api/BlackBerryGlobal.cpp (127039 => 127040)
--- trunk/Source/WebKit/blackberry/Api/BlackBerryGlobal.cpp 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Source/WebKit/blackberry/Api/BlackBerryGlobal.cpp 2012-08-29 20:26:05 UTC (rev 127040)
@@ -29,7 +29,6 @@
#include "JSDOMWindow.h"
#include "JSGlobalData.h"
#include "Logging.h"
-#include "MainThread.h"
#include "MemoryCache.h"
#include "NetworkStateNotifier.h"
#include "PageCache.h"
@@ -41,6 +40,7 @@
#include <BlackBerryPlatformExecutableMessage.h>
#include <BlackBerryPlatformMessageClient.h>
#include <BlackBerryPlatformSettings.h>
+#include <wtf/MainThread.h>
using namespace WebCore;
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (127039 => 127040)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-29 20:26:05 UTC (rev 127040)
@@ -29,7 +29,6 @@
#if ENABLE(BATTERY_STATUS)
#include "BatteryClientBlackBerry.h"
#endif
-#include "CString.h"
#include "CachedImage.h"
#include "Chrome.h"
#include "ChromeClientBlackBerry.h"
@@ -166,6 +165,8 @@
#include <sys/keycodes.h>
#include <unicode/ustring.h> // platform ICU
+#include <wtf/text/CString.h>
+
#ifndef USER_PROCESSES
#include <memalloc.h>
#endif
Modified: trunk/Source/WebKit/blackberry/ChangeLog (127039 => 127040)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-08-29 20:26:05 UTC (rev 127040)
@@ -1,3 +1,23 @@
+2012-08-29 Rob Buis <rb...@rim.com>
+
+ [BlackBerry] Adjust wtf include header style
+ https://bugs.webkit.org/show_bug.cgi?id=95368
+
+ Reviewed by Yong Li.
+
+ Switch to #include <wtf/...> like the other ports.
+
+ * Api/BlackBerryGlobal.cpp:
+ * Api/WebPage.cpp:
+ * WebCoreSupport/ChromeClientBlackBerry.cpp:
+ * WebCoreSupport/GeolocationControllerClientBlackBerry.h:
+ * WebCoreSupport/SelectPopupClient.h:
+ * WebKitSupport/AboutData.cpp:
+ * WebKitSupport/DOMSupport.cpp:
+ * WebKitSupport/GLES2Context.cpp:
+ * WebKitSupport/InPageSearchManager.h:
+ * WebKitSupport/InputHandler.cpp:
+
2012-08-29 Jacky Jiang <zhaji...@rim.com>
[BlackBerry] Remove unused tapGesture in WebPage.cpp
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp (127039 => 127040)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp 2012-08-29 20:26:05 UTC (rev 127040)
@@ -23,7 +23,6 @@
#include "BackingStore.h"
#include "BackingStoreClient.h"
#include "BackingStore_p.h"
-#include "CString.h"
#include "ColorChooser.h"
#include "DatabaseTracker.h"
#include "Document.h"
@@ -70,6 +69,8 @@
#include <BlackBerryPlatformSettings.h>
#include <BlackBerryPlatformWindow.h>
+#include <wtf/text/CString.h>
+
#define DEBUG_OVERFLOW_DETECTION 0
using namespace BlackBerry::WebKit;
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.h (127039 => 127040)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.h 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/GeolocationControllerClientBlackBerry.h 2012-08-29 20:26:05 UTC (rev 127040)
@@ -22,7 +22,7 @@
#include <BlackBerryPlatformGeoTracker.h>
#include <BlackBerryPlatformGeoTrackerListener.h>
#include <GeolocationClient.h>
-#include <RefPtr.h>
+#include <wtf/RefPtr.h>
namespace BlackBerry {
namespace WebKit {
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.h (127039 => 127040)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.h 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.h 2012-08-29 20:26:05 UTC (rev 127040)
@@ -23,8 +23,8 @@
#include "PagePopupClient.h"
#include "ScopePointer.h"
#include "Timer.h"
-#include "WTFString.h"
#include "WebString.h"
+#include <wtf/text/WTFString.h>
namespace BlackBerry {
namespace WebKit {
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/AboutData.cpp (127039 => 127040)
--- trunk/Source/WebKit/blackberry/WebKitSupport/AboutData.cpp 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/AboutData.cpp 2012-08-29 20:26:05 UTC (rev 127040)
@@ -20,7 +20,6 @@
#include "AboutData.h"
#include "AboutTemplate.html.cpp"
-#include "CString.h"
#include "CacheHelper.h"
#include "CookieManager.h"
#include "JSDOMWindow.h"
@@ -39,6 +38,7 @@
#include <runtime/JSGlobalData.h>
#include <sys/stat.h>
#include <sys/utsname.h>
+#include <wtf/text/CString.h>
using namespace WebCore;
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp (127039 => 127040)
--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp 2012-08-29 20:26:05 UTC (rev 127040)
@@ -33,13 +33,14 @@
#include "RenderTextControl.h"
#include "TextIterator.h"
#include "VisibleSelection.h"
-#include "WTFString.h"
#include "htmlediting.h"
#include "visible_units.h"
#include <limits>
+#include <wtf/text/WTFString.h>
+
using WTF::Vector;
using namespace WebCore;
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/GLES2Context.cpp (127039 => 127040)
--- trunk/Source/WebKit/blackberry/WebKitSupport/GLES2Context.cpp 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/GLES2Context.cpp 2012-08-29 20:26:05 UTC (rev 127040)
@@ -32,7 +32,6 @@
#include "config.h"
#include "GLES2Context.h"
-#include "Assertions.h"
#include "BackingStoreCompositingSurface.h"
#include "Chrome.h"
#include "ChromeClient.h"
@@ -42,6 +41,8 @@
#include <GLES2/gl2.h>
+#include <wtf/Assertions.h>
+
using BlackBerry::Platform::Graphics::Window;
namespace BlackBerry {
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.h (127039 => 127040)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.h 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.h 2012-08-29 20:26:05 UTC (rev 127040)
@@ -20,7 +20,7 @@
#define InPageSearchManager_h
#include "FindOptions.h"
-#include "WTFString.h"
+#include <wtf/text/WTFString.h>
namespace WebCore {
class Frame;
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (127039 => 127040)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-08-29 20:26:05 UTC (rev 127040)
@@ -22,7 +22,6 @@
#include "BackingStore.h"
#include "BackingStoreClient.h"
#include "CSSStyleDeclaration.h"
-#include "CString.h"
#include "Chrome.h"
#include "DOMSupport.h"
#include "DatePickerClient.h"
@@ -68,6 +67,7 @@
#include <BlackBerryPlatformMisc.h>
#include <BlackBerryPlatformSettings.h>
#include <sys/keycodes.h>
+#include <wtf/text/CString.h>
#define ENABLE_INPUT_LOG 0
#define ENABLE_FOCUS_LOG 0
Modified: trunk/Tools/ChangeLog (127039 => 127040)
--- trunk/Tools/ChangeLog 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Tools/ChangeLog 2012-08-29 20:26:05 UTC (rev 127040)
@@ -1,3 +1,19 @@
+2012-08-29 Rob Buis <rb...@rim.com>
+
+ [BlackBerry] Adjust wtf include header style
+ https://bugs.webkit.org/show_bug.cgi?id=95368
+
+ Reviewed by Yong Li.
+
+ Switch to #include <wtf/...> like the other ports.
+
+ * DumpRenderTree/blackberry/DumpRenderTree.cpp:
+ * DumpRenderTree/blackberry/PNGImageEncoder.cpp:
+ * DumpRenderTree/blackberry/PNGImageEncoder.h:
+ * DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp:
+ * DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.h:
+ * DumpRenderTree/blackberry/WorkQueueItemBlackBerry.cpp:
+
2012-08-29 Roger Fong <roger_f...@apple.com>
Update cygwin-downloader.zip to match modified downloader script.
Modified: trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp (127039 => 127040)
--- trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2012-08-29 20:26:05 UTC (rev 127040)
@@ -23,7 +23,6 @@
#include "AccessibilityController.h"
#include "BackForwardController.h"
#include "BackForwardListImpl.h"
-#include "CString.h"
#include "Credential.h"
#include "DatabaseTracker.h"
#include "DocumentLoader.h"
@@ -42,7 +41,6 @@
#include "IntSize.h"
#include "JSDOMBinding.h"
#include "NotImplemented.h"
-#include "OwnArrayPtr.h"
#include "Page.h"
#include "PageGroup.h"
#include "PixelDumpSupport.h"
@@ -55,7 +53,6 @@
#include "TestRunner.h"
#include "TextAffinity.h"
#include "Timer.h"
-#include "Vector.h"
#include "WebCoreTestSupport.h"
#include "WebPage.h"
#include "WebPageClient.h"
@@ -67,6 +64,9 @@
#include <sys/stat.h>
#include <unistd.h>
#include <wtf/NonCopyingSort.h>
+#include <wtf/OwnArrayPtr.h>
+#include <wtf/Vector.h>
+#include <wtf/text/CString.h>
#define SDCARD_PATH "/developer"
Modified: trunk/Tools/DumpRenderTree/blackberry/PNGImageEncoder.cpp (127039 => 127040)
--- trunk/Tools/DumpRenderTree/blackberry/PNGImageEncoder.cpp 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Tools/DumpRenderTree/blackberry/PNGImageEncoder.cpp 2012-08-29 20:26:05 UTC (rev 127040)
@@ -28,7 +28,7 @@
#include "png.h"
}
-#include <OwnArrayPtr.h>
+#include <wtf/OwnArrayPtr.h>
// This code is almost a mirror of the code in WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp
// since we can't include this private WebCore file in a WebKit-client application.
Modified: trunk/Tools/DumpRenderTree/blackberry/PNGImageEncoder.h (127039 => 127040)
--- trunk/Tools/DumpRenderTree/blackberry/PNGImageEncoder.h 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Tools/DumpRenderTree/blackberry/PNGImageEncoder.h 2012-08-29 20:26:05 UTC (rev 127040)
@@ -19,7 +19,7 @@
#ifndef PNGImageEncoder_h
#define PNGImageEncoder_h
-#include <Vector.h>
+#include <wtf/Vector.h>
class SkBitmap;
Modified: trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp (127039 => 127040)
--- trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp 2012-08-29 20:26:05 UTC (rev 127040)
@@ -26,9 +26,9 @@
#include "WebPageClient.h"
#include <BlackBerryPlatformWindow.h>
-#include <MD5.h>
-#include <Vector.h>
#include <skia/SkDevice.h>
+#include <wtf/MD5.h>
+#include <wtf/Vector.h>
using namespace BlackBerry::WebKit;
using namespace BlackBerry;
Modified: trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.h (127039 => 127040)
--- trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.h 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.h 2012-08-29 20:26:05 UTC (rev 127040)
@@ -19,10 +19,10 @@
#ifndef PixelDumpSupportBlackBerry_h
#define PixelDumpSupportBlackBerry_h
-#include <PassRefPtr.h>
-#include <RefCounted.h>
#include <skia/SkBitmap.h>
#include <skia/SkCanvas.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
class BitmapContext : public RefCounted<BitmapContext> {
public:
Modified: trunk/Tools/DumpRenderTree/blackberry/WorkQueueItemBlackBerry.cpp (127039 => 127040)
--- trunk/Tools/DumpRenderTree/blackberry/WorkQueueItemBlackBerry.cpp 2012-08-29 20:23:29 UTC (rev 127039)
+++ trunk/Tools/DumpRenderTree/blackberry/WorkQueueItemBlackBerry.cpp 2012-08-29 20:26:05 UTC (rev 127040)
@@ -22,8 +22,8 @@
#include "DumpRenderTreeBlackBerry.h"
#include "Frame.h"
#include "KURL.h"
-#include "OwnArrayPtr.h"
#include "WebPage.h"
+#include <wtf/OwnArrayPtr.h>
using namespace WebCore;
