Title: [162980] trunk/Source/WebKit2
- Revision
- 162980
- Author
- ander...@apple.com
- Date
- 2014-01-28 16:16:00 -0800 (Tue, 28 Jan 2014)
Log Message
Simplify WebFrame::isMainFrame
https://bugs.webkit.org/show_bug.cgi?id=127812
Reviewed by Sam Weinig.
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::isMainFrame):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (162979 => 162980)
--- trunk/Source/WebKit2/ChangeLog 2014-01-29 00:11:15 UTC (rev 162979)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-29 00:16:00 UTC (rev 162980)
@@ -1,3 +1,13 @@
+2014-01-28 Anders Carlsson <ander...@apple.com>
+
+ Simplify WebFrame::isMainFrame
+ https://bugs.webkit.org/show_bug.cgi?id=127812
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::isMainFrame):
+
2014-01-28 Andy Estes <aes...@apple.com>
[iOS] Set INSTALL_PATH_ACTUAL when building WebKit2 for the iOS Simulator
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (162979 => 162980)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2014-01-29 00:11:15 UTC (rev 162979)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2014-01-29 00:16:00 UTC (rev 162980)
@@ -366,10 +366,10 @@
bool WebFrame::isMainFrame() const
{
- if (WebPage* p = page())
- return p->mainWebFrame() == this;
+ if (!m_coreFrame)
+ return false;
- return false;
+ return m_coreFrame->isMainFrame();
}
String WebFrame::name() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
