From cad810f21b803229eb11403f9209855525a25d57 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 6 May 2011 11:45:16 +0100 Subject: Merge WebKit at r75315: Initial merge by git. Change-Id: I570314b346ce101c935ed22a626b48c2af266b84 --- .../bindings/v8/specialization/V8BindingState.cpp | 97 ++++++++++++++++++++++ .../bindings/v8/specialization/V8BindingState.h | 72 ++++++++++++++++ 2 files changed, 169 insertions(+) create mode 100644 Source/WebCore/bindings/v8/specialization/V8BindingState.cpp create mode 100644 Source/WebCore/bindings/v8/specialization/V8BindingState.h (limited to 'Source/WebCore/bindings/v8/specialization') diff --git a/Source/WebCore/bindings/v8/specialization/V8BindingState.cpp b/Source/WebCore/bindings/v8/specialization/V8BindingState.cpp new file mode 100644 index 0000000..891272c --- /dev/null +++ b/Source/WebCore/bindings/v8/specialization/V8BindingState.cpp @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "V8BindingState.h" + +#include "Frame.h" +#include "ScriptController.h" +#include "V8Proxy.h" +#include + +namespace WebCore { + +State* State::Only() +{ + DEFINE_STATIC_LOCAL(State, globalV8BindingState, ()); + return &globalV8BindingState; +} + +DOMWindow* State::activeWindow() +{ + v8::Local activeContext = v8::Context::GetCalling(); + if (activeContext.IsEmpty()) { + // There is a single activation record on the stack, so that must + // be the activeContext. + activeContext = v8::Context::GetCurrent(); + } + return V8Proxy::retrieveWindow(activeContext); +} + +DOMWindow* State::firstWindow() +{ + return V8Proxy::retrieveWindow(v8::Context::GetEntered()); +} + +Frame* State::activeFrame() +{ + Frame* frame = V8Proxy::retrieveFrameForCallingContext(); + if (!frame) { + // Unfortunately, when processing script from a plug-in, we might not + // have a calling context. In those cases, we fall back to the + // entered context for security checks. + // FIXME: We need a better API for retrieving frames that abstracts + // away this concern. + frame = V8Proxy::retrieveFrameForEnteredContext(); + } + return frame; +} + +Frame* State::firstFrame() +{ + return V8Proxy::retrieveFrameForEnteredContext(); +} + +void State::immediatelyReportUnsafeAccessTo(Frame* target) +{ + V8Proxy::reportUnsafeAccessTo(target, V8Proxy::ReportNow); +} + +bool State::processingUserGesture() +{ + return ScriptController::processingUserGesture(); +} + +bool State::allowsAccessFromFrame(Frame* frame) +{ + return ScriptController::isSafeScript(frame); +} + +} // namespace WebCore diff --git a/Source/WebCore/bindings/v8/specialization/V8BindingState.h b/Source/WebCore/bindings/v8/specialization/V8BindingState.h new file mode 100644 index 0000000..c472484 --- /dev/null +++ b/Source/WebCore/bindings/v8/specialization/V8BindingState.h @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef V8BindingState_h +#define V8BindingState_h + +#include "GenericBinding.h" +#include "V8Binding.h" + +namespace WebCore { + +class Frame; + +// Singleton implementation of State. Uses V8's global data +// structures to return information about relevant execution state. +template <> +class State : public State { +public: + // Singleton + static State* Only(); + + // Reports an error message (without delay) if the security check fails. + static void immediatelyReportUnsafeAccessTo(Frame*); + + DOMWindow* activeWindow(); + DOMWindow* firstWindow(); + + Frame* activeFrame(); + Frame* firstFrame(); + + bool processingUserGesture(); + + // FIXME: This should be shared in BindingSecurity + bool allowsAccessFromFrame(Frame*); + +private: + explicit State() {} + ~State(); +}; + +typedef State V8BindingState; + +} + +#endif // V8BindingState_h -- cgit v1.1