diff -r b0dd75e285d2 -r 0f2326c2a325 ginebra2/ContentViews/GWebContentViewWidget.h --- a/ginebra2/ContentViews/GWebContentViewWidget.h Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/ContentViews/GWebContentViewWidget.h Wed Jun 23 17:59:43 2010 +0300 @@ -1,22 +1,24 @@ /* * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License as published by +* the Free Software Foundation, version 2.1 of the License. * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License for more details. * -* Description: +* You should have received a copy of the GNU Lesser General Public License +* along with this program. If not, +* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/". * +* Description: */ - #ifndef GWebContentViewWidget_H_ #define GWebContentViewWidget_H_ @@ -86,9 +88,7 @@ QWebPage* wrtPage() { return m_wrtPage; } void showNormalPage(); - void createPagePixmap(); void setBitmapZoom(qreal zoom); - void deletePagePixmap(); void setPageCenterZoomFactor(qreal zoom); void initializeViewportParams(); @@ -98,7 +98,7 @@ qreal maximumScale(); qreal initialScale(); void updateViewport(); - void setBlockElement(QWebElement pt); + void setBlockElement(const QWebElement &pt); QPointF mapToGlobal(const QPointF& p); QPointF mapFromGlobal(const QPointF& p); @@ -121,22 +121,25 @@ void pageZoomMetaDataChange(QWebFrame* frame, ZoomMetaData data);protected: void paintEvent(QPaintEvent *event); - virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); - public: void onLoadStarted(); void onLoadFinished(); + bool frozen() const { return m_frozenCount > 0; } + void freeze(); + void unfreeze(); + private: void updateViewportSize(QGraphicsSceneResizeEvent *e); + virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); + void updateFrozenImage(); GVA::GWebContentView* m_webContentView; qreal m_dirtyZoomFactor; - QPixmap *m_frozenPixmap; - int m_freezeCount; + QPixmap *m_frozenPixmap; + int m_frozenCount; QWebPage *m_wrtPage; bool m_bitmapZoom; - QPixmap *m_pagePixmap; qreal m_aspectRation; qreal m_viewportWidth; qreal m_viewportHeight; @@ -152,12 +155,12 @@ int m_previousViewPortwidth; qreal m_Ratiox; qreal m_Ratioy; - - + + QImage* m_bitmapImage; qreal m_bitmapZoomFactor; QPixmap* m_checkeredBoxPixmap; - + bool m_inLoading; QTime m_loadingTime; #ifndef NO_QSTM_GESTURE