Attachment 254795 Details for Bug 145925 – Patch

[patch] Patch

bug-145925-20150612051436.patch (text/plain), 2.65 KB, created by Csaba Osztrogonác on 2015-06-12 05:15:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Csaba Osztrogonác

Created: 2015-06-12 05:15:07 PDT

Size: 2.65 KB

patch

obsolete

>Subversion Revision: 185497
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index b45e17b97dfeb3ab06e3c60fe82668947aa7dfd1..8df7ea0db62b4c644e806cedf958b4c4e405eb70 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,15 @@
>+2015-06-12  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
>+
>+        Fix unused private field warning in PageBanner.h
>+        https://bugs.webkit.org/show_bug.cgi?id=145925
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebProcess/WebPage/PageBanner.cpp:
>+        (WebKit::PageBanner::~PageBanner):
>+        * WebProcess/WebPage/PageBanner.h:
>+        * WebProcess/WebPage/mac/PageBannerMac.mm: Use PLATFORM(MAC) instead of !PLATFORM(IOS), they are same in objc files.
>+
> 2015-06-12  Antti Koivisto  <antti@apple.com>
> 
>         Use SHA1 for cache coder checksums
>diff --git a/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp b/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp
>index d352de5405cec25bee93b28d8a12212e88cabb25..6b2fecac7fc164463be0af11de945d49cf3b0167 100644
>--- a/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp
>+++ b/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp
>@@ -33,11 +33,13 @@ namespace WebKit {
> 
> PageBanner::~PageBanner()
> {
>+#if PLATFORM(MAC)
>     ASSERT(!m_webPage);
>+#endif
>     m_client->pageBannerDestroyed(this);
> }
> 
>-#if !PLATFORM(COCOA)
>+#if !PLATFORM(MAC)
> void PageBanner::addToPage(Type, WebPage*)
> {
> }
>diff --git a/Source/WebKit2/WebProcess/WebPage/PageBanner.h b/Source/WebKit2/WebProcess/WebPage/PageBanner.h
>index 8d9181493f26796cd38b4607062cb32c13513030..7f35ce149b58461a0af97498b09da17b87c8fa1c 100644
>--- a/Source/WebKit2/WebProcess/WebPage/PageBanner.h
>+++ b/Source/WebKit2/WebProcess/WebPage/PageBanner.h
>@@ -83,14 +83,14 @@ private:
>     explicit PageBanner(CALayer *, int height, Client*);
> #endif
> 
>-    Type m_type;
>     Client* m_client;
>-    WebPage* m_webPage;
> 
>+#if PLATFORM(MAC)
>+    Type m_type;
>+    WebPage* m_webPage;
>     bool m_mouseDownInBanner;
>     bool m_isHidden;
> 
>-#if PLATFORM(MAC)
>     RetainPtr<CALayer> m_layer;
>     int m_height;
> #endif
>diff --git a/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm b/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm
>index b109d924aac42b2b21857bef615fcbc243fa42dc..bec5fa079e044f7e89661c6fc410270a3ec53f9a 100644
>--- a/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm
>+++ b/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "PageBanner.h"
> 
>-#if !PLATFORM(IOS)
>+#if PLATFORM(MAC)
> 
> #include "WebPage.h"
> #include <WebCore/FrameView.h>
>@@ -170,4 +170,4 @@ CALayer *PageBanner::layer()
> 
> } // namespace WebKit
> 
>-#endif // !PLATFORM(IOS)
>+#endif // PLATFORM(MAC)

Actions: View | Formatted Diff | Diff

Attachments on bug 145925: 254795 | 254867