Skip to content

Commit

Permalink
Mark actor's interface non-overridable explicitly
Browse files Browse the repository at this point in the history 
Conflicts:
	embedding/embedlite/embedthread/EmbedLiteViewThreadChild.h
	embedding/embedlite/embedthread/EmbedLiteViewThreadParent.h
  • Loading branch information
@rojkov
rojkov committed Nov 19, 2014
1 parent 4600082 commit 3b04483
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 75 deletions.
28 changes: 14 additions & 14 deletions embedding/embedlite/embedthread/EmbedLiteAppThreadChild.h
View file
Expand Up @@ -34,25 +34,25 @@ class EmbedLiteAppThreadChild : public PEmbedLiteAppChild,
virtual ~EmbedLiteAppThreadChild();

// Embed API ipdl interface
virtual bool RecvSetBoolPref(const nsCString&, const bool&);
virtual bool RecvSetCharPref(const nsCString&, const nsCString&);
virtual bool RecvSetIntPref(const nsCString&, const int&);
virtual bool RecvLoadGlobalStyleSheet(const nsCString&, const bool&);
virtual bool RecvLoadComponentManifest(const nsCString&);
virtual bool RecvSetBoolPref(const nsCString&, const bool&) MOZ_OVERRIDE;
virtual bool RecvSetCharPref(const nsCString&, const nsCString&) MOZ_OVERRIDE;
virtual bool RecvSetIntPref(const nsCString&, const int&) MOZ_OVERRIDE;
virtual bool RecvLoadGlobalStyleSheet(const nsCString&, const bool&) MOZ_OVERRIDE;
virtual bool RecvLoadComponentManifest(const nsCString&) MOZ_OVERRIDE;

// IPDL protocol impl
virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;

virtual bool RecvPreDestroy();
virtual bool RecvPreDestroy() MOZ_OVERRIDE;
virtual bool RecvObserve(const nsCString& topic,
const nsString& data);
virtual bool RecvAddObserver(const nsCString&);
virtual bool RecvRemoveObserver(const nsCString&);
virtual bool RecvAddObservers(const InfallibleTArray<nsCString>& observers);
virtual bool RecvRemoveObservers(const InfallibleTArray<nsCString>& observers);

virtual PEmbedLiteViewChild* AllocPEmbedLiteViewChild(const uint32_t&, const uint32_t& parentId);
virtual bool DeallocPEmbedLiteViewChild(PEmbedLiteViewChild*);
const nsString& data) MOZ_OVERRIDE;
virtual bool RecvAddObserver(const nsCString&) MOZ_OVERRIDE;
virtual bool RecvRemoveObserver(const nsCString&) MOZ_OVERRIDE;
virtual bool RecvAddObservers(const InfallibleTArray<nsCString>& observers) MOZ_OVERRIDE;
virtual bool RecvRemoveObservers(const InfallibleTArray<nsCString>& observers) MOZ_OVERRIDE;

virtual PEmbedLiteViewChild* AllocPEmbedLiteViewChild(const uint32_t&, const uint32_t& parentId) MOZ_OVERRIDE;
virtual bool DeallocPEmbedLiteViewChild(PEmbedLiteViewChild*) MOZ_OVERRIDE;

private:
void InitWindowWatcher();
Expand Down
23 changes: 12 additions & 11 deletions embedding/embedlite/embedthread/EmbedLiteAppThreadParent.h
View file
Expand Up @@ -15,16 +15,22 @@ class EmbedLiteApp;
class EmbedLiteAppThreadParent : public PEmbedLiteAppParent
{
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(EmbedLiteAppThreadParent)
public:
// IPDL

protected:
// IPDL implementation
virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
virtual PEmbedLiteViewParent* AllocPEmbedLiteViewParent(const uint32_t&, const uint32_t&) MOZ_OVERRIDE;
virtual bool DeallocPEmbedLiteViewParent(PEmbedLiteViewParent*) MOZ_OVERRIDE;

// IPDL interface
virtual bool
RecvInitialized();
RecvInitialized() MOZ_OVERRIDE;

virtual bool
RecvReadyToShutdown();
RecvReadyToShutdown() MOZ_OVERRIDE;

virtual bool RecvObserve(const nsCString& topic,
const nsString& data);
const nsString& data) MOZ_OVERRIDE;

