Title: [156513] trunk/Source/WebCore
- Revision
- 156513
- Author
- [email protected]
- Date
- 2013-09-26 16:16:07 -0700 (Thu, 26 Sep 2013)
Log Message
[Windows] Unreviewed build fix after r156487.
Add explicit casting needed by MSVC to compile this code. Much
of this could probably be removed when we move to VS2012 or newer.
* bindings/js/JSEventListener.cpp:
(WebCore::JSEventListener::JSEventListener):
* bindings/js/JSEventListener.h:
(WebCore::JSEventListener::jsFunction):
* bridge/jsc/BridgeJSC.cpp:
(JSC::Bindings::Instance::createRuntimeObject):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (156512 => 156513)
--- trunk/Source/WebCore/ChangeLog 2013-09-26 23:00:26 UTC (rev 156512)
+++ trunk/Source/WebCore/ChangeLog 2013-09-26 23:16:07 UTC (rev 156513)
@@ -1,3 +1,17 @@
+2013-09-26 Brent Fulgham <[email protected]>
+
+ [Windows] Unreviewed build fix after r156487.
+
+ Add explicit casting needed by MSVC to compile this code. Much
+ of this could probably be removed when we move to VS2012 or newer.
+
+ * bindings/js/JSEventListener.cpp:
+ (WebCore::JSEventListener::JSEventListener):
+ * bindings/js/JSEventListener.h:
+ (WebCore::JSEventListener::jsFunction):
+ * bridge/jsc/BridgeJSC.cpp:
+ (JSC::Bindings::Instance::createRuntimeObject):
+
2013-09-26 Commit Queue <[email protected]>
Unreviewed, rolling out r156510.
Modified: trunk/Source/WebCore/bindings/js/JSEventListener.cpp (156512 => 156513)
--- trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2013-09-26 23:00:26 UTC (rev 156512)
+++ trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2013-09-26 23:16:07 UTC (rev 156513)
@@ -47,7 +47,7 @@
{
if (wrapper) {
JSC::Heap::writeBarrier(wrapper, function);
- m_jsFunction = function;
+ m_jsFunction = JSC::Weak<JSC::JSObject>(function);
} else
ASSERT(!function);
#if ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/bindings/js/JSEventListener.h (156512 => 156513)
--- trunk/Source/WebCore/bindings/js/JSEventListener.h 2013-09-26 23:00:26 UTC (rev 156512)
+++ trunk/Source/WebCore/bindings/js/JSEventListener.h 2013-09-26 23:16:07 UTC (rev 156513)
@@ -85,7 +85,7 @@
if (!m_jsFunction) {
JSC::JSObject* function = initializeJSFunction(scriptExecutionContext);
JSC::Heap::writeBarrier(m_wrapper.get(), function);
- m_jsFunction = function;
+ m_jsFunction = JSC::Weak<JSC::JSObject>(function);
}
// Verify that we have a valid wrapper protecting our function from
Modified: trunk/Source/WebCore/bridge/jsc/BridgeJSC.cpp (156512 => 156513)
--- trunk/Source/WebCore/bridge/jsc/BridgeJSC.cpp 2013-09-26 23:00:26 UTC (rev 156512)
+++ trunk/Source/WebCore/bridge/jsc/BridgeJSC.cpp 2013-09-26 23:16:07 UTC (rev 156513)
@@ -82,7 +82,7 @@
JSLockHolder lock(exec);
RuntimeObject* newObject = newRuntimeObject(exec);
- m_runtimeObject = newObject;
+ m_runtimeObject = JSC::Weak<RuntimeObject>(newObject);
m_rootObject->addRuntimeObject(exec->vm(), newObject);
return newObject;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
