Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Unified Diff: Source/WebKit/chromium/tests/WebViewTest.cpp

Issue 8378004: Revert 96912 - Always call setActive() in WebViewImpl::setFocus(), (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebKit/chromium/tests/WebFrameTest.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/tests/WebViewTest.cpp
===================================================================
--- Source/WebKit/chromium/tests/WebViewTest.cpp (revision 99235)
+++ Source/WebKit/chromium/tests/WebViewTest.cpp (working copy)
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebView.h"
-
-#include "Document.h"
-#include "FrameTestHelpers.h"
-#include "HTMLDocument.h"
-#include "WebDocument.h"
-#include "WebFrame.h"
-#include "WebFrameImpl.h"
-#include <gtest/gtest.h>
-#include <webkit/support/webkit_support.h>
-
-using namespace WebKit;
-
-namespace {
-
-class WebViewTest : public testing::Test {
-public:
- WebViewTest()
- : m_baseURL("http://www.test.com/")
- {
- }
-
- virtual void TearDown()
- {
- webkit_support::UnregisterAllMockedURLs();
- }
-
-protected:
- std::string m_baseURL;
-};
-
-TEST_F(WebViewTest, FocusIsInactive)
-{
- FrameTestHelpers::registerMockedURLLoad(m_baseURL, "visible_iframe.html");
- WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "visible_iframe.html");
-
- webView->setFocus(true);
- WebFrameImpl* frame = static_cast<WebFrameImpl*>(webView->mainFrame());
- EXPECT_TRUE(frame->frame()->document()->isHTMLDocument());
-
- WebCore::HTMLDocument* document = static_cast<WebCore::HTMLDocument*>(frame->frame()->document());
- EXPECT_TRUE(document->hasFocus());
- webView->setFocus(false);
- EXPECT_FALSE(document->hasFocus());
- webView->setFocus(true);
- EXPECT_TRUE(document->hasFocus());
-
- webView->close();
-}
-
-}
« no previous file with comments | « Source/WebKit/chromium/tests/WebFrameTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698