Title: [151972] branches/safari-537-branch/Source/WebKit2
- Revision
- 151972
- Author
- [email protected]
- Date
- 2013-06-25 17:30:49 -0700 (Tue, 25 Jun 2013)
Log Message
Merged r151760. <rdar://problem/14197983>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (151971 => 151972)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-06-25 21:48:11 UTC (rev 151971)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-06-26 00:30:49 UTC (rev 151972)
@@ -1,3 +1,24 @@
+2013-06-25 Lucas Forschler <[email protected]>
+
+ Merge r151760
+
+ 2013-06-19 Ruth Fong <[email protected]>
+
+ <rdar://problem/14197983> Rename functions from Bug 117667 and add safeguards for !ENABLE(VIDEO) platforms (117765)
+ https://bugs.webkit.org/show_bug.cgi?id=117765
+
+ Patch by Ruth Fong <[email protected]>.
+ Reviewed by Brady Eidson.
+
+ * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp:
+ (WKBundleHitTestResultGetMediaType): Updated to use mediaType().
+
+ * WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:
+ (WebKit::InjectedBundleHitTestResult::mediaType): Updated.
+ Renamed getMediaType() to mediaType() and now handles !ENABLE(VIDEO) platforms.
+
+ * WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:
+
2013-06-18 Roger Fong <[email protected]>
Disable some feature flags.
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp (151971 => 151972)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp 2013-06-25 21:48:11 UTC (rev 151971)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp 2013-06-26 00:30:49 UTC (rev 151972)
@@ -81,7 +81,7 @@
WKBundleHitTestResultMediaType WKBundleHitTestResultGetMediaType(WKBundleHitTestResultRef hitTestResultRef)
{
- return toAPI(toImpl(hitTestResultRef)->getMediaType());
+ return toAPI(toImpl(hitTestResultRef)->mediaType());
}
WKRect WKBundleHitTestResultGetImageRect(WKBundleHitTestResultRef hitTestResultRef)
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp (151971 => 151972)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp 2013-06-25 21:48:11 UTC (rev 151971)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp 2013-06-26 00:30:49 UTC (rev 151972)
@@ -104,8 +104,11 @@
return m_hitTestResult.mediaIsInFullscreen();
}
-BundleHitTestResultMediaType InjectedBundleHitTestResult::getMediaType() const
+BundleHitTestResultMediaType InjectedBundleHitTestResult::mediaType() const
{
+#if !ENABLE(VIDEO)
+ return BundleHitTestResultMediaTypeNone;
+#else
WebCore::Node* node = m_hitTestResult.innerNonSharedNode();
if (!node->isElementNode())
return BundleHitTestResultMediaTypeNone;
@@ -114,6 +117,7 @@
return BundleHitTestResultMediaTypeNone;
return m_hitTestResult.mediaIsVideo() ? BundleHitTestResultMediaTypeVideo : BundleHitTestResultMediaTypeAudio;
+#endif
}
String InjectedBundleHitTestResult::linkLabel() const
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h (151971 => 151972)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h 2013-06-25 21:48:11 UTC (rev 151971)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h 2013-06-26 00:30:49 UTC (rev 151972)
@@ -53,7 +53,7 @@
String absoluteLinkURL() const;
String absoluteMediaURL() const;
bool mediaIsInFullscreen() const;
- BundleHitTestResultMediaType getMediaType() const;
+ BundleHitTestResultMediaType mediaType() const;
String linkLabel() const;
String linkTitle() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
