Title: [185549] trunk/Source/WebKit2
- Revision
- 185549
- Author
- [email protected]
- Date
- 2015-06-15 04:20:34 -0700 (Mon, 15 Jun 2015)
Log Message
Fix unused private field warning in PageBanner.h
https://bugs.webkit.org/show_bug.cgi?id=145925
Reviewed by Darin Adler.
* WebProcess/WebPage/PageBanner.cpp:
(WebKit::PageBanner::~PageBanner):
* WebProcess/WebPage/PageBanner.h: Initialize m_type, m_webPage, m_mouseDownInBanner, and m_isHidden here instead of in the constructor.
* WebProcess/WebPage/mac/PageBannerMac.mm: Use PLATFORM(MAC) instead of !PLATFORM(IOS), they are same in objc files.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185548 => 185549)
--- trunk/Source/WebKit2/ChangeLog 2015-06-15 11:09:08 UTC (rev 185548)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-15 11:20:34 UTC (rev 185549)
@@ -1,3 +1,15 @@
+2015-06-15 Csaba Osztrogonác <[email protected]>
+
+ Fix unused private field warning in PageBanner.h
+ https://bugs.webkit.org/show_bug.cgi?id=145925
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/WebPage/PageBanner.cpp:
+ (WebKit::PageBanner::~PageBanner):
+ * WebProcess/WebPage/PageBanner.h: Initialize m_type, m_webPage, m_mouseDownInBanner, and m_isHidden here instead of in the constructor.
+ * WebProcess/WebPage/mac/PageBannerMac.mm: Use PLATFORM(MAC) instead of !PLATFORM(IOS), they are same in objc files.
+
2015-06-15 Carlos Garcia Campos <[email protected]>
[SOUP] Make WebKitSoupRequestGeneric independent from CustomProtocolManagerImpl
Modified: trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp (185548 => 185549)
--- trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp 2015-06-15 11:09:08 UTC (rev 185548)
+++ trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp 2015-06-15 11:20:34 UTC (rev 185549)
@@ -33,11 +33,13 @@
PageBanner::~PageBanner()
{
+#if PLATFORM(MAC)
ASSERT(!m_webPage);
+#endif
m_client->pageBannerDestroyed(this);
}
-#if !PLATFORM(COCOA)
+#if !PLATFORM(MAC)
void PageBanner::addToPage(Type, WebPage*)
{
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.h (185548 => 185549)
--- trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.h 2015-06-15 11:09:08 UTC (rev 185548)
+++ trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.h 2015-06-15 11:20:34 UTC (rev 185549)
@@ -83,14 +83,14 @@
explicit PageBanner(CALayer *, int height, Client*);
#endif
- Type m_type;
Client* m_client;
- WebPage* m_webPage;
- bool m_mouseDownInBanner;
- bool m_isHidden;
+#if PLATFORM(MAC)
+ Type m_type = NotSet;
+ WebPage* m_webPage = 0;
+ bool m_mouseDownInBanner = false;
+ bool m_isHidden = false;
-#if PLATFORM(MAC)
RetainPtr<CALayer> m_layer;
int m_height;
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm (185548 => 185549)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm 2015-06-15 11:09:08 UTC (rev 185548)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm 2015-06-15 11:20:34 UTC (rev 185549)
@@ -26,7 +26,7 @@
#include "config.h"
#include "PageBanner.h"
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC)
#include "WebPage.h"
#include <WebCore/FrameView.h>
@@ -42,11 +42,7 @@
}
PageBanner::PageBanner(CALayer *layer, int height, Client* client)
- : m_type(NotSet)
- , m_client(client)
- , m_webPage(0)
- , m_mouseDownInBanner(false)
- , m_isHidden(false)
+ : m_client(client)
, m_layer(layer)
, m_height(height)
{
@@ -170,4 +166,4 @@
} // namespace WebKit
-#endif // !PLATFORM(IOS)
+#endif // PLATFORM(MAC)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
