Title: [151973] branches/safari-537-branch/Source
- Revision
- 151973
- Author
- [email protected]
- Date
- 2013-06-25 17:36:13 -0700 (Tue, 25 Jun 2013)
Log Message
Merged r151929. <rdar://problem/14250527>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (151972 => 151973)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-06-26 00:30:49 UTC (rev 151972)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-06-26 00:36:13 UTC (rev 151973)
@@ -1,3 +1,18 @@
+2013-06-25 Lucas Forschler <[email protected]>
+
+ Merge r151929
+
+ 2013-06-24 Ruth Fong <[email protected]>
+
+ Expose the mediaHasAudio() function in WK2
+ https://bugs.webkit.org/show_bug.cgi?id=117946
+ <rdar://problem/14250527>
+
+ Reviewed by Beth Dakin.
+
+ * WebCore.exp.in: Updated to include symbol for
+ HTMLMediaElement::mediaHasAudio() function.
+
2013-06-21 Lucas Forschler <[email protected]>
Merge r151787
Modified: branches/safari-537-branch/Source/WebCore/WebCore.exp.in (151972 => 151973)
--- branches/safari-537-branch/Source/WebCore/WebCore.exp.in 2013-06-26 00:30:49 UTC (rev 151972)
+++ branches/safari-537-branch/Source/WebCore/WebCore.exp.in 2013-06-26 00:36:13 UTC (rev 151973)
@@ -1371,6 +1371,7 @@
__ZNK7WebCore13HitTestResult11textContentEv
__ZNK7WebCore13HitTestResult12innerElementEv
__ZNK7WebCore13HitTestResult12mediaIsVideoEv
+__ZNK7WebCore13HitTestResult13mediaHasAudioEv
__ZNK7WebCore13HitTestResult14absolutePDFURLEv
__ZNK7WebCore13HitTestResult14innerNodeFrameEv
__ZNK7WebCore13HitTestResult15absoluteLinkURLEv
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (151972 => 151973)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-06-26 00:30:49 UTC (rev 151972)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-06-26 00:36:13 UTC (rev 151973)
@@ -1,5 +1,27 @@
2013-06-25 Lucas Forschler <[email protected]>
+ Merge r151929
+
+ 2013-06-24 Ruth Fong <[email protected]>
+
+ Expose the mediaHasAudio() function in WK2
+ https://bugs.webkit.org/show_bug.cgi?id=117946
+ <rdar://problem/14250527>
+
+ Reviewed by Beth Dakin.
+
+ Exposes the WebCore::HTMLMediaElement::mediaHasAudio() function
+ in WK2.
+
+ * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp:
+ (WKBundleHitTestResultMediaHasAudio): Added.
+ * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h:
+ * WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:
+ (WebKit::InjectedBundleHitTestResult::mediaHasAudio): Added.
+ * WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:
+
+2013-06-25 Lucas Forschler <[email protected]>
+
Merge r151760
2013-06-19 Ruth Fong <[email protected]>
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp (151972 => 151973)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp 2013-06-26 00:30:49 UTC (rev 151972)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp 2013-06-26 00:36:13 UTC (rev 151973)
@@ -79,6 +79,11 @@
return toImpl(hitTestResultRef)->mediaIsInFullscreen();
}
+bool WKBundleHitTestResultMediaHasAudio(WKBundleHitTestResultRef hitTestResultRef)
+{
+ return toImpl(hitTestResultRef)->mediaHasAudio();
+}
+
WKBundleHitTestResultMediaType WKBundleHitTestResultGetMediaType(WKBundleHitTestResultRef hitTestResultRef)
{
return toAPI(toImpl(hitTestResultRef)->mediaType());
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h (151972 => 151973)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h 2013-06-26 00:30:49 UTC (rev 151972)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h 2013-06-26 00:36:13 UTC (rev 151973)
@@ -52,6 +52,7 @@
WK_EXPORT WKURLRef WKBundleHitTestResultCopyAbsoluteLinkURL(WKBundleHitTestResultRef hitTestResult);
WK_EXPORT WKURLRef WKBundleHitTestResultCopyAbsoluteMediaURL(WKBundleHitTestResultRef hitTestResult);
WK_EXPORT bool WKBundleHitTestResultMediaIsInFullscreen(WKBundleHitTestResultRef hitTestResult);
+WK_EXPORT bool WKBundleHitTestResultMediaHasAudio(WKBundleHitTestResultRef hitTestResult);
WK_EXPORT WKBundleHitTestResultMediaType WKBundleHitTestResultGetMediaType(WKBundleHitTestResultRef hitTestResult);
WK_EXPORT WKRect WKBundleHitTestResultGetImageRect(WKBundleHitTestResultRef hitTestResult);
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp (151972 => 151973)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp 2013-06-26 00:30:49 UTC (rev 151972)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp 2013-06-26 00:36:13 UTC (rev 151973)
@@ -104,6 +104,11 @@
return m_hitTestResult.mediaIsInFullscreen();
}
+bool InjectedBundleHitTestResult::mediaHasAudio() const
+{
+ return m_hitTestResult.mediaHasAudio();
+}
+
BundleHitTestResultMediaType InjectedBundleHitTestResult::mediaType() const
{
#if !ENABLE(VIDEO)
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h (151972 => 151973)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h 2013-06-26 00:30:49 UTC (rev 151972)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h 2013-06-26 00:36:13 UTC (rev 151973)
@@ -53,6 +53,7 @@
String absoluteLinkURL() const;
String absoluteMediaURL() const;
bool mediaIsInFullscreen() const;
+ bool mediaHasAudio() const;
BundleHitTestResultMediaType mediaType() const;
String linkLabel() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
