Changeset 106199 in webkit


Ignore:
Timestamp:
Jan 29, 2012 3:23:17 PM (12 years ago)
Author:
Csaba Osztrogonác
Message:

Unreviewed, rolling out r106109.
​http://trac.webkit.org/changeset/106109
​https://bugs.webkit.org/show_bug.cgi?id=77302

It made tests crash (Requested by Ossy_weekend on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-01-29

Source/WebCore:

  • platform/graphics/qt/TextureMapperQt.cpp:

(WebCore::TextureMapperQt::setGraphicsContext):

  • platform/graphics/qt/TextureMapperQt.h:

(WebCore::TextureMapperQt::initialize):

Source/WebKit2:

  • UIProcess/API/qt/qquickwebpage.cpp:
  • UIProcess/API/qt/qquickwebpage_p_p.h:

(QQuickWebPagePrivate):

  • UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::QQuickWebViewPrivate):

  • UIProcess/API/qt/qquickwebview_p.h:
  • UIProcess/API/qt/qquickwebview_p_p.h:

(QQuickWebViewPrivate):

  • UIProcess/DrawingAreaProxy.h:
  • UIProcess/DrawingAreaProxyImpl.cpp:
  • UIProcess/DrawingAreaProxyImpl.h:

(DrawingAreaProxyImpl):

  • UIProcess/LayerTreeHostProxy.h:

(LayerTreeHostProxy):

  • UIProcess/qt/LayerTreeHostProxyQt.cpp:

(WebKit::LayerTreeHostProxy::paintToCurrentGLContext):

  • UIProcess/qt/QtPageClient.cpp:

(QtPageClient::setViewNeedsDisplay):

Tools:

  • WebKitTestRunner/qt/PlatformWebViewQt.cpp:

(WTR::WrapperWindow::WrapperWindow):
(WTR::PlatformWebView::PlatformWebView):

