Title: [187697] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187697
- Author
- [email protected]
- Date
- 2015-07-31 17:29:44 -0700 (Fri, 31 Jul 2015)
Log Message
Merged r187694. rdar://problem/22015509
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187696 => 187697)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-01 00:27:09 UTC (rev 187696)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-01 00:29:44 UTC (rev 187697)
@@ -1,5 +1,23 @@
2015-07-31 Babak Shafiei <[email protected]>
+ Merge r187694.
+
+ 2015-07-31 Eric Carlson <[email protected]>
+
+ [iOS] use a media-specific user gesture check
+ https://bugs.webkit.org/show_bug.cgi?id=147509
+
+ Reviewed by Tim Horton.
+
+ Change an enum name added in r187688.
+
+ * dom/UserGestureIndicator.cpp:
+ (WebCore::isDefinite): DefinitelyProcessingMediaUserGesture -> DefinitelyProcessingPotentialUserGesture
+ (WebCore::UserGestureIndicator::processingUserGestureForMedia): Ditto.
+ * dom/UserGestureIndicator.h: Ditto.
+
+2015-07-31 Babak Shafiei <[email protected]>
+
Merge r187688.
2015-07-31 Eric Carlson <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebCore/dom/UserGestureIndicator.cpp (187696 => 187697)
--- branches/safari-601.1-branch/Source/WebCore/dom/UserGestureIndicator.cpp 2015-08-01 00:27:09 UTC (rev 187696)
+++ branches/safari-601.1-branch/Source/WebCore/dom/UserGestureIndicator.cpp 2015-08-01 00:29:44 UTC (rev 187697)
@@ -33,7 +33,7 @@
static bool isDefinite(ProcessingUserGestureState state)
{
- return state == DefinitelyProcessingUserGesture || state == DefinitelyNotProcessingUserGesture || state == DefinitelyProcessingMediaUserGesture;
+ return state == DefinitelyProcessingUserGesture || state == DefinitelyNotProcessingUserGesture || state == DefinitelyProcessingPotentialUserGesture;
}
ProcessingUserGestureState UserGestureIndicator::s_state = DefinitelyNotProcessingUserGesture;
@@ -71,7 +71,7 @@
if (!isMainThread())
return false;
- return s_state == DefinitelyProcessingUserGesture || s_state == DefinitelyProcessingMediaUserGesture;
+ return s_state == DefinitelyProcessingUserGesture || s_state == DefinitelyProcessingPotentialUserGesture;
}
}
Modified: branches/safari-601.1-branch/Source/WebCore/dom/UserGestureIndicator.h (187696 => 187697)
--- branches/safari-601.1-branch/Source/WebCore/dom/UserGestureIndicator.h 2015-08-01 00:27:09 UTC (rev 187696)
+++ branches/safari-601.1-branch/Source/WebCore/dom/UserGestureIndicator.h 2015-08-01 00:29:44 UTC (rev 187697)
@@ -34,7 +34,7 @@
enum ProcessingUserGestureState {
DefinitelyProcessingUserGesture,
- DefinitelyProcessingMediaUserGesture,
+ DefinitelyProcessingPotentialUserGesture,
PossiblyProcessingUserGesture,
DefinitelyNotProcessingUserGesture
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