virtual bool
RecvCreateWindow(
Expand All @@ -33,12 +39,7 @@ class EmbedLiteAppThreadParent : public PEmbedLiteAppParent
const uint32_t& chromeFlags,
const uint32_t& contextFlags,
uint32_t* createdID,
bool* cancel);

protected:
virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
virtual PEmbedLiteViewParent* AllocPEmbedLiteViewParent(const uint32_t&, const uint32_t&);
virtual bool DeallocPEmbedLiteViewParent(PEmbedLiteViewParent*);
bool* cancel) MOZ_OVERRIDE;

private:
virtual ~EmbedLiteAppThreadParent();
Expand Down
62 changes: 31 additions & 31 deletions embedding/embedlite/embedthread/EmbedLiteViewThreadChild.h
View file
Expand Up @@ -64,55 +64,55 @@ class EmbedLiteViewThreadChild : public PEmbedLiteViewChild,
virtual ~EmbedLiteViewThreadChild();

virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
virtual bool RecvDestroy();
virtual bool RecvLoadURL(const nsString&);
virtual bool RecvGoBack();
virtual bool RecvGoForward();
virtual bool RecvStopLoad();
virtual bool RecvReload(const bool&);

virtual bool RecvSetIsActive(const bool&);
virtual bool RecvSetIsFocused(const bool&);
virtual bool RecvSuspendTimeouts();
virtual bool RecvResumeTimeouts();
virtual bool RecvLoadFrameScript(const nsString&);
virtual bool RecvSetViewSize(const gfxSize&);
virtual bool RecvDestroy() MOZ_OVERRIDE;
virtual bool RecvLoadURL(const nsString&) MOZ_OVERRIDE;
virtual bool RecvGoBack() MOZ_OVERRIDE;
virtual bool RecvGoForward() MOZ_OVERRIDE;
virtual bool RecvStopLoad() MOZ_OVERRIDE;
virtual bool RecvReload(const bool&) MOZ_OVERRIDE;

virtual bool RecvSetIsActive(const bool&) MOZ_OVERRIDE;
virtual bool RecvSetIsFocused(const bool&) MOZ_OVERRIDE;
virtual bool RecvSuspendTimeouts() MOZ_OVERRIDE;
virtual bool RecvResumeTimeouts() MOZ_OVERRIDE;
virtual bool RecvLoadFrameScript(const nsString&) MOZ_OVERRIDE;
virtual bool RecvSetViewSize(const gfxSize&) MOZ_OVERRIDE;
virtual bool RecvAsyncScrollDOMEvent(const gfxRect& contentRect,
const gfxSize& scrollSize);
const gfxSize& scrollSize) MOZ_OVERRIDE;

