Skip to content
GitLab
Switch branch/tag
  1. 13 Jun, 2013 9 commits
    • michael.bruning@digia.com's avatar
      [Qt][Mac] Disable QTKit video on OS X. · ca67018b
      michael.bruning@digia.com authored 
      https://bugs.webkit.org/show_bug.cgi?id=117591

Reviewed by Tor Arne Vestbø.

Source/WebCore:

Deployment of the same Qt binaries to different
Mac OS X version makes it impossible to link against
the correct WebKitSystemInterface version at build time.

No new tests, no behavioural change.

* WebCore.pri:

Tools:

Deployment of Qt binaries to different Mac OS X
platform version makes it impossible to link against
the correct version of the WebKitSystemInterface library,
so we need to disable QTKit for media elements.

* qmake/mkspecs/features/features.prf:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151546 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      ca67018b
    • commit-queue@webkit.org's avatar
      Column balancing support in the region based multicol implementation · 2a7d9989
      commit-queue@webkit.org authored 
      https://bugs.webkit.org/show_bug.cgi?id=116033

Source/WebCore:

Start by setting the column height to the flow thread's height divided
by the number of columns. Then stretch the column height until
contents fits without creating overflowing columns, or until the
maximum allowed column height is reached, whichever comes first. This
may require several layout iterations (but normally only a
couple). For each time we stretch, stretch by the least amount
required to make a difference to which box goes where.

Also make sure that the columns get tall enough to honor orphans
and widows settings.

This change takes some tiny steps in preparing for multiple column
set support. There is also some minor cleanup and bugfixing; see
details below.

Patch by Morten Stenshorne <mstensho@opera.com> on 2013-06-13
Reviewed by David Hyatt.

Tests: fast/multicol/newmulticol/balance-images.html
       fast/multicol/newmulticol/balance-maxheight1.html
       fast/multicol/newmulticol/balance-maxheight2.html
       fast/multicol/newmulticol/balance1.html
       fast/multicol/newmulticol/balance2.html
       fast/multicol/newmulticol/balance3.html
       fast/multicol/newmulticol/balance4.html
       fast/multicol/newmulticol/balance5.html
       fast/multicol/newmulticol/balance6.html
       fast/multicol/newmulticol/balance7.html
       fast/multicol/newmulticol/balance8.html
       fast/multicol/newmulticol/balance9.html
       fast/multicol/newmulticol/cell-shrinkback.html
       fast/multicol/newmulticol/columns-shorthand-parsing.html
       fast/multicol/newmulticol/orphans-and-widows-balance.html
       fast/multicol/newmulticol/single-line.html

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::adjustForUnsplittableChild):
(WebCore::RenderBlock::setPageBreak):
(WebCore):
(WebCore::RenderBlock::updateMinimumPageHeight):
(WebCore::calculateMinimumPageHeight):
(WebCore::RenderBlock::adjustLinePositionForPagination):
(WebCore::RenderBlock::adjustBlockChildForPagination): If no lines
cross the boundaries, we need to report where blocks cross
instead, so that the column balancer knows how much to stretch
columns if necessary.
* rendering/RenderBlock.h:
* rendering/RenderFlowThread.h:
* rendering/RenderMultiColumnBlock.cpp:
(WebCore::RenderMultiColumnBlock::RenderMultiColumnBlock):
(WebCore::RenderMultiColumnBlock::checkForPaginationLogicalHeightChange):
(WebCore::RenderMultiColumnBlock::relayoutForPagination):
(WebCore::RenderMultiColumnBlock::layoutSpecialExcludedChild):
* rendering/RenderMultiColumnBlock.h:
(WebCore::RenderMultiColumnBlock::columnHeightAvailable):
(WebCore::RenderMultiColumnBlock::requiresBalancing):
(RenderMultiColumnBlock):
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore::RenderMultiColumnFlowThread::autoGenerateRegionsToBlockOffset):
(WebCore::RenderMultiColumnFlowThread::setPageBreak):
(WebCore):
(WebCore::RenderMultiColumnFlowThread::updateMinimumPageHeight):
* rendering/RenderMultiColumnFlowThread.h:
(RenderMultiColumnFlowThread):
* rendering/RenderMultiColumnSet.cpp: Get rid of
RenderMultiColumnSet::updateLogicalHeight() override. Make
RenderMultiColumnSet behave more like normal blocks, by having
computeLogicalHeight() calculate logical top in addition to
height, just like any other block.
(WebCore::RenderMultiColumnSet::RenderMultiColumnSet):
(WebCore::RenderMultiColumnSet::heightAdjustedForSetOffset): This
method will become more meaningful once we add support for
multiple column sets.
(WebCore):
(WebCore::RenderMultiColumnSet::pageLogicalTopForOffset):
(WebCore::RenderMultiColumnSet::setAndConstrainColumnHeight):
(WebCore::RenderMultiColumnSet::calculateBalancedHeight):
(WebCore::RenderMultiColumnSet::recordSpaceShortage):
(WebCore::RenderMultiColumnSet::updateLogicalWidth):
(WebCore::RenderMultiColumnSet::prepareForLayout):
(WebCore::RenderMultiColumnSet::computeLogicalHeight):
(WebCore::RenderMultiColumnSet::columnCount):
(WebCore::RenderMultiColumnSet::columnIndexAtOffset):
repaintFlowThreadContent() could end up in an infinite loop
because columnIndexAtOffset() could return UINT_MAX
(subtracting 1 from unsigned 0, which columnCount() could return),
which an unsigned integer obviously can never become larger
than. Also always call columnIndexAtOffset() if we want to get the
column index for some offset, rather than doing it on our own
sometimes. To make this work also during layout, we cannot just
return the last column created so far if we're past it, since
adding new columns is exactly what we want to do at this point.
* rendering/RenderMultiColumnSet.h:
(RenderMultiColumnSet):

