Title: [96861] trunk/Source
- Revision
- 96861
- Author
- ann...@chromium.org
- Date
- 2011-10-06 14:44:31 -0700 (Thu, 06 Oct 2011)
Log Message
Source/WebCore: Adding parens in WebVTTParser.cpp to appease compiler preferences.
https://bugs.webkit.org/show_bug.cgi?id=69460
Reviewed by David Levin.
No new tests. No new functionality.
* html/track/WebVTTParser.cpp:
(WebCore::WebVTTParser::constructTreeFromToken):
Source/WebKit/chromium: Turn ENABLE_VIDEO_TRACK on for chromium.
https://bugs.webkit.org/show_bug.cgi?id=69460
Reviewed by David Levin.
* features.gypi:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (96860 => 96861)
--- trunk/Source/WebCore/ChangeLog 2011-10-06 21:43:00 UTC (rev 96860)
+++ trunk/Source/WebCore/ChangeLog 2011-10-06 21:44:31 UTC (rev 96861)
@@ -1,3 +1,15 @@
+2011-10-06 Anna Cavender <ann...@chromium.org>
+
+ Adding parens in WebVTTParser.cpp to appease compiler preferences.
+ https://bugs.webkit.org/show_bug.cgi?id=69460
+
+ Reviewed by David Levin.
+
+ No new tests. No new functionality.
+
+ * html/track/WebVTTParser.cpp:
+ (WebCore::WebVTTParser::constructTreeFromToken):
+
2011-10-06 Fady Samuel <fsam...@chromium.org>
Code clean-up: Make RenderObject::absoluteBoundingBoxRect and associated methods const and make its parameter useTransforms no longer default to false
Modified: trunk/Source/WebCore/html/track/WebVTTParser.cpp (96860 => 96861)
--- trunk/Source/WebCore/html/track/WebVTTParser.cpp 2011-10-06 21:43:00 UTC (rev 96860)
+++ trunk/Source/WebCore/html/track/WebVTTParser.cpp 2011-10-06 21:44:31 UTC (rev 96861)
@@ -339,10 +339,11 @@
}
case WebVTTTokenTypes::EndTag:
if (isRecognizedTag(tokenTagName)
- || m_token.name().size() == 1 && m_token.name()[0] == 'c'
- || m_token.name().size() == 1 && m_token.name()[0] == 'v')
+ || (m_token.name().size() == 1 && m_token.name()[0] == 'c')
+ || (m_token.name().size() == 1 && m_token.name()[0] == 'v')) {
if (m_currentNode->parentNode())
m_currentNode = m_currentNode->parentNode();
+ }
break;
case WebVTTTokenTypes::TimestampTag: {
unsigned position = 0;
Modified: trunk/Source/WebKit/chromium/ChangeLog (96860 => 96861)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-06 21:43:00 UTC (rev 96860)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-06 21:44:31 UTC (rev 96861)
@@ -1,3 +1,12 @@
+2011-10-06 Anna Cavender <ann...@chromium.org>
+
+ Turn ENABLE_VIDEO_TRACK on for chromium.
+ https://bugs.webkit.org/show_bug.cgi?id=69460
+
+ Reviewed by David Levin.
+
+ * features.gypi:
+
2011-10-06 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r96791.
Modified: trunk/Source/WebKit/chromium/features.gypi (96860 => 96861)
--- trunk/Source/WebKit/chromium/features.gypi 2011-10-06 21:43:00 UTC (rev 96860)
+++ trunk/Source/WebKit/chromium/features.gypi 2011-10-06 21:44:31 UTC (rev 96861)
@@ -87,6 +87,7 @@
'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',
'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
'ENABLE_VIDEO=1',
+ 'ENABLE_VIDEO_TRACK=1',
'ENABLE_WEBGL=1',
'ENABLE_WEB_SOCKETS=1',
'ENABLE_WEB_TIMING=1',
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
