Changeset 79920 in webkit


Ignore:
Timestamp:
Feb 28, 2011 2:14:21 PM (13 years ago)
Author:
inferno@chromium.org
Message:

2011-02-28 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r78789.
​http://trac.webkit.org/changeset/78789
​https://bugs.webkit.org/show_bug.cgi?id=55409

Incorrect canvas fallback implementation (Requested by
inferno-sec on #webkit).

  • public/WebAccessibilityRole.h:
  • src/AssertMatchingEnums.cpp:

2011-02-28 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r78789.
​http://trac.webkit.org/changeset/78789
​https://bugs.webkit.org/show_bug.cgi?id=55409

Incorrect canvas fallback implementation (Requested by
inferno-sec on #webkit).

  • AccessibleBase.cpp: (MSAARole):

2011-02-28 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r78789.
​http://trac.webkit.org/changeset/78789
​https://bugs.webkit.org/show_bug.cgi?id=55409

Incorrect canvas fallback implementation (Requested by
inferno-sec on #webkit).

  • accessibility/AccessibilityObject.h:
  • accessibility/AccessibilityRenderObject.cpp: (WebCore::AccessibilityRenderObject::determineAccessibilityRole): (WebCore::AccessibilityRenderObject::canHaveChildren):
  • accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (atkRole):
  • accessibility/mac/AccessibilityObjectWrapper.mm:
  • html/HTMLFormControlElement.cpp: (WebCore::HTMLFormControlElement::isFocusable):
  • rendering/RenderHTMLCanvas.cpp:
  • rendering/RenderHTMLCanvas.h:
  • rendering/RenderObject.cpp: (WebCore::RenderObject::repaint):
  • rendering/RenderTreeAsText.cpp: (WebCore::write):

2011-02-28 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r78789.
​http://trac.webkit.org/changeset/78789
​https://bugs.webkit.org/show_bug.cgi?id=55409

Incorrect canvas fallback implementation (Requested by
inferno-sec on #webkit).

  • accessibility/canvas-fallback-content-expected.txt: Removed.
  • accessibility/canvas-fallback-content.html: Removed.
  • accessibility/canvas.html:
Location:
trunk
Files:
2 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r79919 r79920  
     12011-02-28  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r78789.
     4        http://trac.webkit.org/changeset/78789
     5        https://bugs.webkit.org/show_bug.cgi?id=55409
     6
     7        Incorrect canvas fallback implementation (Requested by
     8        inferno-sec on #webkit).
     9
     10        * accessibility/canvas-fallback-content-expected.txt: Removed.
     11        * accessibility/canvas-fallback-content.html: Removed.
     12        * accessibility/canvas.html:
     13
    1142011-02-28  Sheriff Bot  <webkit.review.bot@gmail.com>
    215

  • trunk/LayoutTests/accessibility/canvas.html

    r78789 r79920  
    3535<body id="body" onload="_onload()">
    3636
    37     <!-- This test makes sure that a canvas element shows up as a grouping (because it can have fallback content) -->
     37<html>
    3838 
    39     <canvas title="myCanvasTitle" id="myCanvas" style="width:300px;height:300px;"  width='300' height='300' alt="canvas 1"></canvas>
     39    <!-- This test makes sure that a canvas element shows up as an image -->
     40 
     41    <canvas id="myCanvas" style="width:300px;height:300px;"  width='300' height='300' alt="canvas 1"></canvas>
    4042
    4143    <div id="result"></div>
    … …  
    4951            var canvasElement = accessibilityController.focusedElement.childAtIndex(0).childAtIndex(0);
    5052           
    51             var pattern = "AXRole: AXGroup";
    52             var pattern2 = "AXTitle: myCanvasTitle";
    53             if (canvasElement.allAttributes().indexOf(pattern) != -1 && canvasElement.allAttributes().indexOf(pattern2) != -1) {
     53            var pattern = "AXRole: AXImage";
     54            if (canvasElement.allAttributes().indexOf(pattern) != -1) {
    5455                result.innerText += "Test passed\n";
    5556            }

  • trunk/Source/WebCore/ChangeLog

    r79919 r79920  
     12011-02-28  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r78789.
     4        http://trac.webkit.org/changeset/78789
     5        https://bugs.webkit.org/show_bug.cgi?id=55409
     6
     7        Incorrect canvas fallback implementation (Requested by
     8        inferno-sec on #webkit).
     9
     10        * accessibility/AccessibilityObject.h:
     11        * accessibility/AccessibilityRenderObject.cpp:
     12        (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
     13        (WebCore::AccessibilityRenderObject::canHaveChildren):
     14        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
     15        (atkRole):
     16        * accessibility/mac/AccessibilityObjectWrapper.mm:
     17        * html/HTMLFormControlElement.cpp:
     18        (WebCore::HTMLFormControlElement::isFocusable):
     19        * rendering/RenderHTMLCanvas.cpp:
     20        * rendering/RenderHTMLCanvas.h:
     21        * rendering/RenderObject.cpp:
     22        (WebCore::RenderObject::repaint):
     23        * rendering/RenderTreeAsText.cpp:
     24        (WebCore::write):
     25
    1262011-02-28  Sheriff Bot  <webkit.review.bot@gmail.com>
    227

  • trunk/Source/WebCore/accessibility/AccessibilityObject.h

    r78789 r79920  
    143143    ColumnHeaderRole,
    144144    RowHeaderRole,
    145     CanvasRole,
    146145    // AppKit includes SortButtonRole but it is misnamed and really a subrole of ButtonRole so we do not include it here.
    147146

  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

    r79559 r79920  
    30223022    }
    30233023    if (node && node->hasTagName(canvasTag))
    3024         return CanvasRole;
     3024        return ImageRole;
    30253025
    30263026    if (cssBox && cssBox->isRenderView())
    … …  
    32893289    if (!m_renderer)
    32903290        return false;
    3291 
     3291   
    32923292    // Elements that should not have children
    32933293    switch (roleValue()) {

  • trunk/Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp

    r79196 r79920  
    472472    case ListBoxOptionRole:
    473473        return ATK_ROLE_LIST_ITEM;
    474     case CanvasRole:
    475         return ATK_ROLE_PANEL;
    476474    default:
    477475        return ATK_ROLE_UNKNOWN;

  • trunk/Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm

    r78789 r79920  
    12871287        { TreeRole, NSAccessibilityOutlineRole },
    12881288        { TreeItemRole, NSAccessibilityRowRole },
    1289         { ListItemRole, NSAccessibilityGroupRole },
    1290         { CanvasRole, NSAccessibilityGroupRole }
     1289        { ListItemRole, NSAccessibilityGroupRole }
    12911290    };
    12921291    AccessibilityRoleMap& roleMap = *new AccessibilityRoleMap;

  • trunk/Source/WebCore/html/HTMLFormControlElement.cpp

    r78789 r79920  
    240240bool HTMLFormControlElement::isFocusable() const
    241241{
    242     if (!renderer() || !renderer()->isBox())
     242    if (!renderer() ||
     243        !renderer()->isBox() || toRenderBox(renderer())->size().isEmpty())
    243244        return false;
    244 
    245     if (toRenderBox(renderer())->size().isEmpty()) {
    246         // An empty render box shouldn't be focusable unless it's part of canvas fallback content.
    247         bool isCanvasFallbackContent = false;
    248         const Element* e = this;
    249         while (e) {
    250             if (e->hasLocalName(canvasTag)) {
    251                 isCanvasFallbackContent = true;
    252                 break;
    253             }
    254             e = e->parentElement();
    255         }
    256         if (!isCanvasFallbackContent)
    257             return false;
    258     }
    259 
    260245    // HTMLElement::isFocusable handles visibility and calls suportsFocus which
    261246    // will cover the disabled case.

  • trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp

    r79919 r79920  
    3131#include "FrameView.h"
    3232#include "GraphicsContext.h"
    33 #include "HitTestResult.h"
    3433#include "HTMLCanvasElement.h"
    3534#include "HTMLNames.h"
    … …  
    8988}
    9089
    91 void RenderHTMLCanvas::recursiveSetNoNeedsLayout(RenderObject* obj)
    92 {
    93     obj->setNeedsLayout(false);
    94     for (RenderObject* child = obj->firstChild(); child; child = child->nextSibling())
    95         recursiveSetNoNeedsLayout(child);
    96 }
    97 
    98 void RenderHTMLCanvas::layout()
    99 {
    100     recursiveSetNoNeedsLayout(this);
    101     setNeedsLayout(true);
    102     RenderReplaced::layout();
    103 }
    104 
    105 bool RenderHTMLCanvas::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, int x, int y, int tx, int ty, HitTestAction action)
    106 {
    107     UNUSED_PARAM(request);
    108     UNUSED_PARAM(result);
    109     UNUSED_PARAM(x);
    110     UNUSED_PARAM(y);
    111     UNUSED_PARAM(tx);
    112     UNUSED_PARAM(ty);
    113     UNUSED_PARAM(action);
    114     return false;
    115 }
    116 
    11790} // namespace WebCore

  • trunk/Source/WebCore/rendering/RenderHTMLCanvas.h

    r78789 r79920  
    4040    virtual bool requiresLayer() const;
    4141
    42     const RenderObjectChildList* children() const { return &m_children; }
    43     RenderObjectChildList* children() { return &m_children; }
    44 
    45     virtual bool canHaveChildren() const { return true; }
    46     virtual void layout();
    47 
    4842    void canvasSizeChanged();
    4943   
    … …  
    5246    virtual void paintReplaced(PaintInfo&, int tx, int ty);
    5347    virtual void intrinsicSizeChanged() { canvasSizeChanged(); }
    54 
    55     virtual RenderObjectChildList* virtualChildren() { return children(); }
    56     virtual const RenderObjectChildList* virtualChildren() const { return children(); }
    57     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
    58 
    59     void recursiveSetNoNeedsLayout(RenderObject*);
    60 
    61     RenderObjectChildList m_children;
    6248};
    6349

  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r79196 r79920  
    13121312        return; // Don't repaint if we're printing.
    13131313
    1314     if (!containingBlock())
    1315         return; // Don't repaint if there's no containing block; currently this only happens for canvas fallback content.
    1316 
    13171314    RenderBoxModelObject* repaintContainer = containerForRepaint();
    13181315    repaintUsingContainer(repaintContainer ? repaintContainer : view, clippedOverflowRectForRepaint(repaintContainer), immediate);

  • trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

    r79196 r79920  
    542542    }
    543543
    544     if (!o.isCanvas()) {
    545         for (RenderObject* child = o.firstChild(); child; child = child->nextSibling()) {
    546             if (child->hasLayer())
    547                 continue;
    548             write(ts, *child, indent + 1, behavior);
    549         }
     544    for (RenderObject* child = o.firstChild(); child; child = child->nextSibling()) {
     545        if (child->hasLayer())
     546            continue;
     547        write(ts, *child, indent + 1, behavior);
    550548    }
    551549

  • trunk/Source/WebKit/chromium/ChangeLog

    r79917 r79920  
     12011-02-28  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r78789.
     4        http://trac.webkit.org/changeset/78789
     5        https://bugs.webkit.org/show_bug.cgi?id=55409
     6
     7        Incorrect canvas fallback implementation (Requested by
     8        inferno-sec on #webkit).
     9
     10        * public/WebAccessibilityRole.h:
     11        * src/AssertMatchingEnums.cpp:
     12
    1132011-02-28  Adam Klein  <adamk@chromium.org>
    214

  • trunk/Source/WebKit/chromium/public/WebAccessibilityRole.h

    r78789 r79920  
    8888    WebAccessibilityRoleColumnHeader,
    8989    WebAccessibilityRoleRowHeader,
    90     WebAccessibilityRoleCanvas,
    9190
    9291    WebAccessibilityRoleWebCoreLink,

  • trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp

    r78789 r79920  
    146146COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleColumnHeader, ColumnHeaderRole);
    147147COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleRowHeader, RowHeaderRole);
    148 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleCanvas, CanvasRole);
    149148COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleWebCoreLink, WebCoreLinkRole);
    150149COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleImageMapLink, ImageMapLinkRole);

  • trunk/Source/WebKit/win/AccessibleBase.cpp

    r78789 r79920  
    661661        case WebCore::ImageRole:
    662662            return ROLE_SYSTEM_GRAPHIC;
    663         case WebCore::CanvasRole:
    664             return ROLE_SYSTEM_GROUPING;
    665663        case WebCore::MenuListOptionRole:
    666664        case WebCore::ListItemRole:

  • trunk/Source/WebKit/win/ChangeLog

    r79793 r79920  
     12011-02-28  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r78789.
     4        http://trac.webkit.org/changeset/78789
     5        https://bugs.webkit.org/show_bug.cgi?id=55409
     6
     7        Incorrect canvas fallback implementation (Requested by
     8        inferno-sec on #webkit).
     9
     10        * AccessibleBase.cpp:
     11        (MSAARole):
     12
    1132011-02-26  Vsevolod Vlasov  <vsevik@chromium.org>
    214
Note: See TracChangeset for help on using the changeset viewer.