[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mitz at apple.com
mitz at apple.com
Wed Dec 22 14:55:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5a54cf7b3f8ccdcf94d1d65b9d1434512f298cb7
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 25 05:17:54 2010 +0000
Expose HitTestResult::absoluteMediaURL() via WebKit API
https://bugs.webkit.org/show_bug.cgi?id=48219
Reviewed by Anders Carlsson.
WebCore:
* WebCore.exp.in: Export HitTestResult::absoluteMediaURL().
WebKit/mac:
* Misc/WebElementDictionary.mm:
(+[WebElementDictionary initializeLookupTable]): Map WebElementMediaURLKey to
_absoluteMediaURL.
(-[WebElementDictionary _absoluteMediaURL]): Added. Returns absoluteMediaURL().
* WebKit.exp: Export WebElementMediaURLKey.
* WebView/WebView.mm: Define WebElementMediaURLKey.
* WebView/WebViewPrivate.h: Declare WebElementMediaURLKey.
WebKit/win:
* Interfaces/IWebView.idl: Added WebElementMediaURLKey.
* WebElementPropertyBag.cpp:
(WebElementPropertyBag::Read): Map WebElementMediaURLKey to absoluteMediaURL().
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70435 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3d80d80..3df9c18 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-24 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Anders Carlsson.
+
+ Expose HitTestResult::absoluteMediaURL() via WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=48219
+
+ * WebCore.exp.in: Export HitTestResult::absoluteMediaURL().
+
2010-10-24 Sam Weinig <sam at webkit.org>
Reviewed by Dan Bernstein.
diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
index 299c012..cd0b15a 100644
--- a/WebCore/WebCore.exp.in
+++ b/WebCore/WebCore.exp.in
@@ -950,6 +950,7 @@ __ZNK7WebCore13HitTestResult11textContentEv
__ZNK7WebCore13HitTestResult15absoluteLinkURLEv
__ZNK7WebCore13HitTestResult15spellingToolTipERNS_13TextDirectionE
__ZNK7WebCore13HitTestResult16absoluteImageURLEv
+__ZNK7WebCore13HitTestResult16absoluteMediaURLEv
__ZNK7WebCore13HitTestResult16altDisplayStringEv
__ZNK7WebCore13HitTestResult17isContentEditableEv
__ZNK7WebCore13HitTestResult18titleDisplayStringEv
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index ba54b45..5c0b25a 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,20 @@
2010-10-24 Dan Bernstein <mitz at apple.com>
+ Reviewed by Anders Carlsson.
+
+ Expose HitTestResult::absoluteMediaURL() via WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=48219
+
+ * Misc/WebElementDictionary.mm:
+ (+[WebElementDictionary initializeLookupTable]): Map WebElementMediaURLKey to
+ _absoluteMediaURL.
+ (-[WebElementDictionary _absoluteMediaURL]): Added. Returns absoluteMediaURL().
+ * WebKit.exp: Export WebElementMediaURLKey.
+ * WebView/WebView.mm: Define WebElementMediaURLKey.
+ * WebView/WebViewPrivate.h: Declare WebElementMediaURLKey.
+
+2010-10-24 Dan Bernstein <mitz at apple.com>
+
Reviewed by Simon Fraser.
Removed deprecated methods from the WebHTMLHighlighter private protocol.
diff --git a/WebKit/mac/Misc/WebElementDictionary.mm b/WebKit/mac/Misc/WebElementDictionary.mm
index 6b2eb3d..71c4cc7 100644
--- a/WebKit/mac/Misc/WebElementDictionary.mm
+++ b/WebKit/mac/Misc/WebElementDictionary.mm
@@ -85,6 +85,7 @@ static void cacheValueForKey(const void *key, const void *value, void *self)
addLookupKey(WebElementImageRectKey, @selector(_imageRect));
addLookupKey(WebElementImageURLKey, @selector(_absoluteImageURL));
addLookupKey(WebElementIsSelectedKey, @selector(_isSelected));
+ addLookupKey(WebElementMediaURLKey, @selector(_absoluteMediaURL));
addLookupKey(WebElementSpellingToolTipKey, @selector(_spellingToolTip));
addLookupKey(WebElementTitleKey, @selector(_title));
addLookupKey(WebElementLinkURLKey, @selector(_absoluteLinkURL));
@@ -216,6 +217,11 @@ static NSString* NSStringOrNil(String coreString)
return _result->absoluteImageURL();
}
+- (NSURL *)_absoluteMediaURL
+{
+ return _result->absoluteMediaURL();
+}
+
- (NSNumber *)_isSelected
{
return [NSNumber numberWithBool:_result->isSelected()];
diff --git a/WebKit/mac/WebKit.exp b/WebKit/mac/WebKit.exp
index 463ab00..7c20307 100644
--- a/WebKit/mac/WebKit.exp
+++ b/WebKit/mac/WebKit.exp
@@ -65,6 +65,7 @@ _WebElementImageKey
_WebElementImageRectKey
_WebElementImageURLKey
_WebElementIsSelectedKey
+_WebElementMediaURLKey
_WebElementLinkIsLiveKey
_WebElementLinkLabelKey
_WebElementLinkTargetFrameKey
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 9b267ef..2c26eaf 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -403,6 +403,7 @@ NSString *WebElementLinkLabelKey = @"WebElementLinkLabel";
NSString *WebElementLinkTargetFrameKey = @"WebElementTargetFrame";
NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
NSString *WebElementLinkURLKey = @"WebElementLinkURL";
+NSString *WebElementMediaURLKey = @"WebElementMediaURL";
NSString *WebElementSpellingToolTipKey = @"WebElementSpellingToolTip";
NSString *WebElementTitleKey = @"WebElementTitle";
NSString *WebElementLinkIsLiveKey = @"WebElementLinkIsLive";
diff --git a/WebKit/mac/WebView/WebViewPrivate.h b/WebKit/mac/WebView/WebViewPrivate.h
index 749eeb3..d371ede 100644
--- a/WebKit/mac/WebView/WebViewPrivate.h
+++ b/WebKit/mac/WebView/WebViewPrivate.h
@@ -67,6 +67,7 @@ extern NSString *_WebMainFrameDocumentKey;
extern NSString *WebElementTitleKey; // NSString of the title of the element (used by Safari)
extern NSString *WebElementSpellingToolTipKey; // NSString of a tooltip representing misspelling or bad grammar (used internally)
extern NSString *WebElementIsContentEditableKey; // NSNumber indicating whether the inner non-shared node is content editable (used internally)
+extern NSString *WebElementMediaURLKey; // NSURL of the media element
// other WebElementDictionary keys
extern NSString *WebElementLinkIsLiveKey; // NSNumber of BOOL indictating whether the link is live or not
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index e927d15..e342d50 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-24 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Anders Carlsson.
+
+ Expose HitTestResult::absoluteMediaURL() via WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=48219
+
+ * Interfaces/IWebView.idl: Added WebElementMediaURLKey.
+ * WebElementPropertyBag.cpp:
+ (WebElementPropertyBag::Read): Map WebElementMediaURLKey to absoluteMediaURL().
+
2010-10-22 Andy Estes <aestes at apple.com>
Fix the Windows build.
diff --git a/WebKit/win/Interfaces/IWebView.idl b/WebKit/win/Interfaces/IWebView.idl
index e3ec98a..6c414f8 100644
--- a/WebKit/win/Interfaces/IWebView.idl
+++ b/WebKit/win/Interfaces/IWebView.idl
@@ -82,6 +82,7 @@ const LPCOLESTR WebElementImageKey = L"WebElementImageKey";
const LPCOLESTR WebElementImageRectKey = L"WebElementImageRectKey";
const LPCOLESTR WebElementImageURLKey = L"WebElementImageURLKey";
const LPCOLESTR WebElementIsSelectedKey = L"WebElementIsSelectedKey";
+const LPCOLESTR WebElementMediaURLKey = L"WebElementMediaURLKey";
const LPCOLESTR WebElementSpellingToolTipKey = L"WebElementSpellingToolTipKey";
const LPCOLESTR WebElementTitleKey = L"WebElementTitleKey";
const LPCOLESTR WebElementLinkURLKey = L"WebElementLinkURLKey";
diff --git a/WebKit/win/WebElementPropertyBag.cpp b/WebKit/win/WebElementPropertyBag.cpp
index e68b92e..e68360c 100644
--- a/WebKit/win/WebElementPropertyBag.cpp
+++ b/WebKit/win/WebElementPropertyBag.cpp
@@ -159,7 +159,10 @@ HRESULT STDMETHODCALLTYPE WebElementPropertyBag::Read(LPCOLESTR pszPropName, VAR
else
V_BOOL(pVar) = VARIANT_FALSE;
return S_OK;
- } else if (isEqual(WebElementSpellingToolTipKey, key)) {
+ }
+ if (isEqual(WebElementMediaURLKey, key))
+ return convertStringToVariant(pVar, m_result->absoluteMediaURL().string());
+ if (isEqual(WebElementSpellingToolTipKey, key)) {
TextDirection dir;
return convertStringToVariant(pVar, m_result->spellingToolTip(dir));
} else if (isEqual(WebElementTitleKey, key)) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list