Title: [127275] trunk/Source/WebKit2
- Revision
- 127275
- Author
- kbal...@webkit.org
- Date
- 2012-08-31 10:08:41 -0700 (Fri, 31 Aug 2012)
Log Message
[Qt] ASSERT(m_useFixedLayout) in WebPage when using QRawWebView without setting fixed layout
https://bugs.webkit.org/show_bug.cgi?id=95557
Reviewed by Noam Rosenthal.
Let QRawWebView work with non-fixed layout size.
* UIProcess/API/qt/raw/qrawwebview.cpp:
(QRawWebView::setSize): Also put the member assigment into
the point where the new size is ensured to be committed.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (127274 => 127275)
--- trunk/Source/WebKit2/ChangeLog 2012-08-31 17:07:09 UTC (rev 127274)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-31 17:08:41 UTC (rev 127275)
@@ -1,5 +1,18 @@
2012-08-31 Balazs Kelemen <kbal...@webkit.org>
+ [Qt] ASSERT(m_useFixedLayout) in WebPage when using QRawWebView without setting fixed layout
+ https://bugs.webkit.org/show_bug.cgi?id=95557
+
+ Reviewed by Noam Rosenthal.
+
+ Let QRawWebView work with non-fixed layout size.
+
+ * UIProcess/API/qt/raw/qrawwebview.cpp:
+ (QRawWebView::setSize): Also put the member assigment into
+ the point where the new size is ensured to be committed.
+
+2012-08-31 Balazs Kelemen <kbal...@webkit.org>
+
[Qt] LayerTreeRenderer::callOnMainTread method name is misleading
https://bugs.webkit.org/show_bug.cgi?id=95558
Modified: trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp (127274 => 127275)
--- trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp 2012-08-31 17:07:09 UTC (rev 127274)
+++ trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp 2012-08-31 17:08:41 UTC (rev 127275)
@@ -325,15 +325,21 @@
void QRawWebView::setSize(const QSize& size)
{
- d->m_size = size;
- d->m_webPageProxy->setViewportSize(size);
-
-
WebKit::DrawingAreaProxy* drawingArea = d->m_webPageProxy->drawingArea();
if (!drawingArea)
return;
+ if (d->m_webPageProxy->useFixedLayout())
+ d->m_webPageProxy->setViewportSize(size);
+ else {
+ WebKit::LayerTreeCoordinatorProxy* coordinator = drawingArea->layerTreeCoordinatorProxy();
+ if (!coordinator)
+ return;
+ coordinator->setContentsSize(WebCore::FloatSize(size.width(), size.height()));
+ }
+ d->m_size = size;
+
drawingArea->setSize(d->m_size, WebCore::IntSize());
drawingArea->setVisibleContentsRect(WebCore::IntRect(WebCore::IntPoint(), d->m_size), 1 /*scale*/, WebCore::FloatPoint());
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
