Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 78 frame->localDOMWindow()->printErrorMessage(targetDocument->domWindow ()->crossDomainAccessErrorMessage(callingWindow)); | 78 frame->localDOMWindow()->printErrorMessage(targetDocument->domWindow ()->crossDomainAccessErrorMessage(callingWindow)); |
| 79 } | 79 } |
| 80 | 80 |
| 81 return false; | 81 return false; |
| 82 } | 82 } |
| 83 | 83 |
| 84 bool BindingSecurity::shouldAllowAccessToFrame(v8::Isolate* isolate, Frame* targ et, SecurityReportingOption reportingOption) | 84 bool BindingSecurity::shouldAllowAccessToFrame(v8::Isolate* isolate, Frame* targ et, SecurityReportingOption reportingOption) |
| 85 { | 85 { |
| 86 if (!target || !target->isLocalFrame()) | 86 if (!target || !target->isLocalFrame()) |
| 87 return false; | 87 return false; |
| 88 | |
| 88 return canAccessDocument(isolate, toLocalFrame(target)->document(), reportin gOption); | 89 return canAccessDocument(isolate, toLocalFrame(target)->document(), reportin gOption); |
| 89 } | 90 } |
| 90 | 91 |
| 91 bool BindingSecurity::shouldAllowAccessToFrame(v8::Isolate* isolate, Frame* targ et, ExceptionState& exceptionState) | 92 bool BindingSecurity::shouldAllowAccessToFrame(v8::Isolate* isolate, Frame* targ et, ExceptionState& exceptionState) |
| 92 { | 93 { |
| 93 if (!target || !target->isLocalFrame()) | 94 if (!target) |
| 94 return false; | 95 return false; |
| 96 | |
| 97 if (target->isRemoteFrame() && target->domWindow()) { | |
| 98 LocalDOMWindow* callingWindow = callingDOMWindow(isolate); | |
| 99 exceptionState.throwSecurityError(target->domWindow()->sanitizedCrossDom ainAccessErrorMessage(callingWindow), target->domWindow()->crossDomainAccessErro rMessage(callingWindow)); | |
| 100 return false; | |
| 101 } | |
| 102 | |
| 95 return canAccessDocument(isolate, toLocalFrame(target)->document(), exceptio nState); | 103 return canAccessDocument(isolate, toLocalFrame(target)->document(), exceptio nState); |
|
alexmos
2015/04/15 17:15:17
It seems like I can also go further and turn canAc
dcheng
2015/04/15 21:03:49
Yes, let's try to simplify this.
| |
| 96 } | 104 } |
| 97 | 105 |
| 98 bool BindingSecurity::shouldAllowAccessToNode(v8::Isolate* isolate, Node* target , ExceptionState& exceptionState) | 106 bool BindingSecurity::shouldAllowAccessToNode(v8::Isolate* isolate, Node* target , ExceptionState& exceptionState) |
| 99 { | 107 { |
| 100 return target && canAccessDocument(isolate, &target->document(), exceptionSt ate); | 108 return target && canAccessDocument(isolate, &target->document(), exceptionSt ate); |
| 101 } | 109 } |
| 102 | 110 |
| 103 } | 111 } |
| OLD | NEW |