Title: [103256] trunk/Source/WebKit/chromium
- Revision
- 103256
- Author
- e...@google.com
- Date
- 2011-12-19 12:45:15 -0800 (Mon, 19 Dec 2011)
Log Message
Try to fix the Chromium win builder NotNull conflict.
Unreviewed gardening.
* tests/MockGraphicsContext3DTest.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (103255 => 103256)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-19 20:22:31 UTC (rev 103255)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-19 20:45:15 UTC (rev 103256)
@@ -1,3 +1,11 @@
+2011-12-19 Adrienne Walker <e...@google.com>
+
+ Try to fix the Chromium win builder NotNull conflict.
+
+ Unreviewed gardening.
+
+ * tests/MockGraphicsContext3DTest.cpp:
+
2011-12-18 Keishi Hattori <kei...@webkit.org>
Implement <input type=color> UI WebKit chromium part
Modified: trunk/Source/WebKit/chromium/tests/MockGraphicsContext3DTest.cpp (103255 => 103256)
--- trunk/Source/WebKit/chromium/tests/MockGraphicsContext3DTest.cpp 2011-12-19 20:22:31 UTC (rev 103255)
+++ trunk/Source/WebKit/chromium/tests/MockGraphicsContext3DTest.cpp 2011-12-19 20:45:15 UTC (rev 103256)
@@ -35,7 +35,7 @@
using namespace WebCore;
using namespace WebKit;
-using namespace testing;
+using testing::Return;
class FrameCountingContext : public MockWebGraphicsContext3D {
public:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
