OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2000 Simon Hausmann (hausmann@kde.org) | 4 * (C) 2000 Simon Hausmann (hausmann@kde.org) |
5 * (C) 2001 Dirk Mueller (mueller@kde.org) | 5 * (C) 2001 Dirk Mueller (mueller@kde.org) |
6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 if (contentFrame() && completeURL.protocolIsJavaScript()) { | 60 if (contentFrame() && completeURL.protocolIsJavaScript()) { |
61 // Check if the caller can execute script in the context of the content | 61 // Check if the caller can execute script in the context of the content |
62 // frame. NB: This check can be invoked without any JS on the stack for some | 62 // frame. NB: This check can be invoked without any JS on the stack for some |
63 // parser operations. In such case, we use the origin of the frame element's | 63 // parser operations. In such case, we use the origin of the frame element's |
64 // containing document as the caller context. | 64 // containing document as the caller context. |
65 v8::Isolate* isolate = toIsolate(&document()); | 65 v8::Isolate* isolate = toIsolate(&document()); |
66 LocalDOMWindow* accessingWindow = isolate->InContext() | 66 LocalDOMWindow* accessingWindow = isolate->InContext() |
67 ? currentDOMWindow(isolate) | 67 ? currentDOMWindow(isolate) |
68 : document().domWindow(); | 68 : document().domWindow(); |
69 if (!BindingSecurity::shouldAllowAccessToFrame( | 69 if (!BindingSecurity::shouldAllowAccessToFrame( |
70 accessingWindow, contentFrame(), | 70 accessingWindow, *contentFrame(), |
71 BindingSecurity::ErrorReportOption::Report)) | 71 BindingSecurity::ErrorReportOption::Report)) |
72 return false; | 72 return false; |
73 } | 73 } |
74 return true; | 74 return true; |
75 } | 75 } |
76 | 76 |
77 void HTMLFrameElementBase::openURL(bool replaceCurrentItem) { | 77 void HTMLFrameElementBase::openURL(bool replaceCurrentItem) { |
78 if (!isURLAllowed()) | 78 if (!isURLAllowed()) |
79 return; | 79 return; |
80 | 80 |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 | 284 |
285 if (contentDocument()) { | 285 if (contentDocument()) { |
286 contentDocument()->willChangeFrameOwnerProperties( | 286 contentDocument()->willChangeFrameOwnerProperties( |
287 m_marginWidth, marginHeight, m_scrollingMode); | 287 m_marginWidth, marginHeight, m_scrollingMode); |
288 } | 288 } |
289 m_marginHeight = marginHeight; | 289 m_marginHeight = marginHeight; |
290 frameOwnerPropertiesChanged(); | 290 frameOwnerPropertiesChanged(); |
291 } | 291 } |
292 | 292 |
293 } // namespace blink | 293 } // namespace blink |
OLD | NEW |