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

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

Issue 2706013002: Added support for self.origin in Window and WorkerGlobalScope (Closed)
Patch Set: rebase-update after manifest.json changes Created 3 years, 9 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 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 if (!frame()) 1112 if (!frame())
1113 return; 1113 return;
1114 1114
1115 Page* page = frame()->page(); 1115 Page* page = frame()->page();
1116 if (!page) 1116 if (!page)
1117 return; 1117 return;
1118 1118
1119 page->chromeClient().setStatusbarText(m_defaultStatus); 1119 page->chromeClient().setStatusbarText(m_defaultStatus);
1120 } 1120 }
1121 1121
1122 String LocalDOMWindow::origin() const {
1123 return getExecutionContext()->getSecurityOrigin()->toString();
1124 }
1125
1122 Document* LocalDOMWindow::document() const { 1126 Document* LocalDOMWindow::document() const {
1123 return m_document.get(); 1127 return m_document.get();
1124 } 1128 }
1125 1129
1126 StyleMedia* LocalDOMWindow::styleMedia() const { 1130 StyleMedia* LocalDOMWindow::styleMedia() const {
1127 if (!m_media) 1131 if (!m_media)
1128 m_media = StyleMedia::create(frame()); 1132 m_media = StyleMedia::create(frame());
1129 return m_media.get(); 1133 return m_media.get();
1130 } 1134 }
1131 1135
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
1652 DOMWindow::trace(visitor); 1656 DOMWindow::trace(visitor);
1653 Supplementable<LocalDOMWindow>::trace(visitor); 1657 Supplementable<LocalDOMWindow>::trace(visitor);
1654 } 1658 }
1655 1659
1656 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) { 1660 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) {
1657 visitor->traceWrappers(m_customElements); 1661 visitor->traceWrappers(m_customElements);
1658 DOMWindow::traceWrappers(visitor); 1662 DOMWindow::traceWrappers(visitor);
1659 } 1663 }
1660 1664
1661 } // namespace blink 1665 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalDOMWindow.h ('k') | third_party/WebKit/Source/core/frame/Window.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698