Title: [129666] trunk/Source/WebKit/chromium
- Revision
- 129666
- Author
- leandrogra...@chromium.org
- Date
- 2012-09-26 10:27:13 -0700 (Wed, 26 Sep 2012)
Log Message
[Chromium] Fix find-in-page corner case for detached frames
https://bugs.webkit.org/show_bug.cgi?id=97688
Reviewed by Adam Barth.
Adds a check to prevent crashes when running find-in-page requests
on detached frames.
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::scopeStringMatches):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (129665 => 129666)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-26 17:27:00 UTC (rev 129665)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-26 17:27:13 UTC (rev 129666)
@@ -1,3 +1,16 @@
+2012-09-26 Leandro Gracia Gil <leandrogra...@chromium.org>
+
+ [Chromium] Fix find-in-page corner case for detached frames
+ https://bugs.webkit.org/show_bug.cgi?id=97688
+
+ Reviewed by Adam Barth.
+
+ Adds a check to prevent crashes when running find-in-page requests
+ on detached frames.
+
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::scopeStringMatches):
+
2012-09-26 Ilya Tikhonovsky <loi...@chromium.org>
Web Inspector: NMI: replace manual JS external resources counting with MemoryInstrumentation
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (129665 => 129666)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2012-09-26 17:27:00 UTC (rev 129665)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2012-09-26 17:27:13 UTC (rev 129666)
@@ -1731,7 +1731,7 @@
m_scopingComplete = false;
// Clear highlighting for this frame.
- if (frame() && frame()->editor()->markedTextMatchesAreHighlighted())
+ if (frame() && frame()->page() && frame()->editor()->markedTextMatchesAreHighlighted())
frame()->page()->unmarkAllTextMatches();
// Clear the tickmarks and results cache.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
