Commit 8d43f81f authored by Dmitry Rozhkov's avatar Dmitry Rozhkov

[embedlite-components] Sync with upstream. Merge remote-tracking branch 'origin/master'

parents be572d23 7ea6e986
......@@ -66,7 +66,7 @@ void EmbedTouchListener::HandleSingleTap(const CSSPoint& aPoint, int32_t, const
// SingleTap handler of JavaScript (embedhelper.js) is taken care of input zooming.
}
void EmbedTouchListener::HandleLongTap(const CSSPoint& aPoint, int32_t, const mozilla::layers::ScrollableLayerGuid&)
void EmbedTouchListener::HandleLongTap(const CSSPoint& aPoint, int32_t, const mozilla::layers::ScrollableLayerGuid&, uint64_t)
{
LOGT("pt[%i,%i]", aPoint.x, aPoint.y);
}
......
......@@ -23,7 +23,7 @@
#define MOZ_DOMMetaAdded "DOMMetaAdded"
class EmbedTouchListener : public nsIDOMEventListener,
public mozilla::layers::GeckoContentController
public mozilla::embedlite::EmbedLiteContentController
{
public:
EmbedTouchListener(nsIDOMWindow* aWin);
......@@ -33,11 +33,10 @@ public:
virtual void RequestContentRepaint(const mozilla::layers::FrameMetrics&);
virtual void HandleDoubleTap(const mozilla::CSSPoint&, int32_t, const mozilla::layers::ScrollableLayerGuid&);
virtual void HandleSingleTap(const mozilla::CSSPoint&, int32_t, const mozilla::layers::ScrollableLayerGuid&);
virtual void HandleLongTap(const mozilla::CSSPoint&, int32_t, const mozilla::layers::ScrollableLayerGuid&);
virtual void HandleLongTap(const mozilla::CSSPoint&, int32_t, const mozilla::layers::ScrollableLayerGuid&, uint64_t);
virtual void HandleLongTapUp(const mozilla::CSSPoint&, int32_t, const mozilla::layers::ScrollableLayerGuid&);
virtual void SendAsyncScrollDOMEvent(bool aIsRoot, const mozilla::CSSRect&, const mozilla::CSSSize&);
virtual void ScrollUpdate(const mozilla::CSSPoint&, float);
virtual void PostDelayedTask(Task*, int) {}
virtual void AcknowledgeScrollUpdate(const mozilla::layers::FrameMetrics::ViewID&, const uint32_t&) {};
nsCOMPtr<nsIDOMWindow> DOMWindow;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment