Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[gcc-fix] Moved public dctor of ref-counted classes to protected. Now…
… compiles on gcc483
  • Loading branch information
faenil authored and rojkov committed Oct 8, 2014
1 parent 72e6b4d commit 5d5f16b
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 10 deletions.
6 changes: 4 additions & 2 deletions embedding/embedlite/embedthread/EmbedLitePuppetWidget.h
Expand Up @@ -36,8 +36,7 @@ class EmbedLitePuppetWidget : public nsBaseWidget,

public:
EmbedLitePuppetWidget(EmbedLiteViewThreadChild* aEmbed, uint32_t& aId);
virtual ~EmbedLitePuppetWidget();


NS_DECL_ISUPPORTS_INHERITED

NS_IMETHOD Create(nsIWidget* aParent,
Expand Down Expand Up @@ -154,6 +153,9 @@ class EmbedLitePuppetWidget : public nsBaseWidget,
NS_IMETHOD SetParent(nsIWidget* aNewParent);
virtual nsIWidget *GetParent(void);

protected:
virtual ~EmbedLitePuppetWidget();

private:
nsresult Paint();
bool ViewIsValid();
Expand Down
6 changes: 4 additions & 2 deletions embedding/embedlite/modules/EmbedLiteAppService.h
Expand Up @@ -19,8 +19,7 @@ class EmbedLiteAppService : public nsIObserver,
public nsIEmbedAppService
{
public:
EmbedLiteAppService();
virtual ~EmbedLiteAppService();
EmbedLiteAppService();

NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER
Expand All @@ -30,6 +29,9 @@ class EmbedLiteAppService : public nsIObserver,
void UnregisterView(uint32_t aId);
void HandleAsyncMessage(const char* aMessage, const nsString& aData);

protected:
virtual ~EmbedLiteAppService();

private:
friend class EmbedLiteJSON;
std::map<uint64_t, uint32_t> mIDMap;
Expand Down
5 changes: 3 additions & 2 deletions embedding/embedlite/modules/EmbedLiteJSON.h
Expand Up @@ -13,10 +13,11 @@ class EmbedLiteJSON : public nsIEmbedLiteJSON
{
public:
EmbedLiteJSON();
virtual ~EmbedLiteJSON();

NS_DECL_ISUPPORTS
NS_DECL_NSIEMBEDLITEJSON

protected:
virtual ~EmbedLiteJSON();
};

#define NS_EMBED_LITE_JSON_CONTRACTID "@mozilla.org/embedlite-json;1"
Expand Down
5 changes: 4 additions & 1 deletion embedding/embedlite/utils/EmbedLiteXulAppInfo.h
Expand Up @@ -18,11 +18,14 @@ class EmbedLiteXulAppInfo : public nsIXULAppInfo
{
public:
EmbedLiteXulAppInfo();
virtual ~EmbedLiteXulAppInfo();

NS_DECL_ISUPPORTS
NS_DECL_NSIXULRUNTIME
NS_DECL_NSIXULAPPINFO

protected:
virtual ~EmbedLiteXulAppInfo();

};


Expand Down
2 changes: 1 addition & 1 deletion embedding/embedlite/utils/TabChildHelper.h
Expand Up @@ -32,7 +32,6 @@ class TabChildHelper : public mozilla::dom::TabChildBase,
public:
typedef mozilla::layers::FrameMetrics::ViewID ViewID;
TabChildHelper(EmbedLiteViewThreadChild* aView);
virtual ~TabChildHelper();

NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIDOMEVENTLISTENER
Expand Down Expand Up @@ -64,6 +63,7 @@ class TabChildHelper : public mozilla::dom::TabChildBase,
void ReportSizeUpdate(const gfxSize& aSize);

protected:
virtual ~TabChildHelper();
nsIWidget* GetWidget(nsPoint* aOffset);
nsPresContext* GetPresContext();
// Sends a simulated mouse event from a touch event for compatibility.
Expand Down
4 changes: 3 additions & 1 deletion embedding/embedlite/utils/WebBrowserChrome.h
Expand Up @@ -43,11 +43,13 @@ class WebBrowserChrome : public nsIWebBrowserChrome,

WebBrowserChrome(nsIEmbedBrowserChromeListener* aListener);

virtual ~WebBrowserChrome();

void SetEventHandler();
void RemoveEventHandler();

protected:
virtual ~WebBrowserChrome();

private:
nsIntPoint GetScrollOffset(nsIDOMWindow* aWindow);
nsIntPoint GetScrollOffsetForElement(nsIDOMElement* aElement);
Expand Down
4 changes: 3 additions & 1 deletion embedding/embedlite/utils/WindowCreator.h
Expand Up @@ -17,12 +17,14 @@ class WindowCreator : public nsIWindowCreator2
{
public:
WindowCreator(mozilla::embedlite::EmbedLiteAppThreadChild* aChild);
virtual ~WindowCreator();

NS_DECL_ISUPPORTS
NS_DECL_NSIWINDOWCREATOR
NS_DECL_NSIWINDOWCREATOR2

protected:
virtual ~WindowCreator();

private:
mozilla::embedlite::EmbedLiteAppThreadChild* mChild;
};
Expand Down

0 comments on commit 5d5f16b

Please sign in to comment.