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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 void HTMLCanvasElement::addListener(CanvasDrawListener* listener) 628 void HTMLCanvasElement::addListener(CanvasDrawListener* listener)
629 { 629 {
630 m_listeners.add(listener); 630 m_listeners.add(listener);
631 } 631 }
632 632
633 void HTMLCanvasElement::removeListener(CanvasDrawListener* listener) 633 void HTMLCanvasElement::removeListener(CanvasDrawListener* listener)
634 { 634 {
635 m_listeners.remove(listener); 635 m_listeners.remove(listener);
636 } 636 }
637 637
638 SecurityOrigin* HTMLCanvasElement::securityOrigin() const 638 SecurityOrigin* HTMLCanvasElement::getSecurityOrigin() const
639 { 639 {
640 return document().securityOrigin(); 640 return document().getSecurityOrigin();
641 } 641 }
642 642
643 bool HTMLCanvasElement::originClean() const 643 bool HTMLCanvasElement::originClean() const
644 { 644 {
645 if (document().settings() && document().settings()->disableReadingFromCanvas ()) 645 if (document().settings() && document().settings()->disableReadingFromCanvas ())
646 return false; 646 return false;
647 return m_originClean; 647 return m_originClean;
648 } 648 }
649 649
650 bool HTMLCanvasElement::shouldAccelerate(const IntSize& size) const 650 bool HTMLCanvasElement::shouldAccelerate(const IntSize& size) const
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
1082 || element.hasTagName(HTMLNames::tfootTag) 1082 || element.hasTagName(HTMLNames::tfootTag)
1083 || element.hasTagName(HTMLNames::trTag) 1083 || element.hasTagName(HTMLNames::trTag)
1084 || element.hasTagName(HTMLNames::tdTag) 1084 || element.hasTagName(HTMLNames::tdTag)
1085 || element.hasTagName(HTMLNames::thTag)) 1085 || element.hasTagName(HTMLNames::thTag))
1086 return true; 1086 return true;
1087 1087
1088 return false; 1088 return false;
1089 } 1089 }
1090 1090
1091 } // namespace blink 1091 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLCanvasElement.h ('k') | third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698