Title: [219363] trunk/Source/WebCore
- Revision
- 219363
- Author
- [email protected]
- Date
- 2017-07-11 14:09:31 -0700 (Tue, 11 Jul 2017)
Log Message
Unreviewed, fix Windows build after r219355.
* bindings/js/JSDOMWindowCustom.cpp:
(WebCore::addCrossOriginWindowPropertyNames):
(WebCore::addCrossOriginWindowOwnPropertyNames):
(WebCore::JSDOMWindow::getOwnPropertyNames):
(WebCore::addCrossOriginPropertyNames): Deleted.
(WebCore::addCrossOriginOwnPropertyNames): Deleted.
* bindings/js/JSLocationCustom.cpp:
(WebCore::addCrossOriginLocationPropertyNames):
(WebCore::addCrossOriginLocationOwnPropertyNames):
(WebCore::JSLocation::getOwnPropertyNames):
(WebCore::addCrossOriginPropertyNames): Deleted.
(WebCore::addCrossOriginOwnPropertyNames): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (219362 => 219363)
--- trunk/Source/WebCore/ChangeLog 2017-07-11 21:07:49 UTC (rev 219362)
+++ trunk/Source/WebCore/ChangeLog 2017-07-11 21:09:31 UTC (rev 219363)
@@ -1,3 +1,20 @@
+2017-07-11 Chris Dumez <[email protected]>
+
+ Unreviewed, fix Windows build after r219355.
+
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::addCrossOriginWindowPropertyNames):
+ (WebCore::addCrossOriginWindowOwnPropertyNames):
+ (WebCore::JSDOMWindow::getOwnPropertyNames):
+ (WebCore::addCrossOriginPropertyNames): Deleted.
+ (WebCore::addCrossOriginOwnPropertyNames): Deleted.
+ * bindings/js/JSLocationCustom.cpp:
+ (WebCore::addCrossOriginLocationPropertyNames):
+ (WebCore::addCrossOriginLocationOwnPropertyNames):
+ (WebCore::JSLocation::getOwnPropertyNames):
+ (WebCore::addCrossOriginPropertyNames): Deleted.
+ (WebCore::addCrossOriginOwnPropertyNames): Deleted.
+
2017-07-10 Sam Weinig <[email protected]>
[WebIDL] Convert MutationCallback to be a normal generate callback
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (219362 => 219363)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2017-07-11 21:07:49 UTC (rev 219362)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2017-07-11 21:09:31 UTC (rev 219363)
@@ -332,7 +332,7 @@
}
// https://html.spec.whatwg.org/#crossoriginproperties-(-o-)
-static void addCrossOriginPropertyNames(ExecState& state, PropertyNameArray& propertyNames)
+static void addCrossOriginWindowPropertyNames(ExecState& state, PropertyNameArray& propertyNames)
{
static const Identifier* const properties[] = {
&state.propertyNames().blur, &state.propertyNames().close, &state.propertyNames().closed,
@@ -361,9 +361,9 @@
}
// https://html.spec.whatwg.org/#crossoriginownpropertykeys-(-o-)
-static void addCrossOriginOwnPropertyNames(ExecState& state, PropertyNameArray& propertyNames)
+static void addCrossOriginWindowOwnPropertyNames(ExecState& state, PropertyNameArray& propertyNames)
{
- addCrossOriginPropertyNames(state, propertyNames);
+ addCrossOriginWindowPropertyNames(state, propertyNames);
propertyNames.add(state.propertyNames().toStringTagSymbol);
propertyNames.add(state.propertyNames().hasInstanceSymbol);
@@ -380,7 +380,7 @@
if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped(), DoNotReportSecurityError)) {
if (mode.includeDontEnumProperties())
- addCrossOriginOwnPropertyNames(*exec, propertyNames);
+ addCrossOriginWindowOwnPropertyNames(*exec, propertyNames);
return;
}
Base::getOwnPropertyNames(thisObject, exec, propertyNames, mode);
Modified: trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp (219362 => 219363)
--- trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2017-07-11 21:07:49 UTC (rev 219362)
+++ trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2017-07-11 21:09:31 UTC (rev 219363)
@@ -164,7 +164,7 @@
}
// https://html.spec.whatwg.org/#crossoriginproperties-(-o-)
-static void addCrossOriginPropertyNames(ExecState& state, PropertyNameArray& propertyNames)
+static void addCrossOriginLocationPropertyNames(ExecState& state, PropertyNameArray& propertyNames)
{
static const Identifier* const properties[] = { &state.propertyNames().href, &state.propertyNames().replace };
for (auto* property : properties)
@@ -172,9 +172,9 @@
}
// https://html.spec.whatwg.org/#crossoriginownpropertykeys-(-o-)
-static void addCrossOriginOwnPropertyNames(ExecState& state, PropertyNameArray& propertyNames)
+static void addCrossOriginLocationOwnPropertyNames(ExecState& state, PropertyNameArray& propertyNames)
{
- addCrossOriginPropertyNames(state, propertyNames);
+ addCrossOriginLocationPropertyNames(state, propertyNames);
propertyNames.add(state.propertyNames().toStringTagSymbol);
propertyNames.add(state.propertyNames().hasInstanceSymbol);
@@ -186,7 +186,7 @@
JSLocation* thisObject = jsCast<JSLocation*>(object);
if (!BindingSecurity::shouldAllowAccessToFrame(exec, thisObject->wrapped().frame(), DoNotReportSecurityError)) {
if (mode.includeDontEnumProperties())
- addCrossOriginOwnPropertyNames(*exec, propertyNames);
+ addCrossOriginLocationOwnPropertyNames(*exec, propertyNames);
return;
}
Base::getOwnPropertyNames(thisObject, exec, propertyNames, mode);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
