Diff
Modified: branches/safari-534.52-branch/Source/_javascript_Core/Configurations/Version.xcconfig (98976 => 98977)
--- branches/safari-534.52-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2011-11-01 17:31:07 UTC (rev 98976)
+++ branches/safari-534.52-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2011-11-01 17:35:24 UTC (rev 98977)
@@ -23,7 +23,7 @@
MAJOR_VERSION = 534;
MINOR_VERSION = 52;
-TINY_VERSION = 8;
+TINY_VERSION = 9;
FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
// The bundle version and short version string are set based on the current build configuration, see below.
Modified: branches/safari-534.52-branch/Source/_javascript_Glue/Configurations/Version.xcconfig (98976 => 98977)
--- branches/safari-534.52-branch/Source/_javascript_Glue/Configurations/Version.xcconfig 2011-11-01 17:31:07 UTC (rev 98976)
+++ branches/safari-534.52-branch/Source/_javascript_Glue/Configurations/Version.xcconfig 2011-11-01 17:35:24 UTC (rev 98977)
@@ -23,7 +23,7 @@
MAJOR_VERSION = 534;
MINOR_VERSION = 52;
-TINY_VERSION = 8;
+TINY_VERSION = 9;
FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
// The bundle version and short version string are set based on the current build configuration, see below.
Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (98976 => 98977)
--- branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-11-01 17:31:07 UTC (rev 98976)
+++ branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-11-01 17:35:24 UTC (rev 98977)
@@ -1,3 +1,26 @@
+2011-10-31 Lucas Forschler <[email protected]>
+
+ Merge 98936
+
+ 2011-10-31 Andy Estes <[email protected]>
+
+ Document pointer not null-checked in FrameView::isOnActivePage()
+ https://bugs.webkit.org/show_bug.cgi?id=71265
+ <rdar://problem/10374427>
+
+ Reviewed by Dan Bernstein.
+
+ Return false in FrameView::isOnActivePage() if m_frame->document() is
+ null. Other calls to m_frame->document() in FrameView also have a null
+ check. The frame can have a null document if the FrameLoader is loading
+ the initial empty document.
+
+ No test possible without triggering assertions in debug builds. This is
+ tracked by <http://webkit.org/b/71264>.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::isOnActivePage):
+
2011-10-31 Matthew Delaney <[email protected]>
Updating patch for revision 98470 to include proper flag name.
Modified: branches/safari-534.52-branch/Source/WebCore/Configurations/Version.xcconfig (98976 => 98977)
--- branches/safari-534.52-branch/Source/WebCore/Configurations/Version.xcconfig 2011-11-01 17:31:07 UTC (rev 98976)
+++ branches/safari-534.52-branch/Source/WebCore/Configurations/Version.xcconfig 2011-11-01 17:35:24 UTC (rev 98977)
@@ -23,7 +23,7 @@
MAJOR_VERSION = 534;
MINOR_VERSION = 52;
-TINY_VERSION = 8;
+TINY_VERSION = 9;
FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
// The bundle version and short version string are set based on the current build configuration, see below.
Modified: branches/safari-534.52-branch/Source/WebCore/page/FrameView.cpp (98976 => 98977)
--- branches/safari-534.52-branch/Source/WebCore/page/FrameView.cpp 2011-11-01 17:31:07 UTC (rev 98976)
+++ branches/safari-534.52-branch/Source/WebCore/page/FrameView.cpp 2011-11-01 17:35:24 UTC (rev 98977)
@@ -2236,7 +2236,9 @@
{
if (m_frame->view() != this)
return false;
- return !m_frame->document()->inPageCache();
+ if (Document* document = m_frame->document())
+ return !document->inPageCache();
+ return false;
}
bool FrameView::shouldSuspendScrollAnimations() const
Modified: branches/safari-534.52-branch/Source/WebKit/mac/Configurations/Version.xcconfig (98976 => 98977)
--- branches/safari-534.52-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2011-11-01 17:31:07 UTC (rev 98976)
+++ branches/safari-534.52-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2011-11-01 17:35:24 UTC (rev 98977)
@@ -23,7 +23,7 @@
MAJOR_VERSION = 534;
MINOR_VERSION = 52;
-TINY_VERSION = 8;
+TINY_VERSION = 9;
FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
// The bundle version and short version string are set based on the current build configuration, see below.
Modified: branches/safari-534.52-branch/Source/WebKit2/Configurations/Version.xcconfig (98976 => 98977)
--- branches/safari-534.52-branch/Source/WebKit2/Configurations/Version.xcconfig 2011-11-01 17:31:07 UTC (rev 98976)
+++ branches/safari-534.52-branch/Source/WebKit2/Configurations/Version.xcconfig 2011-11-01 17:35:24 UTC (rev 98977)
@@ -23,7 +23,7 @@
MAJOR_VERSION = 534;
MINOR_VERSION = 52;
-TINY_VERSION = 8;
+TINY_VERSION = 9;
FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
// The bundle version and short version string are set based on the current build configuration, see below.
