Title: [99135] trunk/Source/WebCore
- Revision
- 99135
- Author
- [email protected]
- Date
- 2011-11-02 20:33:38 -0700 (Wed, 02 Nov 2011)
Log Message
Fix crashing tests after r99126 (commit for https://bugs.webkit.org/show_bug.cgi?id=71307)
Reviewed by Adam Roben.
* bindings/js/JSDOMWindowShell.cpp:
(WebCore::JSDOMWindowShell::getOwnPropertyNames):
Since we are proxying to the window, we need to pass it as the this object,
not the shell.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (99134 => 99135)
--- trunk/Source/WebCore/ChangeLog 2011-11-03 03:13:48 UTC (rev 99134)
+++ trunk/Source/WebCore/ChangeLog 2011-11-03 03:33:38 UTC (rev 99135)
@@ -1,3 +1,14 @@
+2011-11-02 Sam Weinig <[email protected]>
+
+ Fix crashing tests after r99126 (commit for https://bugs.webkit.org/show_bug.cgi?id=71307)
+
+ Reviewed by Adam Roben.
+
+ * bindings/js/JSDOMWindowShell.cpp:
+ (WebCore::JSDOMWindowShell::getOwnPropertyNames):
+ Since we are proxying to the window, we need to pass it as the this object,
+ not the shell.
+
2011-11-02 Erik Arvidsson <[email protected]>
Remove LegacyDefaultOptionalArguments flag from storage IDL files
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowShell.cpp (99134 => 99135)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowShell.cpp 2011-11-03 03:13:48 UTC (rev 99134)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowShell.cpp 2011-11-03 03:33:38 UTC (rev 99135)
@@ -130,7 +130,7 @@
void JSDOMWindowShell::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
{
JSDOMWindowShell* thisObject = static_cast<JSDOMWindowShell*>(object);
- thisObject->window()->methodTable()->getOwnPropertyNames(thisObject, exec, propertyNames, mode);
+ thisObject->window()->methodTable()->getOwnPropertyNames(thisObject->window(), exec, propertyNames, mode);
}
void JSDOMWindowShell::defineGetter(JSObject* object, ExecState* exec, const Identifier& propertyName, JSObject* getterFunction, unsigned attributes)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
