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

Side by Side Diff: third_party/WebKit/WebCore/page/AccessibilityRenderObject.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 Apple 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 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 if (!elt) 546 if (!elt)
547 elt = mouseButtonListener(); 547 elt = mouseButtonListener();
548 return elt; 548 return elt;
549 } 549 }
550 550
551 Element* AccessibilityRenderObject::mouseButtonListener() const 551 Element* AccessibilityRenderObject::mouseButtonListener() const
552 { 552 {
553 Node* node = m_renderer->element(); 553 Node* node = m_renderer->element();
554 if (!node) 554 if (!node)
555 return 0; 555 return 0;
556 if (!node->isElementNode()) 556 if (!node->isEventTargetNode())
557 return 0; 557 return 0;
558 558
559 // FIXME: Do the continuation search like anchorElement does 559 // FIXME: Do the continuation search like anchorElement does
560 for (Element* element = static_cast<Element*>(node); element; element = elem ent->parentElement()) { 560 for (EventTargetNode* elt = static_cast<EventTargetNode*>(node); elt; elt = static_cast<EventTargetNode*>(elt->parentNode())) {
561 if (element->inlineEventListenerForType(eventNames().clickEvent) || elem ent->inlineEventListenerForType(eventNames().mousedownEvent) || element->inlineE ventListenerForType(eventNames().mouseupEvent)) 561 if (elt->inlineEventListenerForType(eventNames().clickEvent) || elt->inl ineEventListenerForType(eventNames().mousedownEvent) || elt->inlineEventListener ForType(eventNames().mouseupEvent))
562 return element; 562 return static_cast<Element*>(elt);
563 } 563 }
564 564
565 return 0; 565 return 0;
566 } 566 }
567 567
568 static Element* siblingWithAriaRole(String role, Node* node) 568 static Element* siblingWithAriaRole(String role, Node* node)
569 { 569 {
570 Node* sibling = node->parent()->firstChild(); 570 Node* sibling = node->parent()->firstChild();
571 while (sibling) { 571 while (sibling) {
572 if (sibling->isElementNode()) { 572 if (sibling->isElementNode()) {
573 String siblingAriaRole = static_cast<Element*>(sibling)->getAttribut e(roleAttr).string(); 573 String siblingAriaRole = static_cast<Element*>(sibling)->getAttribut e(roleAttr).string();
574 if (equalIgnoringCase(siblingAriaRole, role)) 574 if (equalIgnoringCase(siblingAriaRole, role))
(...skipping 1883 matching lines...) Expand 10 before | Expand all | Expand 10 after
2458 } 2458 }
2459 2459
2460 void AccessibilityRenderObject::updateBackingStore() 2460 void AccessibilityRenderObject::updateBackingStore()
2461 { 2461 {
2462 if (!m_renderer) 2462 if (!m_renderer)
2463 return; 2463 return;
2464 m_renderer->view()->layoutIfNeeded(); 2464 m_renderer->view()->layoutIfNeeded();
2465 } 2465 }
2466 2466
2467 } // namespace WebCore 2467 } // namespace WebCore
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/loader/MediaDocument.cpp ('k') | third_party/WebKit/WebCore/page/EventHandler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698