summaryrefslogtreecommitdiffstats
path: root/ui/aura/window.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 15:47:07 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 15:47:07 +0000
commit61ede748570cf4495bba507a57f47cc6a664a1e1 (patch)
tree52c729c2156839d64091259ed36779e502ec6aea /ui/aura/window.h
parent35f929c7e1cd451c3077d8bd8e2fc31b6e2eb50f (diff)
downloadchromium_src-61ede748570cf4495bba507a57f47cc6a664a1e1.zip
chromium_src-61ede748570cf4495bba507a57f47cc6a664a1e1.tar.gz
chromium_src-61ede748570cf4495bba507a57f47cc6a664a1e1.tar.bz2
Allow Window point conversion with a NULL source. This just returns immediately without modifying the supplied point. This fixes a crash when converting points for an unparented RWHVA, since the code passes parent_ as source and parent_ is NULL.
Had to remove some export stuff from tests to make this build in component build. test_support_base is a static library, thus need not have AURA_EXPORT. BUG=none TEST=none Review URL: http://codereview.chromium.org/8438052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window.h')
-rw-r--r--ui/aura/window.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/aura/window.h b/ui/aura/window.h
index b376914..bab696d 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -179,6 +179,9 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
Window* GetChildById(int id);
const Window* GetChildById(int id) const;
+ // Converts |point| from |source|'s coordinates to |target|'s. If |source| is
+ // NULL, the function returns without modifying |point|. |target| cannot be
+ // NULL.
static void ConvertPointToWindow(const Window* source,
const Window* target,
gfx::Point* point);