diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/html/HTMLAreaElement.h | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/html/HTMLAreaElement.h')
-rw-r--r-- | Source/WebCore/html/HTMLAreaElement.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/html/HTMLAreaElement.h b/Source/WebCore/html/HTMLAreaElement.h index 42d4198..34f5ba9 100644 --- a/Source/WebCore/html/HTMLAreaElement.h +++ b/Source/WebCore/html/HTMLAreaElement.h @@ -1,7 +1,7 @@ /* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * Copyright (C) 2004, 2008, 2009 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2008, 2009, 2011 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -41,8 +41,8 @@ public: bool mapMouseEvent(int x, int y, const IntSize&, HitTestResult&); - IntRect getRect(RenderObject*) const; - Path getPath(RenderObject*) const; + IntRect computeRect(RenderObject*) const; + Path computePath(RenderObject*) const; // The parent map's image. HTMLImageElement* imageElement() const; @@ -57,7 +57,7 @@ private: virtual bool isMouseFocusable() const; virtual bool isFocusable() const; virtual void updateFocusAppearance(bool /*restorePreviousSelection*/); - virtual void dispatchBlurEvent(); + virtual void setFocus(bool); enum Shape { Default, Poly, Rect, Circle, Unknown }; Path getRegion(const IntSize&) const; |