Attachment #254795 for bug #145925

View Details Raw Unified Return to Bug 145925

| Differences between



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




PageBanner::~PageBanner()
{
#if PLATFORM(MAC)
    ASSERT(!m_webPage);
#endif
    m_client->pageBannerDestroyed(this);
}

#if !PLATFORM(MAC)
void PageBanner::addToPage(Type, WebPage*)
{
}



    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

Lines 26-32 a/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm_sec1
- a/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm -2 / +2 lines
26	#include "config.h"	26	#include "config.h"
27	#include "PageBanner.h"	27	#include "PageBanner.h"
28		28
29	#if !PLATFORM(IOS)	29	#if PLATFORM(MAC)
30		30
31	#include "WebPage.h"	31	#include "WebPage.h"
32	#include <WebCore/FrameView.h>	32	#include <WebCore/FrameView.h>
Lines 170-173 CALayer *PageBanner::layer() a/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm_sec2
170		170
171	} // namespace WebKit	171	} // namespace WebKit
172		172
173	#endif // !PLATFORM(IOS)	173	#endif // PLATFORM(MAC)

Return to Bug 145925

Lines 33-43 namespace WebKit { a/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp_sec1
- a/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp -1 / +3 lines
33		33
34	PageBanner::~PageBanner()	34	PageBanner::~PageBanner()
35	{	35	{
		36	#if PLATFORM(MAC)
36	ASSERT(!m_webPage);	37	ASSERT(!m_webPage);
		38	#endif
37	m_client->pageBannerDestroyed(this);	39	m_client->pageBannerDestroyed(this);
38	}	40	}
39		41
40	#if !PLATFORM(COCOA)	42	#if !PLATFORM(MAC)
41	void PageBanner::addToPage(Type, WebPage*)	43	void PageBanner::addToPage(Type, WebPage*)
42	{	44	{
43	}	45	}

Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
- a/Source/WebKit2/ChangeLog +12 lines
		1	2015-06-12 Csaba Osztrogonác <ossy@webkit.org>
		2
		3	Fix unused private field warning in PageBanner.h
		4	https://bugs.webkit.org/show_bug.cgi?id=145925
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* WebProcess/WebPage/PageBanner.cpp:
		9	(WebKit::PageBanner::~PageBanner):
		10	* WebProcess/WebPage/PageBanner.h:
		11	* WebProcess/WebPage/mac/PageBannerMac.mm: Use PLATFORM(MAC) instead of !PLATFORM(IOS), they are same in objc files.
		12
1	2015-06-12 Antti Koivisto <antti@apple.com>	13	2015-06-12 Antti Koivisto <antti@apple.com>
2		14
3	Use SHA1 for cache coder checksums	15	Use SHA1 for cache coder checksums

Lines 83-96 private: a/Source/WebKit2/WebProcess/WebPage/PageBanner.h_sec1
- a/Source/WebKit2/WebProcess/WebPage/PageBanner.h -3 / +3 lines
83	explicit PageBanner(CALayer , int height, Client);	83	explicit PageBanner(CALayer , int height, Client);
84	#endif	84	#endif
85		85
86	Type m_type;
87	Client* m_client;	86	Client* m_client;
88	WebPage* m_webPage;
89		87
		88	#if PLATFORM(MAC)
		89	Type m_type;
		90	WebPage* m_webPage;
90	bool m_mouseDownInBanner;	91	bool m_mouseDownInBanner;
91	bool m_isHidden;	92	bool m_isHidden;
92		93
93	#if PLATFORM(MAC)
94	RetainPtr<CALayer> m_layer;	94	RetainPtr<CALayer> m_layer;
95	int m_height;	95	int m_height;
96	#endif	96	#endif