Fix build with recent clang.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 12 Aug 2012 11:29:29 +0000 (11:29 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 12 Aug 2012 11:29:29 +0000 (11:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=90701

Patch by Nuno Lopes <nlopes@apple.com> on 2012-08-12
Reviewed by Eric Seidel.

* Shared/CommandLine.h:
(CommandLine):
* WebProcess/Notifications/NotificationPermissionRequestManager.cpp:
(WebKit::NotificationPermissionRequestManager::NotificationPermissionRequestManager):
* WebProcess/Notifications/NotificationPermissionRequestManager.h:
(NotificationPermissionRequestManager):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125370 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/Shared/CommandLine.h
Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp
Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.h

index 3994b5c..8a95bd9 100644 (file)
@@ -1,3 +1,17 @@
+2012-08-12  Nuno Lopes  <nlopes@apple.com>
+
+        Fix build with recent clang.
+        https://bugs.webkit.org/show_bug.cgi?id=90701
+
+        Reviewed by Eric Seidel.
+
+        * Shared/CommandLine.h:
+        (CommandLine):
+        * WebProcess/Notifications/NotificationPermissionRequestManager.cpp:
+        (WebKit::NotificationPermissionRequestManager::NotificationPermissionRequestManager):
+        * WebProcess/Notifications/NotificationPermissionRequestManager.h:
+        (NotificationPermissionRequestManager):
+
 2012-08-11  Sam Weinig  <sam@webkit.org>
 
         Fix the build.
index f70601c..2d79510 100644 (file)
@@ -48,8 +48,6 @@ public:
     }
 
 private:
-    bool m_parsedSuccessfully;
-
     HashMap<String, String> m_args;
 };
 
index 4edfe5a..6d89fc0 100644 (file)
@@ -55,8 +55,11 @@ PassRefPtr<NotificationPermissionRequestManager> NotificationPermissionRequestMa
 }
 
 NotificationPermissionRequestManager::NotificationPermissionRequestManager(WebPage* page)
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
     : m_page(page)
+#endif
 {
+    (void)page;
 }
 
 #if ENABLE(NOTIFICATIONS)
index 3b3799a..138a184 100644 (file)
@@ -72,7 +72,9 @@ private:
     HashMap<RefPtr<WebCore::SecurityOrigin>, uint64_t> m_originToIDMap;
     HashMap<uint64_t, RefPtr<WebCore::SecurityOrigin> > m_idToOriginMap;
 
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
     WebPage* m_page;
+#endif
 };
 
 inline bool isRequestIDValid(uint64_t id)