Commit d784209c authored by Tatiana Meshkova's avatar Tatiana Meshkova

Updated to latest upstream HG: 36da3cb92193, GIT: f3315833afbd2e09bcb51d287acd1dafc01e32df

parent 2d6db718
......@@ -60,18 +60,18 @@ EmbedTouchListener::~EmbedTouchListener()
NS_IMPL_ISUPPORTS1(EmbedTouchListener, nsIDOMEventListener)
void EmbedTouchListener::HandleSingleTap(const nsIntPoint& aPoint)
void EmbedTouchListener::HandleSingleTap(const CSSIntPoint& aPoint)
{
LOGT("pt[%i,%i]", aPoint.x, aPoint.y);
}
void EmbedTouchListener::HandleLongTap(const nsIntPoint& aPoint)
void EmbedTouchListener::HandleLongTap(const CSSIntPoint& aPoint)
{
LOGT("pt[%i,%i]", aPoint.x, aPoint.y);
}
void EmbedTouchListener::SendAsyncScrollDOMEvent(const mozilla::gfx::Rect& aRect,
const mozilla::gfx::Size& aSize)
void EmbedTouchListener::SendAsyncScrollDOMEvent(const mozilla::CSSRect& aRect,
const mozilla::CSSSize& aSize)
{
// LOGT("r[%g,%g,%g,%g], size[%g,%g]", aRect.x, aRect.y, aRect.width, aRect.height, aSize.width, aSize.height);
if (mContentRect.width != aRect.width || mContentRect.height != aRect.height)
......@@ -125,7 +125,7 @@ void EmbedTouchListener::RequestContentRepaint(const mozilla::layers::FrameMetri
mHadResizeSinceLastFrameUpdate = false;
}
void EmbedTouchListener::HandleDoubleTap(const nsIntPoint& aPoint)
void EmbedTouchListener::HandleDoubleTap(const CSSIntPoint& aPoint)
{
LOGT("pt[%i,%i]", aPoint.x, aPoint.y);
// We haven't received a metrics update yet; don't do anything.
......
......@@ -36,10 +36,10 @@ public:
NS_DECL_NSIDOMEVENTLISTENER
virtual void RequestContentRepaint(const mozilla::layers::FrameMetrics&);
virtual void HandleDoubleTap(const nsIntPoint&);
virtual void HandleSingleTap(const nsIntPoint&);
virtual void HandleLongTap(const nsIntPoint&);
virtual void SendAsyncScrollDOMEvent(const mozilla::gfx::Rect&, const mozilla::gfx::Size&);
virtual void HandleDoubleTap(const mozilla::CSSIntPoint&);
virtual void HandleSingleTap(const mozilla::CSSIntPoint&);
virtual void HandleLongTap(const mozilla::CSSIntPoint&);
virtual void SendAsyncScrollDOMEvent(const mozilla::CSSRect&, const mozilla::CSSSize&);
virtual void ScrollUpdate(const mozilla::CSSPoint&, float);
virtual void PostDelayedTask(Task*, int) {}
......@@ -57,8 +57,8 @@ private:
nsresult GetFocusedInput(nsIDOMElement* *aElement, bool aOnlyInputElements = false);
nsCOMPtr<nsIEmbedAppService> mService;
mozilla::gfx::Rect mContentRect;
mozilla::gfx::Size mScrollSize;
mozilla::CSSRect mContentRect;
mozilla::CSSSize mScrollSize;
bool mGotViewPortUpdate;
mozilla::gfx::Rect mViewport;
mozilla::gfx::Rect mCssCompositedRect;
......
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