virtual bool RecvUpdateFrame(const mozilla::layers::FrameMetrics& aFrameMetrics);
virtual bool RecvHandleDoubleTap(const nsIntPoint& aPoint);
virtual bool RecvHandleSingleTap(const nsIntPoint& aPoint);
virtual bool RecvUpdateFrame(const mozilla::layers::FrameMetrics& aFrameMetrics) MOZ_OVERRIDE;
virtual bool RecvHandleDoubleTap(const nsIntPoint& aPoint) MOZ_OVERRIDE;
virtual bool RecvHandleSingleTap(const nsIntPoint& aPoint) MOZ_OVERRIDE;
virtual bool RecvHandleLongTap(const nsIntPoint& aPoint,
const mozilla::layers::ScrollableLayerGuid& aGuid,
const uint64_t& aInputBlockId);
virtual bool RecvAcknowledgeScrollUpdate(const FrameMetrics::ViewID& aScrollId, const uint32_t& aScrollGeneration);
const uint64_t& aInputBlockId) MOZ_OVERRIDE;
virtual bool RecvAcknowledgeScrollUpdate(const FrameMetrics::ViewID& aScrollId, const uint32_t& aScrollGeneration) MOZ_OVERRIDE;
virtual bool RecvMouseEvent(const nsString& aType,
const float& aX,
const float& aY,
const int32_t& aButton,
const int32_t& aClickCount,
const int32_t& aModifiers,
const bool& aIgnoreRootScrollFrame);
virtual bool RecvHandleTextEvent(const nsString& commit, const nsString& preEdit);
virtual bool RecvHandleKeyPressEvent(const int& domKeyCode, const int& gmodifiers, const int& charCode);
virtual bool RecvHandleKeyReleaseEvent(const int& domKeyCode, const int& gmodifiers, const int& charCode);
virtual bool RecvInputDataTouchEvent(const ScrollableLayerGuid& aGuid, const mozilla::MultiTouchInput&, const uint64_t& aInputBlockId);
virtual bool RecvInputDataTouchMoveEvent(const ScrollableLayerGuid& aGuid, const mozilla::MultiTouchInput&, const uint64_t& aInputBlockId);
const bool& aIgnoreRootScrollFrame) MOZ_OVERRIDE;
virtual bool RecvHandleTextEvent(const nsString& commit, const nsString& preEdit) MOZ_OVERRIDE;
virtual bool RecvHandleKeyPressEvent(const int& domKeyCode, const int& gmodifiers, const int& charCode) MOZ_OVERRIDE;
virtual bool RecvHandleKeyReleaseEvent(const int& domKeyCode, const int& gmodifiers, const int& charCode) MOZ_OVERRIDE;
virtual bool RecvInputDataTouchEvent(const ScrollableLayerGuid& aGuid, const mozilla::MultiTouchInput&, const uint64_t& aInputBlockId) MOZ_OVERRIDE;
virtual bool RecvInputDataTouchMoveEvent(const ScrollableLayerGuid& aGuid, const mozilla::MultiTouchInput&, const uint64_t& aInputBlockId) MOZ_OVERRIDE;

virtual bool
RecvAddMessageListener(const nsCString&);
RecvAddMessageListener(const nsCString&) MOZ_OVERRIDE;
virtual bool
RecvRemoveMessageListener(const nsCString&);
RecvRemoveMessageListener(const nsCString&) MOZ_OVERRIDE;
void RecvAsyncMessage(const nsAString& aMessage,
const nsAString& aData);
virtual bool RecvSetGLViewSize(const gfxSize&);
const nsAString& aData) MOZ_OVERRIDE;
virtual bool RecvSetGLViewSize(const gfxSize&) MOZ_OVERRIDE;

virtual bool
RecvAddMessageListeners(const InfallibleTArray<nsString>& messageNames);
RecvAddMessageListeners(const InfallibleTArray<nsString>& messageNames) MOZ_OVERRIDE;

virtual bool
RecvRemoveMessageListeners(const InfallibleTArray<nsString>& messageNames);
RecvRemoveMessageListeners(const InfallibleTArray<nsString>& messageNames) MOZ_OVERRIDE;

private:
friend class TabChildHelper;
Expand Down
40 changes: 21 additions & 19 deletions embedding/embedlite/embedthread/EmbedLiteViewThreadParent.h
View file
Expand Up @@ -30,48 +30,50 @@ class EmbedLiteViewThreadParent : public PEmbedLiteViewParent,
protected:
virtual ~EmbedLiteViewThreadParent();
virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
virtual bool RecvInitialized();

virtual bool
RecvOnLocationChanged(const nsCString& aLocation, const bool& aCanGoBack, const bool& aCanGoForward);
RecvInitialized() MOZ_OVERRIDE;

