[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jam at chromium.org
jam at chromium.org
Wed Dec 22 14:15:50 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a3c98c09746812cef4a29af609b434b415a54575
Author: jam at chromium.org <jam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 6 00:59:42 2010 +0000
Fix Chrome build.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69164 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index fa169a9..4127fd3 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -611,8 +611,9 @@ void ChromeClientImpl::mouseDidMoveOverElement(
// Find out if the mouse is over a link, and if so, let our UI know...
if (result.isLiveLink() && !result.absoluteLinkURL().string().isEmpty())
url = result.absoluteLinkURL();
- else if (result.innerNonSharedNode()->hasTagName(HTMLNames::objectTag)
- || result.innerNonSharedNode()->hasTagName(HTMLNames::embedTag)) {
+ else if (result.innerNonSharedNode()
+ && (result.innerNonSharedNode()->hasTagName(HTMLNames::objectTag)
+ || result.innerNonSharedNode()->hasTagName(HTMLNames::embedTag))) {
RenderObject* object = result.innerNonSharedNode()->renderer();
if (object && object->isWidget()) {
Widget* widget = toRenderWidget(object)->widget();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list