Changeset 85777 in webkit


Ignore:
Timestamp:
May 4, 2011 12:20:49 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-05-04 Justin Novosad <​junov@chromium.org>

Reviewed by Kenneth Russell.

[Chromium] Add gpu acceleration flags to DumpRenderTree
​https://bugs.webkit.org/show_bug.cgi?id=60168
Adding support for command line flags
enable-accelerated-2d-canvas an
enable-accelerated-drawing in DumpRenderTree.

  • DumpRenderTree/chromium/DumpRenderTree.cpp: (main):
  • DumpRenderTree/chromium/TestShell.cpp: (TestShell::TestShell): (TestShell::resetWebSettings):
  • DumpRenderTree/chromium/TestShell.h: (TestShell::setLegacyAccelerated2dCanvasEnabled): (TestShell::setAcceleratedDrawingEnabled):
  • 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

    r85776 r85777  
     12011-05-04  Justin Novosad  <junov@chromium.org>
     2
     3        Reviewed by Kenneth Russell.
     4
     5        [Chromium] Add gpu acceleration flags to DumpRenderTree
     6        https://bugs.webkit.org/show_bug.cgi?id=60168
     7        Adding support for command line flags
     8        enable-accelerated-2d-canvas an
     9        enable-accelerated-drawing in DumpRenderTree.
     10
     11        * DumpRenderTree/chromium/DumpRenderTree.cpp:
     12        (main):
     13        * DumpRenderTree/chromium/TestShell.cpp:
     14        (TestShell::TestShell):
     15        (TestShell::resetWebSettings):
     16        * DumpRenderTree/chromium/TestShell.h:
     17        (TestShell::setLegacyAccelerated2dCanvasEnabled):
     18        (TestShell::setAcceleratedDrawingEnabled):
     19        * DumpRenderTree/chromium/WebPreferences.cpp:
     20        (WebPreferences::reset):
     21        (WebPreferences::applyTo):
     22        * DumpRenderTree/chromium/WebPreferences.h:
     23
    1242011-05-04  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
    225

  • trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp

    r84361 r85777  
    11/*
    2  * Copyright (C) 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2011 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    5757static const char optionForceCompositingMode[] = "--force-compositing-mode";
    5858static const char optionEnableAccelerated2DCanvas[] = "--enable-accelerated-2d-canvas";
     59static const char optionEnableLegacyAccelerated2DCanvas[] = "--enable-legacy-accelerated-2d-canvas";
     60static const char optionEnableAcceleratedDrawing[] = "--enable-accelerated-drawing";
    5961static const char optionEnableCompositeToTexture[] = "--enable-composite-to-texture";
    6062
    … …  
    138140    bool forceCompositingMode = false;
    139141    bool accelerated2DCanvasEnabled = false;
     142    bool legacyAccelerated2DCanvasEnabled = false;
     143    bool acceleratedDrawingEnabled = false;
    140144    bool stressOpt = false;
    141145    bool stressDeopt = false;
    … …  
    177181        else if (argument == optionEnableAccelerated2DCanvas)
    178182            accelerated2DCanvasEnabled = true;
     183        else if (argument == optionEnableLegacyAccelerated2DCanvas)
     184            legacyAccelerated2DCanvasEnabled = true;
     185        else if (argument == optionEnableAcceleratedDrawing)
     186            acceleratedDrawingEnabled = true;
    179187        else if (argument == optionStressOpt)
    180188            stressOpt = true;
    … …  
    211219        shell.setForceCompositingMode(forceCompositingMode);
    212220        shell.setAccelerated2dCanvasEnabled(accelerated2DCanvasEnabled);
     221        shell.setLegacyAccelerated2dCanvasEnabled(legacyAccelerated2DCanvasEnabled);
     222        shell.setAcceleratedDrawingEnabled(acceleratedDrawingEnabled);
    213223        shell.setJavaScriptFlags(javaScriptFlags);
    214224        shell.setStressOpt(stressOpt);

  • trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

    r84926 r85777  
    103103    , m_forceCompositingMode(false)
    104104    , m_accelerated2dCanvasEnabled(false)
     105    , m_legacyAccelerated2dCanvasEnabled(false)
     106    , m_acceleratedDrawingEnabled(false)
    105107    , m_stressOpt(false)
    106108    , m_stressDeopt(false)
    … …  
    183185    m_prefs.forceCompositingMode = m_forceCompositingMode;
    184186    m_prefs.accelerated2dCanvasEnabled = m_accelerated2dCanvasEnabled;
     187    m_prefs.legacyAccelerated2dCanvasEnabled = m_legacyAccelerated2dCanvasEnabled;
     188    m_prefs.acceleratedDrawingEnabled = m_acceleratedDrawingEnabled;
    185189    m_prefs.applyTo(&webView);
    186190}

  • trunk/Tools/DumpRenderTree/chromium/TestShell.h

    r84361 r85777  
    130130    void setForceCompositingMode(bool enabled) { m_forceCompositingMode = enabled; }
    131131    void setAccelerated2dCanvasEnabled(bool enabled) { m_accelerated2dCanvasEnabled = enabled; }
    132 
     132    void setLegacyAccelerated2dCanvasEnabled(bool enabled) { m_legacyAccelerated2dCanvasEnabled = enabled; }
     133    void setAcceleratedDrawingEnabled(bool enabled) { m_acceleratedDrawingEnabled = enabled; }
    133134#if defined(OS_WIN)
    134135    // Access to the finished event.  Used by the static WatchDog thread.
    … …  
    207208    bool m_forceCompositingMode;
    208209    bool m_accelerated2dCanvasEnabled;
     210    bool m_legacyAccelerated2dCanvasEnabled;
     211    bool m_acceleratedDrawingEnabled;
    209212    WebPreferences m_prefs;
    210213    bool m_stressOpt;

  • trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp

    r84361 r85777  
    106106    compositeToTexture = false;
    107107    accelerated2dCanvasEnabled = false;
     108    legacyAccelerated2dCanvasEnabled = false;
     109    acceleratedDrawingEnabled = false;
    108110    forceCompositingMode = false;
    109111}
    … …  
    155157    settings->setForceCompositingMode(forceCompositingMode);
    156158    settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled);
     159    settings->setLegacyAccelerated2dCanvasEnabled(legacyAccelerated2dCanvasEnabled);
     160    settings->setAcceleratedDrawingEnabled(acceleratedDrawingEnabled);
    157161
    158162    // Fixed values.

  • trunk/Tools/DumpRenderTree/chromium/WebPreferences.h

    r84361 r85777  
    8282    bool forceCompositingMode;
    8383    bool accelerated2dCanvasEnabled;
     84    bool legacyAccelerated2dCanvasEnabled;
     85    bool acceleratedDrawingEnabled;
    8486
    8587    WebPreferences() { reset(); }
Note: See TracChangeset for help on using the changeset viewer.