LayoutTests:

  • platform/qt-wk2/Skipped:
Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r106198 r106199  
     12012-01-29  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r106109.
     4        http://trac.webkit.org/changeset/106109
     5        https://bugs.webkit.org/show_bug.cgi?id=77302
     6
     7        It made tests crash (Requested by Ossy_weekend on #webkit).
     8
     9        * platform/qt-wk2/Skipped:
     10
    1112012-01-28  Gavin Barraclough  <barraclough@apple.com>
    212

  • trunk/LayoutTests/platform/qt-wk2/Skipped

    r106109 r106199  
    440440tables/mozilla_expected_failures/marvin/backgr_position-table-column.html
    441441
     442# [Qt][WK2] REGRESSION(r105517): It made 49 tests timeout
     443# https://bugs.webkit.org/show_bug.cgi?id=76708
     444animations/3d/change-transform-in-end-event.html
     445animations/3d/replace-filling-transform.html
     446animations/3d/state-at-end-event-transform.html
     447animations/3d/transform-perspective.html
     448animations/additive-transform-animations.html
     449animations/animation-direction-normal.html
     450animations/animation-end-event-destroy-renderer.html
     451animations/animation-hit-test-transform.html
     452animations/animation-iteration-event-destroy-renderer.html
     453animations/animation-matrix-negative-scale-unmatrix.html
     454animations/animation-start-event-destroy-renderer.html
     455animations/big-rotation.html
     456animations/combo-transform-rotate+scale.html
     457animations/combo-transform-translate+scale.html
     458animations/dynamic-stylesheet-loading.html
     459animations/fill-mode-transform.html
     460animations/keyframe-timing-functions-transform.html
     461animations/matrix-anim.html
     462animations/missing-from-to-transforms.html
     463animations/missing-keyframe-properties-repeating.html
     464animations/missing-keyframe-properties-timing-function.html
     465animations/missing-keyframe-properties.html
     466animations/missing-values-first-keyframe.html
     467animations/missing-values-last-keyframe.html
     468animations/negative-delay.html
     469animations/opacity-transform-animation.html
     470animations/pause-crash.html
     471animations/play-state-paused.html
     472animations/play-state-suspend.html
     473animations/simultaneous-start-transform.html
     474animations/stop-animation-on-suspend.html
     475animations/suspend-resume-animation.html
     476animations/suspend-transform-animation.html
     477animations/transition-and-animation-1.html
     478animations/transition-and-animation-2.html
     479fast/css/getComputedStyle/getComputedStyle-with-pseudo-element.html
     480tables/mozilla/marvin/backgr_simple-table-cell.html
     481transitions/3d/interrupted-transition.html
     482transitions/cancel-transition.html
     483transitions/extra-transition.html
     484transitions/interrupt-transform-transition.html
     485transitions/interrupted-accelerated-transition.html
     486transitions/move-after-transition.html
     487transitions/start-transform-transition.html
     488transitions/transition-end-event-destroy-iframe.html
     489transitions/transition-end-event-destroy-renderer.html
     490transitions/transition-end-event-multiple-04.html
     491transitions/transition-end-event-rendering.html
     492transitions/transition-end-event-transform.html
     493
    442494# [Qt][WK2] http/tests/history/replacestate-post-to-get-2.html fails with timeout
    443495# https://bugs.webkit.org/show_bug.cgi?id=76784

  • trunk/Source/WebCore/ChangeLog

    r106192 r106199  
     12012-01-29  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r106109.
     4        http://trac.webkit.org/changeset/106109
     5        https://bugs.webkit.org/show_bug.cgi?id=77302
     6
     7        It made tests crash (Requested by Ossy_weekend on #webkit).
     8
     9        * platform/graphics/qt/TextureMapperQt.cpp:
     10        (WebCore::TextureMapperQt::setGraphicsContext):
     11        * platform/graphics/qt/TextureMapperQt.h:
     12        (WebCore::TextureMapperQt::initialize):
     13
    1142012-01-28  Alexander Færøy  <ahf@0x90.dk>
    215

  • trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.cpp

    r106109 r106199  
    142142{
    143143    m_context = context;
    144     m_painter = context ? context->platformContext() : 0;
     144    m_painter = context->platformContext();
    145145    initialize(m_painter);
    146146}

  • trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.h

    r106109 r106199  
    7171    static void initialize(QPainter* painter)
    7272    {
    73         if (painter)
    74             painter->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, false);
     73        painter->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, false);
    7574    }
    7675

  • trunk/Source/WebKit2/ChangeLog

    r106146 r106199  
     12012-01-29  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r106109.
     4        http://trac.webkit.org/changeset/106109
     5        https://bugs.webkit.org/show_bug.cgi?id=77302
     6
     7        It made tests crash (Requested by Ossy_weekend on #webkit).
     8
     9        * UIProcess/API/qt/qquickwebpage.cpp:
     10        * UIProcess/API/qt/qquickwebpage_p_p.h:
     11        (QQuickWebPagePrivate):
     12        * UIProcess/API/qt/qquickwebview.cpp:
     13        (QQuickWebViewPrivate::QQuickWebViewPrivate):
     14        * UIProcess/API/qt/qquickwebview_p.h:
     15        * UIProcess/API/qt/qquickwebview_p_p.h:
     16        (QQuickWebViewPrivate):
     17        * UIProcess/DrawingAreaProxy.h:
     18        * UIProcess/DrawingAreaProxyImpl.cpp:
     19        * UIProcess/DrawingAreaProxyImpl.h:
     20        (DrawingAreaProxyImpl):
     21        * UIProcess/LayerTreeHostProxy.h:
     22        (LayerTreeHostProxy):
     23        * UIProcess/qt/LayerTreeHostProxyQt.cpp:
     24        (WebKit::LayerTreeHostProxy::paintToCurrentGLContext):
     25        * UIProcess/qt/QtPageClient.cpp:
     26        (QtPageClient::setViewNeedsDisplay):
     27
    1282012-01-27  Fady Samuel  <fsamuel@chromium.org>
    229

  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp

    r106109 r106199  
    101101}
    102102
    103 void QQuickWebPagePrivate::paint(QPainter* painter)
    104 {
    105     if (webPageProxy->drawingArea())
    106         webPageProxy->drawingArea()->paintLayerTree(painter);
    107 }
    108 
    109103void QQuickWebPagePrivate::paintToCurrentGLContext()
    110104{

  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h

    r106109 r106199  
    4444
    4545    void paintToCurrentGLContext();
    46     void paint(QPainter*);
    4746    void resetPaintNode();
    4847

  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

    r106109 r106199  
    6868    , pageIsSuspended(false)
    6969    , m_navigatorQtObjectEnabled(false)
    70     , m_renderToOffscreenBuffer(false)
    7170{
    7271    viewport->setFlags(QQuickItem::ItemClipsChildrenToShape);
    … …  
    156155}
    157156
    158 void QQuickWebViewPrivate::setNeedsDisplay()
    159 {
    160     Q_Q(QQuickWebView);
    161     if (renderToOffscreenBuffer()) {
    162         // TODO: we can maintain a real image here and use it for pixel tests. Right now this is used only for running the rendering code-path while running tests.
    163         QImage dummyImage(1, 1, QImage::Format_ARGB32);
    164         QPainter painter(&dummyImage);
    165         q->page()->d->paint(&painter);
    166         return;
    167     }
    168 
    169     q->page()->update();
    170 }
    171 
    172157void QQuickWebViewPrivate::loadDidCommit()
    173158{
    … …  
    673658
    674659    d->setUseTraditionalDesktopBehaviour(enable);
    675 }
    676 
    677 void QQuickWebViewExperimental::setRenderToOffscreenBuffer(bool enable)
    678 {
    679     Q_D(QQuickWebView);
    680     d->setRenderToOffscreenBuffer(enable);
    681 }
    682 
    683 bool QQuickWebViewExperimental::renderToOffscreenBuffer() const
    684 {
    685     Q_D(const QQuickWebView);
    686     return d->renderToOffscreenBuffer();
    687660}
    688661

  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h

    r106109 r106199  
    238238    QDeclarativeComponent* itemSelector() const;
    239239    void setItemSelector(QDeclarativeComponent*);
     240   
     241    QWebViewportInfo* viewportInfo();
     242
     243    QWebPreferences* preferences() const;
    240244    bool useTraditionalDesktopBehaviour() const;
    241     void setUseTraditionalDesktopBehaviour(bool enable);
    242 
    243     QWebViewportInfo* viewportInfo();
    244 
    245     QWebPreferences* preferences() const;
    246245    QWebNavigationHistory* navigationHistory() const;
    247246    QQuickWebPage* page();
    … …  
    255254    void sendApplicationSchemeReply(QQuickNetworkReply*);
    256255
    257     // C++ only
    258     bool renderToOffscreenBuffer() const;
    259     void setRenderToOffscreenBuffer(bool enable);
    260 
    261256public Q_SLOTS:
     257    void setUseTraditionalDesktopBehaviour(bool enable);
    262258    void goBackTo(int index);
    263259    void goForwardTo(int index);

  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h

    r106109 r106199  
    7878    void didChangeBackForwardList();
    7979
    80     void setNeedsDisplay();
    81 
    8280    void updateDesktopViewportSize();
    8381    void updateTouchViewportSize();
    … …  
    104102
    105103    void setUseTraditionalDesktopBehaviour(bool enable);
    106     void setRenderToOffscreenBuffer(bool enable) { m_renderToOffscreenBuffer = enable; }
    107104    void setViewInAttachedProperties(QObject*);
    108105    void setIcon(const QUrl&);
    109106
    110107    bool navigatorQtObjectEnabled() const;
    111     bool renderToOffscreenBuffer() const { return m_renderToOffscreenBuffer; }
    112108    void setNavigatorQtObjectEnabled(bool);
    113109
    … …  
    171167    bool pageIsSuspended;
    172168    bool m_navigatorQtObjectEnabled;
    173     bool m_renderToOffscreenBuffer;
    174169    QUrl m_iconURL;
    175170};

  • trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h

    r106109 r106199  
    2828#define DrawingAreaProxy_h
    2929
    30 #include "BackingStore.h"
    3130#include "DrawingAreaInfo.h"
    3231#include <WebCore/IntRect.h>
    … …  
    9089    virtual bool isBackingStoreReady() const { return true; }
    9190    virtual void paintToCurrentGLContext(const WebCore::TransformationMatrix&, float opacity) { }
    92     virtual void paintLayerTree(BackingStore::PlatformGraphicsContext) { }
    9391    LayerTreeHostProxy* layerTreeHostProxy() const { return m_layerTreeHostProxy.get(); }
    9492

  • trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp

    r106109 r106199  
    361361}
    362362
    363 void DrawingAreaProxyImpl::paintLayerTree(BackingStore::PlatformGraphicsContext context)
    364 {
    365     if (m_layerTreeHostProxy)
    366         m_layerTreeHostProxy->paintToGraphicsContext(context);
    367 }
    368 
    369363void DrawingAreaProxyImpl::paintToCurrentGLContext(const TransformationMatrix& matrix, float opacity)
    370364{

  • trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h

    r106109 r106199  
    8282    virtual void setVisibleContentRectTrajectoryVector(const WebCore::FloatPoint&);
    8383    virtual void paintToCurrentGLContext(const WebCore::TransformationMatrix&, float opacity);
    84     virtual void paintLayerTree(BackingStore::PlatformGraphicsContext);
    8584    void didReceiveLayerTreeHostProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
    8685#endif

  • trunk/Source/WebKit2/UIProcess/LayerTreeHostProxy.h

    r106109 r106199  
    5454    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
    5555    void paintToCurrentGLContext(const WebCore::TransformationMatrix&, float);
    56     void paintToGraphicsContext(BackingStore::PlatformGraphicsContext);
    5756    void purgeGLResources();
    5857    void setVisibleContentsRectAndScale(const WebCore::IntRect&, float);

  • trunk/Source/WebKit2/UIProcess/qt/LayerTreeHostProxyQt.cpp

    r106109 r106199  
    2828#include "ShareableBitmap.h"
    2929#include "TextureMapperGL.h"
    30 #include "TextureMapperQt.h"
    3130#include "UpdateInfo.h"
    3231#include "WebCoreArgumentCoders.h"
    … …  
    173172    if (!m_textureMapper)
    174173        m_textureMapper = TextureMapperGL::create();
    175     ASSERT(dynamic_cast<TextureMapperGL*>(m_textureMapper.get()));
    176174
    177175    syncRemoteContent();
    … …  
    206204    }
    207205}
    208 
    209 void LayerTreeHostProxy::paintToGraphicsContext(QPainter* painter)
    210 {
    211     if (!m_textureMapper)
    212         m_textureMapper = TextureMapperQt::create();
    213     ASSERT(dynamic_cast<TextureMapperQt*>(m_textureMapper.get()));
    214 
    215     syncRemoteContent();
    216     TextureMapperNode* node = toTextureMapperNode(rootLayer());
    217 
    218     if (!node)
    219         return;
    220 
    221     GraphicsContext graphicsContext(painter);
    222     m_textureMapper->setGraphicsContext(&graphicsContext);
    223     m_textureMapper->beginPainting();
    224     m_textureMapper->bindSurface(0);
    225     node->paint();
    226     m_textureMapper->endPainting();
    227     m_textureMapper->setGraphicsContext(0);
    228 }
    229 
    230206
    231207void LayerTreeHostProxy::didFireViewportUpdateTimer(Timer<LayerTreeHostProxy>*)

  • trunk/Source/WebKit2/UIProcess/qt/QtPageClient.cpp

    r106109 r106199  
    6363void QtPageClient::setViewNeedsDisplay(const WebCore::IntRect& rect)
    6464{
    65     QQuickWebViewPrivate::get(m_webView)->setNeedsDisplay();
     65    m_webView->page()->update();
    6666}
    6767

  • trunk/Tools/ChangeLog

    r106195 r106199  
     12012-01-29  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r106109.
     4        http://trac.webkit.org/changeset/106109
     5        https://bugs.webkit.org/show_bug.cgi?id=77302
     6
     7        It made tests crash (Requested by Ossy_weekend on #webkit).
     8
     9        * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
     10        (WTR::WrapperWindow::WrapperWindow):
     11        (WTR::PlatformWebView::PlatformWebView):
     12
    1132012-01-28  Nico Weber  <thakis@chromium.org>
    214

  • trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp

    r106109 r106199  
    4646        , m_view(view)
    4747    {
     48        QQuickWebViewExperimental(view).setUseTraditionalDesktopBehaviour(true);
    4849        connect(this, SIGNAL(statusChanged(QQuickView::Status)), SLOT(handleStatusChanged(QQuickView::Status)));
    4950    }
    … …  
    7576    , m_modalEventLoop(0)
    7677{
    77     QQuickWebViewExperimental experimental(m_view);
    78     experimental.setUseTraditionalDesktopBehaviour(true);
    79     experimental.setRenderToOffscreenBuffer(true);
    8078}
    8179
Note: See TracChangeset for help on using the changeset viewer.