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

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp

Issue 2838603002: Added [SecureContext] to the subtle attribute (Closed)
Patch Set: Magic test starts doing differnt things out of the blue. Need to handle this properly. Avada Kedavr… Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 1411 matching lines...) Expand 10 before | Expand all | Expand 10 after
1422 External* LocalDOMWindow::external() { 1422 External* LocalDOMWindow::external() {
1423 if (!external_) 1423 if (!external_)
1424 external_ = new External; 1424 external_ = new External;
1425 return external_; 1425 return external_;
1426 } 1426 }
1427 1427
1428 bool LocalDOMWindow::isSecureContext() const { 1428 bool LocalDOMWindow::isSecureContext() const {
1429 if (!GetFrame()) 1429 if (!GetFrame())
1430 return false; 1430 return false;
1431 1431
1432 return document()->IsSecureContext( 1432 return document()->IsSecureContext();
1433 ExecutionContext::kStandardSecureContextCheck);
1434 } 1433 }
1435 1434
1436 void LocalDOMWindow::AddedEventListener( 1435 void LocalDOMWindow::AddedEventListener(
1437 const AtomicString& event_type, 1436 const AtomicString& event_type,
1438 RegisteredEventListener& registered_listener) { 1437 RegisteredEventListener& registered_listener) {
1439 DOMWindow::AddedEventListener(event_type, registered_listener); 1438 DOMWindow::AddedEventListener(event_type, registered_listener);
1440 if (GetFrame() && GetFrame()->GetPage()) 1439 if (GetFrame() && GetFrame()->GetPage())
1441 GetFrame()->GetPage()->GetEventHandlerRegistry().DidAddEventHandler( 1440 GetFrame()->GetPage()->GetEventHandlerRegistry().DidAddEventHandler(
1442 *this, event_type, registered_listener.Options()); 1441 *this, event_type, registered_listener.Options());
1443 1442
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
1684 DOMWindow::Trace(visitor); 1683 DOMWindow::Trace(visitor);
1685 Supplementable<LocalDOMWindow>::Trace(visitor); 1684 Supplementable<LocalDOMWindow>::Trace(visitor);
1686 } 1685 }
1687 1686
1688 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) { 1687 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) {
1689 visitor->TraceWrappers(custom_elements_); 1688 visitor->TraceWrappers(custom_elements_);
1690 DOMWindow::TraceWrappers(visitor); 1689 DOMWindow::TraceWrappers(visitor);
1691 } 1690 }
1692 1691
1693 } // namespace blink 1692 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/Deprecation.cpp ('k') | third_party/WebKit/Source/core/frame/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698