Modified: trunk/Source/WebCore/ChangeLog (230839 => 230840)
--- trunk/Source/WebCore/ChangeLog 2018-04-20 13:24:22 UTC (rev 230839)
+++ trunk/Source/WebCore/ChangeLog 2018-04-20 16:12:41 UTC (rev 230840)
@@ -1,3 +1,11 @@
+2018-04-20 Chris Dumez <cdu...@apple.com>
+
+ Unreviewed attempt to fix the Windows build after r230831.
+
+ * bindings/js/JSWindowProxy.cpp:
+ (WebCore::JSWindowProxy::create):
+ (WebCore::JSWindowProxy::attachDebugger):
+
2018-04-20 Chris Nardi <cna...@chromium.org>
Omit default value when serializing font-feature-settings
Modified: trunk/Source/WebCore/bindings/js/JSWindowProxy.cpp (230839 => 230840)
--- trunk/Source/WebCore/bindings/js/JSWindowProxy.cpp 2018-04-20 13:24:22 UTC (rev 230839)
+++ trunk/Source/WebCore/bindings/js/JSWindowProxy.cpp 2018-04-20 16:12:41 UTC (rev 230840)
@@ -43,6 +43,8 @@
namespace WebCore {
+using namespace JSC;
+
const ClassInfo JSWindowProxy::s_info = { "JSWindowProxy", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSWindowProxy) };
inline JSWindowProxy::JSWindowProxy(VM& vm, Structure& structure, DOMWrapperWorld& world)
@@ -58,10 +60,10 @@
setWindow(window);
}
-JSWindowProxy& JSWindowProxy::create(JSC::VM& vm, AbstractDOMWindow& window, DOMWrapperWorld& world)
+JSWindowProxy& JSWindowProxy::create(VM& vm, AbstractDOMWindow& window, DOMWrapperWorld& world)
{
- auto& structure = *JSC::Structure::create(vm, 0, jsNull(), JSC::TypeInfo(JSC::PureForwardingProxyType, StructureFlags), info());
- auto& proxy = *new (NotNull, JSC::allocateCell<JSWindowProxy>(vm.heap)) JSWindowProxy(vm, structure, world);
+ auto& structure = *Structure::create(vm, 0, jsNull(), TypeInfo(PureForwardingProxyType, StructureFlags), info());
+ auto& proxy = *new (NotNull, allocateCell<JSWindowProxy>(vm.heap)) JSWindowProxy(vm, structure, world);
proxy.finishCreation(vm, window);
return proxy;
}
@@ -117,7 +119,7 @@
ASSERT(prototype->globalObject() == window);
}
-void JSWindowProxy::attachDebugger(JSC::Debugger* debugger)
+void JSWindowProxy::attachDebugger(Debugger* debugger)
{
auto* globalObject = window();
JSLockHolder lock(globalObject->vm());
@@ -125,7 +127,7 @@
if (debugger)
debugger->attach(globalObject);
else if (auto* currentDebugger = globalObject->debugger())
- currentDebugger->detach(globalObject, JSC::Debugger::TerminatingDebuggingSession);
+ currentDebugger->detach(globalObject, Debugger::TerminatingDebuggingSession);
}
AbstractDOMWindow& JSWindowProxy::wrapped() const
