[webkit-changes] [167651] trunk
Title: [167651] trunk
Revision 167651
Author zandober...@gmail.com
Date 2014-04-22 01:29:23 -0700 (Tue, 22 Apr 2014)
Log Message
Fix a typo in WebKitFeatures.cmake -- INITALVALUE - INITIALVALUE.
Rubber-stamped by Carlos Garcia Campos.
* Source/cmake/WebKitFeatures.cmake:
Modified Paths
trunk/ChangeLog
trunk/Source/cmake/WebKitFeatures.cmake
Diff
Modified: trunk/ChangeLog (167650 => 167651)
--- trunk/ChangeLog 2014-04-22 05:44:49 UTC (rev 167650)
+++ trunk/ChangeLog 2014-04-22 08:29:23 UTC (rev 167651)
@@ -1,3 +1,11 @@
+2014-04-22 Zan Dobersek zdober...@igalia.com
+
+Fix a typo in WebKitFeatures.cmake -- INITALVALUE - INITIALVALUE.
+
+Rubber-stamped by Carlos Garcia Campos.
+
+* Source/cmake/WebKitFeatures.cmake:
+
2014-04-18 Jon Honeycutt jhoneyc...@apple.com
Empty RenderInline objects should not be line break objects.
Modified: trunk/Source/cmake/WebKitFeatures.cmake (167650 => 167651)
--- trunk/Source/cmake/WebKitFeatures.cmake 2014-04-22 05:44:49 UTC (rev 167650)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2014-04-22 08:29:23 UTC (rev 167651)
@@ -1,13 +1,13 @@
set(_WEBKIT_AVAILABLE_OPTIONS )
macro(WEBKIT_OPTION_DEFINE _name _description _initialvalue)
-set(_WEBKIT_AVAILABLE_OPTIONS_INITALVALUE_${_name} ${_initialvalue})
+set(_WEBKIT_AVAILABLE_OPTIONS_INITIALVALUE_${_name} ${_initialvalue})
set(_WEBKIT_AVAILABLE_OPTIONS_DESCRIPTION_${_name} ${_description})
list(APPEND _WEBKIT_AVAILABLE_OPTIONS ${_name})
endmacro()
macro(WEBKIT_OPTION_DEFAULT_PORT_VALUE _name _value)
-set(_WEBKIT_AVAILABLE_OPTIONS_INITALVALUE_${_name} ${_value})
+set(_WEBKIT_AVAILABLE_OPTIONS_INITIALVALUE_${_name} ${_value})
endmacro()
macro(WEBKIT_OPTION_BEGIN)
@@ -132,7 +132,7 @@
macro(WEBKIT_OPTION_END)
foreach (_name ${_WEBKIT_AVAILABLE_OPTIONS})
-option(${_name} ${_WEBKIT_AVAILABLE_OPTIONS_DESCRIPTION_${_name}} ${_WEBKIT_AVAILABLE_OPTIONS_INITALVALUE_${_name}})
+option(${_name} ${_WEBKIT_AVAILABLE_OPTIONS_DESCRIPTION_${_name}} ${_WEBKIT_AVAILABLE_OPTIONS_INITIALVALUE_${_name}})
endforeach ()
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167655] trunk/LayoutTests
Title: [167655] trunk/LayoutTests Revision 167655 Author r...@igalia.com Date 2014-04-22 05:00:04 -0700 (Tue, 22 Apr 2014) Log Message Unreviewed gardening. * TestExpectations: fast/regions/cssom/region-range-for-box-crash.html is crashing on debug mode after r167652. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (167654 => 167655) --- trunk/LayoutTests/ChangeLog 2014-04-22 11:03:04 UTC (rev 167654) +++ trunk/LayoutTests/ChangeLog 2014-04-22 12:00:04 UTC (rev 167655) @@ -1,5 +1,11 @@ 2014-04-22 Manuel Rego Casasnovas r...@igalia.com +Unreviewed gardening. + +* TestExpectations: fast/regions/cssom/region-range-for-box-crash.html is crashing on debug mode after r167652. + +2014-04-22 Manuel Rego Casasnovas r...@igalia.com + [CSS Regions] Selection highlight doesn't match DOM selection https://bugs.webkit.org/show_bug.cgi?id=131511 Modified: trunk/LayoutTests/TestExpectations (167654 => 167655) --- trunk/LayoutTests/TestExpectations 2014-04-22 11:03:04 UTC (rev 167654) +++ trunk/LayoutTests/TestExpectations 2014-04-22 12:00:04 UTC (rev 167655) @@ -106,3 +106,5 @@ # Expando properties on attribute nodes disappear webkit.org/b/88045 fast/dom/gc-attribute-node.html [ Failure Pass ] + +webkit.org/b/131982 [ Debug ] fast/regions/cssom/region-range-for-box-crash.html [ Crash ] ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167656] trunk/Source/WebKit2
Title: [167656] trunk/Source/WebKit2
Revision 167656
Author carlo...@webkit.org
Date 2014-04-22 06:36:21 -0700 (Tue, 22 Apr 2014)
Log Message
[GTK] Crash after getting web view context property with g_object_get
https://bugs.webkit.org/show_bug.cgi?id=131983
Reviewed by Philippe Normand.
The problem is that the getter is using g_value_take_object() and
the default context is destroyed when the caller releases its ref.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewGetProperty): Use g_value_set_object() instead of
g_value_take_object().
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167655 => 167656)
--- trunk/Source/WebKit2/ChangeLog 2014-04-22 12:00:04 UTC (rev 167655)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-22 13:36:21 UTC (rev 167656)
@@ -1,3 +1,17 @@
+2014-04-22 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Crash after getting web view context property with g_object_get
+https://bugs.webkit.org/show_bug.cgi?id=131983
+
+Reviewed by Philippe Normand.
+
+The problem is that the getter is using g_value_take_object() and
+the default context is destroyed when the caller releases its ref.
+
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkitWebViewGetProperty): Use g_value_set_object() instead of
+g_value_take_object().
+
2014-04-22 Ryuan Choi ryuan.c...@samsung.com
[EFL][WK2] Remove unnecessary includes in files of Source/WebKit2/UIProcess/API/efl
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (167655 => 167656)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-04-22 12:00:04 UTC (rev 167655)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-04-22 13:36:21 UTC (rev 167656)
@@ -560,7 +560,7 @@
switch (propId) {
case PROP_WEB_CONTEXT:
-g_value_take_object(value, webView-priv-context);
+g_value_set_object(value, webView-priv-context);
break;
case PROP_GROUP:
g_value_set_object(value, webkit_web_view_get_group(webView));
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167657] releases/WebKitGTK/webkit-2.4/Source/WebKit2
Title: [167657] releases/WebKitGTK/webkit-2.4/Source/WebKit2
Revision 167657
Author carlo...@webkit.org
Date 2014-04-22 06:39:49 -0700 (Tue, 22 Apr 2014)
Log Message
Merge r167656 - [GTK] Crash after getting web view context property with g_object_get
https://bugs.webkit.org/show_bug.cgi?id=131983
Reviewed by Philippe Normand.
The problem is that the getter is using g_value_take_object() and
the default context is destroyed when the caller releases its ref.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewGetProperty): Use g_value_set_object() instead of
g_value_take_object().
Modified Paths
releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog
releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (167656 => 167657)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-04-22 13:36:21 UTC (rev 167656)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-04-22 13:39:49 UTC (rev 167657)
@@ -1,3 +1,17 @@
+2014-04-22 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Crash after getting web view context property with g_object_get
+https://bugs.webkit.org/show_bug.cgi?id=131983
+
+Reviewed by Philippe Normand.
+
+The problem is that the getter is using g_value_take_object() and
+the default context is destroyed when the caller releases its ref.
+
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkitWebViewGetProperty): Use g_value_set_object() instead of
+g_value_take_object().
+
2014-03-20 Alexey Proskuryakov a...@apple.com
Generalize WebInspector check in maybeInitializeSandboxExtensionHandle().
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (167656 => 167657)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-04-22 13:36:21 UTC (rev 167656)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-04-22 13:39:49 UTC (rev 167657)
@@ -561,7 +561,7 @@
switch (propId) {
case PROP_WEB_CONTEXT:
-g_value_take_object(value, webView-priv-context);
+g_value_set_object(value, webView-priv-context);
break;
case PROP_GROUP:
g_value_set_object(value, webkit_web_view_get_group(webView));
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167658] trunk/Source/WebCore
Title: [167658] trunk/Source/WebCore
Revision 167658
Author eric.carl...@apple.com
Date 2014-04-22 07:06:36 -0700 (Tue, 22 Apr 2014)
Log Message
[Mac] don't ask for AVAssetTrack properties before they are available
https://bugs.webkit.org/show_bug.cgi?id=131902
rdar://problem/16505076
Reviewed by Jer Noble.
No new tests, the behavior this changes can not be tested with a layout test.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC): Initialize
m_cachedTotalBytes.
(WebCore::MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata): Don't report that
metadata has been loaded until the track properties we need have been loaded too.
(WebCore::MediaPlayerPrivateAVFoundationObjC::totalBytes): Cache totalBytes instead
of recalculating it every time.
(WebCore::MediaPlayerPrivateAVFoundationObjC::tracksDidChange): Invalidate cached
total bytes.
(WebCore::assetTrackMetadataKeyNames): Array of AVAssetTrack properties we use.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (167657 => 167658)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 13:39:49 UTC (rev 167657)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 14:06:36 UTC (rev 167658)
@@ -1,3 +1,25 @@
+2014-04-22 Eric Carlson eric.carl...@apple.com
+
+[Mac] don't ask for AVAssetTrack properties before they are available
+https://bugs.webkit.org/show_bug.cgi?id=131902
+rdar://problem/16505076
+
+Reviewed by Jer Noble.
+
+No new tests, the behavior this changes can not be tested with a layout test.
+
+* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+(WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC): Initialize
+m_cachedTotalBytes.
+(WebCore::MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata): Don't report that
+metadata has been loaded until the track properties we need have been loaded too.
+(WebCore::MediaPlayerPrivateAVFoundationObjC::totalBytes): Cache totalBytes instead
+of recalculating it every time.
+(WebCore::MediaPlayerPrivateAVFoundationObjC::tracksDidChange): Invalidate cached
+total bytes.
+(WebCore::assetTrackMetadataKeyNames): Array of AVAssetTrack properties we use.
+
2014-04-22 Peter Molnar pmolnar.u-sze...@partner.samsung.com
Buildfix after r167650 broke non-Cocoa builds
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (167657 => 167658)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-04-22 13:39:49 UTC (rev 167657)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-04-22 14:06:36 UTC (rev 167658)
@@ -320,6 +320,7 @@
FloatSize m_cachedPresentationSize;
double m_cachedDuration;
double m_cachedRate;
+mutable long long m_cachedTotalBytes;
unsigned m_pendingStatusChanges;
int m_cachedItemStatus;
bool m_cachedLikelyToKeepUp;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (167657 => 167658)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-04-22 13:39:49 UTC (rev 167657)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-04-22 14:06:36 UTC (rev 167658)
@@ -294,6 +294,7 @@
static NSArray *assetMetadataKeyNames();
static NSArray *itemKVOProperties();
+static NSArray* assetTrackMetadataKeyNames();
#if !LOG_DISABLED
static const char *boolString(bool val)
@@ -365,6 +366,7 @@
, m_currentTextTrack(0)
, m_cachedDuration(MediaPlayer::invalidTime())
, m_cachedRate(0)
+, m_cachedTotalBytes(0)
, m_pendingStatusChanges(0)
, m_cachedItemStatus(MediaPlayerAVPlayerItemStatusDoesNotExist)
, m_cachedLikelyToKeepUp(false)
@@ -783,9 +785,23 @@
void MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata()
{
LOG(Media, MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata(%p) - requesting metadata loading, this);
+dispatch_group_t metadataLoadingGroup = dispatch_group_create();
+dispatch_group_enter(metadataLoadingGroup);
[m_avAsset.get() loadValuesAsynchronouslyForKeys:[assetMetadataKeyNames() retain] completionHandler:^{
+if ([m_avAsset.get() statusOfValueForKey:@tracks error:nil] ==
[webkit-changes] [167659] trunk
Title: [167659] trunk
Revision 167659
Author za...@apple.com
Date 2014-04-22 07:17:43 -0700 (Tue, 22 Apr 2014)
Log Message
border-style: double rendered as solid when combined with border-radius
https://bugs.webkit.org/show_bug.cgi?id=131927
Reviewed by Simon Fraser.
BorderEdge::getDoubleBorderStripeWidths() should return the calculated inner, outer border widths.
Source/WebCore:
Test: fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html
* rendering/BorderEdge.cpp:
(WebCore::BorderEdge::getDoubleBorderStripeWidths):
* rendering/BorderEdge.h:
LayoutTests:
* fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line-expected.html: Added.
* fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/BorderEdge.cpp
trunk/Source/WebCore/rendering/BorderEdge.h
Added Paths
trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line-expected.html
trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html
Diff
Modified: trunk/LayoutTests/ChangeLog (167658 => 167659)
--- trunk/LayoutTests/ChangeLog 2014-04-22 14:06:36 UTC (rev 167658)
+++ trunk/LayoutTests/ChangeLog 2014-04-22 14:17:43 UTC (rev 167659)
@@ -1,3 +1,15 @@
+2014-04-22 Zalan Bujtas za...@apple.com
+
+border-style: double rendered as solid when combined with border-radius
+https://bugs.webkit.org/show_bug.cgi?id=131927
+
+Reviewed by Simon Fraser.
+
+BorderEdge::getDoubleBorderStripeWidths() should return the calculated inner, outer border widths.
+
+* fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line-expected.html: Added.
+* fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html: Added.
+
2014-04-22 Manuel Rego Casasnovas r...@igalia.com
Unreviewed gardening.
Added: trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line-expected.html (0 => 167659)
--- trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line-expected.html (rev 0)
+++ trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line-expected.html 2014-04-22 14:17:43 UTC (rev 167659)
@@ -0,0 +1,19 @@
+!DOCTYPE html
+html
+head
+titleThis tests if double borders with radius paint doubles instead of solid single borders./title
+style
+ div {
+border-style: solid;
+border-color: red;
+ }
+/style
+/head
+body
+ div style=width: 20px; height: 20px; border-width: 0.5px; border-radius: 1px/div/br
+ div style=width: 20px; height: 20px; border-width: 1px; border-radius: 5px/div/br
+ div style=width: 20px; height: 20px; border-width: 1px; position: fixed; top: 89px; left: 10px/div/br
+ div style=width: 20px; height: 20px; border-width: 1px; position: fixed; top: 133.5px; left: 10.5px/div/br
+ div style=width: 20px; height: 20px; border-width: 1px; position: fixed; top: 179px; left: 11px/div/br
+/body
+/html
\ No newline at end of file
Added: trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html (0 => 167659)
--- trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html (rev 0)
+++ trunk/LayoutTests/fast/borders/hidpi-double-border-with-border-radius-always-produce-solid-line.html 2014-04-22 14:17:43 UTC (rev 167659)
@@ -0,0 +1,26 @@
+!DOCTYPE html
+html
+head
+titleThis tests if double borders with radius paint doubles instead of solid single borders./title
+style
+ .outer {
+width: 20px;
+height: 20px;
+border-style: double;
+border-color: red;
+ }
+
+ .cover {
+border: solid white 1px;
+position: relative;
+ }
+/style
+/head
+body
+ div class=outer style=border-width: 0.5px; border-radius: 1px/div/br
+ div class=outer style=border-width: 1px; border-radius: 5px/div/br
+ div class=outer style=border-width: 3px; border-radius: 1pxdiv class=cover style= top: -3px; left: -3px; width: 24px; height: 24px;/div/div/br
+ div class=outer style=border-width: 3.5px; border-radius: 1pxdiv class=cover style=top: -3.5px; left: -3.5px; width: 25px; height: 25px;/div/div/br
+ div class=outer style=border-width: 4px; border-radius: 2pxdiv class=cover style=border-width: 3px; top: -4px; left: -4px; width: 22px; height: 22px;/div/div/br
+/body
+/html
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (167658 => 167659)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 14:06:36 UTC (rev 167658)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 14:17:43 UTC (rev 167659)
@@ -1,3 +1,18 @@
+2014-04-22 Zalan Bujtas za...@apple.com
+
+border-style: double rendered as solid when combined with
[webkit-changes] [167660] trunk/Source/WebKit2
Title: [167660] trunk/Source/WebKit2
Revision 167660
Author commit-qu...@webkit.org
Date 2014-04-22 08:19:02 -0700 (Tue, 22 Apr 2014)
Log Message
[WebKit2] Cleanup the build from unused parameter in WebProcess Module
https://bugs.webkit.org/show_bug.cgi?id=131970
Patch by Shivakumar JM shiva...@samsung.com on 2014-04-22
Reviewed by Darin Adler.
Fix a build warning by removing the parameters in function paintLayerContents() to fix build warning.
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::paintLayerContents):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167659 => 167660)
--- trunk/Source/WebKit2/ChangeLog 2014-04-22 14:17:43 UTC (rev 167659)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-22 15:19:02 UTC (rev 167660)
@@ -1,3 +1,15 @@
+2014-04-22 Shivakumar JM shiva...@samsung.com
+
+[WebKit2] Cleanup the build from unused parameter in WebProcess Module
+https://bugs.webkit.org/show_bug.cgi?id=131970
+
+Reviewed by Darin Adler.
+
+Fix a build warning by removing the parameters in function paintLayerContents() to fix build warning.
+
+* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+(WebKit::CoordinatedLayerTreeHost::paintLayerContents):
+
2014-04-22 Carlos Garcia Campos cgar...@igalia.com
[GTK] Crash after getting web view context property with g_object_get
Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (167659 => 167660)
--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2014-04-22 14:17:43 UTC (rev 167659)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2014-04-22 15:19:02 UTC (rev 167660)
@@ -206,7 +206,7 @@
performScheduledLayerFlush();
}
-void CoordinatedLayerTreeHost::paintLayerContents(const GraphicsLayer* graphicsLayer, GraphicsContext graphicsContext, const IntRect clipRect)
+void CoordinatedLayerTreeHost::paintLayerContents(const GraphicsLayer*, GraphicsContext, const IntRect)
{
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167662] trunk/Source/WebKit2
Title: [167662] trunk/Source/WebKit2
Revision 167662
Author timothy_hor...@apple.com
Date 2014-04-22 08:51:33 -0700 (Tue, 22 Apr 2014)
Log Message
WKThumbnailView doesn't quite work with topContentInset
https://bugs.webkit.org/show_bug.cgi?id=131976
rdar://problem/16642127
Reviewed by Darin Adler.
* UIProcess/API/Cocoa/_WKThumbnailView.mm:
(-[_WKThumbnailView initWithFrame:fromWKView:]):
_WKThumbnailView always needs a layer.
We don't want to use snapshots by default, this was debugging accidentally landed in the last change.
(-[_WKThumbnailView _requestSnapshotIfNeeded]):
Don't request a new snapshot if the scale is the same as the existing one.
Reduce the height of the snapshot by the topContentInset.
Having the origin at (0, 0) is still correct, as the inset content is in negative Y space,
and (0, 0) is the true origin of the content.
(-[_WKThumbnailView setScale:]):
When not snapshotting, we've decided that WKThumbnailView should apply the scale to the WKView layer tree,
instead of depending on clients to do so.
(-[_WKThumbnailView setUsesSnapshot:]):
We *do* need to apply thumbnail scale in the web process even when snapshotting,
because we use the live layer tree temporarily while waiting for the asynchronous
snapshot to return. This was a misstep in the last thumbnail view patch.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167661 => 167662)
--- trunk/Source/WebKit2/ChangeLog 2014-04-22 15:39:26 UTC (rev 167661)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-22 15:51:33 UTC (rev 167662)
@@ -1,3 +1,31 @@
+2014-04-22 Tim Horton timothy_hor...@apple.com
+
+WKThumbnailView doesn't quite work with topContentInset
+https://bugs.webkit.org/show_bug.cgi?id=131976
+rdar://problem/16642127
+
+Reviewed by Darin Adler.
+
+* UIProcess/API/Cocoa/_WKThumbnailView.mm:
+(-[_WKThumbnailView initWithFrame:fromWKView:]):
+_WKThumbnailView always needs a layer.
+We don't want to use snapshots by default, this was debugging accidentally landed in the last change.
+
+(-[_WKThumbnailView _requestSnapshotIfNeeded]):
+Don't request a new snapshot if the scale is the same as the existing one.
+Reduce the height of the snapshot by the topContentInset.
+Having the origin at (0, 0) is still correct, as the inset content is in negative Y space,
+and (0, 0) is the true origin of the content.
+
+(-[_WKThumbnailView setScale:]):
+When not snapshotting, we've decided that WKThumbnailView should apply the scale to the WKView layer tree,
+instead of depending on clients to do so.
+
+(-[_WKThumbnailView setUsesSnapshot:]):
+We *do* need to apply thumbnail scale in the web process even when snapshotting,
+because we use the live layer tree temporarily while waiting for the asynchronous
+snapshot to return. This was a misstep in the last thumbnail view patch.
+
2014-04-22 Shivakumar JM shiva...@samsung.com
[WebKit2] Cleanup the build from unused parameter in WebProcess Module
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm (167661 => 167662)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm 2014-04-22 15:39:26 UTC (rev 167661)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm 2014-04-22 15:51:33 UTC (rev 167662)
@@ -55,6 +55,7 @@
BOOL _shouldApplyThumbnailScale;
BOOL _snapshotWasDeferred;
+double _lastSnapshotScale;
}
@synthesize _waitingForSnapshot = _waitingForSnapshot;
@@ -64,17 +65,18 @@
if (!(self = [super initWithFrame:frame]))
return nil;
+self.wantsLayer = YES;
+
_wkView = wkView;
_webPageProxy = toImpl([_wkView pageRef]);
_scale = 1;
+_lastSnapshotScale = NAN;
_originalMayStartMediaWhenInWindow = _webPageProxy-mayStartMediaWhenInWindow();
_originalSourceViewIsInWindow = !![_wkView window];
_shouldApplyThumbnailScale = !_originalSourceViewIsInWindow;
-self.usesSnapshot = YES;
-
return self;
}
@@ -86,6 +88,7 @@
[_wkView _setThumbnailView:nil];
self.layer.contents = nil;
+_lastSnapshotScale = NAN;
_webPageProxy-setMayStartMediaWhenInWindow(_originalMayStartMediaWhenInWindow);
}
@@ -110,6 +113,9 @@
if (!_usesSnapshot)
return;
+if (self.layer.contents _lastSnapshotScale == _scale)
+return;
+
if (_waitingForSnapshot) {
_snapshotWasDeferred = YES;
return;
@@ -118,10 +124,11 @@
_waitingForSnapshot = YES;
RetainPtr_WKThumbnailView thumbnailView = self;
-IntRect snapshotRect(IntPoint(), _webPageProxy-viewSize());
+IntRect snapshotRect(IntPoint(), _webPageProxy-viewSize() - IntSize(0, _webPageProxy-topContentInset()));
SnapshotOptions options = SnapshotOptionsRespectDrawingAreaTransform |
[webkit-changes] [167664] trunk/Source/WebCore
Title: [167664] trunk/Source/WebCore
Revision 167664
Author commit-qu...@webkit.org
Date 2014-04-22 09:56:24 -0700 (Tue, 22 Apr 2014)
Log Message
Unreviewed, rolling out r167658.
https://bugs.webkit.org/show_bug.cgi?id=131993
Caused many crashes on media tests (Requested by ap on
#webkit).
Reverted changeset:
[Mac] don't ask for AVAssetTrack properties before they are
available
https://bugs.webkit.org/show_bug.cgi?id=131902
http://trac.webkit.org/changeset/167658
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (167663 => 167664)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 16:08:18 UTC (rev 167663)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 16:56:24 UTC (rev 167664)
@@ -1,3 +1,18 @@
+2014-04-22 Commit Queue commit-qu...@webkit.org
+
+Unreviewed, rolling out r167658.
+https://bugs.webkit.org/show_bug.cgi?id=131993
+
+Caused many crashes on media tests (Requested by ap on
+#webkit).
+
+Reverted changeset:
+
+[Mac] don't ask for AVAssetTrack properties before they are
+available
+https://bugs.webkit.org/show_bug.cgi?id=131902
+http://trac.webkit.org/changeset/167658
+
2014-04-22 David Hyatt hy...@apple.com
[New Multicolumn] fast/multicol/multicol-with-child-renderLayer-for-input.html puts the textfield in the wrong place
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (167663 => 167664)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-04-22 16:08:18 UTC (rev 167663)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-04-22 16:56:24 UTC (rev 167664)
@@ -320,7 +320,6 @@
FloatSize m_cachedPresentationSize;
double m_cachedDuration;
double m_cachedRate;
-mutable long long m_cachedTotalBytes;
unsigned m_pendingStatusChanges;
int m_cachedItemStatus;
bool m_cachedLikelyToKeepUp;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (167663 => 167664)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-04-22 16:08:18 UTC (rev 167663)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-04-22 16:56:24 UTC (rev 167664)
@@ -294,7 +294,6 @@
static NSArray *assetMetadataKeyNames();
static NSArray *itemKVOProperties();
-static NSArray* assetTrackMetadataKeyNames();
#if !LOG_DISABLED
static const char *boolString(bool val)
@@ -366,7 +365,6 @@
, m_currentTextTrack(0)
, m_cachedDuration(MediaPlayer::invalidTime())
, m_cachedRate(0)
-, m_cachedTotalBytes(0)
, m_pendingStatusChanges(0)
, m_cachedItemStatus(MediaPlayerAVPlayerItemStatusDoesNotExist)
, m_cachedLikelyToKeepUp(false)
@@ -785,23 +783,9 @@
void MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata()
{
LOG(Media, MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata(%p) - requesting metadata loading, this);
-dispatch_group_t metadataLoadingGroup = dispatch_group_create();
-dispatch_group_enter(metadataLoadingGroup);
[m_avAsset.get() loadValuesAsynchronouslyForKeys:[assetMetadataKeyNames() retain] completionHandler:^{
-if ([m_avAsset.get() statusOfValueForKey:@tracks error:nil] == AVKeyValueStatusLoaded) {
-for (AVAssetTrack *track in [m_avAsset.get() tracks]) {
-dispatch_group_enter(metadataLoadingGroup);
-[track loadValuesAsynchronouslyForKeys:[assetTrackMetadataKeyNames() retain] completionHandler:^{
-dispatch_group_leave(metadataLoadingGroup);
-}];
-}
-}
-dispatch_group_leave(metadataLoadingGroup);
-}];
-dispatch_group_notify(metadataLoadingGroup, dispatch_get_main_queue(), ^{
[m_objcObserver.get() metadataLoaded];
-});
-dispatch_release(metadataLoadingGroup);
+}];
}
MediaPlayerPrivateAVFoundation::ItemStatus MediaPlayerPrivateAVFoundationObjC::playerItemStatus() const
@@ -1146,13 +1130,11 @@
if (!metaDataAvailable())
return 0;
-if (m_cachedTotalBytes)
-return m_cachedTotalBytes;
-
+long long totalMediaSize = 0;
for (AVPlayerItemTrack *thisTrack in m_cachedTracks.get())
-m_cachedTotalBytes += [[thisTrack assetTrack] totalSampleDataLength];
+totalMediaSize += [[thisTrack assetTrack] totalSampleDataLength];
-return m_cachedTotalBytes;
+return totalMediaSize;
}
void MediaPlayerPrivateAVFoundationObjC::setAsset(id asset)
@@ -2361,7 +2343,6 @@
void
[webkit-changes] [167667] trunk/Tools
Title: [167667] trunk/Tools Revision 167667 Author changseok...@collabora.com Date 2014-04-22 10:38:15 -0700 (Tue, 22 Apr 2014) Log Message [GTK] YCM choose a newer compile_commands.json in between Release or Debug https://bugs.webkit.org/show_bug.cgi?id=131911 Reviewed by Martin Robinson. common.get_build_path returns release path even though Debug configuration is newer than Release. So YouCompleteMe is used to refer old build setup inadvertently. * gtk/ycm_extra_conf.py: (get_build_path): Compare modified time of Release and Debug. And return a recent modified path. (FlagsForFile): Modified Paths trunk/Tools/ChangeLog trunk/Tools/gtk/ycm_extra_conf.py Diff Modified: trunk/Tools/ChangeLog (167666 => 167667) --- trunk/Tools/ChangeLog 2014-04-22 17:30:56 UTC (rev 167666) +++ trunk/Tools/ChangeLog 2014-04-22 17:38:15 UTC (rev 167667) @@ -1,3 +1,17 @@ +2014-04-22 ChangSeok Oh changseok...@collabora.com + +[GTK] YCM choose a newer compile_commands.json in between Release or Debug +https://bugs.webkit.org/show_bug.cgi?id=131911 + +Reviewed by Martin Robinson. + +common.get_build_path returns release path even though Debug configuration +is newer than Release. So YouCompleteMe is used to refer old build setup inadvertently. + +* gtk/ycm_extra_conf.py: +(get_build_path): Compare modified time of Release and Debug. And return a recent modified path. +(FlagsForFile): + 2014-04-21 Brent Fulgham bfulg...@apple.com Unreviewed build fix. Modified: trunk/Tools/gtk/ycm_extra_conf.py (167666 => 167667) --- trunk/Tools/gtk/ycm_extra_conf.py 2014-04-22 17:30:56 UTC (rev 167666) +++ trunk/Tools/gtk/ycm_extra_conf.py 2014-04-22 17:38:15 UTC (rev 167667) @@ -61,6 +61,26 @@ return result +def get_build_path(): +webkitbuild_path = os.path.join(common.get_build_path(fatal=False), '..') +if not os.path.exists(webkitbuild_path): +return None + +release_build_path = os.path.join(webkitbuild_path, 'Release') +debug_build_path = os.path.join(webkitbuild_path, 'Debug') + +try: +release_mtime = os.path.getmtime(os.path.join(release_build_path, 'compile_commands.json')) +except os.error: +release_mtime = 0 +try: +debug_mtime = os.path.getmtime(os.path.join(debug_build_path, 'compile_commands.json')) +except os.error: +debug_mtime = 0 + +return release_build_path if release_mtime = debug_mtime else debug_build_path + + def FlagsForFile(filename, **kwargs): This is the main entry point for YCM. Its interface is fixed. @@ -88,7 +108,7 @@ # Force config.h file inclusion, for GLib macros. result['flags'].append(-includeconfig.h) -build_path = os.path.normpath(common.get_build_path(fatal=False)) +build_path = os.path.normpath(get_build_path()) if not build_path: print Could not find WebKit build path. return result ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167669] trunk/Tools
Title: [167669] trunk/Tools
Revision 167669
Author g...@gnome.org
Date 2014-04-22 11:12:56 -0700 (Tue, 22 Apr 2014)
Log Message
[GTK] Fails to build documentation when output is redirected
https://bugs.webkit.org/show_bug.cgi?id=131178
Reviewed by Martin Robinson.
* gtk/generate-gtkdoc: set the output for stdout and stderr to UTF-8
explicitly to avoid encoding issues when they are redirected.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/gtk/generate-gtkdoc
Diff
Modified: trunk/Tools/ChangeLog (167668 => 167669)
--- trunk/Tools/ChangeLog 2014-04-22 18:08:53 UTC (rev 167668)
+++ trunk/Tools/ChangeLog 2014-04-22 18:12:56 UTC (rev 167669)
@@ -1,3 +1,13 @@
+2014-04-22 Gustavo Noronha Silva g...@gnome.org
+
+[GTK] Fails to build documentation when output is redirected
+https://bugs.webkit.org/show_bug.cgi?id=131178
+
+Reviewed by Martin Robinson.
+
+* gtk/generate-gtkdoc: set the output for stdout and stderr to UTF-8
+explicitly to avoid encoding issues when they are redirected.
+
2014-04-22 ChangSeok Oh changseok...@collabora.com
[GTK] YCM choose a newer compile_commands.json in between Release or Debug
Modified: trunk/Tools/gtk/generate-gtkdoc (167668 => 167669)
--- trunk/Tools/gtk/generate-gtkdoc 2014-04-22 18:08:53 UTC (rev 167668)
+++ trunk/Tools/gtk/generate-gtkdoc 2014-04-22 18:12:56 UTC (rev 167669)
@@ -19,6 +19,7 @@
from ConfigParser import SafeConfigParser
import argparse
+import codecs
import common
import glob
import gtkdoc
@@ -27,6 +28,9 @@
import sys
import webkitdom
+sys.stdout = codecs.getwriter(utf-8)(sys.stdout)
+sys.stderr = codecs.getwriter(utf-8)(sys.stderr)
+
def configure_logging(verbose):
level = logging.DEBUG if verbose else logging.INFO
logger = logging.getLogger('gtkdoc')
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167671] trunk
Title: [167671] trunk
Revision 167671
Author fpi...@apple.com
Date 2014-04-22 11:36:23 -0700 (Tue, 22 Apr 2014)
Log Message
Switch the LLVMForJSC target to using the LLVM in /usr/local rather than /usr/local/LLVMForJavaScriptCore on iOS
https://bugs.webkit.org/show_bug.cgi?id=130867
rdar://problem/16432456
Reviewed by Mark Hahnenberg.
Source/_javascript_Core:
* Configurations/Base.xcconfig:
* Configurations/LLVMForJSC.xcconfig:
Tools:
* Scripts/build-webkit:
* Scripts/copy-webkitlibraries-to-product-directory:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/Base.xcconfig
trunk/Source/_javascript_Core/Configurations/LLVMForJSC.xcconfig
trunk/Tools/ChangeLog
trunk/Tools/Scripts/build-webkit
trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (167670 => 167671)
--- trunk/Source/_javascript_Core/ChangeLog 2014-04-22 18:22:02 UTC (rev 167670)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-04-22 18:36:23 UTC (rev 167671)
@@ -1,3 +1,14 @@
+2014-04-22 Filip Pizlo fpi...@apple.com
+
+Switch the LLVMForJSC target to using the LLVM in /usr/local rather than /usr/local/LLVMForJavaScriptCore on iOS
+https://bugs.webkit.org/show_bug.cgi?id=130867
+rdar://problem/16432456
+
+Reviewed by Mark Hahnenberg.
+
+* Configurations/Base.xcconfig:
+* Configurations/LLVMForJSC.xcconfig:
+
2014-04-22 Alex Christensen achristen...@webkit.org
[Win] Unreviewed build fix after my r167666.
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (167670 => 167671)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-04-22 18:22:02 UTC (rev 167670)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-04-22 18:36:23 UTC (rev 167671)
@@ -86,8 +86,18 @@
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
-HEADER_SEARCH_PATHS = . icu ${BUILT_PRODUCTS_DIR}/usr/local/LLVMForJavaScriptCore/include ${BUILT_PRODUCTS_DIR}/ExtraIncludesForLocalLLVMBuild /usr/local/LLVMForJavaScriptCore/include ${BUILT_PRODUCTS_DIR}/usr/local/include $(HEADER_SEARCH_PATHS);
+LLVM_LOCAL_HEADER_PATH = $(LLVM_LOCAL_HEADER_PATH_$(PLATFORM_NAME))
+LLVM_LOCAL_HEADER_PATH_macosx = ${BUILT_PRODUCTS_DIR}/usr/local/LLVMForJavaScriptCore/include
+LLVM_LOCAL_HEADER_PATH_iphoneos = ;
+LLVM_LOCAL_HEADER_PATH_iphonesimulator = ;
+LLVM_SYSTEM_HEADER_PATH = $(LLVM_SYSTEM_HEADER_PATH_$(PLATFORM_NAME))
+LLVM_SYSTEM_HEADER_PATH_macosx = /usr/local/LLVMForJavaScriptCore/include;
+LLVM_SYSTEM_HEADER_PATH_iphoneos = ;
+LLVM_SYSTEM_HEADER_PATH_iphonesimulator = ;
+
+HEADER_SEARCH_PATHS = . icu $(LLVM_LOCAL_HEADER_PATH) ${BUILT_PRODUCTS_DIR}/ExtraIncludesForLocalLLVMBuild $(LLVM_SYSTEM_HEADER_PATH) ${BUILT_PRODUCTS_DIR}/usr/local/include $(HEADER_SEARCH_PATHS);
+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx;
Modified: trunk/Source/_javascript_Core/Configurations/LLVMForJSC.xcconfig (167670 => 167671)
--- trunk/Source/_javascript_Core/Configurations/LLVMForJSC.xcconfig 2014-04-22 18:22:02 UTC (rev 167670)
+++ trunk/Source/_javascript_Core/Configurations/LLVMForJSC.xcconfig 2014-04-22 18:36:23 UTC (rev 167671)
@@ -30,8 +30,13 @@
LLVM_LIBS_iphoneos = -lLLVMLinker -lLLVMipo -lLLVMVectorize -lLLVMBitWriter -lLLVMTableGen -lLLVMInstrumentation -lLLVMIRReader -lLLVMBitReader -lLLVMAsmParser -lLLVMARM64Disassembler -lLLVMARM64CodeGen -lLLVMARM64AsmParser -lLLVMARM64Desc -lLLVMARM64Info -lLLVMARM64AsmPrinter -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMMCParser -lLLVMDebugInfo -lLLVMOption -lLLVMInterpreter -lLLVMJIT -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMMCDisassembler -lLLVMMCJIT -lLLVMTarget -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport -lprotobuf;
LLVM_LIBS_macosx = -lLLVMTableGen -lLLVMDebugInfo -lLLVMOption -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMIRReader -lLLVMAsmParser -lLLVMMCDisassembler -lLLVMMCParser -lLLVMInstrumentation -lLLVMBitReader -lLLVMInterpreter -lLLVMipo -lLLVMVectorize -lLLVMLinker -lLLVMBitWriter -lLLVMMCJIT -lLLVMJIT -lLLVMCodeGen -lLLVMObjCARCOpts -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMTarget -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport;
-LIBRARY_SEARCH_PATHS = ${BUILT_PRODUCTS_DIR} ${BUILT_PRODUCTS_DIR}/usr/local/LLVMForJavaScriptCore/lib
[webkit-changes] [167672] trunk
Title: [167672] trunk
Revision 167672
Author bfulg...@apple.com
Date 2014-04-22 11:36:52 -0700 (Tue, 22 Apr 2014)
Log Message
Check (rather than assume) element is a RenderTableSection before using it
https://bugs.webkit.org/show_bug.cgi?id=121858
Reviewed by David Kilzer.
Source/WebCore:
Test: fast/table/table-insert-object-before-td-crash.html
* rendering/RenderTable.cpp:
(WebCore::RenderTable::addChild): Check that lastBox is a table section before
using the node as if it was one.
LayoutTests:
* fast/table/table-insert-object-before-td-crash-expected.txt: Added.
* fast/table/table-insert-object-before-td-crash.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderTable.cpp
Added Paths
trunk/LayoutTests/fast/table/table-insert-object-before-td-crash-expected.txt
trunk/LayoutTests/fast/table/table-insert-object-before-td-crash.html
Diff
Modified: trunk/LayoutTests/ChangeLog (167671 => 167672)
--- trunk/LayoutTests/ChangeLog 2014-04-22 18:36:23 UTC (rev 167671)
+++ trunk/LayoutTests/ChangeLog 2014-04-22 18:36:52 UTC (rev 167672)
@@ -1,3 +1,13 @@
+2014-04-22 Brent Fulgham bfulg...@apple.com
+
+Check (rather than assume) element is a RenderTableSection before using it
+https://bugs.webkit.org/show_bug.cgi?id=121858
+
+Reviewed by David Kilzer.
+
+* fast/table/table-insert-object-before-td-crash-expected.txt: Added.
+* fast/table/table-insert-object-before-td-crash.html: Added.
+
2014-04-22 David Hyatt hy...@apple.com
[New Multicolumn] fast/multicol/multicol-with-child-renderLayer-for-input.html puts the textfield in the wrong place
Added: trunk/LayoutTests/fast/table/table-insert-object-before-td-crash-expected.txt (0 => 167672)
--- trunk/LayoutTests/fast/table/table-insert-object-before-td-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/table/table-insert-object-before-td-crash-expected.txt 2014-04-22 18:36:52 UTC (rev 167672)
@@ -0,0 +1,3 @@
+Test that node insertion of an object before a td works properly. This test passes if it does not crash.
+X
+PASS: Did not crash.
Added: trunk/LayoutTests/fast/table/table-insert-object-before-td-crash.html (0 => 167672)
--- trunk/LayoutTests/fast/table/table-insert-object-before-td-crash.html (rev 0)
+++ trunk/LayoutTests/fast/table/table-insert-object-before-td-crash.html 2014-04-22 18:36:52 UTC (rev 167672)
@@ -0,0 +1,25 @@
+doctype HTML
+html
+body
+Test that node insertion of an object before a lt;tdgt; works properly.
+This test passes if it does not crash.
+table
+td id=tdX/td
+/table
+div id=resultspan style='color: red;'FAIL:/span Did not complete test/div
+script
+if (window.testRunner) {
+testRunner.dumpAsText();
+}
+
+var new_elem = document.createElement(col);
+var td = document.getElementById(td);
+td.parentNode.insertBefore(new_elem, td.nextSibling);
+new_elem = document.createElement(object);
+new_elem.setAttribute('standby', 'X');
+td.parentNode.insertBefore(new_elem, td.nextSibling);
+
+document.getElementById(result).innerHTML = span style='color: green;'PASS:/span Did not crash.;
+/script
+/body
+/html
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (167671 => 167672)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 18:36:23 UTC (rev 167671)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 18:36:52 UTC (rev 167672)
@@ -1,3 +1,16 @@
+2014-04-22 Brent Fulgham bfulg...@apple.com
+
+Check (rather than assume) element is a RenderTableSection before using it
+https://bugs.webkit.org/show_bug.cgi?id=121858
+
+Reviewed by David Kilzer.
+
+Test: fast/table/table-insert-object-before-td-crash.html
+
+* rendering/RenderTable.cpp:
+(WebCore::RenderTable::addChild): Check that lastBox is a table section before
+using the node as if it was one.
+
2014-04-22 Alex Christensen achristen...@webkit.org
Begin implementation of video using Media Foundation.
Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (167671 => 167672)
--- trunk/Source/WebCore/rendering/RenderTable.cpp 2014-04-22 18:36:23 UTC (rev 167671)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2014-04-22 18:36:52 UTC (rev 167672)
@@ -205,7 +205,7 @@
RenderObject* lastBox = beforeChild;
while (lastBox lastBox-parent()-isAnonymous() !lastBox-isTableSection() lastBox-style().display() != TABLE_CAPTION lastBox-style().display() != TABLE_COLUMN_GROUP)
lastBox = lastBox-parent();
-if (lastBox lastBox-isAnonymous() !isAfterContent(lastBox)) {
+if (lastBox lastBox-isAnonymous() !isAfterContent(lastBox) lastBox-isTableSection()) {
RenderTableSection* section = toRenderTableSection(lastBox);
if (beforeChild == section)
beforeChild = section-firstRow();
___
webkit-changes mailing
[webkit-changes] [167673] trunk/Source/WebCore
Title: [167673] trunk/Source/WebCore
Revision 167673
Author hy...@apple.com
Date 2014-04-22 12:00:06 -0700 (Tue, 22 Apr 2014)
Log Message
REGRESSION: Hitting asserts in new flow thread selection code.
https://bugs.webkit.org/show_bug.cgi?id=132019
Reviewed by Anders Carlsson.
Null checking flowThreadController is not enough. The list of threads
can be null even when the flowThreadController is not. That's why you
use hasRenderNamedFlowThreads. I patched the two bad places in the code
to use hasRenderNamedFlowThreads to stop the crashes.
* rendering/RenderView.cpp:
(WebCore::RenderView::selectionBounds):
(WebCore::RenderView::repaintSelection):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderView.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (167672 => 167673)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 18:36:52 UTC (rev 167672)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 19:00:06 UTC (rev 167673)
@@ -1,3 +1,19 @@
+2014-04-22 David Hyatt hy...@apple.com
+
+REGRESSION: Hitting asserts in new flow thread selection code.
+https://bugs.webkit.org/show_bug.cgi?id=132019
+
+Reviewed by Anders Carlsson.
+
+Null checking flowThreadController is not enough. The list of threads
+can be null even when the flowThreadController is not. That's why you
+use hasRenderNamedFlowThreads. I patched the two bad places in the code
+to use hasRenderNamedFlowThreads to stop the crashes.
+
+* rendering/RenderView.cpp:
+(WebCore::RenderView::selectionBounds):
+(WebCore::RenderView::repaintSelection):
+
2014-04-22 Brent Fulgham bfulg...@apple.com
Check (rather than assume) element is a RenderTableSection before using it
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (167672 => 167673)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-04-22 18:36:52 UTC (rev 167672)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-04-22 19:00:06 UTC (rev 167673)
@@ -663,7 +663,7 @@
{
LayoutRect selRect = subtreeSelectionBounds(*this, clipToVisibleContent);
-if (m_flowThreadController) {
+if (hasRenderNamedFlowThreads()) {
for (auto* namedFlowThread : *m_flowThreadController-renderNamedFlowThreadList()) {
LayoutRect currRect = subtreeSelectionBounds(*namedFlowThread, clipToVisibleContent);
selRect.unite(currRect);
@@ -717,7 +717,7 @@
{
repaintSubtreeSelection(*this);
-if (m_flowThreadController) {
+if (hasRenderNamedFlowThreads()) {
for (auto* namedFlowThread : *m_flowThreadController-renderNamedFlowThreadList())
repaintSubtreeSelection(*namedFlowThread);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167674] trunk/Source
Title: [167674] trunk/Source
Revision 167674
Author beid...@apple.com
Date 2014-04-22 12:22:28 -0700 (Tue, 22 Apr 2014)
Log Message
Change Image Controls replacement to use selection and paste
rdar://problem/16302722 and https://bugs.webkit.org/show_bug.cgi?id=131992
Reviewed by Tim Horton.
Source/WebCore:
* WebCore.exp.in: Remove deleted symbol.
* html/shadow/mac/ImageControlsButtonElementMac.cpp:
(WebCore::ImageControlsButtonElementMac::defaultEventHandler):
* page/ContextMenuController.cpp:
(WebCore::ContextMenuController::showImageControlsMenu): Select the image element
before showing the menu.
(WebCore::ContextMenuController::replaceControlledImage): Deleted.
* page/ContextMenuController.h:
Source/WebKit/mac:
* Misc/WebSharingServicePickerController.mm:
(-[WebSharingServicePickerController sharingService:didShareItems:]): Write the
replacement data to a special pasteboard, then replace the current selection from
that pasteboard.
Source/WebKit2:
* UIProcess/mac/WebContextMenuProxyMac.mm:
(-[WKSharingServicePickerDelegate sharingService:didShareItems:]): Write the
replacement data to a special pasteboard, then replace the current selection from
that pasteboard.
Remove all other code used to support the old replacement mechanism:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::replaceControlledImage): Deleted.
* UIProcess/WebPageProxy.h:
* UIProcess/mac/WebContextMenuProxyMac.h:
(WebKit::WebContextMenuProxyMac::page):
(WebKit::WebContextMenuProxyMac::replaceControlledImage): Deleted.
* WebProcess/WebPage/WebContextMenu.cpp:
(WebKit::WebContextMenu::replaceControlledImage): Deleted.
* WebProcess/WebPage/WebContextMenu.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::replaceControlledImage): Deleted.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp
trunk/Source/WebCore/page/ContextMenuController.cpp
trunk/Source/WebCore/page/ContextMenuController.h
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
Diff
Modified: trunk/Source/WebCore/ChangeLog (167673 => 167674)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 19:00:06 UTC (rev 167673)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 19:22:28 UTC (rev 167674)
@@ -1,3 +1,21 @@
+2014-04-22 Brady Eidson beid...@apple.com
+
+Change Image Controls replacement to use selection and paste
+rdar://problem/16302722 and https://bugs.webkit.org/show_bug.cgi?id=131992
+
+Reviewed by Tim Horton.
+
+* WebCore.exp.in: Remove deleted symbol.
+
+* html/shadow/mac/ImageControlsButtonElementMac.cpp:
+(WebCore::ImageControlsButtonElementMac::defaultEventHandler):
+
+* page/ContextMenuController.cpp:
+(WebCore::ContextMenuController::showImageControlsMenu): Select the image element
+ before showing the menu.
+(WebCore::ContextMenuController::replaceControlledImage): Deleted.
+* page/ContextMenuController.h:
+
2014-04-22 David Hyatt hy...@apple.com
REGRESSION: Hitting asserts in new flow thread selection code.
Modified: trunk/Source/WebCore/WebCore.exp.in (167673 => 167674)
--- trunk/Source/WebCore/WebCore.exp.in 2014-04-22 19:00:06 UTC (rev 167673)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-22 19:22:28 UTC (rev 167674)
@@ -2987,10 +2987,6 @@
__ZNK7WebCore12IconDatabase9isEnabledEv
#endif
-#if ENABLE(IMAGE_CONTROLS)
-__ZN7WebCore21ContextMenuController22replaceControlledImageEN3WTF10PassRefPtrINS_5ImageEEE
-#endif
-
#if ENABLE(INDEXED_DATABASE)
__ZN7WebCore10IDBKeyData14setNumberValueEd
__ZN7WebCore10IDBKeyData6decodeERNS_12KeyedDecoderERS0_
Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp (167673 => 167674)
--- trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2014-04-22 19:00:06 UTC (rev 167673)
+++ trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2014-04-22 19:22:28 UTC (rev 167674)
@@ -30,11 +30,15 @@
#include ContextMenuController.h
#include Event.h
+#include Frame.h
+#include FrameSelection.h
#include HTMLDivElement.h
#include Page.h
+#include Range.h
#include RenderBlockFlow.h
#include RenderStyle.h
#include RenderTheme.h
+#include ShadowRoot.h
namespace WebCore {
@@ -99,8 +103,33 @@
[webkit-changes] [167675] trunk
Title: [167675] trunk
Revision 167675
Author r...@igalia.com
Date 2014-04-22 12:48:29 -0700 (Tue, 22 Apr 2014)
Log Message
REGRESSION (r167652): Broke fast/regions/cssom/region-range-for-box-crash.html in debug mode
https://bugs.webkit.org/show_bug.cgi?id=131982
Reviewed by David Hyatt.
Source/WebCore:
The problem was creating the Range from the arguments received at RenderView::setSelection(). Specifically
in this test endPos is 1 when the element has not children which creates an invalid Range.
* rendering/RenderView.cpp:
(WebCore::RenderView::splitSelectionBetweenSubtrees): Pass 0 as startPos and endPos to Range::create() as we are
not interested in the positions at this point.
LayoutTests:
* TestExpectations: Unskip fast/regions/cssom/region-range-for-box-crash.html.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderView.cpp
Diff
Modified: trunk/LayoutTests/ChangeLog (167674 => 167675)
--- trunk/LayoutTests/ChangeLog 2014-04-22 19:22:28 UTC (rev 167674)
+++ trunk/LayoutTests/ChangeLog 2014-04-22 19:48:29 UTC (rev 167675)
@@ -1,3 +1,12 @@
+2014-04-22 Manuel Rego Casasnovas r...@igalia.com
+
+REGRESSION (r167652): Broke fast/regions/cssom/region-range-for-box-crash.html in debug mode
+https://bugs.webkit.org/show_bug.cgi?id=131982
+
+Reviewed by David Hyatt.
+
+* TestExpectations: Unskip fast/regions/cssom/region-range-for-box-crash.html.
+
2014-04-22 Brent Fulgham bfulg...@apple.com
Check (rather than assume) element is a RenderTableSection before using it
Modified: trunk/LayoutTests/TestExpectations (167674 => 167675)
--- trunk/LayoutTests/TestExpectations 2014-04-22 19:22:28 UTC (rev 167674)
+++ trunk/LayoutTests/TestExpectations 2014-04-22 19:48:29 UTC (rev 167675)
@@ -106,5 +106,3 @@
# Expando properties on attribute nodes disappear
webkit.org/b/88045 fast/dom/gc-attribute-node.html [ Failure Pass ]
-
-webkit.org/b/131982 [ Debug ] fast/regions/cssom/region-range-for-box-crash.html [ Crash ]
Modified: trunk/Source/WebCore/ChangeLog (167674 => 167675)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 19:22:28 UTC (rev 167674)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 19:48:29 UTC (rev 167675)
@@ -1,3 +1,17 @@
+2014-04-22 Manuel Rego Casasnovas r...@igalia.com
+
+REGRESSION (r167652): Broke fast/regions/cssom/region-range-for-box-crash.html in debug mode
+https://bugs.webkit.org/show_bug.cgi?id=131982
+
+Reviewed by David Hyatt.
+
+The problem was creating the Range from the arguments received at RenderView::setSelection(). Specifically
+in this test endPos is 1 when the element has not children which creates an invalid Range.
+
+* rendering/RenderView.cpp:
+(WebCore::RenderView::splitSelectionBetweenSubtrees): Pass 0 as startPos and endPos to Range::create() as we are
+not interested in the positions at this point.
+
2014-04-22 Brady Eidson beid...@apple.com
Change Image Controls replacement to use selection and paste
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (167674 => 167675)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-04-22 19:22:28 UTC (rev 167674)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-04-22 19:48:29 UTC (rev 167675)
@@ -799,7 +799,7 @@
renderSubtreesMap.set(namedFlowThread, nullptr);
if (start end) {
-RefPtrRange initialRange = Range::create(document(), start-node(), startPos, end-node(), endPos);
+RefPtrRange initialRange = Range::create(document(), start-node(), 0, end-node(), 0);
Node* startNode = initialRange-startContainer();
Node* endNode = initialRange-endContainer();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167676] trunk/Source/WebCore
Title: [167676] trunk/Source/WebCore Revision 167676 Author mark@apple.com Date 2014-04-22 12:58:24 -0700 (Tue, 22 Apr 2014) Log Message WebCore::HTMLMediaElement::ensureMediaControlsInjectedScript() needs to acquire the JSLock before calling into JS. https://webkit.org/b/132021 Reviewed by Mark Hahnenberg. Covered by existing layout test. * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::parseAttribute): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/html/HTMLMediaElement.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (167675 => 167676) --- trunk/Source/WebCore/ChangeLog 2014-04-22 19:48:29 UTC (rev 167675) +++ trunk/Source/WebCore/ChangeLog 2014-04-22 19:58:24 UTC (rev 167676) @@ -1,3 +1,15 @@ +2014-04-22 Mark Lam mark@apple.com + +WebCore::HTMLMediaElement::ensureMediaControlsInjectedScript() needs to acquire the JSLock before calling into JS. +https://webkit.org/b/132021 + +Reviewed by Mark Hahnenberg. + +Covered by existing layout test. + +* html/HTMLMediaElement.cpp: +(WebCore::HTMLMediaElement::parseAttribute): + 2014-04-22 Manuel Rego Casasnovas r...@igalia.com REGRESSION (r167652): Broke fast/regions/cssom/region-range-for-box-crash.html in debug mode Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (167675 => 167676) --- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-22 19:48:29 UTC (rev 167675) +++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-22 19:58:24 UTC (rev 167676) @@ -5935,6 +5935,7 @@ ScriptController scriptController = page-mainFrame().script(); JSDOMGlobalObject* globalObject = JSC::jsCastJSDOMGlobalObject*(scriptController.globalObject(world)); JSC::ExecState* exec = globalObject-globalExec(); +JSC::JSLockHolder lock(exec); JSC::JSValue functionValue = globalObject-get(exec, JSC::Identifier(exec, createControls)); if (functionValue.isFunction()) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167677] trunk/Source/WebCore
Title: [167677] trunk/Source/WebCore
Revision 167677
Author hy...@apple.com
Date 2014-04-22 13:05:29 -0700 (Tue, 22 Apr 2014)
Log Message
[New Multicolumn] Make sure columnTranslationForOffset has the same column-span-aware
translation that fragment collection does.
https://bugs.webkit.org/show_bug.cgi?id=131738
Reviewed by Anders Carlsson.
* rendering/RenderMultiColumnSet.cpp:
(WebCore::RenderMultiColumnSet::collectLayerFragments):
Remove a FIXME that is no longer needed, since the translation offset of the
column set did get patched.
(WebCore::RenderMultiColumnSet::columnTranslationForOffset):
Add the exact same fix to columnTranslationForOffset that was applied to collectLayerFragments.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (167676 => 167677)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 19:58:24 UTC (rev 167676)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 20:05:29 UTC (rev 167677)
@@ -1,3 +1,19 @@
+2014-04-22 David Hyatt hy...@apple.com
+
+[New Multicolumn] Make sure columnTranslationForOffset has the same column-span-aware
+translation that fragment collection does.
+https://bugs.webkit.org/show_bug.cgi?id=131738
+
+Reviewed by Anders Carlsson.
+
+* rendering/RenderMultiColumnSet.cpp:
+(WebCore::RenderMultiColumnSet::collectLayerFragments):
+Remove a FIXME that is no longer needed, since the translation offset of the
+column set did get patched.
+
+(WebCore::RenderMultiColumnSet::columnTranslationForOffset):
+Add the exact same fix to columnTranslationForOffset that was applied to collectLayerFragments.
+
2014-04-22 Mark Lam mark@apple.com
WebCore::HTMLMediaElement::ensureMediaControlsInjectedScript() needs to acquire the JSLock before calling into JS.
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (167676 => 167677)
--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-04-22 19:58:24 UTC (rev 167676)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-04-22 20:05:29 UTC (rev 167677)
@@ -790,9 +790,7 @@
translationOffset.setY(blockOffset);
if (!isHorizontalWritingMode())
translationOffset = translationOffset.transposedPoint();
-// FIXME: The translation needs to include the multicolumn set's content offset within the
-// multicolumn block as well. This won't be an issue until we start creating multiple multicolumn sets.
-
+
// Shift the dirty rect to be in flow thread coordinates with this translation applied.
LayoutRect translatedDirtyRect(dirtyRect);
translatedDirtyRect.moveBy(-translationOffset);
@@ -840,7 +838,7 @@
inlineOffset += contentLogicalWidth() - colLogicalWidth;
}
translationOffset.setX(inlineOffset);
-LayoutUnit blockOffset = initialBlockOffset + (isHorizontalWritingMode() ? -flowThreadPortion.y() : -flowThreadPortion.x());
+LayoutUnit blockOffset = initialBlockOffset + logicalTop() - flowThread()-logicalTop() + (isHorizontalWritingMode() ? -flowThreadPortion.y() : -flowThreadPortion.x());
if (!progressionIsInline) {
if (!progressionReversed)
blockOffset = startColumn * colGap;
@@ -854,8 +852,6 @@
if (!isHorizontalWritingMode())
translationOffset = translationOffset.transposedPoint();
-// FIXME: The translation needs to include the multicolumn set's content offset within the
-// multicolumn block as well. This won't be an issue until we start creating multiple multicolumn sets.
return translationOffset;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167678] trunk/Source/WebCore
Title: [167678] trunk/Source/WebCore Revision 167678 Author hy...@apple.com Date 2014-04-22 13:31:47 -0700 (Tue, 22 Apr 2014) Log Message [New Multicolumn] widows/orphans cause assertion failures. https://bugs.webkit.org/show_bug.cgi?id=131233 Reviewed by Dean Jackson. * rendering/RenderMultiColumnSet.cpp: (WebCore::RenderMultiColumnSet::recordSpaceShortage): Fix an obvious bug where the space shortage is recorded twice (and the if statement that kept it from being negative is accidentally ignored). Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (167677 => 167678) --- trunk/Source/WebCore/ChangeLog 2014-04-22 20:05:29 UTC (rev 167677) +++ trunk/Source/WebCore/ChangeLog 2014-04-22 20:31:47 UTC (rev 167678) @@ -1,5 +1,17 @@ 2014-04-22 David Hyatt hy...@apple.com +[New Multicolumn] widows/orphans cause assertion failures. +https://bugs.webkit.org/show_bug.cgi?id=131233 + +Reviewed by Dean Jackson. + +* rendering/RenderMultiColumnSet.cpp: +(WebCore::RenderMultiColumnSet::recordSpaceShortage): +Fix an obvious bug where the space shortage is recorded twice (and the +if statement that kept it from being negative is accidentally ignored). + +2014-04-22 David Hyatt hy...@apple.com + [New Multicolumn] Make sure columnTranslationForOffset has the same column-span-aware translation that fragment collection does. https://bugs.webkit.org/show_bug.cgi?id=131738 Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (167677 => 167678) --- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-04-22 20:05:29 UTC (rev 167677) +++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-04-22 20:31:47 UTC (rev 167678) @@ -301,8 +301,6 @@ // order to get anywhere. Some lines actually have zero height. Ignore them. if (spaceShortage 0) m_minSpaceShortage = spaceShortage; - -m_minSpaceShortage = spaceShortage; } void RenderMultiColumnSet::updateLogicalWidth() ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167680] trunk/LayoutTests
Title: [167680] trunk/LayoutTests Revision 167680 Author timothy_hor...@apple.com Date 2014-04-22 13:40:49 -0700 (Tue, 22 Apr 2014) Log Message REGRESSION: JSRegress's js/slow-stress/new-spread.html fails sometimes https://bugs.webkit.org/show_bug.cgi?id=132022 rdar://problem/16690671 * TestExpectations: Mark the test as flaky pass/fail/timeout, because that's what it is. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (167679 => 167680) --- trunk/LayoutTests/ChangeLog 2014-04-22 20:38:00 UTC (rev 167679) +++ trunk/LayoutTests/ChangeLog 2014-04-22 20:40:49 UTC (rev 167680) @@ -1,3 +1,12 @@ +2014-04-22 Tim Horton timothy_hor...@apple.com + +REGRESSION: JSRegress's js/slow-stress/new-spread.html fails sometimes +https://bugs.webkit.org/show_bug.cgi?id=132022 +rdar://problem/16690671 + +* TestExpectations: +Mark the test as flaky pass/fail/timeout, because that's what it is. + 2014-04-21 Myles C. Maxfield mmaxfi...@apple.com [OS X] Glyph spacing for system fonts may be incorrect Modified: trunk/LayoutTests/TestExpectations (167679 => 167680) --- trunk/LayoutTests/TestExpectations 2014-04-22 20:38:00 UTC (rev 167679) +++ trunk/LayoutTests/TestExpectations 2014-04-22 20:40:49 UTC (rev 167680) @@ -106,3 +106,5 @@ # Expando properties on attribute nodes disappear webkit.org/b/88045 fast/dom/gc-attribute-node.html [ Failure Pass ] + +webkit.org/b/132022 js/slow-stress/new-spread.html [ Failure Pass Timeout ] \ No newline at end of file ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167681] trunk/Source/WebCore
Title: [167681] trunk/Source/WebCore Revision 167681 Author mmaxfi...@apple.com Date 2014-04-22 13:49:13 -0700 (Tue, 22 Apr 2014) Log Message [OS X] Glyph spacing for system fonts may be incorrect https://bugs.webkit.org/show_bug.cgi?id=131967 Unreviewed build fix after r167679. * platform/graphics/mac/SimpleFontDataMac.mm: (WebCore::hasCustomTracking): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm Diff Modified: trunk/Source/WebCore/ChangeLog (167680 => 167681) --- trunk/Source/WebCore/ChangeLog 2014-04-22 20:40:49 UTC (rev 167680) +++ trunk/Source/WebCore/ChangeLog 2014-04-22 20:49:13 UTC (rev 167681) @@ -1,3 +1,13 @@ +2014-04-22 Myles C. Maxfield mmaxfi...@apple.com + +[OS X] Glyph spacing for system fonts may be incorrect +https://bugs.webkit.org/show_bug.cgi?id=131967 + +Unreviewed build fix after r167679. + +* platform/graphics/mac/SimpleFontDataMac.mm: +(WebCore::hasCustomTracking): + 2014-04-21 Myles C. Maxfield mmaxfi...@apple.com [OS X] Glyph spacing for system fonts may be incorrect Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm (167680 => 167681) --- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2014-04-22 20:40:49 UTC (rev 167680) +++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2014-04-22 20:49:13 UTC (rev 167681) @@ -372,7 +372,7 @@ return false; #else RetainPtrCTFontDescriptorRef descriptor = CTFontCopyFontDescriptor(font); -return CTFontDescriptorIsSystemUIFont(descriptor.get()) +return CTFontDescriptorIsSystemUIFont(descriptor.get()); #endif } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167682] trunk/Source/WebKit2
Title: [167682] trunk/Source/WebKit2
Revision 167682
Author commit-qu...@webkit.org
Date 2014-04-22 13:51:14 -0700 (Tue, 22 Apr 2014)
Log Message
Remove unused local variable
https://bugs.webkit.org/show_bug.cgi?id=132020
Patch by Joseph Pecoraro pecor...@apple.com on 2014-04-22
Reviewed by Alexey Proskuryakov.
* UIProcess/ios/forms/WKFormSelectPopover.mm:
(-[WKSelectPopover initWithView:hasGroups:]):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167681 => 167682)
--- trunk/Source/WebKit2/ChangeLog 2014-04-22 20:49:13 UTC (rev 167681)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-22 20:51:14 UTC (rev 167682)
@@ -1,3 +1,13 @@
+2014-04-22 Joseph Pecoraro pecor...@apple.com
+
+Remove unused local variable
+https://bugs.webkit.org/show_bug.cgi?id=132020
+
+Reviewed by Alexey Proskuryakov.
+
+* UIProcess/ios/forms/WKFormSelectPopover.mm:
+(-[WKSelectPopover initWithView:hasGroups:]):
+
2014-04-22 Brady Eidson beid...@apple.com
Change Image Controls replacement to use selection and paste
Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm (167681 => 167682)
--- trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm 2014-04-22 20:49:13 UTC (rev 167681)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKFormSelectPopover.mm 2014-04-22 20:51:14 UTC (rev 167682)
@@ -390,7 +390,6 @@
UIViewController *popoverViewController = _tableViewController.get();
UINavigationController *navController = nil;
NSString *title = view.assistedNodeInformation.title;
-CGFloat titleHeight = 0;
BOOL needsNavigationController = (_view _UIApplicationUsesLegacyUI()) || [title length];
if (needsNavigationController) {
navController = [[UINavigationController alloc] initWithRootViewController:_tableViewController.get()];
@@ -398,8 +397,6 @@
if (_view.assistedNodeInformation.isMultiSelect _UIApplicationUsesLegacyUI())
_tableViewController.get().navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(_userActionDismissedPopover:)] autorelease];
-
-titleHeight = navController.navigationBar.bounds.size.height;
}
CGSize popoverSize = [_tableViewController.get().tableView sizeThatFits:CGSizeMake(320, CGFLOAT_MAX)];
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167683] trunk/Source/WebCore
Title: [167683] trunk/Source/WebCore
Revision 167683
Author mmaxfi...@apple.com
Date 2014-04-22 14:07:11 -0700 (Tue, 22 Apr 2014)
Log Message
[OS X] Glyph spacing for system fonts may be incorrect
https://bugs.webkit.org/show_bug.cgi?id=131967
Unreviewed iOS build fix after r167679.
* platform/graphics/mac/SimpleFontDataMac.mm:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (167682 => 167683)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 20:51:14 UTC (rev 167682)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 21:07:11 UTC (rev 167683)
@@ -3,6 +3,15 @@
[OS X] Glyph spacing for system fonts may be incorrect
https://bugs.webkit.org/show_bug.cgi?id=131967
+Unreviewed iOS build fix after r167679.
+
+* platform/graphics/mac/SimpleFontDataMac.mm:
+
+2014-04-22 Myles C. Maxfield mmaxfi...@apple.com
+
+[OS X] Glyph spacing for system fonts may be incorrect
+https://bugs.webkit.org/show_bug.cgi?id=131967
+
Unreviewed build fix after r167679.
* platform/graphics/mac/SimpleFontDataMac.mm:
Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm (167682 => 167683)
--- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2014-04-22 20:51:14 UTC (rev 167682)
+++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2014-04-22 21:07:11 UTC (rev 167683)
@@ -365,6 +365,7 @@
return boundingBox;
}
+#if !PLATFORM(IOS)
static bool hasCustomTracking(CTFontRef font)
{
#if __MAC_OS_X_VERSION_MIN_REQUIRED 1090
@@ -376,7 +377,6 @@
#endif
}
-#if !PLATFORM(IOS)
float SimpleFontData::platformWidthForGlyph(Glyph glyph) const
{
CGSize advance = CGSizeZero;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167684] trunk
Title: [167684] trunk
Revision 167684
Author akl...@apple.com
Date 2014-04-22 14:55:59 -0700 (Tue, 22 Apr 2014)
Log Message
REGRESSION (r151839): Subframe keeps getting mousemove events with the same coordinates after hiding a hovered element.
https://webkit.org/b/131974
rdar://problem/15907469
Source/WebCore:
When the currently hovered element disappears as a result of style recalc,
we send a fake mousemove event to the page, to see if anything newly added
should become hovered.
The faking mechanism lives in EventHandler and simply synthesizes a new
mousemove event using the last seen mouse location.
The problem here is that we were sending this fake mousemove event to the
subframe where the hovered element lived. Since subframes aren't kept up
to date on recent mouse locations, this could cause some strange behavior
where a subframe would dispatch mousemove events with stale coordinates.
The solution is to always dispatch fake mousemove events from the main
frame's event handler. This is how real event delivery happens, and hit
testing will then find the appropriate subframe, if any.
Reviewed by Benjamin Poulain.
Test: fast/events/ghostly-mousemoves-in-subframe.html
* dom/Document.cpp:
(WebCore::Document::recalcStyle):
LayoutTests:
Add a test that triggers the weirdness where removing the renderer from
a hovered element in a subframe would leave the subframe's EventHandler
in a state where it could dispatch fake mousemove events with stale
coordinates in response to style recalc.
Note that the final 500ms delay is because fake mousemove events are
sent on 250ms delay timers so we need to give it some time to catch up.
Reviewed by Benjamin Poulain.
* fast/events/ghostly-mousemoves-in-subframe-expected.txt: Added.
* fast/events/ghostly-mousemoves-in-subframe.html: Added.
* platform/mac-wk2/fast/events/resources/ghostly-mousemoves-in-subframe-the-actual-subframe.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Document.cpp
Added Paths
trunk/LayoutTests/fast/events/ghostly-mousemoves-in-subframe.html
trunk/LayoutTests/fast/events/resources/ghostly-mousemoves-in-subframe-the-actual-subframe.html
trunk/LayoutTests/platform/mac-wk2/fast/events/
trunk/LayoutTests/platform/mac-wk2/fast/events/ghostly-mousemoves-in-subframe-expected.txt
Diff
Modified: trunk/LayoutTests/ChangeLog (167683 => 167684)
--- trunk/LayoutTests/ChangeLog 2014-04-22 21:07:11 UTC (rev 167683)
+++ trunk/LayoutTests/ChangeLog 2014-04-22 21:55:59 UTC (rev 167684)
@@ -1,3 +1,23 @@
+2014-04-22 Andreas Kling akl...@apple.com
+
+REGRESSION (r151839): Subframe keeps getting mousemove events with the same coordinates after hiding a hovered element.
+https://webkit.org/b/131974
+rdar://problem/15907469
+
+Add a test that triggers the weirdness where removing the renderer from
+a hovered element in a subframe would leave the subframe's EventHandler
+in a state where it could dispatch fake mousemove events with stale
+coordinates in response to style recalc.
+
+Note that the final 500ms delay is because fake mousemove events are
+sent on 250ms delay timers so we need to give it some time to catch up.
+
+Reviewed by Benjamin Poulain.
+
+* fast/events/ghostly-mousemoves-in-subframe-expected.txt: Added.
+* fast/events/ghostly-mousemoves-in-subframe.html: Added.
+* platform/mac-wk2/fast/events/resources/ghostly-mousemoves-in-subframe-the-actual-subframe.html: Added.
+
2014-04-22 Tim Horton timothy_hor...@apple.com
REGRESSION: JSRegress's js/slow-stress/new-spread.html fails sometimes
Added: trunk/LayoutTests/fast/events/ghostly-mousemoves-in-subframe.html (0 => 167684)
--- trunk/LayoutTests/fast/events/ghostly-mousemoves-in-subframe.html (rev 0)
+++ trunk/LayoutTests/fast/events/ghostly-mousemoves-in-subframe.html 2014-04-22 21:55:59 UTC (rev 167684)
@@ -0,0 +1,89 @@
+!DOCTYPE html
+html id=main_frame
+head
+meta charset=utf-8
+script src=""
+style
+#subframe {
+position: absolute;
+left: 0;
+top: 0;
+width: 200px;
+height: 200px;
+background: white;
+}
+
+#overlapping_div_in_main_frame {
+position: absolute;
+background: black;
+top: 0;
+left: 0;
+height: 50px;
+width: 50px;
+display: none;
+z-index: 10;
+}
+/style
+/head
+body
+iframe id=subframe src=""
+div id=overlapping_div_in_main_frame/div
+script
+
+description(Test for http://webkit.org/b/131974 REGRESSION (r151839): Subframe keeps getting mousemove events with the same coordinates after hiding a hovered element.);
+var jsTestIsAsync = true;
+
+function logEvent(e) {
+debug(e.target.id + got + event.type + at + event.x + , + event.y);
+}
+
+window._onload_ = function() {
+window._onclick_ = function(event) {
+logEvent(event);
+
+var clickable_div_in_subframe =
[webkit-changes] [167685] trunk
Title: [167685] trunk Revision 167685 Author bfulg...@apple.com Date 2014-04-22 14:58:42 -0700 (Tue, 22 Apr 2014) Log Message [Win] Support Python 2.7 in Cygwin https://bugs.webkit.org/show_bug.cgi?id=132023 Reviewed by Michael Saboff. Source/_javascript_Core: * DerivedSources.make: Use a conditional variable to define the path to Python/Perl. Source/WebCore: * DerivedSources.make: Use proper path to Cygwin on all platforms. Source/WebInspectorUI: * WebInspectorUI.vcxproj/build-webinspectorui.sh: use proper path to Python under Cygwin. Source/WebKit: * WebKit.vcxproj/WebKit/WebKitVersion.cmd: Use correct path to Python under Cygwin. Source/WTF: * WTF.vcxproj/WTFGenerated.make: Use proper path to Python. Tools: * Scripts/webkitdirs.pm: (checkInstalledTools): Remove check for Python 2.7, since it now works properly. Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/DerivedSources.make trunk/Source/WTF/ChangeLog trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/DerivedSources.make trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitVersion.cmd trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitdirs.pm Diff Modified: trunk/Source/_javascript_Core/ChangeLog (167684 => 167685) --- trunk/Source/_javascript_Core/ChangeLog 2014-04-22 21:55:59 UTC (rev 167684) +++ trunk/Source/_javascript_Core/ChangeLog 2014-04-22 21:58:42 UTC (rev 167685) @@ -1,3 +1,13 @@ +2014-04-22 Brent Fulgham bfulg...@apple.com + +[Win] Support Python 2.7 in Cygwin +https://bugs.webkit.org/show_bug.cgi?id=132023 + +Reviewed by Michael Saboff. + +* DerivedSources.make: Use a conditional variable to define +the path to Python/Perl. + 2014-04-22 Filip Pizlo fpi...@apple.com Switch the LLVMForJSC target to using the LLVM in /usr/local rather than /usr/local/LLVMForJavaScriptCore on iOS Modified: trunk/Source/_javascript_Core/DerivedSources.make (167684 => 167685) --- trunk/Source/_javascript_Core/DerivedSources.make 2014-04-22 21:55:59 UTC (rev 167684) +++ trunk/Source/_javascript_Core/DerivedSources.make 2014-04-22 21:58:42 UTC (rev 167685) @@ -66,9 +66,19 @@ # builtin functions .PHONY: JSCBuiltins +# Windows has specific needs for specifying the path to its interpreters +ifeq ($(OS),Windows_NT) +PYTHON = /usr/bin/python +PERL = /usr/bin/perl +else +PYTHON = python +PERL = perl +endif +# + JSCBuiltins: $(_javascript_Core)/generate-js-builtins JSCBuiltins.h JSCBuiltins.cpp JSCBuiltins.h: $(_javascript_Core)/generate-js-builtins $(_javascript_Core)/builtins/*.js - python $^ $@ + $(PYTHON) $^ $@ JSCBuiltins.cpp: JSCBuiltins.h @@ -82,23 +92,23 @@ # character tables for Yarr RegExpJitTables.h: create_regex_tables - python $^ $@ + $(PYTHON) $^ $@ KeywordLookup.h: KeywordLookupGenerator.py Keywords.table - python $^ $@ + $(PYTHON) $^ $@ # udis86 instruction tables udis86_itab.h: $(_javascript_Core)/disassembler/udis86/itab.py $(_javascript_Core)/disassembler/udis86/optable.xml - (PYTHONPATH=$(_javascript_Core)/disassembler/udis86 python $(_javascript_Core)/disassembler/udis86/itab.py $(_javascript_Core)/disassembler/udis86/optable.xml || exit 1) + (PYTHONPATH=$(_javascript_Core)/disassembler/udis86 $(PYTHON) $(_javascript_Core)/disassembler/udis86/itab.py $(_javascript_Core)/disassembler/udis86/optable.xml || exit 1) # Bytecode files Bytecodes.h: $(_javascript_Core)/generate-bytecode-files $(_javascript_Core)/bytecode/BytecodeList.json - python $(_javascript_Core)/generate-bytecode-files --bytecodes_h Bytecodes.h $(_javascript_Core)/bytecode/BytecodeList.json + $(PYTHON) $(_javascript_Core)/generate-bytecode-files --bytecodes_h Bytecodes.h $(_javascript_Core)/bytecode/BytecodeList.json InitBytecodes.asm: $(_javascript_Core)/generate-bytecode-files $(_javascript_Core)/bytecode/BytecodeList.json - python $(_javascript_Core)/generate-bytecode-files --init_bytecodes_asm InitBytecodes.asm $(_javascript_Core)/bytecode/BytecodeList.json + $(PYTHON) $(_javascript_Core)/generate-bytecode-files --init_bytecodes_asm InitBytecodes.asm $(_javascript_Core)/bytecode/BytecodeList.json # Inspector interfaces @@ -130,15 +140,15 @@ echo '$(INSPECTOR_DOMAINS)' | cmp -s - $@ || echo '$(INSPECTOR_DOMAINS)' $@ InspectorJS.json : inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) EnabledInspectorDomains - python $(_javascript_Core)/inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) ./InspectorJS.json + $(PYTHON) $(_javascript_Core)/inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) ./InspectorJS.json # Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders InspectorJSFrontendDispatchers.h :
[webkit-changes] [167686] trunk/Source
Title: [167686] trunk/Source
Revision 167686
Author commit-qu...@webkit.org
Date 2014-04-22 15:05:46 -0700 (Tue, 22 Apr 2014)
Log Message
Unreviewed, rolling out r167674.
https://bugs.webkit.org/show_bug.cgi?id=132025
Going a different way with this (Requested by bradee-oh on
#webkit).
Reverted changeset:
Change Image Controls replacement to use selection and paste
https://bugs.webkit.org/show_bug.cgi?id=131992
http://trac.webkit.org/changeset/167674
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp
trunk/Source/WebCore/page/ContextMenuController.cpp
trunk/Source/WebCore/page/ContextMenuController.h
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
Diff
Modified: trunk/Source/WebCore/ChangeLog (167685 => 167686)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 22:05:46 UTC (rev 167686)
@@ -1,3 +1,17 @@
+2014-04-22 Commit Queue commit-qu...@webkit.org
+
+Unreviewed, rolling out r167674.
+https://bugs.webkit.org/show_bug.cgi?id=132025
+
+Going a different way with this (Requested by bradee-oh on
+#webkit).
+
+Reverted changeset:
+
+Change Image Controls replacement to use selection and paste
+https://bugs.webkit.org/show_bug.cgi?id=131992
+http://trac.webkit.org/changeset/167674
+
2014-04-22 Brent Fulgham bfulg...@apple.com
[Win] Support Python 2.7 in Cygwin
Modified: trunk/Source/WebCore/WebCore.exp.in (167685 => 167686)
--- trunk/Source/WebCore/WebCore.exp.in 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-22 22:05:46 UTC (rev 167686)
@@ -2987,6 +2987,10 @@
__ZNK7WebCore12IconDatabase9isEnabledEv
#endif
+#if ENABLE(IMAGE_CONTROLS)
+__ZN7WebCore21ContextMenuController22replaceControlledImageEN3WTF10PassRefPtrINS_5ImageEEE
+#endif
+
#if ENABLE(INDEXED_DATABASE)
__ZN7WebCore10IDBKeyData14setNumberValueEd
__ZN7WebCore10IDBKeyData6decodeERNS_12KeyedDecoderERS0_
Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp (167685 => 167686)
--- trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2014-04-22 22:05:46 UTC (rev 167686)
@@ -30,15 +30,11 @@
#include ContextMenuController.h
#include Event.h
-#include Frame.h
-#include FrameSelection.h
#include HTMLDivElement.h
#include Page.h
-#include Range.h
#include RenderBlockFlow.h
#include RenderStyle.h
#include RenderTheme.h
-#include ShadowRoot.h
namespace WebCore {
@@ -103,33 +99,8 @@
void ImageControlsButtonElementMac::defaultEventHandler(Event* event)
{
if (event-type() == eventNames().clickEvent) {
-// Before showing the menu, change the current selection to the represented Image element.
-ContainerNode* parent = parentNode();
-Element* hostElement = nullptr;
-while (parent) {
-if (parent-isShadowRoot()) {
-hostElement = static_castShadowRoot*(parent)-hostElement();
-break;
-}
-parent = parent-parentNode();
-}
-
-if (!hostElement)
-return;
-ASSERT(isHTMLImageElement(hostElement));
-
-Frame* frame = document().frame();
-if (!frame)
-return;
-
-Page* page = document().page();
-if (!page)
-return;
-
-RefPtrRange range = Range::create(document(), Position(hostElement, Position::PositionIsBeforeAnchor), Position(hostElement, Position::PositionIsAfterAnchor));
-frame-selection().setSelection(VisibleSelection(range.get()));
-
-page-contextMenuController().showImageControlsMenu(event);
+if (Page* page = document().page())
+page-contextMenuController().showImageControlsMenu(event);
event-setDefaultHandled();
return;
}
Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (167685 => 167686)
--- trunk/Source/WebCore/page/ContextMenuController.cpp 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2014-04-22 22:05:46 UTC (rev 167686)
@@ -1452,6 +1452,24 @@
handleContextMenuEvent(event);
[webkit-changes] [167687] trunk/Tools
Title: [167687] trunk/Tools
Revision 167687
Author timothy_hor...@apple.com
Date 2014-04-22 15:44:51 -0700 (Tue, 22 Apr 2014)
Log Message
DumpRenderTree generates white snapshots on some platforms
https://bugs.webkit.org/show_bug.cgi?id=132026
rdar://problem/16679363
Reviewed by Simon Fraser.
* DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
Link DRT against QuartzCore.
* DumpRenderTree/mac/PixelDumpSupportMac.mm:
(createBitmapContextFromWebView):
Force CoreAnimation to synchronously update layers in a more explicit
way that doesn't depend on AppKit behavior. This is very similar to what
WebKitTestRunner does (indirectly) during its force repaint.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig
trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm
Diff
Modified: trunk/Tools/ChangeLog (167686 => 167687)
--- trunk/Tools/ChangeLog 2014-04-22 22:05:46 UTC (rev 167686)
+++ trunk/Tools/ChangeLog 2014-04-22 22:44:51 UTC (rev 167687)
@@ -1,3 +1,20 @@
+2014-04-22 Tim Horton timothy_hor...@apple.com
+
+DumpRenderTree generates white snapshots on some platforms
+https://bugs.webkit.org/show_bug.cgi?id=132026
+rdar://problem/16679363
+
+Reviewed by Simon Fraser.
+
+* DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
+Link DRT against QuartzCore.
+
+* DumpRenderTree/mac/PixelDumpSupportMac.mm:
+(createBitmapContextFromWebView):
+Force CoreAnimation to synchronously update layers in a more explicit
+way that doesn't depend on AppKit behavior. This is very similar to what
+WebKitTestRunner does (indirectly) during its force repaint.
+
2014-04-22 Brent Fulgham bfulg...@apple.com
[Win] Support Python 2.7 in Cygwin
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (167686 => 167687)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2014-04-22 22:05:46 UTC (rev 167686)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2014-04-22 22:44:51 UTC (rev 167687)
@@ -24,7 +24,7 @@
#include BaseTarget.xcconfig
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_macosx = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework _javascript_Core -framework OpenGL -framework WebKit;
+OTHER_LDFLAGS_macosx = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework _javascript_Core -framework OpenGL -framework QuartzCore -framework WebKit;
LD_RUNPATH_SEARCH_PATHS = @loader_path/.;
PRODUCT_NAME = DumpRenderTree;
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
Modified: trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm (167686 => 167687)
--- trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2014-04-22 22:05:46 UTC (rev 167686)
+++ trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2014-04-22 22:44:51 UTC (rev 167687)
@@ -28,15 +28,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include config.h
-#include PixelDumpSupport.h
-#include PixelDumpSupportCG.h
+#import config.h
+#import PixelDumpSupport.h
+#import PixelDumpSupportCG.h
-#include DumpRenderTree.h
-#include TestRunner.h
-#include CoreGraphics/CGBitmapContext.h
-#include wtf/Assertions.h
-#include wtf/RefPtr.h
+#import DumpRenderTree.h
+#import TestRunner.h
+#import CoreGraphics/CGBitmapContext.h
+#import QuartzCore/QuartzCore.h
+#import wtf/Assertions.h
+#import wtf/RefPtr.h
#import WebKit/WebCoreStatistics.h
#import WebKit/WebDocumentPrivate.h
@@ -44,6 +45,10 @@
#import WebKit/WebKit.h
#import WebKit/WebViewPrivate.h
+@interface CATransaction (Details)
++ (void)synchronize;
+@end
+
static PassRefPtrBitmapContext createBitmapContext(size_t pixelsWide, size_t pixelsHigh, size_t rowBytes, void* buffer)
{
rowBytes = (4 * pixelsWide + 63) ~63; // Use a multiple of 64 bytes to improve CG performance
@@ -129,12 +134,11 @@
}
} else {
if (onscreen) {
-// displayIfNeeded does not update the CA layers if the layer-hosting view was not marked as needing display, so
-// we're at the mercy of CA's display-link callback to update layers in time. So we need to force a display of the view
-// to get AppKit to update the CA layers synchronously.
-// FIXME: this will break repaint testing if we have compositing in repaint tests
+// FIXME: This will break repaint testing if we have compositing in repaint tests.
// (displayWebView() painted gray over the webview, but we'll be making everything repaint again).
[view display];
+[CATransaction flush];
+[CATransaction
[webkit-changes] [167688] trunk
Title: [167688] trunk
Revision 167688
Author rn...@webkit.org
Date 2014-04-22 16:05:53 -0700 (Tue, 22 Apr 2014)
Log Message
Rollout r156635 since the old behavior was intentional.
Source/WebCore:
* page/EventHandler.cpp:
(WebCore::EventHandler::selectCursor):
LayoutTests:
* editing/caret/selection-with-caret-type-progress-expected.txt: Removed.
* editing/caret/selection-with-caret-type-progress.html: Removed.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/EventHandler.cpp
Removed Paths
trunk/LayoutTests/editing/caret/selection-with-caret-type-progress-expected.txt
trunk/LayoutTests/editing/caret/selection-with-caret-type-progress.html
Diff
Modified: trunk/LayoutTests/ChangeLog (167687 => 167688)
--- trunk/LayoutTests/ChangeLog 2014-04-22 22:44:51 UTC (rev 167687)
+++ trunk/LayoutTests/ChangeLog 2014-04-22 23:05:53 UTC (rev 167688)
@@ -1,3 +1,10 @@
+2014-04-22 Ryosuke Niwa rn...@webkit.org
+
+Rollout r156635 since the old behavior was intentional.
+
+* editing/caret/selection-with-caret-type-progress-expected.txt: Removed.
+* editing/caret/selection-with-caret-type-progress.html: Removed.
+
2014-04-22 Andreas Kling akl...@apple.com
REGRESSION (r151839): Subframe keeps getting mousemove events with the same coordinates after hiding a hovered element.
Deleted: trunk/LayoutTests/editing/caret/selection-with-caret-type-progress-expected.txt (167687 => 167688)
--- trunk/LayoutTests/editing/caret/selection-with-caret-type-progress-expected.txt 2014-04-22 22:44:51 UTC (rev 167687)
+++ trunk/LayoutTests/editing/caret/selection-with-caret-type-progress-expected.txt 2014-04-22 23:05:53 UTC (rev 167688)
@@ -1,11 +0,0 @@
-Tests whether explicitly set caret style is retained on performing text selection
-
-On success, you will see a series of PASS messages, followed by TEST COMPLETE.
-
-
-Try selecting this text by dragging the mouse.
-PASS currentCursorType is Progress
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/editing/caret/selection-with-caret-type-progress.html (167687 => 167688)
--- trunk/LayoutTests/editing/caret/selection-with-caret-type-progress.html 2014-04-22 22:44:51 UTC (rev 167687)
+++ trunk/LayoutTests/editing/caret/selection-with-caret-type-progress.html 2014-04-22 23:05:53 UTC (rev 167688)
@@ -1,38 +0,0 @@
-!DOCTYPE html
-html
-body
-p id=description/p
-div style=cursor:progress; border: 2px solid red; id=testTry selecting this text by dragging the mouse./div
-div id=console/div
-script src=""
-script
-description('Tests whether explicitly set caret style is retained on performing text selection');
-if (window.eventSender window.internals) {
-var div = document.getElementById(test);
-div.focus();
-
-var y = div.offsetTop + div.offsetHeight / 2;
-
-function leapForwardAndMove(x) {
-eventSender.leapForward(200);
-eventSender.mouseMoveTo(div.offsetLeft + x, y);
-}
-
-eventSender.dragMode = false;
-leapForwardAndMove(div.offsetLeft + 5);
-eventSender.mouseDown();
-
-leapForwardAndMove(div.offsetLeft + 10);
-leapForwardAndMove(div.offsetLeft + 20);
-leapForwardAndMove(div.offsetWidth - 10);
-
-var cursorInfo = window.internals.getCurrentCursorInfo();
-var currentCursorType = cursorInfo.substring(cursorInfo.indexOf('=') + 1, cursorInfo.lastIndexOf(' '));
-shouldBeEqualToString('currentCursorType', 'Progress');
-} else {
-debug('To test manually, select the text within the red bordered div above by dragging the mouse. Progress cursor should be displayed while doing so.');
-}
-/script
-script src=""
-/body
-/html
Modified: trunk/Source/WebCore/ChangeLog (167687 => 167688)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 22:44:51 UTC (rev 167687)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 23:05:53 UTC (rev 167688)
@@ -1,3 +1,10 @@
+2014-04-22 Ryosuke Niwa rn...@webkit.org
+
+Rollout r156635 since the old behavior was intentional.
+
+* page/EventHandler.cpp:
+(WebCore::EventHandler::selectCursor):
+
2014-04-22 Commit Queue commit-qu...@webkit.org
Unreviewed, rolling out r167674.
Modified: trunk/Source/WebCore/page/EventHandler.cpp (167687 => 167688)
--- trunk/Source/WebCore/page/EventHandler.cpp 2014-04-22 22:44:51 UTC (rev 167687)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-04-22 23:05:53 UTC (rev 167688)
@@ -1373,6 +1373,17 @@
}
}
+// During selection, use an I-beam regardless of the content beneath the cursor.
+// If a drag may be starting or we're capturing mouse events for a particular node, don't treat this as a selection.
+if (m_mousePressed
+ m_mouseDownMayStartSelect
+#if ENABLE(DRAG_SUPPORT)
+ !m_mouseDownMayStartDrag
+#endif
+ m_frame.selection().isCaretOrRange()
+ !m_capturingMouseEventsElement)
+return iBeam;
+
switch (style ? style-cursor()
[webkit-changes] [167690] trunk/Source/WebKit2
Title: [167690] trunk/Source/WebKit2
Revision 167690
Author cfleiz...@apple.com
Date 2014-04-22 16:51:51 -0700 (Tue, 22 Apr 2014)
Log Message
AX: iOS hit-testing does not work when page is zoomed
https://bugs.webkit.org/show_bug.cgi?id=132013
Reviewed by Simon Fraser.
Implement accessibilityHitTest so that the point can be converted correctly.
* WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm:
(-[WKAccessibilityWebPageObject accessibilityHitTest:]):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167689 => 167690)
--- trunk/Source/WebKit2/ChangeLog 2014-04-22 23:25:59 UTC (rev 167689)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-22 23:51:51 UTC (rev 167690)
@@ -1,3 +1,15 @@
+2014-04-22 Chris Fleizach cfleiz...@apple.com
+
+AX: iOS hit-testing does not work when page is zoomed
+https://bugs.webkit.org/show_bug.cgi?id=132013
+
+Reviewed by Simon Fraser.
+
+Implement accessibilityHitTest so that the point can be converted correctly.
+
+* WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm:
+(-[WKAccessibilityWebPageObject accessibilityHitTest:]):
+
2014-04-22 Commit Queue commit-qu...@webkit.org
Unreviewed, rolling out r167674.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm (167689 => 167690)
--- trunk/Source/WebKit2/WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm 2014-04-22 23:25:59 UTC (rev 167689)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm 2014-04-22 23:51:51 UTC (rev 167690)
@@ -30,6 +30,7 @@
#import WebFrame.h
#import WebPage.h
+#import WebCore/IntPoint.h
#import WebCore/FrameView.h
/*
@@ -66,6 +67,15 @@
return m_page-pageScaleFactor();
}
+- (id)accessibilityHitTest:(NSPoint)point
+{
+if (!m_page)
+return nil;
+
+WebCore::IntPoint convertedPoint = m_page-screenToRootView(WebCore::IntPoint(point));
+return [[self accessibilityRootObjectWrapper] accessibilityHitTest:convertedPoint];
+}
+
@end
#endif // PLATFORM(IOS)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167691] trunk/Tools
Title: [167691] trunk/Tools Revision 167691 Author timothy_hor...@apple.com Date 2014-04-22 16:54:49 -0700 (Tue, 22 Apr 2014) Log Message DumpRenderTree generates black snapshots on some platforms https://bugs.webkit.org/show_bug.cgi?id=132029 rdar://problem/16679363 Reviewed by Simon Fraser. * DumpRenderTree/mac/PixelDumpSupportMac.mm: (createBitmapContextFromWebView): DRT checks with the WebView to determine whether it can use the window's backing store directly or (because of compositing) needs to take a WindowServer snapshot. However, on some platforms and in some situations, the window can be layer backed without the WebView necessarily currently being composited. We should check with the window in addition to the WebView before going ahead and using its backing store. Modified Paths trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm Diff Modified: trunk/Tools/ChangeLog (167690 => 167691) --- trunk/Tools/ChangeLog 2014-04-22 23:51:51 UTC (rev 167690) +++ trunk/Tools/ChangeLog 2014-04-22 23:54:49 UTC (rev 167691) @@ -1,5 +1,22 @@ 2014-04-22 Tim Horton timothy_hor...@apple.com +DumpRenderTree generates black snapshots on some platforms +https://bugs.webkit.org/show_bug.cgi?id=132029 +rdar://problem/16679363 + +Reviewed by Simon Fraser. + +* DumpRenderTree/mac/PixelDumpSupportMac.mm: +(createBitmapContextFromWebView): +DRT checks with the WebView to determine whether it can use the window's +backing store directly or (because of compositing) needs to take a WindowServer +snapshot. However, on some platforms and in some situations, the window can +be layer backed without the WebView necessarily currently being composited. +We should check with the window in addition to the WebView before going +ahead and using its backing store. + +2014-04-22 Tim Horton timothy_hor...@apple.com + DumpRenderTree generates white snapshots on some platforms https://bugs.webkit.org/show_bug.cgi?id=132026 rdar://problem/16679363 Modified: trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm (167690 => 167691) --- trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2014-04-22 23:51:51 UTC (rev 167690) +++ trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2014-04-22 23:54:49 UTC (rev 167691) @@ -106,6 +106,10 @@ if ([view _isUsingAcceleratedCompositing]) _onscreen_ = YES; +// If the window is layer-backed, its backing store will be empty, so we have to use a window server snapshot. +if ([view.window.contentView layer]) +_onscreen_ = YES; + float deviceScaleFactor = [view _backingScaleFactor]; NSSize webViewSize = [view frame].size; size_t pixelsWide = static_castsize_t(webViewSize.width * deviceScaleFactor); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167692] trunk/Source/JavaScriptCore
Title: [167692] trunk/Source/_javascript_Core
Revision 167692
Author mark@apple.com
Date 2014-04-22 17:36:49 -0700 (Tue, 22 Apr 2014)
Log Message
DFG::Worklist should acquire the m_lock before iterating DFG plans.
https://webkit.org/b/132032
Reviewed by Filip Pizlo.
Currently, there's a rightToRun mechanism that ensures that no compilation
threads are running when the GC is iterating through the DFG worklists.
However, this does not prevent a Worker thread from doing a DFG compilation
and modifying the plans in the worklists thereby invalidating the plan
iterator that the GC is using. This patch fixes the issue by acquiring
the worklist m_lock before iterating the worklist plans.
This issue was uncovered by running the fast/workers layout tests with
COLLECT_ON_EVERY_ALLOCATION enabled.
* dfg/DFGWorklist.cpp:
(JSC::DFG::Worklist::isActiveForVM):
(JSC::DFG::Worklist::visitChildren):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGWorklist.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (167691 => 167692)
--- trunk/Source/_javascript_Core/ChangeLog 2014-04-22 23:54:49 UTC (rev 167691)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-04-23 00:36:49 UTC (rev 167692)
@@ -1,3 +1,24 @@
+2014-04-22 Mark Lam mark@apple.com
+
+DFG::Worklist should acquire the m_lock before iterating DFG plans.
+https://webkit.org/b/132032
+
+Reviewed by Filip Pizlo.
+
+Currently, there's a rightToRun mechanism that ensures that no compilation
+threads are running when the GC is iterating through the DFG worklists.
+However, this does not prevent a Worker thread from doing a DFG compilation
+and modifying the plans in the worklists thereby invalidating the plan
+iterator that the GC is using. This patch fixes the issue by acquiring
+the worklist m_lock before iterating the worklist plans.
+
+This issue was uncovered by running the fast/workers layout tests with
+COLLECT_ON_EVERY_ALLOCATION enabled.
+
+* dfg/DFGWorklist.cpp:
+(JSC::DFG::Worklist::isActiveForVM):
+(JSC::DFG::Worklist::visitChildren):
+
2014-04-22 Brent Fulgham bfulg...@apple.com
[Win] Support Python 2.7 in Cygwin
Modified: trunk/Source/_javascript_Core/dfg/DFGWorklist.cpp (167691 => 167692)
--- trunk/Source/_javascript_Core/dfg/DFGWorklist.cpp 2014-04-22 23:54:49 UTC (rev 167691)
+++ trunk/Source/_javascript_Core/dfg/DFGWorklist.cpp 2014-04-23 00:36:49 UTC (rev 167692)
@@ -76,6 +76,7 @@
bool Worklist::isActiveForVM(VM vm) const
{
+MutexLocker locker(m_lock);
PlanMap::const_iterator end = m_plans.end();
for (PlanMap::const_iterator iter = m_plans.begin(); iter != end; ++iter) {
if (iter-value-vm == vm)
@@ -222,14 +223,21 @@
void Worklist::visitChildren(SlotVisitor visitor, CodeBlockSet codeBlocks)
{
VM* vm = visitor.heap()-vm();
-for (PlanMap::iterator iter = m_plans.begin(); iter != m_plans.end(); ++iter) {
-Plan* plan = iter-value.get();
-if (plan-vm != vm)
-continue;
-iter-key.visitChildren(codeBlocks);
-iter-value-visitChildren(visitor, codeBlocks);
+{
+MutexLocker locker(m_lock);
+for (PlanMap::iterator iter = m_plans.begin(); iter != m_plans.end(); ++iter) {
+Plan* plan = iter-value.get();
+if (plan-vm != vm)
+continue;
+iter-key.visitChildren(codeBlocks);
+iter-value-visitChildren(visitor, codeBlocks);
+}
}
+// This loop doesn't need further locking because:
+// (1) no new threads can be added to m_threads. Hence, it is immutable and needs no locks.
+// (2) ThreadData::m_safepoint is protected by that thread's m_rightToRun which we must be
+// holding here because of a prior call to suspendAllThreads().
for (unsigned i = m_threads.size(); i--;) {
ThreadData* data = ""
Safepoint* safepoint = data-m_safepoint;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167693] trunk/Source/WebCore
Title: [167693] trunk/Source/WebCore
Revision 167693
Author timothy_hor...@apple.com
Date 2014-04-22 18:37:39 -0700 (Tue, 22 Apr 2014)
Log Message
ASSERTION FAILED: scrollerImp == scrollbarPainterForScrollbar(_scrollbar) on two API tests
https://bugs.webkit.org/show_bug.cgi?id=132034
rdar://problem/16624332
Reviewed by Simon Fraser.
* platform/mac/ScrollAnimatorMac.mm:
(-[WebScrollbarPainterDelegate shouldUseLayerPerPartForScrollerImp:]):
scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp: moves the delegate
from the old scrollerImp to the new one, and also happens to call shouldUseLayerPerPartForScrollerImp.
Since scrollerImpWithStyle: has not returned yet, the scrollbarPainterForScrollbar still returns the old scrollerImp,
so this assertion fires. It's safe to remove this because supportsUpdateOnSecondaryThread doesn't make use of the imp.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (167692 => 167693)
--- trunk/Source/WebCore/ChangeLog 2014-04-23 00:36:49 UTC (rev 167692)
+++ trunk/Source/WebCore/ChangeLog 2014-04-23 01:37:39 UTC (rev 167693)
@@ -1,3 +1,18 @@
+2014-04-22 Tim Horton timothy_hor...@apple.com
+
+ASSERTION FAILED: scrollerImp == scrollbarPainterForScrollbar(_scrollbar) on two API tests
+https://bugs.webkit.org/show_bug.cgi?id=132034
+rdar://problem/16624332
+
+Reviewed by Simon Fraser.
+
+* platform/mac/ScrollAnimatorMac.mm:
+(-[WebScrollbarPainterDelegate shouldUseLayerPerPartForScrollerImp:]):
+scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp: moves the delegate
+from the old scrollerImp to the new one, and also happens to call shouldUseLayerPerPartForScrollerImp.
+Since scrollerImpWithStyle: has not returned yet, the scrollbarPainterForScrollbar still returns the old scrollerImp,
+so this assertion fires. It's safe to remove this because supportsUpdateOnSecondaryThread doesn't make use of the imp.
+
2014-04-22 Ryosuke Niwa rn...@webkit.org
REGRESSION (r157328): popover to check into flight ba.com dismisses instantly when focusing form
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (167692 => 167693)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2014-04-23 00:36:49 UTC (rev 167692)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2014-04-23 01:37:39 UTC (rev 167693)
@@ -464,11 +464,11 @@
- (BOOL)shouldUseLayerPerPartForScrollerImp:(id)scrollerImp
{
+UNUSED_PARAM(scrollerImp);
+
if (!_scrollbar)
return false;
-ASSERT_UNUSED(scrollerImp, scrollerImp == scrollbarPainterForScrollbar(_scrollbar));
-
return _scrollbar-supportsUpdateOnSecondaryThread();
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167694] trunk
Title: [167694] trunk
Revision 167694
Author za...@apple.com
Date 2014-04-22 19:44:25 -0700 (Tue, 22 Apr 2014)
Log Message
Do not paint border image when the border rect is empty.
https://bugs.webkit.org/show_bug.cgi?id=131988
Reviewed by Darin Adler.
http://trac.webkit.org/changeset/167351 introduced an early return when border
rect is empty. This patch ensures that border image is not painted either in that case.
Source/WebCore:
Modified padding-margin-negative-border.html to cover border-image case.
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintBorder):
LayoutTests:
* fast/css/padding-margin-negative-border-expected.html: Borders in -expected.html does not get painted either, just
ensure that they are explicitly different colors.
* fast/css/padding-margin-negative-border.html:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/css/padding-margin-negative-border-expected.html
trunk/LayoutTests/fast/css/padding-margin-negative-border.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp
Diff
Modified: trunk/LayoutTests/ChangeLog (167693 => 167694)
--- trunk/LayoutTests/ChangeLog 2014-04-23 01:37:39 UTC (rev 167693)
+++ trunk/LayoutTests/ChangeLog 2014-04-23 02:44:25 UTC (rev 167694)
@@ -1,3 +1,17 @@
+2014-04-22 Zalan Bujtas za...@apple.com
+
+Do not paint border image when the border rect is empty.
+https://bugs.webkit.org/show_bug.cgi?id=131988
+
+Reviewed by Darin Adler.
+
+http://trac.webkit.org/changeset/167351 introduced an early return when border
+rect is empty. This patch ensures that border image is not painted either in that case.
+
+* fast/css/padding-margin-negative-border-expected.html: Borders in -expected.html does not get painted either, just
+ensure that they are explicitly different colors.
+* fast/css/padding-margin-negative-border.html:
+
2014-04-22 Ryosuke Niwa rn...@webkit.org
REGRESSION (r157328): popover to check into flight ba.com dismisses instantly when focusing form
Modified: trunk/LayoutTests/fast/css/padding-margin-negative-border-expected.html (167693 => 167694)
--- trunk/LayoutTests/fast/css/padding-margin-negative-border-expected.html 2014-04-23 01:37:39 UTC (rev 167693)
+++ trunk/LayoutTests/fast/css/padding-margin-negative-border-expected.html 2014-04-23 02:44:25 UTC (rev 167694)
@@ -1,13 +1,22 @@
!DOCTYPE html
html
+ head
+style
+ table { width: 700px; }
+ td { width: 400px; }
+ b { border: solid blue; }
+ i { background-color: green; }
+ .nonBlueBorder { border-color: red; }
+ .borderImage { border-image:url(resources/greenbox.png) 3 3 repeat; }
+/style
+ /head
body
-table style=width:700px
+table
tr
tdtop/td
-td style=width:400px
- b style=border:solid;
+td
+ b
i style=
-background-color:green;
margin: -30px 0px 0px 0px;
padding: 1px 0px 0px 0px;
Here is some text.
@@ -17,14 +26,12 @@
/tr
/table
-table style=width:700px
+table
tr
tdright/td
-td style=width:400px
- b style=border:solid;
-border-color:white
+td
+ b class=nonBlueBorder
i style=
-background-color:green;
margin: 0px -208px 0px 0px;
padding: 0px 1px 0px 0px;
Here is some text.
@@ -34,13 +41,12 @@
/tr
/table
-table style=width:700px
+table
tr
tdbottom/td
-td style=width:400px
- b style=border:solid;
+td
+ b
i style=
-background-color:green;
margin: 0px 0px -30px 0px;
padding: 0px 0px 1px 0px;
Here is some text.
@@ -50,13 +56,12 @@
/tr
/table
-table style=width:700px
+table
+ tr
tdleft/td
-td style=width:400px
- b style=border:solid;
-border-color:white
+td
+ b class=nonBlueBorder
i style=
-background-color:green;
margin: 0px 0px 0px -208px;
padding: 0px 0px 0px 31px;
Here is some text.
@@ -65,5 +70,20 @@
/td
/tr
/table
+
+table
+ tr
+tdleft/td
+td
+ b class=borderImage
+i style=
+margin: 0px 0px 0px -208px;
+padding: 0px 0px 0px 31px;
+Here is some text.
+/i
+ /b
+/td
+ /tr
+/table
/body
/html
Modified: trunk/LayoutTests/fast/css/padding-margin-negative-border.html (167693 => 167694)
--- trunk/LayoutTests/fast/css/padding-margin-negative-border.html 2014-04-23 01:37:39 UTC (rev 167693)
+++
[webkit-changes] [167695] trunk/LayoutTests
Title: [167695] trunk/LayoutTests Revision 167695 Author akl...@apple.com Date 2014-04-22 20:13:41 -0700 (Tue, 22 Apr 2014) Log Message Skip fast/events/ghostly-mousemoves-in-subframe.html on Mac/WK1. * platform/mac-wk1/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/mac-wk1/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (167694 => 167695) --- trunk/LayoutTests/ChangeLog 2014-04-23 02:44:25 UTC (rev 167694) +++ trunk/LayoutTests/ChangeLog 2014-04-23 03:13:41 UTC (rev 167695) @@ -1,3 +1,9 @@ +2014-04-22 Andreas Kling akl...@apple.com + +Skip fast/events/ghostly-mousemoves-in-subframe.html on Mac/WK1. + +* platform/mac-wk1/TestExpectations: + 2014-04-22 Zalan Bujtas za...@apple.com Do not paint border image when the border rect is empty. Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (167694 => 167695) --- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2014-04-23 02:44:25 UTC (rev 167694) +++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2014-04-23 03:13:41 UTC (rev 167695) @@ -40,5 +40,8 @@ # Color input is not yet enabled on Mac WK1. fast/forms/color/input-color-onchange-event.html [ Skip ] +# WK1 and WK2 mousemove events are subtly different in ways that break this test on WK1. +fast/events/ghostly-mousemoves-in-subframe.html [ Skip ] + ### END OF (2) Failures without bug reports ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [167698] trunk/Source/WebKit2
Title: [167698] trunk/Source/WebKit2 Revision 167698 Author benja...@webkit.org Date 2014-04-22 22:53:05 -0700 (Tue, 22 Apr 2014) Log Message [iOS][WK2] Split iOS touch event dispatch for the regular touch event dispatch https://bugs.webkit.org/show_bug.cgi?id=132033 Patch by Benjamin Poulain bpoul...@apple.com on 2014-04-22 Reviewed by Simon Fraser. The generic touch event dispatching does not work well with iOS gesture recognizers. Some events are required to be synchronous, while other needs can be asynchronous and can even use event coalescing. We only need UI callback for the synchronous events. Previously, that was implemented by changing the property ShouldSendEventsSynchronously on WebPageProxy. That is causing issues when synchronous events are sent right after asynchronous events because the responses in WebPageProxy::didReceiveEvent() easily get out of order. This patch completely split the UIGestureRecognizerDispatching from the normal asynchronous event dispatching. Synchronous events are sent directly to the WebProcess and report the result to the PageClient right away. Asynchronous events are sent to the EventDispatcher where they are coalesced until the main thread is free to process events. There can be a race where a synchronous event comes before the asynchronous events are processed. In that case, the synchronous event handler starts by getting the events out of the EventDispatcher and dispatch them first. * Shared/NativeWebTouchEvent.h: (WebKit::NativeWebTouchEvent::uniqueId): Deleted. * Shared/ios/NativeWebTouchEventIOS.mm: (WebKit::NativeWebTouchEvent::NativeWebTouchEvent): * UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::handleSynchronousTouchEvent): (WebKit::WebPageProxy::sendAsynchronousTouchEvent): (WebKit::WebPageProxy::didReceiveEvent): (WebKit::WebPageProxy::resetStateAfterProcessExited): * UIProcess/WebPageProxy.h: * UIProcess/ios/WKContentViewInteraction.h: * UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView _webTouchEventsRecognized:]): (-[WKContentView _webTouchEvent:WebKit::preventsNativeGestures:]): * WebProcess/WebPage/EventDispatcher.cpp: (WebKit::EventDispatcher::EventDispatcher): (WebKit::EventDispatcher::clearQueuedTouchEventsForPage): (WebKit::EventDispatcher::getQueuedTouchEventsForPage): (WebKit::EventDispatcher::touchEvent): (WebKit::EventDispatcher::dispatchTouchEvents): * WebProcess/WebPage/EventDispatcher.h: * WebProcess/WebPage/EventDispatcher.messages.in: * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::dispatchTouchEvent): (WebKit::WebPage::touchEventSync): (WebKit::WebPage::touchEvent): (WebKit::WebPage::touchEventSyncForTesting): (WebKit::WebPage::didCommitLoad): * WebProcess/WebPage/WebPage.h: * WebProcess/WebPage/WebPage.messages.in: * WebProcess/WebPage/ios/WebPageIOS.mm: (WebKit::WebPage::dispatchAsynchronousTouchEventsQueue): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp trunk/Source/WebKit2/UIProcess/WebPageProxy.h trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.messages.in trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (167697 => 167698) --- trunk/Source/WebKit2/ChangeLog 2014-04-23 05:28:20 UTC (rev 167697) +++ trunk/Source/WebKit2/ChangeLog 2014-04-23 05:53:05 UTC (rev 167698) @@ -1,3 +1,61 @@ +2014-04-22 Benjamin Poulain bpoul...@apple.com + +[iOS][WK2] Split iOS touch event dispatch for the regular touch event dispatch +https://bugs.webkit.org/show_bug.cgi?id=132033 + +Reviewed by Simon Fraser. + +The generic touch event dispatching does not work well with iOS gesture recognizers. +Some events are required to be synchronous, while other needs can be asynchronous and +can even use event coalescing. We only need UI callback for the synchronous events. + +Previously, that was implemented by changing the property ShouldSendEventsSynchronously +on WebPageProxy. That is causing issues when synchronous events are sent right after asynchronous +events because the responses in WebPageProxy::didReceiveEvent() easily get out of order. + +This patch completely split the UIGestureRecognizerDispatching from the normal asynchronous event dispatching. + +Synchronous events are sent directly to the WebProcess and report the result to the PageClient right away. + +Asynchronous events are sent to the
