equal
deleted
inserted
replaced
286 { |
286 { |
287 TSize s(m_frameRect.Size()); |
287 TSize s(m_frameRect.Size()); |
288 return TRect(m_contentPos, s ); |
288 return TRect(m_contentPos, s ); |
289 } |
289 } |
290 |
290 |
291 void WebFrameView::scrollTo(const TPoint& aPoint) |
291 void WebFrameView::scrollTo(const TPoint& aPoint, TBool aPluginPause) |
292 { |
292 { |
293 |
293 |
294 m_topView->scrollStatus(ETrue); |
294 if(aPluginPause) |
|
295 m_topView->scrollStatus(ETrue); |
295 |
296 |
296 if (m_parent) { |
297 if (m_parent) { |
297 // tot:fixme frame scrolling when frame-flat is off |
298 // tot:fixme frame scrolling when frame-flat is off |
298 if (m_frame->isIframe()) { |
299 if (m_frame->isIframe()) { |
299 // iframe, support scrolling |
300 // iframe, support scrolling |
421 TPoint p( nearestPointInFrame(m_contentPos) ); |
422 TPoint p( nearestPointInFrame(m_contentPos) ); |
422 if (p!=m_contentPos) |
423 if (p!=m_contentPos) |
423 { |
424 { |
424 // this will also update scrollbars is necessary |
425 // this will also update scrollbars is necessary |
425 scrollTo(p); |
426 scrollTo(p); |
426 m_topView->scrollStatus(false); |
|
427 } |
427 } |
428 else if (!m_parent) { |
428 else if (!m_parent) { |
429 // top level |
429 // top level |
430 m_topView->updateScrollbars(m_contentSize.iHeight, m_contentPos.iY, m_contentSize.iWidth, m_contentPos.iX); |
430 m_topView->updateScrollbars(m_contentSize.iHeight, m_contentPos.iY, m_contentSize.iWidth, m_contentPos.iX); |
431 } |
431 } |