Commit ce9548fc62d93f4b82db8e60e1e1d6b5585c69dd

Tree SHA1: 7b47730
Parent SHA1: ac6abf4 (Merge branch 'engine-thread' of gitorious.org:~akoivisto/webkit/anttis-webkit into engine-thread)
raw diff | raw patch

Update view size asynchronously to avoid main thread locking


376	376	, inspectorFrontend(0)
377	377	, inspector(0)
378	378	, inspectorIsInternalOnly(false)
	379	#if ENABLE(ENGINE_THREAD)
	380	, viewportSizeCommitTimer(this, &QWebPagePrivate::viewportSizeCommitTimerFired)
	381	#endif
379	382	{
380	383	WebCore::InitializeLoggingChannelsIfNecessary();
381	384	JSC::initializeThreading();
…	…
1512	1512	return page->inspectorController();
1513	1513	}
1514	1514
	1515	#if ENABLE(ENGINE_THREAD)
	1516	/! \internal /
	1517	void QWebPagePrivate::viewportSizeCommitTimerFired(WebCore::Timer<QWebPagePrivate>*)
	1518	{
	1519	if (mainFrame->d->frame && mainFrame->d->frame->view()) {
	1520	WebCore::FrameView* view = mainFrame->d->frame->view();
	1521	view->setFrameRect(QRect(QPoint(0, 0), viewportSize));
	1522	view->forceLayout();
	1523	view->adjustViewSize();
	1524	}
	1525	}
	1526	#endif
1515	1527
1516	1528	/*!
1517	1529	\enum QWebPage::FindFlag
…	…
2101	2101	{
2102	2102	d->viewportSize = size;
2103	2103
	2104	#if ENABLE(ENGINE_THREAD)
	2105	if (!EngineThread::isCurrent()) {
	2106	d->viewportSizeCommitTimer.startOneShot(0);
	2107	return;
	2108	}
	2109	#endif
2104	2110	QWebFrame *frame = mainFrame();
2105	2111	if (frame->d->frame && frame->d->frame->view()) {
2106	2112	WebCore::FrameView* view = frame->d->frame->view();


33	33
34	34	#include "KURL.h"
35	35	#include "PlatformString.h"
	36	#include "Timer.h"
36	37
37	38	#include <wtf/RefPtr.h>
38	39
…	…
127	127	static QWebPage::WebAction editorActionForKeyEvent(QKeyEvent* event);
128	128	#endif
129	129	static const char* editorCommandForWebActions(QWebPage::WebAction action);
130
	130
	131	#if ENABLE(ENGINE_THREAD)
	132	void viewportSizeCommitTimerFired(WebCore::Timer<QWebPagePrivate>*);
	133	#endif
	134
131	135	WebCore::ChromeClientQt *chromeClient;
132	136	WebCore::ContextMenuClientQt *contextMenuClient;
133	137	WebCore::EditorClientQt *editorClient;
…	…
187	187	bool inspectorIsInternalOnly; // True if created through the Inspect context menu action
188	188
189	189	static bool drtRun;
	190
	191	#if ENABLE(ENGINE_THREAD)
	192	WebCore::Timer<QWebPagePrivate> viewportSizeCommitTimer;
	193	#endif
190	194	};
191	195
192	196	#endif