Diff
Modified: trunk/ChangeLog (128346 => 128347)
--- trunk/ChangeLog 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/ChangeLog 2012-09-12 19:21:41 UTC (rev 128347)
@@ -1,3 +1,15 @@
+2012-09-12 Sami Kyostila <skyos...@google.com>
+
+ Rename OVERFLOW_SCROLLING as ACCELERATED_OVERFLOW_SCROLLING
+ https://bugs.webkit.org/show_bug.cgi?id=96251
+
+ Reviewed by Simon Fraser.
+
+ Rename OVERFLOW_SCROLLING as ACCELERATED_OVERFLOW_SCROLLING to better describe
+ the feature it controls.
+
+ * Source/cmakeconfig.h.cmake:
+
2012-09-11 Ryuan Choi <ryuan.c...@samsung.com>
[CMAKE] Supply feature defines to CodeGeneratorTestRunner.
Modified: trunk/LayoutTests/ChangeLog (128346 => 128347)
--- trunk/LayoutTests/ChangeLog 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/LayoutTests/ChangeLog 2012-09-12 19:21:41 UTC (rev 128347)
@@ -1,3 +1,15 @@
+2012-09-12 Sami Kyostila <skyos...@google.com>
+
+ Rename OVERFLOW_SCROLLING as ACCELERATED_OVERFLOW_SCROLLING
+ https://bugs.webkit.org/show_bug.cgi?id=96251
+
+ Reviewed by Simon Fraser.
+
+ Rename OVERFLOW_SCROLLING as ACCELERATED_OVERFLOW_SCROLLING to better describe
+ the feature it controls.
+
+ * platform/chromium/TestExpectations:
+
2012-09-12 Levi Weintraub <le...@chromium.org>
Inline repainting can be off-by-one with sub-pixel enabled
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (128346 => 128347)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-09-12 19:21:41 UTC (rev 128347)
@@ -3450,7 +3450,7 @@
BUGWK94261 DEBUG : http/tests/inspector/indexeddb/resources-panel.html = PASS CRASH TIMEOUT
-// ENABLE_OVERFLOW_SCROLLING is not currently enabled in Chromium.
+// ENABLE_ACCELERATED_OVERFLOW_SCROLLING is not currently enabled in Chromium.
BUGWK94353 : compositing/overflow/scrolling-content-clip-to-viewport.html = TEXT
BUGWK94353 : compositing/overflow/textarea-scroll-touch.html = TEXT
// Failing on Linux (Content Shell) only now
Modified: trunk/Source/WebCore/ChangeLog (128346 => 128347)
--- trunk/Source/WebCore/ChangeLog 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebCore/ChangeLog 2012-09-12 19:21:41 UTC (rev 128347)
@@ -1,3 +1,37 @@
+2012-09-12 Sami Kyostila <skyos...@google.com>
+
+ Rename OVERFLOW_SCROLLING as ACCELERATED_OVERFLOW_SCROLLING
+ https://bugs.webkit.org/show_bug.cgi?id=96251
+
+ Reviewed by Simon Fraser.
+
+ Rename OVERFLOW_SCROLLING as ACCELERATED_OVERFLOW_SCROLLING to better describe
+ the feature it controls.
+
+ No tests because of no change in runtime behavior.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore):
+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+ * css/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue):
+ (WebCore::isKeywordPropertyID):
+ (WebCore::CSSParser::parseValue):
+ * css/CSSProperty.cpp:
+ (WebCore::CSSProperty::isInheritedProperty):
+ * css/CSSPropertyNames.in:
+ * css/CSSValueKeywords.in:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::collectMatchingRulesForList):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::usesCompositedScrolling):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleRareInheritedData.cpp:
+ (WebCore::StyleRareInheritedData::StyleRareInheritedData):
+ (WebCore::StyleRareInheritedData::operator==):
+ * rendering/style/StyleRareInheritedData.h:
+ (StyleRareInheritedData):
+
2012-09-12 Levi Weintraub <le...@chromium.org>
Inline repainting can be off-by-one with sub-pixel enabled
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (128346 => 128347)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2012-09-12 19:21:41 UTC (rev 128347)
@@ -304,7 +304,7 @@
CSSPropertyWebkitMaskSize,
CSSPropertyWebkitNbspMode,
CSSPropertyWebkitOrder,
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
CSSPropertyWebkitOverflowScrolling,
#endif
CSSPropertyWebkitPerspective,
@@ -2274,7 +2274,7 @@
case CSSPropertyWebkitMarginTopCollapse:
case CSSPropertyWebkitMarginBeforeCollapse:
return cssValuePool().createValue(style->marginBeforeCollapse());
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
case CSSPropertyWebkitOverflowScrolling:
if (!style->useTouchOverflowScrolling())
return cssValuePool().createIdentifierValue(CSSValueAuto);
Modified: trunk/Source/WebCore/css/CSSParser.cpp (128346 => 128347)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-09-12 19:21:41 UTC (rev 128347)
@@ -834,7 +834,7 @@
if (valueID == CSSValueNormal || valueID == CSSValueSpace)
return true;
break;
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
case CSSPropertyWebkitOverflowScrolling:
if (valueID == CSSValueAuto || valueID == CSSValueTouch)
return true;
@@ -1012,7 +1012,7 @@
case CSSPropertyWebkitMarqueeDirection:
case CSSPropertyWebkitMarqueeStyle:
case CSSPropertyWebkitNbspMode:
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
case CSSPropertyWebkitOverflowScrolling:
#endif
case CSSPropertyWebkitPrintColorAdjust:
@@ -2872,7 +2872,7 @@
case CSSPropertyWebkitMarqueeDirection:
case CSSPropertyWebkitMarqueeStyle:
case CSSPropertyWebkitNbspMode:
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
case CSSPropertyWebkitOverflowScrolling:
#endif
case CSSPropertyWebkitPrintColorAdjust:
Modified: trunk/Source/WebCore/css/CSSProperty.cpp (128346 => 128347)
--- trunk/Source/WebCore/css/CSSProperty.cpp 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebCore/css/CSSProperty.cpp 2012-09-12 19:21:41 UTC (rev 128347)
@@ -342,7 +342,7 @@
case CSSPropertyWebkitLineGrid:
case CSSPropertyWebkitLineSnap:
case CSSPropertyWebkitNbspMode:
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
case CSSPropertyWebkitOverflowScrolling:
#endif
case CSSPropertyWebkitPrintColorAdjust:
Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (128346 => 128347)
--- trunk/Source/WebCore/css/CSSPropertyNames.in 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2012-09-12 19:21:41 UTC (rev 128347)
@@ -411,6 +411,6 @@
#if defined(ENABLE_WIDGET_REGION) && ENABLE_WIDGET_REGION
-webkit-widget-region
#endif
-#if defined(ENABLE_OVERFLOW_SCROLLING) && ENABLE_OVERFLOW_SCROLLING
+#if defined(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) && ENABLE_ACCELERATED_OVERFLOW_SCROLLING
-webkit-overflow-scrolling
#endif
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (128346 => 128347)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2012-09-12 19:21:41 UTC (rev 128347)
@@ -829,7 +829,7 @@
manual
// auto
-#if defined(ENABLE_OVERFLOW_SCROLLING) && ENABLE_OVERFLOW_SCROLLING
+#if defined(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) && ENABLE_ACCELERATED_OVERFLOW_SCROLLING
// -webkit-overflow-scrolling
// auto
touch
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (128346 => 128347)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2012-09-12 19:21:41 UTC (rev 128347)
@@ -2200,7 +2200,7 @@
#else
|| (style->position() == FixedPosition && e && e->document()->page() && e->document()->page()->settings()->fixedPositionCreatesStackingContext())
#endif
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
// Touch overflow scrolling creates a stacking context.
|| ((style->overflowX() != OHIDDEN || style->overflowY() != OHIDDEN) && style->useTouchOverflowScrolling())
#endif
@@ -4047,7 +4047,7 @@
return;
}
#endif
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
case CSSPropertyWebkitOverflowScrolling: {
HANDLE_INHERIT_AND_INITIAL(useTouchOverflowScrolling, UseTouchOverflowScrolling);
if (!primitiveValue)
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (128346 => 128347)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-09-12 19:21:41 UTC (rev 128347)
@@ -1573,7 +1573,7 @@
if (!scrollsOverflow() || !allowsScrolling())
return false;
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
return renderer()->style()->useTouchOverflowScrolling();
#else
return false;
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (128346 => 128347)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-09-12 19:21:41 UTC (rev 128347)
@@ -953,7 +953,7 @@
#if ENABLE(TOUCH_EVENTS)
Color tapHighlightColor() const { return rareInheritedData->tapHighlightColor; }
#endif
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
bool useTouchOverflowScrolling() const { return rareInheritedData->useTouchOverflowScrolling; }
#endif
bool textSizeAdjust() const { return rareInheritedData->textSizeAdjust; }
@@ -1405,7 +1405,7 @@
#if ENABLE(TOUCH_EVENTS)
void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHighlightColor, c); }
#endif
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
void setUseTouchOverflowScrolling(bool v) { SET_VAR(rareInheritedData, useTouchOverflowScrolling, v); }
#endif
bool setTextSizeAdjust(bool);
@@ -1727,7 +1727,7 @@
#if ENABLE(TOUCH_EVENTS)
static Color initialTapHighlightColor();
#endif
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
static bool initialUseTouchOverflowScrolling() { return false; }
#endif
#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(WIDGET_REGION)
Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (128346 => 128347)
--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2012-09-12 19:21:41 UTC (rev 128347)
@@ -88,7 +88,7 @@
, m_imageRendering(RenderStyle::initialImageRendering())
, m_lineSnap(RenderStyle::initialLineSnap())
, m_lineAlign(RenderStyle::initialLineAlign())
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
, useTouchOverflowScrolling(RenderStyle::initialUseTouchOverflowScrolling())
#endif
#if ENABLE(CSS_IMAGE_RESOLUTION)
@@ -150,7 +150,7 @@
, m_imageRendering(o.m_imageRendering)
, m_lineSnap(o.m_lineSnap)
, m_lineAlign(o.m_lineAlign)
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
, useTouchOverflowScrolling(o.useTouchOverflowScrolling)
#endif
#if ENABLE(CSS_IMAGE_RESOLUTION)
@@ -215,7 +215,7 @@
&& overflowWrap == o.overflowWrap
&& nbspMode == o.nbspMode
&& khtmlLineBreak == o.khtmlLineBreak
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
&& useTouchOverflowScrolling == o.useTouchOverflowScrolling
#endif
&& textSizeAdjust == o.textSizeAdjust
Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h (128346 => 128347)
--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2012-09-12 19:21:41 UTC (rev 128347)
@@ -104,7 +104,7 @@
unsigned m_imageRendering : 2; // EImageRendering
unsigned m_lineSnap : 2; // LineSnap
unsigned m_lineAlign : 1; // LineAlign
-#if ENABLE(OVERFLOW_SCROLLING)
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
unsigned useTouchOverflowScrolling: 1;
#endif
#if ENABLE(CSS_IMAGE_RESOLUTION)
Modified: trunk/Source/WebKit/blackberry/ChangeLog (128346 => 128347)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-09-12 19:21:41 UTC (rev 128347)
@@ -1,3 +1,15 @@
+2012-09-12 Sami Kyostila <skyos...@google.com>
+
+ Rename OVERFLOW_SCROLLING as ACCELERATED_OVERFLOW_SCROLLING
+ https://bugs.webkit.org/show_bug.cgi?id=96251
+
+ Reviewed by Simon Fraser.
+
+ Rename OVERFLOW_SCROLLING as ACCELERATED_OVERFLOW_SCROLLING to better describe
+ the feature it controls.
+
+ * WebCoreSupport/AboutDataEnableFeatures.in:
+
2012-09-11 Antonio Gomes <ago...@rim.com>
[BlackBerry] add a way to overscroll non-overflown content
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in (128346 => 128347)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in 2012-09-12 19:21:41 UTC (rev 128347)
@@ -1,6 +1,7 @@
3D_CANVAS
3D_RENDERING
ACCELERATED_2D_CANVAS
+ACCELERATED_OVERFLOW_SCROLLING
ALL_VARIABLES_CAPTURED
ASSEMBLER
ASSEMBLER_WX_EXCLUSIVE
@@ -134,7 +135,6 @@
OPCODE_STATS
ORIENTATION_EVENTS
OSR_ENTRY
-OVERFLOW_SCROLLING
PAGE_POPUP
PAGE_VISIBILITY_API
PAN_SCROLLING
Modified: trunk/Source/WebKit/chromium/ChangeLog (128346 => 128347)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-12 19:21:41 UTC (rev 128347)
@@ -1,3 +1,15 @@
+2012-09-12 Sami Kyostila <skyos...@google.com>
+
+ Rename OVERFLOW_SCROLLING as ACCELERATED_OVERFLOW_SCROLLING
+ https://bugs.webkit.org/show_bug.cgi?id=96251
+
+ Reviewed by Simon Fraser.
+
+ Rename OVERFLOW_SCROLLING as ACCELERATED_OVERFLOW_SCROLLING to better describe
+ the feature it controls.
+
+ * features.gypi:
+
2012-09-12 Christopher Cameron <ccame...@chromium.org>
[chromium] Evict textures through the texture manager instead of the resource provider
Modified: trunk/Source/WebKit/chromium/features.gypi (128346 => 128347)
--- trunk/Source/WebKit/chromium/features.gypi 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/WebKit/chromium/features.gypi 2012-09-12 19:21:41 UTC (rev 128347)
@@ -147,6 +147,7 @@
'conditions': [
['OS=="android"', {
'feature_defines': [
+ 'ENABLE_ACCELERATED_OVERFLOW_SCROLLING=1',
'ENABLE_CALENDAR_PICKER=0',
'ENABLE_DATALIST_ELEMENT=0',
'ENABLE_INPUT_SPEECH=0',
@@ -157,7 +158,6 @@
'ENABLE_MEDIA_STREAM=0',
'ENABLE_NOTIFICATIONS=0',
'ENABLE_ORIENTATION_EVENTS=1',
- 'ENABLE_OVERFLOW_SCROLLING=1',
'ENABLE_PAGE_POPUP=0',
'ENABLE_PRINTING=0',
# FIXME: Disable once the linking error has been resolved.
@@ -169,6 +169,7 @@
'enable_touch_icon_loading': 1,
}, { # OS!="android"
'feature_defines': [
+ 'ENABLE_ACCELERATED_OVERFLOW_SCROLLING=0',
'ENABLE_CALENDAR_PICKER=1',
'ENABLE_DATALIST_ELEMENT=1',
'ENABLE_INPUT_SPEECH=1',
@@ -180,7 +181,6 @@
'ENABLE_MEDIA_STREAM=1',
'ENABLE_NOTIFICATIONS=1',
'ENABLE_ORIENTATION_EVENTS=0',
- 'ENABLE_OVERFLOW_SCROLLING=0',
'ENABLE_PAGE_POPUP=1',
'ENABLE_PRINTING=1',
'ENABLE_SHARED_WORKERS=1',
Modified: trunk/Source/cmakeconfig.h.cmake (128346 => 128347)
--- trunk/Source/cmakeconfig.h.cmake 2012-09-12 19:17:03 UTC (rev 128346)
+++ trunk/Source/cmakeconfig.h.cmake 2012-09-12 19:21:41 UTC (rev 128347)
@@ -3,6 +3,7 @@
#cmakedefine01 ENABLE_3D_RENDERING
#cmakedefine01 ENABLE_ACCELERATED_2D_CANVAS
+#cmakedefine01 ENABLE_ACCELERATED_OVERFLOW_SCROLLING
#cmakedefine01 ENABLE_ANIMATION_API
#cmakedefine01 ENABLE_API_TESTS
#cmakedefine01 ENABLE_AS_IMAGE
@@ -79,7 +80,6 @@
#cmakedefine01 ENABLE_NETWORK_INFO
#cmakedefine01 ENABLE_NOTIFICATIONS
#cmakedefine01 ENABLE_ORIENTATION_EVENTS
-#cmakedefine01 ENABLE_OVERFLOW_SCROLLING
#cmakedefine01 ENABLE_PAGE_POPUP
#cmakedefine01 ENABLE_PAGE_VISIBILITY_API
#cmakedefine01 ENABLE_PLUGIN_PROXY_FOR_VIDEO
