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

Side by Side Diff: Source/web/tests/FrameLoaderClientImplTest.cpp

Issue 1157563004: Revert of Update Blink to use the tree scope info on WebFrame for scoping checks. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/web/tests/ChromeClientImplTest.cpp ('k') | Source/web/tests/FrameTestHelpers.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 protected: 66 protected:
67 virtual void SetUp() override 67 virtual void SetUp() override
68 { 68 {
69 ON_CALL(m_webFrameClient, userAgentOverride(_, _)).WillByDefault(Return( WebString())); 69 ON_CALL(m_webFrameClient, userAgentOverride(_, _)).WillByDefault(Return( WebString()));
70 70
71 FrameTestHelpers::TestWebViewClient webViewClient; 71 FrameTestHelpers::TestWebViewClient webViewClient;
72 m_webView = WebView::create(&webViewClient); 72 m_webView = WebView::create(&webViewClient);
73 // FIXME: http://crbug.com/363843. This needs to find a better way to 73 // FIXME: http://crbug.com/363843. This needs to find a better way to
74 // not create graphics layers. 74 // not create graphics layers.
75 m_webView->settings()->setAcceleratedCompositingEnabled(false); 75 m_webView->settings()->setAcceleratedCompositingEnabled(false);
76 m_mainFrame = WebLocalFrame::create(WebTreeScopeType::Document, &m_webFr ameClient); 76 m_mainFrame = WebLocalFrame::create(&m_webFrameClient);
77 m_webView->setMainFrame(m_mainFrame); 77 m_webView->setMainFrame(m_mainFrame);
78 m_frameLoaderClientImpl = toFrameLoaderClientImpl(toWebLocalFrameImpl(m_ webView->mainFrame())->frame()->loader().client()); 78 m_frameLoaderClientImpl = toFrameLoaderClientImpl(toWebLocalFrameImpl(m_ webView->mainFrame())->frame()->loader().client());
79 } 79 }
80 80
81 virtual void TearDown() override 81 virtual void TearDown() override
82 { 82 {
83 m_webView->close(); 83 m_webView->close();
84 m_mainFrame->close(); 84 m_mainFrame->close();
85 } 85 }
86 86
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 EXPECT_CALL(webFrameClient(), createPluginPlaceholder(mainFrame(), _)) 143 EXPECT_CALL(webFrameClient(), createPluginPlaceholder(mainFrame(), _))
144 .WillOnce(Return(nullptr)); 144 .WillOnce(Return(nullptr));
145 OwnPtrWillBeRawPtr<PluginPlaceholder> pluginPlaceholder = frameLoaderCli ent().createPluginPlaceholder( 145 OwnPtrWillBeRawPtr<PluginPlaceholder> pluginPlaceholder = frameLoaderCli ent().createPluginPlaceholder(
146 document(), url, paramNames, paramValues, mimeType, loadManually); 146 document(), url, paramNames, paramValues, mimeType, loadManually);
147 ASSERT_FALSE(pluginPlaceholder); 147 ASSERT_FALSE(pluginPlaceholder);
148 } 148 }
149 } 149 }
150 150
151 } // namespace 151 } // namespace
152 } // namespace blink 152 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/tests/ChromeClientImplTest.cpp ('k') | Source/web/tests/FrameTestHelpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698