Summary: | [Qt] ASSERT(m_useFixedLayout) in WebPage when using QRawWebView without setting fixed layout | ||||||
---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Balazs Kelemen <kbalazs> | ||||
Component: | WebKit Qt | Assignee: | Balazs Kelemen <kbalazs> | ||||
Status: | RESOLVED FIXED | ||||||
Severity: | Normal | CC: | abecsi, cmarcelo, jturcotte, kenneth, luiz, menard, noam, webkit.review.bot, zoltan | ||||
Priority: | P2 | ||||||
Version: | 528+ (Nightly build) | ||||||
Hardware: | Unspecified | ||||||
OS: | Unspecified | ||||||
Attachments: |
|
Description
Balazs Kelemen
2012-08-31 04:44:56 PDT
Created attachment 161665 [details]
Patch
Comment on attachment 161665 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161665&action=review > Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp:334 > + // Note: it's up to our client to decide if it wants fixed layout. > + if (d->m_webPageProxy->useFixedLayout()) > + d->m_webPageProxy->setViewportSize(size); whether*. Anyway does that commetn add any value? > Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp:339 > + WebKit::LayerTreeCoordinatorProxy* coordinator = drawingArea->layerTreeCoordinatorProxy(); > + if (!coordinator) > + return; > + coordinator->setContentsSize(WebCore::FloatSize(size.width(), size.height())); That could be written in two lines instead of 4 (In reply to comment #2) > (From update of attachment 161665 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=161665&action=review > > > Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp:334 > > + // Note: it's up to our client to decide if it wants fixed layout. > > + if (d->m_webPageProxy->useFixedLayout()) > > + d->m_webPageProxy->setViewportSize(size); > > whether*. Anyway does that commetn add any value? Not much, I can remove it. > > > Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp:339 > > + WebKit::LayerTreeCoordinatorProxy* coordinator = drawingArea->layerTreeCoordinatorProxy(); > > + if (!coordinator) > > + return; > > + coordinator->setContentsSize(WebCore::FloatSize(size.width(), size.height())); > > That could be written in two lines instead of 4 Than I need an else+return, so it would still be 4 lines :) Comment on attachment 161665 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161665&action=review >>> Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp:339 >>> + coordinator->setContentsSize(WebCore::FloatSize(size.width(), size.height())); >> >> That could be written in two lines instead of 4 > > Than I need an else+return, so it would still be 4 lines :) Ah you are right else if (WebKit::LayerTreeCoordinatorProxy* coordinator = drawingArea->layerTreeCoordinatorProxy()) coordinator-> else return; Comment on attachment 161665 [details]
Patch
Please remove comment before committing as Kenneth suggests.
Landed in http://trac.webkit.org/changeset/127275 |