[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
benm at google.com
benm at google.com
Thu Apr 8 00:13:52 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 7fa1e046906f0372e331cceaee81b4d285f69295
Author: benm at google.com <benm at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 3 12:31:28 2009 +0000
[Android] notifyHistoryItemChanged() should pass a pointer to the HistoryItem that changed.
https://bugs.webkit.org/show_bug.cgi?id=31915
Reviewed by Brady Eidson.
WebCore:
No change in functionality so no new tests required.
* history/HistoryItem.cpp:
(WebCore::defaultNotifyHistoryItemChanged): Update this function to pass the HistoryItem that is being changed.
(WebCore::HistoryItem::setAlternateTitle): Update call to notifyHistoryItemChanged to include the new parameter.
(WebCore::HistoryItem::setURLString): ditto.
(WebCore::HistoryItem::setOriginalURLString): ditto.
(WebCore::HistoryItem::setReferrer): ditto.
(WebCore::HistoryItem::setTitle): ditto.
(WebCore::HistoryItem::setTarget): ditto.
(WebCore::HistoryItem::setDocumentState): On Android, add a call to notifyHistoryItemChanged. See bug for a discussion of why this is needed.
(WebCore::HistoryItem::clearDocumentState): ditto.
(WebCore::HistoryItem::setIsTargetItem): ditto.
(WebCore::HistoryItem::addChildItem): ditto.
(WebCore::HistoryItem::setFormInfoFromRequest): ditto.
* history/HistoryItem.h: Update signature of notifyHistoryItemChanged.
WebKit/mac:
* History/WebHistoryItem.mm:
(WKNotifyHistoryItemChanged): Update WKNotifyHistoryItemChanged() to add the new HistoryItem parameter added in the WebCore portion of this patch.
* History/WebHistoryItemInternal.h: ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51630 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a380cbd..787105e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,30 @@
Reviewed by Brady Eidson.
+ [Android] notifyHistoryItemChanged() should pass a pointer to the HistoryItem that changed.
+ https://bugs.webkit.org/show_bug.cgi?id=31915
+
+ No change in functionality so no new tests required.
+
+ * history/HistoryItem.cpp:
+ (WebCore::defaultNotifyHistoryItemChanged): Update this function to pass the HistoryItem that is being changed.
+ (WebCore::HistoryItem::setAlternateTitle): Update call to notifyHistoryItemChanged to include the new parameter.
+ (WebCore::HistoryItem::setURLString): ditto.
+ (WebCore::HistoryItem::setOriginalURLString): ditto.
+ (WebCore::HistoryItem::setReferrer): ditto.
+ (WebCore::HistoryItem::setTitle): ditto.
+ (WebCore::HistoryItem::setTarget): ditto.
+ (WebCore::HistoryItem::setDocumentState): On Android, add a call to notifyHistoryItemChanged. See bug for a discussion of why this is needed.
+ (WebCore::HistoryItem::clearDocumentState): ditto.
+ (WebCore::HistoryItem::setIsTargetItem): ditto.
+ (WebCore::HistoryItem::addChildItem): ditto.
+ (WebCore::HistoryItem::setFormInfoFromRequest): ditto.
+ * history/HistoryItem.h: Update signature of notifyHistoryItemChanged.
+
+2009-12-03 Ben Murdoch <benm at google.com>
+
+ Reviewed by Brady Eidson.
+
[Android] The FrameLoaderClient is unaware of BackForwardList changes.
https://bugs.webkit.org/show_bug.cgi?id=31914
diff --git a/WebCore/history/HistoryItem.cpp b/WebCore/history/HistoryItem.cpp
index 4352936..2ca29e3 100644
--- a/WebCore/history/HistoryItem.cpp
+++ b/WebCore/history/HistoryItem.cpp
@@ -36,11 +36,11 @@
namespace WebCore {
-static void defaultNotifyHistoryItemChanged()
+static void defaultNotifyHistoryItemChanged(HistoryItem*)
{
}
-void (*notifyHistoryItemChanged)() = defaultNotifyHistoryItemChanged;
+void (*notifyHistoryItemChanged)(HistoryItem*) = defaultNotifyHistoryItemChanged;
HistoryItem::HistoryItem()
: m_lastVisitedTime(0)
@@ -198,7 +198,7 @@ const String& HistoryItem::parent() const
void HistoryItem::setAlternateTitle(const String& alternateTitle)
{
m_displayTitle = alternateTitle;
- notifyHistoryItemChanged();
+ notifyHistoryItemChanged(this);
}
void HistoryItem::setURLString(const String& urlString)
@@ -209,7 +209,7 @@ void HistoryItem::setURLString(const String& urlString)
iconDatabase()->retainIconForPageURL(m_urlString);
}
- notifyHistoryItemChanged();
+ notifyHistoryItemChanged(this);
}
void HistoryItem::setURL(const KURL& url)
@@ -222,25 +222,25 @@ void HistoryItem::setURL(const KURL& url)
void HistoryItem::setOriginalURLString(const String& urlString)
{
m_originalURLString = urlString;
- notifyHistoryItemChanged();
+ notifyHistoryItemChanged(this);
}
void HistoryItem::setReferrer(const String& referrer)
{
m_referrer = referrer;
- notifyHistoryItemChanged();
+ notifyHistoryItemChanged(this);
}
void HistoryItem::setTitle(const String& title)
{
m_title = title;
- notifyHistoryItemChanged();
+ notifyHistoryItemChanged(this);
}
void HistoryItem::setTarget(const String& target)
{
m_target = target;
- notifyHistoryItemChanged();
+ notifyHistoryItemChanged(this);
}
void HistoryItem::setParent(const String& parent)
@@ -356,6 +356,9 @@ void HistoryItem::clearScrollPoint()
void HistoryItem::setDocumentState(const Vector<String>& state)
{
m_documentState = state;
+#if PLATFORM(ANDROID)
+ notifyHistoryItemChanged(this);
+#endif
}
const Vector<String>& HistoryItem::documentState() const
@@ -366,6 +369,9 @@ const Vector<String>& HistoryItem::documentState() const
void HistoryItem::clearDocumentState()
{
m_documentState.clear();
+#if PLATFORM(ANDROID)
+ notifyHistoryItemChanged(this);
+#endif
}
bool HistoryItem::isTargetItem() const
@@ -376,12 +382,18 @@ bool HistoryItem::isTargetItem() const
void HistoryItem::setIsTargetItem(bool flag)
{
m_isTargetItem = flag;
+#if PLATFORM(ANDROID)
+ notifyHistoryItemChanged(this);
+#endif
}
void HistoryItem::addChildItem(PassRefPtr<HistoryItem> child)
{
ASSERT(!childItemWithTarget(child->target()));
m_children.append(child);
+#if PLATFORM(ANDROID)
+ notifyHistoryItemChanged(this);
+#endif
}
void HistoryItem::setChildItem(PassRefPtr<HistoryItem> child)
@@ -460,6 +472,9 @@ void HistoryItem::setFormInfoFromRequest(const ResourceRequest& request)
m_formData = 0;
m_formContentType = String();
}
+#if PLATFORM(ANDROID)
+ notifyHistoryItemChanged(this);
+#endif
}
void HistoryItem::setFormData(PassRefPtr<FormData> formData)
diff --git a/WebCore/history/HistoryItem.h b/WebCore/history/HistoryItem.h
index 39694d4..d991470 100644
--- a/WebCore/history/HistoryItem.h
+++ b/WebCore/history/HistoryItem.h
@@ -58,7 +58,7 @@ class ResourceRequest;
typedef Vector<RefPtr<HistoryItem> > HistoryItemVector;
-extern void (*notifyHistoryItemChanged)();
+extern void (*notifyHistoryItemChanged)(HistoryItem*);
enum VisitCountBehavior {
IncreaseVisitCount,
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 4005782..acabcb5 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -2,6 +2,17 @@
Reviewed by Brady Eidson.
+ [Android] notifyHistoryItemChanged() should pass a pointer to the HistoryItem that changed.
+ https://bugs.webkit.org/show_bug.cgi?id=31915
+
+ * History/WebHistoryItem.mm:
+ (WKNotifyHistoryItemChanged): Update WKNotifyHistoryItemChanged() to add the new HistoryItem parameter added in the WebCore portion of this patch.
+ * History/WebHistoryItemInternal.h: ditto.
+
+2009-12-03 Ben Murdoch <benm at google.com>
+
+ Reviewed by Brady Eidson.
+
[Android] The FrameLoaderClient is unaware of BackForwardList changes.
https://bugs.webkit.org/show_bug.cgi?id=31914
diff --git a/WebKit/mac/History/WebHistoryItem.mm b/WebKit/mac/History/WebHistoryItem.mm
index 3ed4e1f..91bc610 100644
--- a/WebKit/mac/History/WebHistoryItem.mm
+++ b/WebKit/mac/History/WebHistoryItem.mm
@@ -84,7 +84,7 @@ static HistoryItemMap& historyItemWrappers()
return historyItemWrappers;
}
-void WKNotifyHistoryItemChanged()
+void WKNotifyHistoryItemChanged(HistoryItem*)
{
[[NSNotificationCenter defaultCenter]
postNotificationName:WebHistoryItemChangedNotification object:nil userInfo:nil];
diff --git a/WebKit/mac/History/WebHistoryItemInternal.h b/WebKit/mac/History/WebHistoryItemInternal.h
index 787eb05..d324682 100644
--- a/WebKit/mac/History/WebHistoryItemInternal.h
+++ b/WebKit/mac/History/WebHistoryItemInternal.h
@@ -37,7 +37,7 @@ namespace WebCore {
WebCore::HistoryItem* core(WebHistoryItem *item);
WebHistoryItem *kit(WebCore::HistoryItem* item);
-extern void WKNotifyHistoryItemChanged();
+extern void WKNotifyHistoryItemChanged(WebCore::HistoryItem*);
@interface WebHistoryItem (WebInternal)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list