LayoutTests:

Patch by Morten Stenshorne <mstensho@opera.com> on 2013-06-13
Reviewed by David Hyatt.

* fast/multicol/newmulticol/balance-images-expected.txt: Added.
* fast/multicol/newmulticol/balance-images.html: Added.
* fast/multicol/newmulticol/balance-maxheight1-expected.txt: Added.
* fast/multicol/newmulticol/balance-maxheight1.html: Added.
* fast/multicol/newmulticol/balance-maxheight2-expected.txt: Added.
* fast/multicol/newmulticol/balance-maxheight2.html: Added.
* fast/multicol/newmulticol/balance1-expected.txt: Added.
* fast/multicol/newmulticol/balance1.html: Added.
* fast/multicol/newmulticol/balance2-expected.txt: Added.
* fast/multicol/newmulticol/balance2.html: Added.
* fast/multicol/newmulticol/balance3-expected.txt: Added.
* fast/multicol/newmulticol/balance3.html: Added.
* fast/multicol/newmulticol/balance4-expected.txt: Added.
* fast/multicol/newmulticol/balance4.html: Added.
* fast/multicol/newmulticol/balance5-expected.txt: Added.
* fast/multicol/newmulticol/balance5.html: Added.
* fast/multicol/newmulticol/balance6-expected.txt: Added.
* fast/multicol/newmulticol/balance6.html: Added.
* fast/multicol/newmulticol/balance7-expected.txt: Added.
* fast/multicol/newmulticol/balance7.html: Added.
* fast/multicol/newmulticol/balance8-expected.txt: Added.
* fast/multicol/newmulticol/balance8.html: Added.
* fast/multicol/newmulticol/balance9-expected.txt: Added.
* fast/multicol/newmulticol/balance9.html: Added.
* fast/multicol/newmulticol/cell-shrinkback-expected.html: Added.
* fast/multicol/newmulticol/cell-shrinkback.html: Added.
* fast/multicol/newmulticol/columns-shorthand-parsing-expected.html: Added.
* fast/multicol/newmulticol/columns-shorthand-parsing.html: Added.
* fast/multicol/newmulticol/orphans-and-widows-balance-expected.txt: Added.
* fast/multicol/newmulticol/orphans-and-widows-balance.html: Added.
* fast/multicol/newmulticol/single-line-expected.html: Added.
* fast/multicol/newmulticol/single-line.html: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151545 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      2a7d9989
    • zarvai@inf.u-szeged.hu's avatar
      [Qt] Unreviewed gardening. Unskipping passing test and move to the right place. · 14ef2dbe
      zarvai@inf.u-szeged.hu authored 
      Patch by Gabor Abraham <abrhm@inf.u-szeged.hu> on 2013-06-13

