Changeset 135415 in webkit


Ignore:
Timestamp:
Nov 21, 2012, 10:20:16 AM (12 years ago)
Author:
commit-queue@webkit.org
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.bot@gmail.com> on 2012-11-21

  • tests/IDBRequestTest.cpp:

(WebCore::TEST):

Location:
trunk/Source/WebKit/chromium
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/chromium/ChangeLog

    r135414 r135415  
     12012-11-21  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r135409.
     4        http://trac.webkit.org/changeset/135409
     5        https://bugs.webkit.org/show_bug.cgi?id=102959
     6
     7        This patch causes compiling error to Chromium build (Requested
     8        by jianli_ on #webkit).
     9
     10        * tests/IDBRequestTest.cpp:
     11        (WebCore::TEST):
     12
    1132012-11-21  Kevin Ellis  <kevers@chromium.org>
    214

  • trunk/Source/WebKit/chromium/tests/IDBRequestTest.cpp

    r135409 r135415  
    2929
    3030#include "DOMStringList.h"
    31 #include "Document.h"
    32 #include "Frame.h"
    33 #include "FrameTestHelpers.h"
    3431#include "IDBCursorBackendInterface.h"
    3532#include "IDBDatabaseBackendImpl.h"
    3633#include "IDBTransactionCoordinator.h"
    37 #include "WebFrame.h"
    38 #include "WebFrameImpl.h"
    39 #include "WebView.h"
    4034
    4135#include <gtest/gtest.h>
    … …  
    4438
    4539using namespace WebCore;
    46 using namespace WebKit;
    4740
    4841namespace {
    4942
    50 class IDBRequestTest : public testing::Test {
    51 public:
    52     IDBRequestTest()
    53         : m_webView(0)
    54     {
    55     }
    56 
    57     void SetUp() OVERRIDE
    58     {
    59         m_webView = FrameTestHelpers::createWebViewAndLoad("about:blank");
    60         m_webView->setFocus(true);
    61     }
    62 
    63     void TearDown() OVERRIDE
    64     {
    65         m_webView->close();
    66     }
    67 
    68     v8::Handle<v8::Context> context()
    69     {
    70         return static_cast<WebFrameImpl*>(m_webView->mainFrame())->frame()->script()->mainWorldContext();
    71     }
    72 
    73     ScriptExecutionContext* scriptExecutionContext()
    74     {
    75         return static_cast<WebFrameImpl*>(m_webView->mainFrame())->frame()->document();
    76     }
    77 
    78 private:
    79     WebView* m_webView;
    80 };
    81 
    82 TEST_F(IDBRequestTest, EventsAfterStopping)
     43TEST(IDBRequestTest, EventsAfterStopping)
    8344{
    84     v8::HandleScope handleScope;
    85     v8::Context::Scope scope(context());
    86 
     45    ScriptExecutionContext* context = 0;
    8746    IDBTransaction* transaction = 0;
    88     RefPtr<IDBRequest> request = IDBRequest::create(scriptExecutionContext(), IDBAny::createInvalid(), transaction);
     47    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::createInvalid(), transaction);
    8948    EXPECT_EQ(request->readyState(), "pending");
    9049    request->stop();
    … …  
    10160}
    10261
    103 TEST_F(IDBRequestTest, AbortErrorAfterAbort)
     62TEST(IDBRequestTest, AbortErrorAfterAbort)
    10463{
    105     v8::HandleScope handleScope;
    106     v8::Context::Scope scope(context());
    107 
     64    ScriptExecutionContext* context = 0;
    10865    IDBTransaction* transaction = 0;
    109     RefPtr<IDBRequest> request = IDBRequest::create(scriptExecutionContext(), IDBAny::createInvalid(), transaction);
     66    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::createInvalid(), transaction);
    11067    EXPECT_EQ(request->readyState(), "pending");
    11168
Note: See TracChangeset for help on using the changeset viewer.