Title: [114443] branches/safari-534.57-branch/Source/WebCore
- Revision
- 114443
- Author
- lforsch...@apple.com
- Date
- 2012-04-17 15:15:54 -0700 (Tue, 17 Apr 2012)
Log Message
Merged r113528.
Modified Paths
Diff
Modified: branches/safari-534.57-branch/Source/WebCore/ChangeLog (114442 => 114443)
--- branches/safari-534.57-branch/Source/WebCore/ChangeLog 2012-04-17 22:09:26 UTC (rev 114442)
+++ branches/safari-534.57-branch/Source/WebCore/ChangeLog 2012-04-17 22:15:54 UTC (rev 114443)
@@ -1,3 +1,22 @@
+2012-04-17 Lucas Forschler <lforsch...@apple.com>
+
+ Merge 113528
+
+ 2012-04-06 Oliver Hunt <oli...@apple.com>
+
+ Accessing the returnValue of a modal dialog should be performed directly on the global object.
+ https://bugs.webkit.org/show_bug.cgi?id=83414
+
+ Reviewed by Gavin Barraclough.
+
+ Presumably during the mass-devirtualising of JSObject, this deliberate use of
+ the GlobalObject's property lookup logic directly was replaced with a dynamic
+ call. That results in the DOMWindow filtering out the lookup. This regression
+ was masked by r93567.
+
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::DialogHandler::returnValue):
+
2012-04-16 Lucas Forschler <lforsch...@apple.com>
Merge 111108
Modified: branches/safari-534.57-branch/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (114442 => 114443)
--- branches/safari-534.57-branch/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2012-04-17 22:09:26 UTC (rev 114442)
+++ branches/safari-534.57-branch/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2012-04-17 22:15:54 UTC (rev 114443)
@@ -640,7 +640,7 @@
return jsUndefined();
Identifier identifier(m_exec, "returnValue");
PropertySlot slot;
- if (!m_globalObject->methodTable()->getOwnPropertySlot(m_globalObject, m_exec, identifier, slot))
+ if (!JSGlobalObject::getOwnPropertySlot(m_globalObject, m_exec, identifier, slot))
return jsUndefined();
return slot.getValue(m_exec, identifier);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
