Changeset 84361 in webkit


Ignore:
Timestamp:
Apr 20, 2011 6:17:01 AM (13 years ago)
Author:
wjmaclean@chromium.org
Message:

2011-04-20 W. James MacLean <wjmaclean@chromium.org>

Reviewed by Kenneth Russell.

Add support for composite-to-texture to DumpRenderTree.
https://bugs.webkit.org/show_bug.cgi?id=58675

  • DumpRenderTree/chromium/DumpRenderTree.cpp: (main):
  • DumpRenderTree/chromium/TestShell.cpp: (TestShell::TestShell): (TestShell::resetWebSettings):
  • DumpRenderTree/chromium/TestShell.h: (TestShell::setCompositeToTexture):
  • DumpRenderTree/chromium/WebPreferences.cpp: (WebPreferences::reset): (WebPreferences::applyTo):
  • DumpRenderTree/chromium/WebPreferences.h:
Location:
trunk/Tools
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r84333 r84361  
     12011-04-20  W. James MacLean  <wjmaclean@chromium.org>
     2
     3        Reviewed by Kenneth Russell.
     4
     5        Add support for composite-to-texture to DumpRenderTree.
     6        https://bugs.webkit.org/show_bug.cgi?id=58675
     7
     8        * DumpRenderTree/chromium/DumpRenderTree.cpp:
     9        (main):
     10        * DumpRenderTree/chromium/TestShell.cpp:
     11        (TestShell::TestShell):
     12        (TestShell::resetWebSettings):
     13        * DumpRenderTree/chromium/TestShell.h:
     14        (TestShell::setCompositeToTexture):
     15        * DumpRenderTree/chromium/WebPreferences.cpp:
     16        (WebPreferences::reset):
     17        (WebPreferences::applyTo):
     18        * DumpRenderTree/chromium/WebPreferences.h:
     19
    1202011-04-19  Eric Seidel  <eric@webkit.org>
    221
  • trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp

    r81603 r84361  
    5757static const char optionForceCompositingMode[] = "--force-compositing-mode";
    5858static const char optionEnableAccelerated2DCanvas[] = "--enable-accelerated-2d-canvas";
     59static const char optionEnableCompositeToTexture[] = "--enable-composite-to-texture";
    5960
    6061static const char optionStressOpt[] = "--stress-opt";
     
    134135    bool startupDialog = false;
    135136    bool acceleratedCompositingEnabled = false;
     137    bool compositeToTexture = false;
    136138    bool forceCompositingMode = false;
    137139    bool accelerated2DCanvasEnabled = false;
     
    169171        else if (argument == optionEnableAcceleratedCompositing)
    170172            acceleratedCompositingEnabled = true;
     173        else if (argument == optionEnableCompositeToTexture)
     174            compositeToTexture = true;
    171175        else if (argument == optionForceCompositingMode)
    172176            forceCompositingMode = true;
     
    204208        shell.setAllowExternalPages(allowExternalPages);
    205209        shell.setAcceleratedCompositingEnabled(acceleratedCompositingEnabled);
     210        shell.setCompositeToTexture(compositeToTexture);
    206211        shell.setForceCompositingMode(forceCompositingMode);
    207212        shell.setAccelerated2dCanvasEnabled(accelerated2DCanvasEnabled);
  • trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

    r83941 r84361  
    100100    , m_allowExternalPages(false)
    101101    , m_acceleratedCompositingEnabled(false)
     102    , m_compositeToTexture(false)
    102103    , m_forceCompositingMode(false)
    103104    , m_accelerated2dCanvasEnabled(false)
     
    179180    m_prefs.reset();
    180181    m_prefs.acceleratedCompositingEnabled = m_acceleratedCompositingEnabled;
     182    m_prefs.compositeToTexture = m_compositeToTexture;
    181183    m_prefs.forceCompositingMode = m_forceCompositingMode;
    182184    m_prefs.accelerated2dCanvasEnabled = m_accelerated2dCanvasEnabled;
  • trunk/Tools/DumpRenderTree/chromium/TestShell.h

    r83941 r84361  
    127127
    128128    void setAcceleratedCompositingEnabled(bool enabled) { m_acceleratedCompositingEnabled = enabled; }
     129    void setCompositeToTexture(bool enabled) { m_compositeToTexture = enabled; }
    129130    void setForceCompositingMode(bool enabled) { m_forceCompositingMode = enabled; }
    130131    void setAccelerated2dCanvasEnabled(bool enabled) { m_accelerated2dCanvasEnabled = enabled; }
     
    203204    bool m_allowExternalPages;
    204205    bool m_acceleratedCompositingEnabled;
     206    bool m_compositeToTexture;
    205207    bool m_forceCompositingMode;
    206208    bool m_accelerated2dCanvasEnabled;
  • trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp

    r83701 r84361  
    104104    hyperlinkAuditingEnabled = false;
    105105    acceleratedCompositingEnabled = false;
     106    compositeToTexture = false;
    106107    accelerated2dCanvasEnabled = false;
    107108    forceCompositingMode = false;
     
    151152    settings->setCaretBrowsingEnabled(caretBrowsingEnabled);
    152153    settings->setAcceleratedCompositingEnabled(acceleratedCompositingEnabled);
     154    settings->setCompositeToTextureEnabled(compositeToTexture);
    153155    settings->setForceCompositingMode(forceCompositingMode);
    154156    settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled);
  • trunk/Tools/DumpRenderTree/chromium/WebPreferences.h

    r81289 r84361  
    7979    bool caretBrowsingEnabled;
    8080    bool acceleratedCompositingEnabled;
     81    bool compositeToTexture;
    8182    bool forceCompositingMode;
    8283    bool accelerated2dCanvasEnabled;
Note: See TracChangeset for help on using the changeset viewer.