Title: [141601] tags/Safari-537.26.5/Source/WebKit2
- Revision
- 141601
- Author
- lforsch...@apple.com
- Date
- 2013-02-01 09:49:49 -0800 (Fri, 01 Feb 2013)
Log Message
Merged r141180. <rdar://problem/13047398>
Modified Paths
Diff
Modified: tags/Safari-537.26.5/Source/WebKit2/ChangeLog (141600 => 141601)
--- tags/Safari-537.26.5/Source/WebKit2/ChangeLog 2013-02-01 17:46:55 UTC (rev 141600)
+++ tags/Safari-537.26.5/Source/WebKit2/ChangeLog 2013-02-01 17:49:49 UTC (rev 141601)
@@ -1,5 +1,20 @@
2013-02-01 Lucas Forschler <lforsch...@apple.com>
+ Merge r141180
+
+ 2013-01-29 Kiran Muppala <cmupp...@apple.com>
+
+ Fix erroneous semicolon causing build failure: if statement has empty body [-Werror,-Wempty-body]
+ https://bugs.webkit.org/show_bug.cgi?id=108241
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::addExistingWebPage): Remove erroneous
+ semicolon following the if condition.
+
+2013-02-01 Lucas Forschler <lforsch...@apple.com>
+
Merge r141167
2013-01-29 Kiran Muppala <cmupp...@apple.com>
Modified: tags/Safari-537.26.5/Source/WebKit2/UIProcess/WebProcessProxy.cpp (141600 => 141601)
--- tags/Safari-537.26.5/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-02-01 17:46:55 UTC (rev 141600)
+++ tags/Safari-537.26.5/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-02-01 17:49:49 UTC (rev 141601)
@@ -178,7 +178,7 @@
{
m_pageMap.set(pageID, webPage);
#if PLATFORM(MAC)
- if (pageIsProcessSuppressible(webPage));
+ if (pageIsProcessSuppressible(webPage))
m_processSuppressiblePages.add(pageID);
updateProcessSuppressionState();
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
