Title: [117184] trunk/Tools
- Revision
- 117184
- Author
- [email protected]
- Date
- 2012-05-15 16:41:54 -0700 (Tue, 15 May 2012)
Log Message
[chromium] Unreviewed build fix.
Partial revert of r117166 - it appears making DumpRenderTree depend on webkit_platform causes crashes in the
component build, at least on linux. This restores Tools/DumpRenderTree to its pre-r117166 state.
* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
* DumpRenderTree/chromium/TestWebPlugin.cpp:
(TestWebPlugin::initialize):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (117183 => 117184)
--- trunk/Tools/ChangeLog 2012-05-15 23:38:25 UTC (rev 117183)
+++ trunk/Tools/ChangeLog 2012-05-15 23:41:54 UTC (rev 117184)
@@ -1,3 +1,14 @@
+2012-05-15 James Robinson <[email protected]>
+
+ [chromium] Unreviewed build fix.
+
+ Partial revert of r117166 - it appears making DumpRenderTree depend on webkit_platform causes crashes in the
+ component build, at least on linux. This restores Tools/DumpRenderTree to its pre-r117166 state.
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+ * DumpRenderTree/chromium/TestWebPlugin.cpp:
+ (TestWebPlugin::initialize):
+
2012-05-15 Elliot Poger <[email protected]>
add unit test for NRWT's --additional-expectations option
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (117183 => 117184)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-05-15 23:38:25 UTC (rev 117183)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-05-15 23:41:54 UTC (rev 117184)
@@ -78,7 +78,6 @@
'type': 'executable',
'mac_bundle': 1,
'dependencies': [
- '<(source_dir)/Platform/Platform.gyp/Platform.gyp:webkit_platform',
'<(source_dir)/WebKit/chromium/WebKit.gyp:inspector_resources',
'<(source_dir)/WebKit/chromium/WebKit.gyp:webkit',
'<(source_dir)/WTF/WTF.gyp/WTF.gyp:wtf',
Modified: trunk/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp (117183 => 117184)
--- trunk/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp 2012-05-15 23:38:25 UTC (rev 117183)
+++ trunk/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp 2012-05-15 23:41:54 UTC (rev 117184)
@@ -27,10 +27,11 @@
#include "TestWebPlugin.h"
#include "WebFrame.h"
+#include "platform/WebGraphicsContext3D.h"
+#include "WebKit.h"
+#include "platform/WebKitPlatformSupport.h"
#include "WebPluginContainer.h"
#include "WebPluginParams.h"
-#include <public/Platform.h>
-#include <public/WebGraphicsContext3D.h>
#include <wtf/Assertions.h>
#include <wtf/text/CString.h>
@@ -115,7 +116,7 @@
bool TestWebPlugin::initialize(WebPluginContainer* container)
{
WebGraphicsContext3D::Attributes attrs;
- m_context = WebKit::Platform::current()->createOffscreenGraphicsContext3D(attrs);
+ m_context = webKitPlatformSupport()->createOffscreenGraphicsContext3D(attrs);
if (!m_context)
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
