Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'omp-jb53209' into 'sailfishos-esr78'
[sailfishos][embedlite] Adapt EmbedLiteViewBaseChild to PEmbedLiteViewChild. Fixes JB#53209

See merge request mer-core/gecko-dev!236
  • Loading branch information
rainemak committed Feb 26, 2021
2 parents 035386a + b5c00a5 commit c3456e1
Show file tree
Hide file tree
Showing 10 changed files with 188 additions and 182 deletions.
Expand Up @@ -13,7 +13,7 @@ EmbedLiteViewProcessChild::EmbedLiteViewProcessChild(const uint32_t& windowId,
const uint32_t& id,
const uint32_t& parentId,
const bool& isPrivateWindow)
: EmbedLiteViewBaseChild(windowId, id, parentId, isPrivateWindow)
: EmbedLiteViewChild(windowId, id, parentId, isPrivateWindow)
{
LOGT();
}
Expand Down
4 changes: 2 additions & 2 deletions embedding/embedlite/embedprocess/EmbedLiteViewProcessChild.h
Expand Up @@ -6,12 +6,12 @@
#ifndef MOZ_VIEW_EMBED_PROCESS_CHILD_H
#define MOZ_VIEW_EMBED_PROCESS_CHILD_H

#include "EmbedLiteViewBaseChild.h"
#include "EmbedLiteViewChild.h"

namespace mozilla {
namespace embedlite {

class EmbedLiteViewProcessChild : public EmbedLiteViewBaseChild
class EmbedLiteViewProcessChild : public EmbedLiteViewChild
{
public:
MOZ_IMPLICIT EmbedLiteViewProcessChild(const uint32_t& windowId,
Expand Down
2 changes: 1 addition & 1 deletion embedding/embedlite/embedshared/EmbedLitePuppetWidget.cpp
Expand Up @@ -457,7 +457,7 @@ EmbedLitePuppetWidget::GetEmbedLiteChildView() const

void EmbedLitePuppetWidget::ConfigureAPZCTreeManager()
{
LOGT("Do nothing - APZEventState configured in EmbedLiteViewBaseChild");
LOGT("Do nothing - APZEventState configured in EmbedLiteViewChild");
}

void EmbedLitePuppetWidget::ConfigureAPZControllerThread()
Expand Down

0 comments on commit c3456e1

Please sign in to comment.