OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
529 STATIC_ASSERT_MATCHING_ENUMS(SandboxFlags::POPUPS, | 529 STATIC_ASSERT_MATCHING_ENUMS(SandboxFlags::POPUPS, |
530 blink::WebSandboxFlags::Popups); | 530 blink::WebSandboxFlags::Popups); |
531 STATIC_ASSERT_MATCHING_ENUMS(SandboxFlags::AUTOMATIC_FEATURES, | 531 STATIC_ASSERT_MATCHING_ENUMS(SandboxFlags::AUTOMATIC_FEATURES, |
532 blink::WebSandboxFlags::AutomaticFeatures); | 532 blink::WebSandboxFlags::AutomaticFeatures); |
533 STATIC_ASSERT_MATCHING_ENUMS(SandboxFlags::POINTER_LOCK, | 533 STATIC_ASSERT_MATCHING_ENUMS(SandboxFlags::POINTER_LOCK, |
534 blink::WebSandboxFlags::PointerLock); | 534 blink::WebSandboxFlags::PointerLock); |
535 STATIC_ASSERT_MATCHING_ENUMS(SandboxFlags::DOCUMENT_DOMAIN, | 535 STATIC_ASSERT_MATCHING_ENUMS(SandboxFlags::DOCUMENT_DOMAIN, |
536 blink::WebSandboxFlags::DocumentDomain); | 536 blink::WebSandboxFlags::DocumentDomain); |
537 STATIC_ASSERT_MATCHING_ENUMS(SandboxFlags::ORIENTATION_LOCK, | 537 STATIC_ASSERT_MATCHING_ENUMS(SandboxFlags::ORIENTATION_LOCK, |
538 blink::WebSandboxFlags::OrientationLock); | 538 blink::WebSandboxFlags::OrientationLock); |
| 539 STATIC_ASSERT_MATCHING_ENUMS( |
| 540 SandboxFlags::PROPAGATES_TO_AUXILIARY, |
| 541 blink::WebSandboxFlags::PropagatesToAuxiliaryBrowsingContexts); |
| 542 STATIC_ASSERT_MATCHING_ENUMS(SandboxFlags::MODALS, |
| 543 blink::WebSandboxFlags::Modals); |
539 STATIC_ASSERT_MATCHING_ENUMS(SandboxFlags::ALL, | 544 STATIC_ASSERT_MATCHING_ENUMS(SandboxFlags::ALL, |
540 blink::WebSandboxFlags::All); | 545 blink::WebSandboxFlags::All); |
541 | 546 |
542 } // namespace | 547 } // namespace |
543 | 548 |
544 // static | 549 // static |
545 RenderFrameImpl* RenderFrameImpl::Create(RenderViewImpl* render_view, | 550 RenderFrameImpl* RenderFrameImpl::Create(RenderViewImpl* render_view, |
546 int32 routing_id) { | 551 int32 routing_id) { |
547 DCHECK(routing_id != MSG_ROUTING_NONE); | 552 DCHECK(routing_id != MSG_ROUTING_NONE); |
548 | 553 |
(...skipping 4368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4917 #elif defined(ENABLE_BROWSER_CDMS) | 4922 #elif defined(ENABLE_BROWSER_CDMS) |
4918 cdm_manager_, | 4923 cdm_manager_, |
4919 #endif | 4924 #endif |
4920 this); | 4925 this); |
4921 } | 4926 } |
4922 | 4927 |
4923 return cdm_factory_; | 4928 return cdm_factory_; |
4924 } | 4929 } |
4925 | 4930 |
4926 } // namespace content | 4931 } // namespace content |
OLD | NEW |