Commit 653ea5bd authored by rjw's avatar rjw

Fixed 3128477. Check KJS::Window before saving js objects.

        Reviewed by darin.

        * kwq/KWQKHTMLPart.mm:
        (KWQKHTMLPart::saveWindowProperties):
        (KWQKHTMLPart::saveLocationProperties):
        (KWQKHTMLPart::restoreWindowProperties):
        (KWQKHTMLPart::restoreLocationProperties):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3093 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 28c6394a
2002-12-16 Richard Williamson <rjw@apple.com>
Fixed 3128477. Check KJS::Window before saving js objects.
Reviewed by darin.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::saveWindowProperties):
(KWQKHTMLPart::saveLocationProperties):
(KWQKHTMLPart::restoreWindowProperties):
(KWQKHTMLPart::restoreLocationProperties):
=== Alexander-37 ===
2002-12-16 Maciej Stachowiak <mjs@apple.com>
......
2002-12-16 Richard Williamson <rjw@apple.com>
Fixed 3128477. Check KJS::Window before saving js objects.
Reviewed by darin.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::saveWindowProperties):
(KWQKHTMLPart::saveLocationProperties):
(KWQKHTMLPart::restoreWindowProperties):
(KWQKHTMLPart::restoreLocationProperties):
=== Alexander-37 ===
2002-12-16 Maciej Stachowiak <mjs@apple.com>
......
......@@ -441,22 +441,34 @@ bool KWQKHTMLPart::canCachePage()
void KWQKHTMLPart::saveWindowProperties(SavedProperties *windowProperties)
{
Window::retrieveWindow(this)->saveProperties(*windowProperties);
KJS::Window *window;
window = Window::retrieveWindow(this);
if (window)
window->saveProperties(*windowProperties);
}
void KWQKHTMLPart::saveLocationProperties(SavedProperties *locationProperties)
{
Window::retrieveWindow(this)->location()->saveProperties(*locationProperties);
KJS::Window *window;
window = Window::retrieveWindow(this);
if (window)
window->saveProperties(*locationProperties);
}
void KWQKHTMLPart::restoreWindowProperties(SavedProperties *windowProperties)
{
Window::retrieveWindow(this)->restoreProperties(*windowProperties);
KJS::Window *window;
window = Window::retrieveWindow(this);
if (window)
window->restoreProperties(*windowProperties);
}
void KWQKHTMLPart::restoreLocationProperties(SavedProperties *locationProperties)
{
Window::retrieveWindow(this)->location()->restoreProperties(*locationProperties);
KJS::Window *window;
window = Window::retrieveWindow(this);
if (window)
window->location()->restoreProperties(*locationProperties);
}
void KWQKHTMLPart::openURLFromPageCache(DocumentImpl *doc, RenderObject *renderer, KURL *url, SavedProperties *windowProperties, SavedProperties *locationProperties)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment