Title: [205801] branches/safari-602-branch/Source/WebCore
- Revision
- 205801
- Author
- [email protected]
- Date
- 2016-09-12 00:54:02 -0700 (Mon, 12 Sep 2016)
Log Message
Merge r204943. rdar://problem/28233330
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (205800 => 205801)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-12 07:54:00 UTC (rev 205800)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-12 07:54:02 UTC (rev 205801)
@@ -1,5 +1,19 @@
2016-09-12 Babak Shafiei <[email protected]>
+ Merge r204943. rdar://problem/28233330
+
+ 2016-08-24 Ryan Haddad <[email protected]>
+
+ Rebaseline bindings tests after r204923.
+
+ Unreviewed test gardening.
+
+ * bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
+ (WebCore::jsTestActiveDOMObjectExcitingAttr):
+ (WebCore::jsTestActiveDOMObjectPrototypeFunctionExcitingFunction):
+
+2016-09-12 Babak Shafiei <[email protected]>
+
Merge r204923. rdar://problem/28233330
2016-08-24 Chris Dumez <[email protected]>
Modified: branches/safari-602-branch/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp (205800 => 205801)
--- branches/safari-602-branch/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2016-09-12 07:54:00 UTC (rev 205800)
+++ branches/safari-602-branch/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2016-09-12 07:54:02 UTC (rev 205801)
@@ -149,7 +149,7 @@
if (UNLIKELY(!castedThis)) {
return throwGetterTypeError(*state, "TestActiveDOMObject", "excitingAttr");
}
- if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->wrapped()))
+ if (!shouldAllowAccessToFrame(state, castedThis->wrapped().frame()))
return JSValue::encode(jsUndefined());
auto& impl = castedThis->wrapped();
JSValue result = jsNumber(impl.excitingAttr());
@@ -189,7 +189,7 @@
if (UNLIKELY(!castedThis))
return throwThisTypeError(*state, "TestActiveDOMObject", "excitingFunction");
ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestActiveDOMObject::info());
- if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->wrapped()))
+ if (!shouldAllowAccessToFrame(state, castedThis->wrapped().frame()))
return JSValue::encode(jsUndefined());
auto& impl = castedThis->wrapped();
if (UNLIKELY(state->argumentCount() < 1))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