* platform/qt-5.0-wk2/TestExpectations:
* platform/qt/TestExpectations:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151544 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      14ef2dbe
    • ossy@webkit.org's avatar
      [ARM] Unreviewed gardening, skip one more test to paint the bot green. · dffe4aa9
      ossy@webkit.org authored 
      * platform/qt-arm/TestExpectations:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151543 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      dffe4aa9
    • zandobersek@gmail.com's avatar
      Unreviewed GTK gardening. · 8c46432b
      zandobersek@gmail.com authored 
      Adding failure expectations for most of the current failures.

* platform/gtk-wk1/TestExpectations:
* platform/gtk/TestExpectations:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151542 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      8c46432b
    • commit-queue@webkit.org's avatar
      [EFL][WK2] Wrong context menu and popup menu positions when scroll is applied · 50e00eea
      commit-queue@webkit.org authored 
      https://bugs.webkit.org/show_bug.cgi?id=116610

Patch by Michał Pakuła vel Rutka <m.pakula@samsung.com> on 2013-06-13
Reviewed by Noam Rosenthal.

Source/WebKit2:

WebKit2 EFL uses fixed layout - because of this ScrollView::contentsToWindow, does
not take scroll into account, as it is meant to be handled by UI application.
When popup and context menu are created, after calling contentsToWindow their position
are not adjusted to page scroll.
Added two functions to EwkView and WKView, converting contents position to user viewport
coordinates, to adjust popup and context menu positions.

* UIProcess/API/C/CoordinatedGraphics/WKView.cpp:
(WKViewContentsToUserViewport):
* UIProcess/API/C/CoordinatedGraphics/WKView.h:
* UIProcess/API/efl/EwkView.cpp:
(EwkView::showContextMenu):
(EwkView::requestPopupMenu):
* UIProcess/CoordinatedGraphics/WebView.cpp:
(WebKit::WebView::contentsToUserViewport):
* UIProcess/CoordinatedGraphics/WebView.h:

Tools:

Remove unnecessary code adjusting context menu position to webview position.
Now position is calculcated in EwkView.

* MiniBrowser/efl/main.c:
(on_context_menu_show):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151541 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      50e00eea
    • ryuan.choi@samsung.com's avatar
      [EFL] Refactor ewk_view_scroll to remove internal structure. · 00f5f457
      ryuan.choi@samsung.com authored 
      https://bugs.webkit.org/show_bug.cgi?id=115713

Reviewed by Gyuyoung Kim.

After removed c-ism from WebKit/Efl, There is no reason to keep internal
structures like Ewk_Scroll_Request.
This patch refactored ewk_view_scroll to use WTF instead of Ewk_Scroll_Request
and scrolls of SmartData.

* WebCoreSupport/ChromeClientEfl.cpp:
(WebCore::ChromeClientEfl::scroll):
* ewk/ewk_view.cpp: Removed functions to manage Ewk_Scroll_Request.
(_Ewk_View_Private_Data):
(_ewk_view_scrolls_flush):
(_ewk_view_priv_del):
(_ewk_view_smart_calculate):
(ewk_view_scroll_offsets_get):
(ewk_view_scroll_rects_get):
(ewk_view_scroll):
* ewk/ewk_view.h: Removed Ewk_Scroll_Request which is private structure.
* ewk/ewk_view_private.h:
(WebCore):
* ewk/ewk_view_single.cpp:
(_ewk_view_single_scroll_process_single):
(_ewk_view_single_smart_scrolls_process):
* ewk/ewk_view_tiled.cpp:
(_ewk_view_tiled_smart_scrolls_process):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151540 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      00f5f457
    • lforschler@apple.com's avatar
      Versioning. · 8dce1eb0
      lforschler@apple.com authored 
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151539 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      8dce1eb0
    • ossy@webkit.org's avatar
      [ARM] Unreviewed gardening, skip one more test to paint the bot green. · c0fac7e0
      ossy@webkit.org authored 
      * platform/qt-arm/TestExpectations:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151537 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      c0fac7e0
  3. 12 Jun, 2013 31 commits