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

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2389493002: Revert of Require WebLocalFrame to be created with a non-null client (Closed)
Patch Set: Created 4 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 1460 matching lines...) Expand 10 before | Expand all | Expand 10 after
1471 : WebLocalFrame(scope) 1471 : WebLocalFrame(scope)
1472 , m_frameLoaderClientImpl(FrameLoaderClientImpl::create(this)) 1472 , m_frameLoaderClientImpl(FrameLoaderClientImpl::create(this))
1473 , m_frameWidget(0) 1473 , m_frameWidget(0)
1474 , m_client(client) 1474 , m_client(client)
1475 , m_autofillClient(0) 1475 , m_autofillClient(0)
1476 , m_contentSettingsClient(0) 1476 , m_contentSettingsClient(0)
1477 , m_inputEventsScaleFactorForEmulation(1) 1477 , m_inputEventsScaleFactorForEmulation(1)
1478 , m_webDevToolsFrontend(0) 1478 , m_webDevToolsFrontend(0)
1479 , m_selfKeepAlive(this) 1479 , m_selfKeepAlive(this)
1480 { 1480 {
1481 DCHECK(m_client);
1482 frameCount++; 1481 frameCount++;
1483 } 1482 }
1484 1483
1485 WebLocalFrameImpl::WebLocalFrameImpl(WebRemoteFrame* oldWebFrame, WebFrameClient * client) 1484 WebLocalFrameImpl::WebLocalFrameImpl(WebRemoteFrame* oldWebFrame, WebFrameClient * client)
1486 : WebLocalFrameImpl(oldWebFrame->inShadowTree() ? WebTreeScopeType::Shadow : WebTreeScopeType::Document, client) 1485 : WebLocalFrameImpl(oldWebFrame->inShadowTree() ? WebTreeScopeType::Shadow : WebTreeScopeType::Document, client)
1487 { 1486 {
1488 } 1487 }
1489 1488
1490 WebLocalFrameImpl::~WebLocalFrameImpl() 1489 WebLocalFrameImpl::~WebLocalFrameImpl()
1491 { 1490 {
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
2246 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; 2245 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol;
2247 } else if (metric == "wasAlternateProtocolAvailable") { 2246 } else if (metric == "wasAlternateProtocolAvailable") {
2248 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; 2247 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable;
2249 } else if (metric == "connectionInfo") { 2248 } else if (metric == "connectionInfo") {
2250 feature = UseCounter::ChromeLoadTimesConnectionInfo; 2249 feature = UseCounter::ChromeLoadTimesConnectionInfo;
2251 } 2250 }
2252 UseCounter::count(frame(), feature); 2251 UseCounter::count(frame(), feature);
2253 } 2252 }
2254 2253
2255 } // namespace blink 2254 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebFrameClient.cpp ('k') | third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698