Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2006, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2003, 2006, 2010 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 38 | 38 |
| 39 struct FrameLoadRequest { | 39 struct FrameLoadRequest { |
| 40 STACK_ALLOCATED(); | 40 STACK_ALLOCATED(); |
| 41 public: | 41 public: |
| 42 explicit FrameLoadRequest(Document* originDocument) | 42 explicit FrameLoadRequest(Document* originDocument) |
| 43 : m_originDocument(originDocument) | 43 : m_originDocument(originDocument) |
| 44 , m_lockBackForwardList(false) | 44 , m_lockBackForwardList(false) |
| 45 , m_clientRedirect(NotClientRedirect) | 45 , m_clientRedirect(NotClientRedirect) |
| 46 , m_shouldSendReferrer(MaybeSendReferrer) | 46 , m_shouldSendReferrer(MaybeSendReferrer) |
| 47 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) | 47 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) |
| 48 , m_sandboxFlags(SandboxNone) | |
| 48 { | 49 { |
| 49 } | 50 } |
| 50 | 51 |
| 51 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest) | 52 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest) |
| 52 : m_originDocument(originDocument) | 53 : m_originDocument(originDocument) |
| 53 , m_resourceRequest(resourceRequest) | 54 , m_resourceRequest(resourceRequest) |
| 54 , m_lockBackForwardList(false) | 55 , m_lockBackForwardList(false) |
| 55 , m_clientRedirect(NotClientRedirect) | 56 , m_clientRedirect(NotClientRedirect) |
| 56 , m_shouldSendReferrer(MaybeSendReferrer) | 57 , m_shouldSendReferrer(MaybeSendReferrer) |
| 57 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) | 58 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) |
| 59 , m_sandboxFlags(SandboxNone) | |
| 58 { | 60 { |
| 59 } | 61 } |
| 60 | 62 |
| 61 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const AtomicString& frameName) | 63 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const AtomicString& frameName) |
| 62 : m_originDocument(originDocument) | 64 : m_originDocument(originDocument) |
| 63 , m_resourceRequest(resourceRequest) | 65 , m_resourceRequest(resourceRequest) |
| 64 , m_frameName(frameName) | 66 , m_frameName(frameName) |
| 65 , m_lockBackForwardList(false) | 67 , m_lockBackForwardList(false) |
| 66 , m_clientRedirect(NotClientRedirect) | 68 , m_clientRedirect(NotClientRedirect) |
| 67 , m_shouldSendReferrer(MaybeSendReferrer) | 69 , m_shouldSendReferrer(MaybeSendReferrer) |
| 68 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) | 70 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) |
| 71 , m_sandboxFlags(SandboxNone) | |
| 69 { | 72 { |
| 70 } | 73 } |
| 71 | 74 |
| 72 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const AtomicString& frameName, ContentSecurityPolicyDisposition shouldChe ckMainWorldContentSecurityPolicy) | 75 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const AtomicString& frameName, ContentSecurityPolicyDisposition shouldChe ckMainWorldContentSecurityPolicy) |
| 73 : m_originDocument(originDocument) | 76 : m_originDocument(originDocument) |
| 74 , m_resourceRequest(resourceRequest) | 77 , m_resourceRequest(resourceRequest) |
| 75 , m_frameName(frameName) | 78 , m_frameName(frameName) |
| 76 , m_lockBackForwardList(false) | 79 , m_lockBackForwardList(false) |
| 77 , m_clientRedirect(NotClientRedirect) | 80 , m_clientRedirect(NotClientRedirect) |
| 78 , m_shouldSendReferrer(MaybeSendReferrer) | 81 , m_shouldSendReferrer(MaybeSendReferrer) |
| 79 , m_shouldCheckMainWorldContentSecurityPolicy(shouldCheckMainWorldConten tSecurityPolicy) | 82 , m_shouldCheckMainWorldContentSecurityPolicy(shouldCheckMainWorldConten tSecurityPolicy) |
| 83 , m_sandboxFlags(SandboxNone) | |
|
dcheng
2015/01/16 19:11:19
We should probably consider delegated constructors
alexmos
2015/01/17 02:54:42
Oh, neat, didn't realize these are allowed. :) I
| |
| 80 { | 84 { |
| 81 } | 85 } |
| 82 | 86 |
| 87 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const AtomicString& frameName, ContentSecurityPolicyDisposition shouldChe ckMainWorldContentSecurityPolicy, SandboxFlags sandboxFlags) | |
| 88 : m_originDocument(originDocument) | |
| 89 , m_resourceRequest(resourceRequest) | |
| 90 , m_frameName(frameName) | |
| 91 , m_lockBackForwardList(false) | |
| 92 , m_clientRedirect(NotClientRedirect) | |
| 93 , m_shouldSendReferrer(MaybeSendReferrer) | |
| 94 , m_shouldCheckMainWorldContentSecurityPolicy(shouldCheckMainWorldConten tSecurityPolicy) | |
| 95 , m_sandboxFlags(sandboxFlags) | |
| 96 { | |
| 97 } | |
| 98 | |
| 83 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const SubstituteData& substituteData) | 99 FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRe quest, const SubstituteData& substituteData) |
| 84 : m_originDocument(originDocument) | 100 : m_originDocument(originDocument) |
| 85 , m_resourceRequest(resourceRequest) | 101 , m_resourceRequest(resourceRequest) |
| 86 , m_substituteData(substituteData) | 102 , m_substituteData(substituteData) |
| 87 , m_lockBackForwardList(false) | 103 , m_lockBackForwardList(false) |
| 88 , m_clientRedirect(NotClientRedirect) | 104 , m_clientRedirect(NotClientRedirect) |
| 89 , m_shouldSendReferrer(MaybeSendReferrer) | 105 , m_shouldSendReferrer(MaybeSendReferrer) |
| 90 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) | 106 , m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy ) |
| 107 , m_sandboxFlags(SandboxNone) | |
| 91 { | 108 { |
| 92 } | 109 } |
| 93 | 110 |
| 94 Document* originDocument() const { return m_originDocument.get(); } | 111 Document* originDocument() const { return m_originDocument.get(); } |
| 95 | 112 |
| 96 ResourceRequest& resourceRequest() { return m_resourceRequest; } | 113 ResourceRequest& resourceRequest() { return m_resourceRequest; } |
| 97 const ResourceRequest& resourceRequest() const { return m_resourceRequest; } | 114 const ResourceRequest& resourceRequest() const { return m_resourceRequest; } |
| 98 | 115 |
| 99 const AtomicString& frameName() const { return m_frameName; } | 116 const AtomicString& frameName() const { return m_frameName; } |
| 100 void setFrameName(const AtomicString& frameName) { m_frameName = frameName; } | 117 void setFrameName(const AtomicString& frameName) { m_frameName = frameName; } |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 111 void setTriggeringEvent(PassRefPtrWillBeRawPtr<Event> triggeringEvent) { m_t riggeringEvent = triggeringEvent; } | 128 void setTriggeringEvent(PassRefPtrWillBeRawPtr<Event> triggeringEvent) { m_t riggeringEvent = triggeringEvent; } |
| 112 | 129 |
| 113 FormState* formState() const { return m_formState.get(); } | 130 FormState* formState() const { return m_formState.get(); } |
| 114 void setFormState(PassRefPtrWillBeRawPtr<FormState> formState) { m_formState = formState; } | 131 void setFormState(PassRefPtrWillBeRawPtr<FormState> formState) { m_formState = formState; } |
| 115 | 132 |
| 116 ShouldSendReferrer shouldSendReferrer() const { return m_shouldSendReferrer; } | 133 ShouldSendReferrer shouldSendReferrer() const { return m_shouldSendReferrer; } |
| 117 void setShouldSendReferrer(ShouldSendReferrer shouldSendReferrer) { m_should SendReferrer = shouldSendReferrer; } | 134 void setShouldSendReferrer(ShouldSendReferrer shouldSendReferrer) { m_should SendReferrer = shouldSendReferrer; } |
| 118 | 135 |
| 119 ContentSecurityPolicyDisposition shouldCheckMainWorldContentSecurityPolicy() const { return m_shouldCheckMainWorldContentSecurityPolicy; } | 136 ContentSecurityPolicyDisposition shouldCheckMainWorldContentSecurityPolicy() const { return m_shouldCheckMainWorldContentSecurityPolicy; } |
| 120 | 137 |
| 138 const SandboxFlags& sandboxFlags() const { return m_sandboxFlags; } | |
|
dcheng
2015/01/16 19:11:19
Are you intentionally returning a reference here?
alexmos
2015/01/17 02:54:42
Unintentional, fixed.
| |
| 139 | |
| 121 private: | 140 private: |
| 122 RefPtrWillBeMember<Document> m_originDocument; | 141 RefPtrWillBeMember<Document> m_originDocument; |
| 123 ResourceRequest m_resourceRequest; | 142 ResourceRequest m_resourceRequest; |
| 124 AtomicString m_frameName; | 143 AtomicString m_frameName; |
| 125 SubstituteData m_substituteData; | 144 SubstituteData m_substituteData; |
| 126 bool m_lockBackForwardList; | 145 bool m_lockBackForwardList; |
| 127 ClientRedirectPolicy m_clientRedirect; | 146 ClientRedirectPolicy m_clientRedirect; |
| 128 RefPtrWillBeMember<Event> m_triggeringEvent; | 147 RefPtrWillBeMember<Event> m_triggeringEvent; |
| 129 RefPtrWillBeMember<FormState> m_formState; | 148 RefPtrWillBeMember<FormState> m_formState; |
| 130 ShouldSendReferrer m_shouldSendReferrer; | 149 ShouldSendReferrer m_shouldSendReferrer; |
| 131 ContentSecurityPolicyDisposition m_shouldCheckMainWorldContentSecurityPolicy ; | 150 ContentSecurityPolicyDisposition m_shouldCheckMainWorldContentSecurityPolicy ; |
| 151 SandboxFlags m_sandboxFlags; | |
| 132 }; | 152 }; |
| 133 | 153 |
| 134 } | 154 } |
| 135 | 155 |
| 136 #endif // FrameLoadRequest_h | 156 #endif // FrameLoadRequest_h |
| OLD | NEW |