virtual bool
RecvOnLoadStarted(const nsCString& aLocation);
RecvOnLocationChanged(const nsCString& aLocation, const bool& aCanGoBack, const bool& aCanGoForward) MOZ_OVERRIDE;

virtual bool
RecvOnLoadFinished();
RecvOnLoadStarted(const nsCString& aLocation) MOZ_OVERRIDE;

virtual bool
RecvOnWindowCloseRequested();
RecvOnLoadFinished() MOZ_OVERRIDE;

virtual bool
RecvOnLoadRedirect();
RecvOnWindowCloseRequested() MOZ_OVERRIDE;

virtual bool
RecvOnLoadProgress(const int32_t& aProgress, const int32_t& aCurTotal, const int32_t& aMaxTotal);
RecvOnLoadRedirect() MOZ_OVERRIDE;

virtual bool
RecvOnLoadProgress(const int32_t& aProgress, const int32_t& aCurTotal, const int32_t& aMaxTotal) MOZ_OVERRIDE;

virtual bool
RecvOnSecurityChanged(
const nsCString& aStatus,
const uint32_t& aState);
const uint32_t& aState) MOZ_OVERRIDE;

virtual bool
RecvOnFirstPaint(
const int32_t& aX,
const int32_t& aY);
const int32_t& aY) MOZ_OVERRIDE;

virtual bool
RecvOnScrolledAreaChanged(
const uint32_t& aWidth,
const uint32_t& aHeight);
const uint32_t& aHeight) MOZ_OVERRIDE;

virtual bool
RecvOnScrollChanged(
const int32_t& offSetX,
const int32_t& offSetY);
const int32_t& offSetY) MOZ_OVERRIDE;

virtual bool
RecvOnTitleChanged(const nsString& aTitle);
RecvOnTitleChanged(const nsString& aTitle) MOZ_OVERRIDE;

virtual bool RecvAsyncMessage(const nsString& aMessage,
const nsString& aData) MOZ_OVERRIDE;
Expand All @@ -85,27 +87,27 @@ class EmbedLiteViewThreadParent : public PEmbedLiteViewParent,
RecvUpdateZoomConstraints(const uint32_t& aPresShellId,
const ViewID& aViewId,
const bool& aIsRoot,
const ZoomConstraints& aConstraints);
const ZoomConstraints& aConstraints) MOZ_OVERRIDE;
virtual bool RecvZoomToRect(const uint32_t& aPresShellId,
const ViewID& aViewId,
const CSSRect& aRect);
virtual bool RecvSetBackgroundColor(const nscolor& aColor);
const CSSRect& aRect) MOZ_OVERRIDE;
virtual bool RecvSetBackgroundColor(const nscolor& aColor) MOZ_OVERRIDE;
virtual bool RecvContentReceivedTouch(const ScrollableLayerGuid& aGuid,
const uint64_t& aInputBlockId,
const bool& aPreventDefault);
const bool& aPreventDefault) MOZ_OVERRIDE;

// IME
virtual bool RecvGetInputContext(int32_t* aIMEEnabled,
int32_t* aIMEOpen,
intptr_t* aNativeIMEContext);
intptr_t* aNativeIMEContext) MOZ_OVERRIDE;
virtual bool RecvSetInputContext(const int32_t& aIMEEnabled,
const int32_t& aIMEOpen,
const nsString& aType,
const nsString& aInputmode,
const nsString& aActionHint,
const int32_t& aCause,
const int32_t& aFocusChange);
virtual bool RecvGetGLViewSize(gfxSize* aSize);
const int32_t& aFocusChange) MOZ_OVERRIDE;
virtual bool RecvGetGLViewSize(gfxSize* aSize) MOZ_OVERRIDE;

private:
friend class EmbedContentController;
Expand Down

0 comments on commit 3b04483

Please sign in to comment.