Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Side by Side Diff: Source/modules/accessibility/AXNodeObject.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012, Google Inc. All rights reserved. 2 * Copyright (C) 2012, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 27 matching lines...) Expand all
38 #include "core/html/HTMLInputElement.h" 38 #include "core/html/HTMLInputElement.h"
39 #include "core/html/HTMLLabelElement.h" 39 #include "core/html/HTMLLabelElement.h"
40 #include "core/html/HTMLLegendElement.h" 40 #include "core/html/HTMLLegendElement.h"
41 #include "core/html/HTMLMediaElement.h" 41 #include "core/html/HTMLMediaElement.h"
42 #include "core/html/HTMLMeterElement.h" 42 #include "core/html/HTMLMeterElement.h"
43 #include "core/html/HTMLPlugInElement.h" 43 #include "core/html/HTMLPlugInElement.h"
44 #include "core/html/HTMLSelectElement.h" 44 #include "core/html/HTMLSelectElement.h"
45 #include "core/html/HTMLTextAreaElement.h" 45 #include "core/html/HTMLTextAreaElement.h"
46 #include "core/html/parser/HTMLParserIdioms.h" 46 #include "core/html/parser/HTMLParserIdioms.h"
47 #include "core/html/shadow/MediaControlElements.h" 47 #include "core/html/shadow/MediaControlElements.h"
48 #include "core/rendering/RenderObject.h" 48 #include "core/layout/LayoutObject.h"
49 #include "modules/accessibility/AXObjectCacheImpl.h" 49 #include "modules/accessibility/AXObjectCacheImpl.h"
50 #include "platform/UserGestureIndicator.h" 50 #include "platform/UserGestureIndicator.h"
51 #include "wtf/text/StringBuilder.h" 51 #include "wtf/text/StringBuilder.h"
52 52
53 53
54 namespace blink { 54 namespace blink {
55 55
56 using namespace HTMLNames; 56 using namespace HTMLNames;
57 57
58 AXNodeObject::AXNodeObject(Node* node, AXObjectCacheImpl* axObjectCache) 58 AXNodeObject::AXNodeObject(Node* node, AXObjectCacheImpl* axObjectCache)
(...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1292 1292
1293 // Skip big container elements like lists, tables, etc. 1293 // Skip big container elements like lists, tables, etc.
1294 if (obj->isList() || obj->isAXTable() || obj->isTree() || obj->isCanvas()) 1294 if (obj->isList() || obj->isAXTable() || obj->isTree() || obj->isCanvas())
1295 return false; 1295 return false;
1296 1296
1297 return true; 1297 return true;
1298 } 1298 }
1299 1299
1300 // Returns true if |r1| and |r2| are both non-null and are contained within the 1300 // Returns true if |r1| and |r2| are both non-null and are contained within the
1301 // same RenderBox. 1301 // same RenderBox.
1302 static bool isSameRenderBox(RenderObject* r1, RenderObject* r2) 1302 static bool isSameRenderBox(LayoutObject* r1, LayoutObject* r2)
1303 { 1303 {
1304 if (!r1 || !r2) 1304 if (!r1 || !r2)
1305 return false; 1305 return false;
1306 RenderBox* b1 = r1->enclosingBox(); 1306 RenderBox* b1 = r1->enclosingBox();
1307 RenderBox* b2 = r2->enclosingBox(); 1307 RenderBox* b2 = r2->enclosingBox();
1308 return b1 && b2 && b1 == b2; 1308 return b1 && b2 && b1 == b2;
1309 } 1309 }
1310 1310
1311 String AXNodeObject::textUnderElement() const 1311 String AXNodeObject::textUnderElement() const
1312 { 1312 {
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
1997 float range = maxValueForRange() - minValueForRange(); 1997 float range = maxValueForRange() - minValueForRange();
1998 float value = valueForRange(); 1998 float value = valueForRange();
1999 1999
2000 value += range * (percentChange / 100); 2000 value += range * (percentChange / 100);
2001 setValue(String::number(value)); 2001 setValue(String::number(value));
2002 2002
2003 axObjectCache()->postNotification(node(), AXObjectCacheImpl::AXValueChanged, true); 2003 axObjectCache()->postNotification(node(), AXObjectCacheImpl::AXValueChanged, true);
2004 } 2004 }
2005 2005
2006 } // namespace blink 2006 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/accessibility/AXMediaControls.cpp ('k') | Source/modules/accessibility/AXObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698