Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Issue 2159006: Merge 59866 - 20100520 Justin Schuh <jschuh@chromium.org>... (Closed)

Created:
10 years, 7 months ago by jschuh
Modified:
9 years, 6 months ago
Reviewers:
CC:
chromium-reviews
Visibility:
Public.

Description

Merge 59866 - 20100520 Justin Schuh <jschuh@chromium.org>; Reviewed by Adam Barth. Moving frame.src checks out of the bindings https://bugs.webkit.org/show_bug.cgi?id=37815 Moved JavaScript frame.src checks out of bindings and into HTMLFrameElementBase. Added main thread state stack to JavaScriptCore so ExecState is available inside core DOM. Updated affected bindings (except for GObject, which will need to be updated to avoid origin failures inside native code). * Android.jscbindings.mk: * CMakeLists.txt: * GNUmakefile.am: * WebCore.gypi: * WebCore.pro: * WebCore.vcproj/WebCore.vcproj: * WebCore.xcodeproj/project.pbxproj: * bindings/js/JSBindingsAllInOne.cpp: * bindings/js/JSCallbackData.cpp: (WebCore::JSCallbackData::invokeCallback): * bindings/js/JSEventListener.cpp: (WebCore::JSEventListener::handleEvent): * bindings/js/JSInjectedScriptHostCustom.cpp: (WebCore::InjectedScriptHost::createInjectedScript): * bindings/js/JSMainThreadExecState.cpp: Added. * bindings/js/JSMainThreadExecState.h: Added. (WebCore::JSMainThreadExecState::currentState): (WebCore::JSMainThreadExecState::call): (WebCore::JSMainThreadExecState::evaluate): (WebCore::JSMainThreadExecState::JSMainThreadExecState): (WebCore::JSMainThreadExecState::~JSMainThreadExecState): (WebCore::JSMainThreadNullState::JSMainThreadNullState): * bindings/js/ScheduledAction.cpp: (WebCore::ScheduledAction::executeFunctionInContext): (WebCore::ScheduledAction::execute): * bindings/js/ScheduledAction.h: * bindings/js/ScriptController.cpp: (WebCore::ScriptController::evaluateInWorld): (WebCore::ScriptController::canAccessFromCurrentOrigin): * bindings/js/ScriptController.h: * bindings/js/ScriptFunctionCall.cpp: (WebCore::ScriptFunctionCall::call): * bindings/objc/ObjCEventListener.mm: * bindings/objc/WebScriptObject.mm: ([WebScriptObject callWebScriptMethod:withArguments:]): ([WebScriptObject evaluateWebScript:]): * bindings/scripts/CodeGeneratorObjC.pm: * bindings/scripts/test/ObjC/DOMTestCallback.mm: ([DOMTestCallback callbackWithClass1Param:]): ([DOMTestCallback callbackWithClass2Param:strArg:]): ([DOMTestCallback callbackWithNonBoolReturnType:]): ([DOMTestCallback customCallback:class6Param:]): * bindings/scripts/test/ObjC/DOMTestInterface.mm: * bindings/scripts/test/ObjC/DOMTestObj.mm: ([DOMTestObj readOnlyIntAttr]): ([DOMTestObj readOnlyStringAttr]): ([DOMTestObj readOnlyTestObjAttr]): ([DOMTestObj intAttr]): ([DOMTestObj setIntAttr:]): ([DOMTestObj longLongAttr]): ([DOMTestObj setLongLongAttr:]): ([DOMTestObj unsignedLongLongAttr]): ([DOMTestObj setUnsignedLongLongAttr:]): ([DOMTestObj stringAttr]): ([DOMTestObj setStringAttr:]): ([DOMTestObj testObjAttr]): ([DOMTestObj setTestObjAttr:]): ([DOMTestObj attrWithException]): ([DOMTestObj setAttrWithException:]): ([DOMTestObj attrWithSetterException]): ([DOMTestObj setAttrWithSetterException:]): ([DOMTestObj attrWithGetterException]): ([DOMTestObj setAttrWithGetterException:]): ([DOMTestObj customAttr]): ([DOMTestObj setCustomAttr:]): ([DOMTestObj scriptStringAttr]): ([DOMTestObj voidMethod]): ([DOMTestObj voidMethodWithArgs:strArg:objArg:]): ([DOMTestObj intMethod]): ([DOMTestObj intMethodWithArgs:strArg:objArg:]): ([DOMTestObj objMethod]): ([DOMTestObj objMethodWithArgs:strArg:objArg:]): ([DOMTestObj methodThatRequiresAllArgs:objArg:]): ([DOMTestObj methodThatRequiresAllArgsAndThrows:objArg:]): ([DOMTestObj serializedValue:]): ([DOMTestObj methodWithException]): ([DOMTestObj customMethod]): ([DOMTestObj customMethodWithArgs:strArg:objArg:]): ([DOMTestObj customArgsAndException:]): ([DOMTestObj addEventListener:listener:useCapture:]): ([DOMTestObj removeEventListener:listener:useCapture:]): ([DOMTestObj withDynamicFrame]): ([DOMTestObj withDynamicFrameAndArg:]): ([DOMTestObj withDynamicFrameAndOptionalArg:optionalArg:]): ([DOMTestObj withDynamicFrameAndUserGesture:]): ([DOMTestObj withDynamicFrameAndUserGestureASAD:optionalArg:]): ([DOMTestObj withScriptStateVoid]): ([DOMTestObj withScriptStateObj]): ([DOMTestObj withScriptStateVoidException]): ([DOMTestObj withScriptStateObjException]): ([DOMTestObj methodWithOptionalArg:]): ([DOMTestObj methodWithNonOptionalArgAndOptionalArg:opt:]): ([DOMTestObj methodWithNonOptionalArgAndTwoOptionalArgs:opt1:opt2:]): * bindings/v8/ScriptController.cpp: (WebCore::ScriptController::canAccessFromCurrentOrigin): * bindings/v8/ScriptController.h: * html/HTMLFrameElementBase.cpp: (WebCore::HTMLFrameElementBase::isURLAllowed): 20100520 Justin Schuh <jschuh@chromium.org>; Reviewed by Adam Barth. Moving frame.src checks out of the bindings https://bugs.webkit.org/show_bug.cgi?id=37815 * http/tests/security/xssDENIEDiframesrcaliasexpected.txt: * http/tests/security/xssDENIEDiframesrcalias.html: TBR=jschuh@chromium.org BUG=39985 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=48159

Patch Set 1 #

Patch Set 2 : '' #

Unified diffs Side-by-side diffs Delta from patch set Stats (+14 lines, -0 lines) Patch
M WebCore/bindings/v8/ScriptController.h View 1 chunk +2 lines, -0 lines 0 comments Download
M WebCore/bindings/v8/ScriptController.cpp View 1 chunk +5 lines, -0 lines 0 comments Download
M WebCore/html/HTMLFrameElementBase.cpp View 2 chunks +7 lines, -0 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
jschuh
10 years, 7 months ago (2010-05-25 16:53:42 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698