[webkit-changes] [137926] trunk/Tools

[pilgrim]

Title: [137926] trunk/Tools

Revision

137926

Author

pilg...@chromium.org

Date

2012-12-17 11:32:26 -0800 (Mon, 17 Dec 2012)

Log Message

Use Platform::current() instead of webKitPlatformSupport() in DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=105054

Reviewed by Jochen Eisinger.

Part of a refactoring series; see tracking bug 82948.

* DumpRenderTree/chromium/NotificationPresenter.cpp:
(NotificationPresenter::show):
* DumpRenderTree/chromium/Task.cpp:
(postTask):
* DumpRenderTree/chromium/TestRunner/src/WebTestPlugin.cpp:

Modified Paths

• trunk/Tools/ChangeLog
• trunk/Tools/DumpRenderTree/chromium/NotificationPresenter.cpp
• trunk/Tools/DumpRenderTree/chromium/Task.cpp
• trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestPlugin.cpp

Diff

Modified: trunk/Tools/ChangeLog (137925 => 137926)

--- trunk/Tools/ChangeLog	2012-12-17 19:21:05 UTC (rev 137925)
+++ trunk/Tools/ChangeLog	2012-12-17 19:32:26 UTC (rev 137926)
@@ -1,3 +1,18 @@
+2012-12-17  Mark Pilgrim  <pilg...@chromium.org>
+
+        Use Platform::current() instead of webKitPlatformSupport() in DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=105054
+
+        Reviewed by Jochen Eisinger.
+
+        Part of a refactoring series; see tracking bug 82948.
+
+        * DumpRenderTree/chromium/NotificationPresenter.cpp:
+        (NotificationPresenter::show):
+        * DumpRenderTree/chromium/Task.cpp:
+        (postTask):
+        * DumpRenderTree/chromium/TestRunner/src/WebTestPlugin.cpp:
+
 2012-12-17  Emil A Eklund  <e...@chromium.org>
 
         Clamp values in LayoutUnit::operator/ when SATURATED_LAYOUT_ARITHMETIC is enabled

Modified: trunk/Tools/DumpRenderTree/chromium/NotificationPresenter.cpp (137925 => 137926)

--- trunk/Tools/DumpRenderTree/chromium/NotificationPresenter.cpp	2012-12-17 19:21:05 UTC (rev 137925)
+++ trunk/Tools/DumpRenderTree/chromium/NotificationPresenter.cpp	2012-12-17 19:32:26 UTC (rev 137926)
@@ -34,13 +34,13 @@
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
 
 #include "WebKit.h"
-#include "platform/WebKitPlatformSupport.h"
 #include "WebNotification.h"
 #include "WebNotificationPermissionCallback.h"
 #include "WebSecurityOrigin.h"
 #include "platform/WebString.h"
 #include "platform/WebURL.h"
 #include "googleurl/src/gurl.h"
+#include <public/Platform.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
@@ -111,7 +111,7 @@
     WTF::String id(identifier.data(), identifier.length());
     m_activeNotifications.set(id, notification);
 
-    webKitPlatformSupport()->callOnMainThread(deferredDisplayDispatch, new WebNotification(notification));
+    Platform::current()->callOnMainThread(deferredDisplayDispatch, new WebNotification(notification));
     return true;
 }
 

Modified: trunk/Tools/DumpRenderTree/chromium/Task.cpp (137925 => 137926)

--- trunk/Tools/DumpRenderTree/chromium/Task.cpp	2012-12-17 19:21:05 UTC (rev 137925)
+++ trunk/Tools/DumpRenderTree/chromium/Task.cpp	2012-12-17 19:32:26 UTC (rev 137926)
@@ -33,8 +33,8 @@
 
 #include "WebKit.h"
 #include "WebTask.h"
-#include "platform/WebKitPlatformSupport.h"
 #include "webkit/support/webkit_support.h"
+#include <public/Platform.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
@@ -70,7 +70,7 @@
 
 void postTask(WebTask* task)
 {
-    webKitPlatformSupport()->callOnMainThread(invokeTask, static_cast<void*>(task));
+    Platform::current()->callOnMainThread(invokeTask, static_cast<void*>(task));
 }
 
 void postDelayedTask(WebTask* task, long long ms)

Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestPlugin.cpp (137925 => 137926)

--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestPlugin.cpp	2012-12-17 19:21:05 UTC (rev 137925)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestPlugin.cpp	2012-12-17 19:32:26 UTC (rev 137926)
@@ -34,10 +34,10 @@
 #include "WebTestDelegate.h"
 #include "WebTouchPoint.h"
 #include "platform/WebGraphicsContext3D.h"
-#include "platform/WebKitPlatformSupport.h"
 #include "public/WebCompositorSupport.h"
 #include "public/WebExternalTextureLayer.h"
 #include "public/WebExternalTextureLayerClient.h"
+#include <public/Platform.h>
 #include <wtf/Assertions.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
@@ -291,7 +291,7 @@
 bool WebTestPluginImpl::initialize(WebPluginContainer* container)
 {
     WebGraphicsContext3D::Attributes attrs;
-    m_context = webKitPlatformSupport()->createOffscreenGraphicsContext3D(attrs);
+    m_context = Platform::current()->createOffscreenGraphicsContext3D(attrs);
     if (!m_context)
         return false;
 
@@ -301,7 +301,7 @@
     if (!initScene())
         return false;
 
-    m_layer = adoptPtr(webKitPlatformSupport()->compositorSupport()->createExternalTextureLayer(this));
+    m_layer = adoptPtr(Platform::current()->compositorSupport()->createExternalTextureLayer(this));
     m_container = container;
     m_container->setWebLayer(m_layer->layer());
     m_container->requestTouchEventType(m_touchEventRequest);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes