Title: [151760] trunk/Source/WebKit2
- Revision
- 151760
- Author
- [email protected]
- Date
- 2013-06-19 17:10:38 -0700 (Wed, 19 Jun 2013)
Log Message
<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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (151759 => 151760)
--- trunk/Source/WebKit2/ChangeLog 2013-06-19 23:37:38 UTC (rev 151759)
+++ trunk/Source/WebKit2/ChangeLog 2013-06-20 00:10:38 UTC (rev 151760)
@@ -1,3 +1,20 @@
+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-19 Benjamin Poulain <[email protected]>
Use the PlatformEvent timestamp when creating a DOM Event
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp (151759 => 151760)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp 2013-06-19 23:37:38 UTC (rev 151759)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp 2013-06-20 00:10:38 UTC (rev 151760)
@@ -81,7 +81,7 @@
WKBundleHitTestResultMediaType WKBundleHitTestResultGetMediaType(WKBundleHitTestResultRef hitTestResultRef)
{
- return toAPI(toImpl(hitTestResultRef)->getMediaType());
+ return toAPI(toImpl(hitTestResultRef)->mediaType());
}
WKRect WKBundleHitTestResultGetImageRect(WKBundleHitTestResultRef hitTestResultRef)
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp (151759 => 151760)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp 2013-06-19 23:37:38 UTC (rev 151759)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp 2013-06-20 00:10:38 UTC (rev 151760)
@@ -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: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h (151759 => 151760)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h 2013-06-19 23:37:38 UTC (rev 151759)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h 2013-06-20 00:10:38 UTC (rev 151760)
@@ -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
