[webkit-changes] [99584] branches/safari-534.52-branch/Source/WebCore

[lforschler]

Title: [99584] branches/safari-534.52-branch/Source/WebCore

Revision

99584

Author

lforsch...@apple.com

Date

2011-11-08 10:10:56 -0800 (Tue, 08 Nov 2011)

Log Message

Merged r99508.

Modified Paths

branches/safari-534.52-branch/Source/WebCore/ChangeLog
branches/safari-534.52-branch/Source/WebCore/page/FrameView.cpp

Diff

Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (99583 => 99584)

--- branches/safari-534.52-branch/Source/WebCore/ChangeLog	2011-11-08 18:10:31 UTC (rev 99583)
+++ branches/safari-534.52-branch/Source/WebCore/ChangeLog	2011-11-08 18:10:56 UTC (rev 99584)
@@ -1,3 +1,17 @@
+2011-11-08 Lucas Forschler  <lforsch...@apple.com>
+
+    Merge 99508
+
+    2011-11-07  Dan Bernstein  <m...@apple.com>
+
+            <rdar://problem/10405215> REGRESSION (r98178): World of Warcraft Launcher crashes in FrameView::isOnActivePage()
+            https://bugs.webkit.org/show_bug.cgi?id=71743
+
+            Reviewed by Beth Dakin.
+
+            * page/FrameView.cpp:
+            (WebCore::FrameView::isOnActivePage): Added a check for a null m_frame.
+
 2011-10-31  Lucas Forschler  <lforsch...@apple.com>
 
     Merge 98936

Modified: branches/safari-534.52-branch/Source/WebCore/page/FrameView.cpp (99583 => 99584)

--- branches/safari-534.52-branch/Source/WebCore/page/FrameView.cpp	2011-11-08 18:10:31 UTC (rev 99583)
+++ branches/safari-534.52-branch/Source/WebCore/page/FrameView.cpp	2011-11-08 18:10:56 UTC (rev 99584)
@@ -2234,6 +2234,8 @@
 
 bool FrameView::isOnActivePage() const
 {
+    if (!m_frame)
+        return false;
     if (m_frame->view() != this)
         return false;
     if (Document* document = m_frame->document())

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes