Title: [135415] trunk/Source/WebKit/chromium
- Revision
- 135415
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-21 10:20:16 -0800 (Wed, 21 Nov 2012)
Log Message
Unreviewed, rolling out r135409.
http://trac.webkit.org/changeset/135409
https://bugs.webkit.org/show_bug.cgi?id=102959
This patch causes compiling error to Chromium build (Requested
by jianli_ on #webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-11-21
* tests/IDBRequestTest.cpp:
(WebCore::TEST):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (135414 => 135415)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-21 18:09:22 UTC (rev 135414)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-21 18:20:16 UTC (rev 135415)
@@ -1,3 +1,15 @@
+2012-11-21 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r135409.
+ http://trac.webkit.org/changeset/135409
+ https://bugs.webkit.org/show_bug.cgi?id=102959
+
+ This patch causes compiling error to Chromium build (Requested
+ by jianli_ on #webkit).
+
+ * tests/IDBRequestTest.cpp:
+ (WebCore::TEST):
+
2012-11-21 Kevin Ellis <kev...@chromium.org>
[chromium] Add flag to enable/disable touch adjustment at runtime.
Modified: trunk/Source/WebKit/chromium/tests/IDBRequestTest.cpp (135414 => 135415)
--- trunk/Source/WebKit/chromium/tests/IDBRequestTest.cpp 2012-11-21 18:09:22 UTC (rev 135414)
+++ trunk/Source/WebKit/chromium/tests/IDBRequestTest.cpp 2012-11-21 18:20:16 UTC (rev 135415)
@@ -28,64 +28,23 @@
#include "IDBRequest.h"
#include "DOMStringList.h"
-#include "Document.h"
-#include "Frame.h"
-#include "FrameTestHelpers.h"
#include "IDBCursorBackendInterface.h"
#include "IDBDatabaseBackendImpl.h"
#include "IDBTransactionCoordinator.h"
-#include "WebFrame.h"
-#include "WebFrameImpl.h"
-#include "WebView.h"
#include <gtest/gtest.h>
#if ENABLE(INDEXED_DATABASE)
using namespace WebCore;
-using namespace WebKit;
namespace {
-class IDBRequestTest : public testing::Test {
-public:
- IDBRequestTest()
- : m_webView(0)
- {
- }
-
- void SetUp() OVERRIDE
- {
- m_webView = FrameTestHelpers::createWebViewAndLoad("about:blank");
- m_webView->setFocus(true);
- }
-
- void TearDown() OVERRIDE
- {
- m_webView->close();
- }
-
- v8::Handle<v8::Context> context()
- {
- return static_cast<WebFrameImpl*>(m_webView->mainFrame())->frame()->script()->mainWorldContext();
- }
-
- ScriptExecutionContext* scriptExecutionContext()
- {
- return static_cast<WebFrameImpl*>(m_webView->mainFrame())->frame()->document();
- }
-
-private:
- WebView* m_webView;
-};
-
-TEST_F(IDBRequestTest, EventsAfterStopping)
+TEST(IDBRequestTest, EventsAfterStopping)
{
- v8::HandleScope handleScope;
- v8::Context::Scope scope(context());
-
+ ScriptExecutionContext* context = 0;
IDBTransaction* transaction = 0;
- RefPtr<IDBRequest> request = IDBRequest::create(scriptExecutionContext(), IDBAny::createInvalid(), transaction);
+ RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::createInvalid(), transaction);
EXPECT_EQ(request->readyState(), "pending");
request->stop();
@@ -100,13 +59,11 @@
request->onSuccess(IDBKey::createInvalid(), IDBKey::createInvalid(), SerializedScriptValue::nullValue());
}
-TEST_F(IDBRequestTest, AbortErrorAfterAbort)
+TEST(IDBRequestTest, AbortErrorAfterAbort)
{
- v8::HandleScope handleScope;
- v8::Context::Scope scope(context());
-
+ ScriptExecutionContext* context = 0;
IDBTransaction* transaction = 0;
- RefPtr<IDBRequest> request = IDBRequest::create(scriptExecutionContext(), IDBAny::createInvalid(), transaction);
+ RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::createInvalid(), transaction);
EXPECT_EQ(request->readyState(), "pending");
// Simulate the IDBTransaction having received onAbort from back end and aborting the request:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
