From 2fc2651226baac27029e38c9d6ef883fa32084db Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 18 May 2011 13:36:51 +0100 Subject: Merge WebKit at r78450: Initial merge by git. Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1 --- Source/WebCore/html/HTMLAreaElement.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/WebCore/html/HTMLAreaElement.h') 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; -- cgit v1.1