[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 14:36:43 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ccf5401f95545ec599e74444a7f825cd6ba73249
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 14 04:11:43 2010 +0000
Memory smasher in WebKit2 InjectedBundleHitTestResult::absoluteLinkURL
https://bugs.webkit.org/show_bug.cgi?id=47648
Reviewed by Jon Honeycutt.
* WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:
(WebKit::InjectedBundleHitTestResult::absoluteLinkURL):
* WebProcess/InjectedBundle/InjectedBundleHitTestResult.h: Return a String instead of
a const String&.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69734 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 746ea6f..bfb5bd2 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,18 @@
Reviewed by Jon Honeycutt.
+ Memory smasher in WebKit2 InjectedBundleHitTestResult::absoluteLinkURL
+ https://bugs.webkit.org/show_bug.cgi?id=47648
+
+ * WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:
+ (WebKit::InjectedBundleHitTestResult::absoluteLinkURL):
+ * WebProcess/InjectedBundle/InjectedBundleHitTestResult.h: Return a String instead of
+ a const String&.
+
+2010-10-13 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Jon Honeycutt.
+
PlatformMouseEvents need to contain modifier flags
https://bugs.webkit.org/show_bug.cgi?id=47651
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp b/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
index 857aa77..98629cd 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
@@ -74,7 +74,7 @@ WebFrame* InjectedBundleHitTestResult::targetFrame() const
return static_cast<WebFrameLoaderClient*>(frame->loader()->client())->webFrame();
}
-const String& InjectedBundleHitTestResult::absoluteLinkURL() const
+String InjectedBundleHitTestResult::absoluteLinkURL() const
{
return m_hitTestResult.absoluteLinkURL().string();
}
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h b/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h
index bda34d6..eac9e78 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h
@@ -48,7 +48,7 @@ public:
PassRefPtr<InjectedBundleNodeHandle> nodeHandle() const;
WebFrame* frame() const;
WebFrame* targetFrame() const;
- const String& absoluteLinkURL() const;
+ String absoluteLinkURL() const;
private:
explicit InjectedBundleHitTestResult(const WebCore::HitTestResult& hitTestResult)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list