--- a/webengine/osswebengine/WebKit/s60/webview/BrCtl.h Tue Aug 31 16:17:46 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtl.h Wed Sep 01 12:28:30 2010 +0100
@@ -23,7 +23,6 @@
// INCLUDES
#include <brctlinterface.h>
-#include "BrCtlDefs.h"
#include "HistoryInterface.h"
#include "WmlInterface.h"
@@ -58,6 +57,7 @@
class CWmlDispatcher;
class CWmlContentInterface;
class CUserAgent;
+class CWidgetExtension;
namespace WebCore {
class FormData;
@@ -161,6 +161,7 @@
TBrCtlWmlServiceOption* firstPrevDoElement() const { return m_firstPrevDoElement; }
HBufC* fileNameToUrlLC(const TDesC& aFileName);
void SetScriptLogMode(TInt aMode);
+ CWidgetExtension* getWidgetExt();
public: // Methods from CBrCtlInterface
@@ -413,6 +414,8 @@
*/
IMPORT_C void TakeSnapshotL(CFbsBitmap& snapshot);
+ IMPORT_C TBool IsSynchRequestPending();
+
/**
* From CBrCtlInterface
* Register an observer for state change changes
@@ -590,7 +593,6 @@
/**
* From CCoeControl
*/
- void HandlePointerBufferReadyL();
MBrCtlSpecialLoadObserver* brCtlSpecialLoadObserver() const { return m_brCtlSpecialLoadObserver; }
MBrCtlDownloadObserver* brCtlDownloadObserver();
MBrCtlLinkResolver* brCtlLinkResolver() const { return m_brCtlLinkResolver; }
@@ -609,6 +611,7 @@
void showWindow();
void closeWindowSoon();
+ // this function leaves in case of exit which is the normal behaviour
void doCloseWindowSoon();
TBool sendCommandsToClient(TBrCtlDefs::TBrCtlClientCommands aCommand,
const CArrayFix<TPtrC>& aAttributesNames,
@@ -705,6 +708,7 @@
CPeriodic* m_timer;
bool m_wmlMode;
bool m_suspendTimers;
+ bool m_pageLoadFinished;
MWmlEngineInterface* m_wmlEngineInterface;
RLibrary m_Library;
MWmlInterface* m_WmlInterface;
@@ -728,7 +732,8 @@
TBrCtlWmlServiceOption* m_firstPrevDoElement;
MBrCtlDownloadObserver* m_brCtlDownloadObserver;
CPeriodic* m_windoCloseTimer; //new timer for managing browser window close
-
+ bool m_didFirstLayout;
+ bool m_NotifyPluginFocusChangeEvent;
};
#endif // BRCTL_H