MCL/sf/mw/web: comparison webengine/osswebengine/WebKit/s60/webview/WebView.cpp

equal deleted inserted replaced

-:a1a5d4e727e8
+:800203832575
 , m_firedEvent(0)
 , m_waitTimer(0)
 , m_pinchZoomHandler(NULL)
 , m_isPinchZoom(false)
 , m_drawsMissed(0)
-, m_scroll(false)
 , m_thumbnailGenerator(NULL)
 , m_checkerBoardBitmap(NULL)
 , m_checkerBoardDevice(NULL)
 , m_checkerBoardGc(NULL)
 , m_checkerBoardDestroyTimer(NULL)
 // operates on the WebView object
 delete m_pageZoomHandler;
 m_pageZoomHandler = NULL;
 m_zoomLevelArray.Close();
-m_visiblePlugins.Reset();
-m_visiblePlugins.Close();
 // prevent frameViews to access members when topView is
 // closing down.
 m_isClosing = true;
 m_page->setGroupName(String());
 m_userAgent = HBufC::NewL(userAgent8->Length());
 m_userAgent->Des().Copy(userAgent8->Des());
 CleanupStack::PopAndDestroy(2); // userAgent8, usrAgnt
 MakeViewVisible(ETrue);
-m_isPluginsVisible=ETrue;
 CCoeControl::SetFocus(ETrue);
 cache()->setCapacities(0, 0, defaultCacheCapacity);
 m_waiter = new(ELeave) CActiveSchedulerWait();
 m_checkerBoardDestroyTimer = CPeriodic::NewL(CActive::EPriorityIdle);
-m_visiblePlugins.Reset();
 }
 void WebView::initializePageScalerL()
 {
 );
 }
 }
 #endif
 }
-mainFrame()->notifyPluginsOfPositionChange();
 }
 //-------------------------------------------------------------------------------
 // WebView::syncRepaint
 // Repaint the current repaint region synchronously and clear it
 //-------------------------------------------------------------------------------
 }
 else if (value == "none") {
 m_brctl->settings()->setNavigationType(SettingsContainer::NavigationTypeNone);
 }
 }
+else if (name == "widgetAppBackgroundColour") {
+if (value == "black") {
+WebCore::Frame *frame = core(mainFrame());
+if (frame) {
+WebCore::FrameView* frameView = frame->view();
+if (frameView) {
+WebCore::Color bc = Color::black;
+frameView->setBaseBackgroundColor(bc);
+}
+}
+}
+}
 }
 //-------------------------------------------------------------------------------
 // WebView::handleShowAnchorHrefL
 // Display a popup with the url of an anchor
 m_zoomLevelChangedByUser = true;
 WebFrameView* view = mainFrame()->frameView();
 if (!view) return;
 m_dirtyZoomMode = true;
-m_isPluginsVisible = false;
-mainFrame()->makeVisiblePlugins(false);
 if (zoomLevel > m_startZoomLevel) {
 // cut m_srcRectForZooming from m_offscreenrect and enlarge it to fit the view rect
 void WebView::restoreZoomLevel(int zoomLevel)
 {
 m_dirtyZoomMode = false;
 clearOffScreenBitmap();
 zoomLevelChanged(zoomLevel);
-mainFrame()->notifyPluginsOfPositionChange();
+	//update the position position after the relayout is completed,
-m_isPluginsVisible = false;
+	//This will minimize the plugins flickering
-mainFrame()->makeVisiblePlugins(true);
+scrollStatus(false);
-m_isPluginsVisible = true;
 }
 //-------------------------------------------------------------------------------
 // WebView::resetZoomLevel
 //-------------------------------------------------------------------------------
 void WebView::setFastScrollingMode(bool fastScrolling)
 {
 if (fastScrolling != m_viewIsFastScrolling) {
 setViewIsFastScrolling (fastScrolling);
-m_isPluginsVisible = false;
 mainFrame()->makeVisiblePlugins(!m_viewIsFastScrolling);
-m_isPluginsVisible = !m_viewIsFastScrolling;
 if (!m_viewIsFastScrolling) {
 mainFrame()->notifyPluginsOfPositionChange();
 }
 toggleRepaintTimer(!m_viewIsFastScrolling);
 // WebView::setPinchBitmapZoomLevelL
 //-------------------------------------------------------------------------------
 void WebView::setPinchBitmapZoomLevelL(int zoomLevel)
 {
 m_zoomLevelChangedByUser = true;
+m_isPinchZoom = true;
+if(!m_dirtyZoomMode)
+{
+//If panning or scroll is in progress, we will be notifiying to plugins for collecting bitmap
+//in case of pinchZoom, we need to deactivate the plugins which are not supported for bitmap
+//sharing.
+if(m_scrollingstatus)
+{
+m_scrollingstatus = false;
+}
+scrollStatus(true);
+	}
 m_dirtyZoomMode = true;
-m_isPluginsVisible = false;
-m_isPinchZoom = true;
 if (zoomLevel > m_startZoomLevel) {
 setPinchBitmapZoomIn(zoomLevel);
 }
 else {
 setPinchBitmapZoomOutL(zoomLevel);
 m_isPinchZoomOut = true;
 }
 m_currentZoomLevel = zoomLevel;
 DrawNow();
-PluginSkin* pluginskin = mainFrame()->focusedPlugin();
-if(pluginskin)
-{
-pluginskin->deActivate();
-}
 }
 //-------------------------------------------------------------------------------
 // WebView::setPinchBitmapZoomIn
 //-------------------------------------------------------------------------------
 if(!m_isPinchZoomOut)
 createCheckerBoardL();
 }
-void WebView::setScrolling(bool scroll)
-{
-m_scroll = scroll;
-mainFrame()->PlayPausePlugins(m_scroll);
-}
 void drawCheckerBoard(CBitmapContext *gc,const TRect &rect)
 {
 for(int i = rect.iTl.iX; i <= (rect.iTl.iX + rect.Width()); i = i + (2 * KCheckerSize)) {
 for(int j = rect.iTl.iY; j <= (rect.iTl.iY + rect.Height()); j = j + (2 * KCheckerSize)) {
 m_jsTimeouts = 0;
 }
 }
 }
 // END OF FILE
+void WebView::scrollStatus(bool status)
+{
+if(m_scrollingstatus != status)
+{
+m_scrollingstatus = status;
+#ifdef BRDO_MULTITOUCH_ENABLED_FF
+mainFrame()->ScrollOrPinchStatus(m_scrollingstatus);
+#endif
+}
+}
+void WebView::setViewIsScrolling(bool scrolling)
+{
+m_viewIsScrolling = scrolling;
+if(!scrolling)
+{
+scrollStatus(scrolling);
+}
+};

branch	RCL_3
changeset 44	800203832575
parent 42	a1a5d4e727e8
child 46	30342f40acbf