[webkit-changes] [179011] trunk/LayoutTests
Title: [179011] trunk/LayoutTests
Revision 179011
Author eric.carl...@apple.com
Date 2015-01-23 10:28:05 -0800 (Fri, 23 Jan 2015)
Log Message
Create a load and stall cgi that support byte ranges.
https://bugs.webkit.org/show_bug.cgi?id=140628
Reviewed by Jer Noble.
* http/tests/media/resources/serve-video.php: Add support for stallOffset, stallDuration,
and chunkSize parameters.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/media/resources/serve-video.php
Diff
Modified: trunk/LayoutTests/ChangeLog (179010 => 179011)
--- trunk/LayoutTests/ChangeLog 2015-01-23 18:27:27 UTC (rev 179010)
+++ trunk/LayoutTests/ChangeLog 2015-01-23 18:28:05 UTC (rev 179011)
@@ -1,3 +1,13 @@
+2015-01-23 Eric Carlson eric.carl...@apple.com
+
+Create a load and stall cgi that support byte ranges.
+https://bugs.webkit.org/show_bug.cgi?id=140628
+
+Reviewed by Jer Noble.
+
+* http/tests/media/resources/serve-video.php: Add support for stallOffset, stallDuration,
+and chunkSize parameters.
+
2015-01-23 Alexey Proskuryakov a...@apple.com
svg-resource-fragment-identifier-img-src.html is a hidpi reftest, but its -expected.html
Modified: trunk/LayoutTests/http/tests/media/resources/serve-video.php (179010 => 179011)
--- trunk/LayoutTests/http/tests/media/resources/serve-video.php 2015-01-23 18:27:27 UTC (rev 179010)
+++ trunk/LayoutTests/http/tests/media/resources/serve-video.php 2015-01-23 18:28:05 UTC (rev 179011)
@@ -7,7 +7,7 @@
// Set variables
$settings = array(
-chunkSize = 1024 * 256,
+chunkSize = array_key_exists(chunkSize, $_GET) ? $_GET[chunkSize] : 1024 * 256,
databaseFile = metadata.db,
httpStatus = 500 Internal Server Error,
mediaDirectory = array_key_exists(name, $_GET) ? dirname($_GET[name]) : ,
@@ -18,6 +18,8 @@
setContentLength = array_key_exists(content-length, $_GET) ? $_GET[content-length] : yes,
setIcyData = array_key_exists(icy-data, $_GET) ? $_GET[icy-data] : no,
supportRanges = array_key_exists(ranges, $_GET) ? $_GET[ranges] : yes,
+stallOffset = array_key_exists(stallOffset, $_GET) ? $_GET[stallOffset] : 0,
+stallDuration = array_key_exists(stallDuration, $_GET) ? $_GET[stallDuration] : 2,
);
// 500 on errors
@@ -25,10 +27,10 @@
trigger_error(You have not specified a 'name' parameter., E_USER_WARNING);
goto answering;
}
+
$fileName = $_GET[name];
-
if (!file_exists($fileName)) {
-trigger_error(The file to stream specified at 'name' doesn't exist., E_USER_WARNING);
+trigger_error(The file ' . $fileName . ' doesn't exist., E_USER_WARNING);
goto answering;
}
$settings[databaseFile] = $settings[mediaDirectory] . / . $settings[databaseFile];
@@ -67,6 +69,11 @@
// There is everything needed to send the media file
$fileSize = filesize($fileName);
+if ($settings[stallOffset] ($settings[stallOffset] $fileSize)) {
+trigger_error(The 'stallOffset' offset parameter is greater than file size ( . $fileSize . )., E_USER_WARNING);
+goto answering;
+}
+
$start = 0;
$end = $fileSize - 1;
if ($settings[supportRanges] != no array_key_exists(HTTP_RANGE, $_SERVER))
@@ -107,7 +114,7 @@
}
header(Last-Modified: . gmdate(D, d M Y H:i:s) . GMT);
-header(Pragma: no-cache);
+header(Cache-Control: no-cache);
header(Etag: . '' . $fileSize . - . filemtime($fileName) . '');
if ($settings[setIcyData] == yes) {
$bitRate = ceil($playFiles[$i][bitRate] / 1000);
@@ -134,12 +141,24 @@
$fn = fopen($fileName, rb);
fseek($fn, $offset, 0);
+if ($settings[stallDuration])
+set_time_limit(0);
+
while (!feof($fn) $offset = $end connection_status() == 0) {
$readSize = min($settings[chunkSize], ($end - $offset) + 1);
+$stallNow = false;
+if ($settings[stallOffset] $settings[stallOffset] = $offset $settings[stallOffset] $offset + $readSize) {
+$readSize = min($settings[chunkSize], $settings[stallOffset] - $offset);
+$stallNow = true;
+}
+
$buffer = fread($fn, $readSize);
print($buffer);
flush();
$offset += $settings[chunkSize];
+
+if ($stallNow)
+sleep($settings[stallDuration]);
}
fclose($fn);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179010] trunk/Source/WebCore
Title: [179010] trunk/Source/WebCore
Revision 179010
Author jer.no...@apple.com
Date 2015-01-23 10:27:27 -0800 (Fri, 23 Jan 2015)
Log Message
Layout Test http/tests/media/track-in-band-hls-metadata.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=140827
Reviewed by Eric Carlson.
Create the m_metadataTrack by calling prepareMetadataTrack() before deref-ing it.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::metadataDidArrive):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (179009 => 179010)
--- trunk/Source/WebCore/ChangeLog 2015-01-23 16:33:04 UTC (rev 179009)
+++ trunk/Source/WebCore/ChangeLog 2015-01-23 18:27:27 UTC (rev 179010)
@@ -1,3 +1,15 @@
+2015-01-23 Jer Noble jer.no...@apple.com
+
+Layout Test http/tests/media/track-in-band-hls-metadata.html is flaky
+https://bugs.webkit.org/show_bug.cgi?id=140827
+
+Reviewed by Eric Carlson.
+
+Create the m_metadataTrack by calling prepareMetadataTrack() before deref-ing it.
+
+* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+(WebCore::MediaPlayerPrivateAVFoundationObjC::metadataDidArrive):
+
2015-01-23 Carlos Garcia Campos cgar...@igalia.com
[GTK] Add initial database process support
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (179009 => 179010)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-01-23 16:33:04 UTC (rev 179009)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-01-23 18:27:27 UTC (rev 179010)
@@ -2728,14 +2728,14 @@
if (seeking())
return;
+if (!m_metadataTrack)
+processMetadataTrack();
+
if (!metadata || [metadata isKindOfClass:[NSNull class]]) {
m_metadataTrack-updatePendingCueEndTimes(mediaTime);
return;
}
-if (!m_metadataTrack)
-processMetadataTrack();
-
// Set the duration of all incomplete cues before adding new ones.
MediaTime earliestStartTime = MediaTime::positiveInfiniteTime();
for (AVMetadataItemType *item in m_currentMetaData.get()) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179009] trunk/Source/WTF
Title: [179009] trunk/Source/WTF
Revision 179009
Author carlo...@webkit.org
Date 2015-01-23 08:33:04 -0800 (Fri, 23 Jan 2015)
Log Message
[GTK] Add missing null check in some derefGPtr implementations
https://bugs.webkit.org/show_bug.cgi?id=140822
Reviewed by Sergio Villar Senin.
It's missing in GHashTable and GVariant implementations.
* wtf/gobject/GRefPtr.cpp:
(WTF::derefGPtr):
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/gobject/GRefPtr.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (179008 => 179009)
--- trunk/Source/WTF/ChangeLog 2015-01-23 14:56:54 UTC (rev 179008)
+++ trunk/Source/WTF/ChangeLog 2015-01-23 16:33:04 UTC (rev 179009)
@@ -1,5 +1,17 @@
2015-01-23 Carlos Garcia Campos cgar...@igalia.com
+[GTK] Add missing null check in some derefGPtr implementations
+https://bugs.webkit.org/show_bug.cgi?id=140822
+
+Reviewed by Sergio Villar Senin.
+
+It's missing in GHashTable and GVariant implementations.
+
+* wtf/gobject/GRefPtr.cpp:
+(WTF::derefGPtr):
+
+2015-01-23 Carlos Garcia Campos cgar...@igalia.com
+
[GTK] Add initial database process support
https://bugs.webkit.org/show_bug.cgi?id=139491
Modified: trunk/Source/WTF/wtf/gobject/GRefPtr.cpp (179008 => 179009)
--- trunk/Source/WTF/wtf/gobject/GRefPtr.cpp 2015-01-23 14:56:54 UTC (rev 179008)
+++ trunk/Source/WTF/wtf/gobject/GRefPtr.cpp 2015-01-23 16:33:04 UTC (rev 179009)
@@ -35,7 +35,8 @@
template void derefGPtr(GHashTable* ptr)
{
-g_hash_table_unref(ptr);
+if (ptr)
+g_hash_table_unref(ptr);
}
template GMainContext* refGPtr(GMainContext* ptr)
@@ -86,7 +87,8 @@
template void derefGPtr(GVariant* ptr)
{
-g_variant_unref(ptr);
+if (ptr)
+g_variant_unref(ptr);
}
template GVariantBuilder* refGPtr(GVariantBuilder* ptr)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179014] trunk/Source
Title: [179014] trunk/Source Revision 179014 Author timothy_hor...@apple.com Date 2015-01-23 11:43:20 -0800 (Fri, 23 Jan 2015) Log Message QLPreviewMenuItem popovers don't close when the page scrolls https://bugs.webkit.org/show_bug.cgi?id=140806 rdar://problem/19555618 Reviewed by Beth Dakin. Now that QLPreviewMenuItem's popover doesn't eat scrolls, we need to dismiss it if the page scrolls. * WebView/WebHTMLView.mm: (-[WebHTMLView scrollWheel:scrollWheel:]): Send scrollWheel along to WebImmediateActionController. * WebView/WebImmediateActionController.h: * WebView/WebImmediateActionController.mm: (-[WebImmediateActionController webView:didHandleScrollWheel:]): (-[WebImmediateActionController _clearImmediateActionState]): (-[WebImmediateActionController _defaultAnimationController]): Keep track of the active QLPreviewMenuItem, and close it upon scroll. * UIProcess/API/mac/WKView.mm: (-[WKView _dismissContentRelativeChildWindows]): Send _dismissContentRelativeChildWindows on to WKImmediateActionController. * UIProcess/mac/WKImmediateActionController.h: * UIProcess/mac/WKImmediateActionController.mm: (-[WKImmediateActionController _clearImmediateActionState]): (-[WKImmediateActionController dismissContentRelativeChildWindows]): (-[WKImmediateActionController _defaultAnimationController]): Keep track of the active QLPreviewMenuItem, and close it upon scroll. * platform/spi/mac/QuickLookMacSPI.h: Add some SPI. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h trunk/Source/WebKit/mac/ChangeLog trunk/Source/WebKit/mac/WebView/WebHTMLView.mm trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm Diff Modified: trunk/Source/WebCore/ChangeLog (179013 => 179014) --- trunk/Source/WebCore/ChangeLog 2015-01-23 19:42:03 UTC (rev 179013) +++ trunk/Source/WebCore/ChangeLog 2015-01-23 19:43:20 UTC (rev 179014) @@ -1,3 +1,14 @@ +2015-01-23 Timothy Horton timothy_hor...@apple.com + +QLPreviewMenuItem popovers don't close when the page scrolls +https://bugs.webkit.org/show_bug.cgi?id=140806 +rdar://problem/19555618 + +Reviewed by Beth Dakin. + +* platform/spi/mac/QuickLookMacSPI.h: +Add some SPI. + 2015-01-23 Andreas Kling akl...@apple.com Hang CSSFontSelector off Document instead of StyleResolver. Modified: trunk/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h (179013 => 179014) --- trunk/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h 2015-01-23 19:42:03 UTC (rev 179013) +++ trunk/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h 2015-01-23 19:43:20 UTC (rev 179014) @@ -46,6 +46,8 @@ QLPreviewStylePopover }; +- (void)close; + @property (assign) idQLPreviewMenuItemDelegate delegate; @property QLPreviewStyle previewStyle; @end Modified: trunk/Source/WebKit/mac/ChangeLog (179013 => 179014) --- trunk/Source/WebKit/mac/ChangeLog 2015-01-23 19:42:03 UTC (rev 179013) +++ trunk/Source/WebKit/mac/ChangeLog 2015-01-23 19:43:20 UTC (rev 179014) @@ -1,5 +1,26 @@ 2015-01-23 Timothy Horton timothy_hor...@apple.com +QLPreviewMenuItem popovers don't close when the page scrolls +https://bugs.webkit.org/show_bug.cgi?id=140806 +rdar://problem/19555618 + +Reviewed by Beth Dakin. + +Now that QLPreviewMenuItem's popover doesn't eat scrolls, we need to dismiss it if the page scrolls. + +* WebView/WebHTMLView.mm: +(-[WebHTMLView scrollWheel:scrollWheel:]): +Send scrollWheel along to WebImmediateActionController. + +* WebView/WebImmediateActionController.h: +* WebView/WebImmediateActionController.mm: +(-[WebImmediateActionController webView:didHandleScrollWheel:]): +(-[WebImmediateActionController _clearImmediateActionState]): +(-[WebImmediateActionController _defaultAnimationController]): +Keep track of the active QLPreviewMenuItem, and close it upon scroll. + +2015-01-23 Timothy Horton timothy_hor...@apple.com + Infinite recursion in _clearImmediateActionState https://bugs.webkit.org/show_bug.cgi?id=140807 rdar://problem/19571601 Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (179013 => 179014) --- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-01-23 19:42:03 UTC (rev 179013) +++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-01-23 19:43:20 UTC (rev 179014) @@ -3711,6 +3711,7 @@ #if PLATFORM(MAC) __MAC_OS_X_VERSION_MIN_REQUIRED = 101000 [[[self _webView] _actionMenuController] webView:[self _webView] didHandleScrollWheel:event]; +[[[self _webView] _immediateActionController] webView:[self _webView] didHandleScrollWheel:event];
[webkit-changes] [179015] trunk/Source/JavaScriptCore
Title: [179015] trunk/Source/_javascript_Core
Revision 179015
Author msab...@apple.com
Date 2015-01-23 11:52:25 -0800 (Fri, 23 Jan 2015)
Log Message
Immediate crash when setting JS breakpoint
https://bugs.webkit.org/show_bug.cgi?id=140811
Reviewed by Mark Lam.
When the DFG stack layout phase doesn't allocate a register for the scope register,
it incorrectly sets the scope register in the code block to a bad value, one with
an offset of 0. Changed it so that we set the code block's scope register to the
invalid VirtualRegister instead.
No tests needed as adding the ASSERT in setScopeRegister() was used to find the bug.
We crash with that ASSERT in testapi and likely many other tests as well.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::CodeBlock):
* bytecode/CodeBlock.h:
(JSC::CodeBlock::setScopeRegister):
(JSC::CodeBlock::scopeRegister):
Added ASSERTs to catch any future improper setting of the code block's scope register.
* dfg/DFGStackLayoutPhase.cpp:
(JSC::DFG::StackLayoutPhase::run):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp
trunk/Source/_javascript_Core/bytecode/CodeBlock.h
trunk/Source/_javascript_Core/dfg/DFGStackLayoutPhase.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (179014 => 179015)
--- trunk/Source/_javascript_Core/ChangeLog 2015-01-23 19:43:20 UTC (rev 179014)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-01-23 19:52:25 UTC (rev 179015)
@@ -1,3 +1,28 @@
+2015-01-23 Michael Saboff msab...@apple.com
+
+Immediate crash when setting JS breakpoint
+https://bugs.webkit.org/show_bug.cgi?id=140811
+
+Reviewed by Mark Lam.
+
+When the DFG stack layout phase doesn't allocate a register for the scope register,
+it incorrectly sets the scope register in the code block to a bad value, one with
+an offset of 0. Changed it so that we set the code block's scope register to the
+invalid VirtualRegister instead.
+
+No tests needed as adding the ASSERT in setScopeRegister() was used to find the bug.
+We crash with that ASSERT in testapi and likely many other tests as well.
+
+* bytecode/CodeBlock.cpp:
+(JSC::CodeBlock::CodeBlock):
+* bytecode/CodeBlock.h:
+(JSC::CodeBlock::setScopeRegister):
+(JSC::CodeBlock::scopeRegister):
+Added ASSERTs to catch any future improper setting of the code block's scope register.
+
+* dfg/DFGStackLayoutPhase.cpp:
+(JSC::DFG::StackLayoutPhase::run):
+
2015-01-22 Mark Hahnenberg mhahn...@gmail.com
EdenCollections unnecessarily visit SmallStrings
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (179014 => 179015)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2015-01-23 19:43:20 UTC (rev 179014)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2015-01-23 19:52:25 UTC (rev 179015)
@@ -1663,7 +1663,8 @@
#endif
{
ASSERT(m_heap-isDeferred());
-
+ASSERT(m_scopeRegister.isLocal());
+
if (SymbolTable* symbolTable = other.symbolTable())
m_symbolTable.set(*m_vm, m_ownerExecutable.get(), symbolTable);
@@ -1719,6 +1720,7 @@
#endif
{
ASSERT(m_heap-isDeferred());
+ASSERT(m_scopeRegister.isLocal());
bool didCloneSymbolTable = false;
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (179014 => 179015)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2015-01-23 19:43:20 UTC (rev 179014)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2015-01-23 19:52:25 UTC (rev 179015)
@@ -324,12 +324,12 @@
void setScopeRegister(VirtualRegister scopeRegister)
{
+ASSERT(scopeRegister.isLocal() || !scopeRegister.isValid());
m_scopeRegister = scopeRegister;
}
VirtualRegister scopeRegister() const
{
-ASSERT(m_scopeRegister.isValid());
return m_scopeRegister;
}
Modified: trunk/Source/_javascript_Core/dfg/DFGStackLayoutPhase.cpp (179014 => 179015)
--- trunk/Source/_javascript_Core/dfg/DFGStackLayoutPhase.cpp 2015-01-23 19:43:20 UTC (rev 179014)
+++ trunk/Source/_javascript_Core/dfg/DFGStackLayoutPhase.cpp 2015-01-23 19:52:25 UTC (rev 179015)
@@ -169,8 +169,8 @@
}
if (codeBlock()-scopeRegister().isValid()) {
-codeBlock()-setScopeRegister(
-virtualRegisterForLocal(allocation[codeBlock()-scopeRegister().toLocal()]));
+unsigned scopeRegisterAllocation = allocation[codeBlock()-scopeRegister().toLocal()];
+codeBlock()-setScopeRegister(scopeRegisterAllocation == UINT_MAX ? VirtualRegister() : virtualRegisterForLocal(scopeRegisterAllocation));
}
for (unsigned i = m_graph.m_inlineVariableData.size(); i--;) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179013] trunk/Source
Title: [179013] trunk/Source
Revision 179013
Author timothy_hor...@apple.com
Date 2015-01-23 11:42:03 -0800 (Fri, 23 Jan 2015)
Log Message
Infinite recursion in _clearImmediateActionState
https://bugs.webkit.org/show_bug.cgi?id=140807
rdar://problem/19571601
Reviewed by Anders Carlsson.
* UIProcess/mac/WKImmediateActionController.mm:
(-[WKImmediateActionController _clearImmediateActionState]):
Clear _hasActivatedActionContext before calling didUseActions, because
didUseActions can call _clearImmediateActionState.
* WebView/WebImmediateActionController.mm:
(-[WebImmediateActionController _clearImmediateActionState]):
Use this opportunity to bring identical code to WebKit1, to avoid
getting DataDetectors stuck when an immediate action is canceled.
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (179012 => 179013)
--- trunk/Source/WebKit/mac/ChangeLog 2015-01-23 18:44:22 UTC (rev 179012)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-23 19:42:03 UTC (rev 179013)
@@ -1,3 +1,16 @@
+2015-01-23 Timothy Horton timothy_hor...@apple.com
+
+Infinite recursion in _clearImmediateActionState
+https://bugs.webkit.org/show_bug.cgi?id=140807
+rdar://problem/19571601
+
+Reviewed by Anders Carlsson.
+
+* WebView/WebImmediateActionController.mm:
+(-[WebImmediateActionController _clearImmediateActionState]):
+Use this opportunity to bring identical code to WebKit1, to avoid
+getting DataDetectors stuck when an immediate action is canceled.
+
2015-01-22 Ryosuke Niwa rn...@webkit.org
Add a build flag for ES6 class syntax
Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (179012 => 179013)
--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-23 18:44:22 UTC (rev 179012)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-23 19:42:03 UTC (rev 179013)
@@ -110,7 +110,15 @@
- (void)_clearImmediateActionState
{
[_webView _clearTextIndicator];
+DDActionsManager *actionsManager = [getDDActionsManagerClass() sharedManager];
+if ([actionsManager respondsToSelector:@selector(requestBubbleClosureUnanchorOnFailure:)])
+[actionsManager requestBubbleClosureUnanchorOnFailure:YES];
+if (_currentActionContext _hasActivatedActionContext) {
+_hasActivatedActionContext = NO;
+[getDDActionsManagerClass() didUseActions];
+}
+
_type = WebImmediateActionNone;
_currentActionContext = nil;
}
Modified: trunk/Source/WebKit2/ChangeLog (179012 => 179013)
--- trunk/Source/WebKit2/ChangeLog 2015-01-23 18:44:22 UTC (rev 179012)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-23 19:42:03 UTC (rev 179013)
@@ -1,3 +1,16 @@
+2015-01-23 Timothy Horton timothy_hor...@apple.com
+
+Infinite recursion in _clearImmediateActionState
+https://bugs.webkit.org/show_bug.cgi?id=140807
+rdar://problem/19571601
+
+Reviewed by Anders Carlsson.
+
+* UIProcess/mac/WKImmediateActionController.mm:
+(-[WKImmediateActionController _clearImmediateActionState]):
+Clear _hasActivatedActionContext before calling didUseActions, because
+didUseActions can call _clearImmediateActionState.
+
2015-01-23 Carlos Garcia Campos cgar...@igalia.com
[GTK] Add initial database process support
Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (179012 => 179013)
--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-23 18:44:22 UTC (rev 179012)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-23 19:42:03 UTC (rev 179013)
@@ -117,8 +117,8 @@
_page-clearTextIndicator();
if (_currentActionContext _hasActivatedActionContext) {
+_hasActivatedActionContext = NO;
[getDDActionsManagerClass() didUseActions];
-_hasActivatedActionContext = NO;
}
_state = ImmediateActionState::None;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179017] trunk/Source/WebCore
Title: [179017] trunk/Source/WebCore
Revision 179017
Author cdu...@apple.com
Date 2015-01-23 12:01:50 -0800 (Fri, 23 Jan 2015)
Log Message
Leverage CSSValuePool's font family cache in CSSComputedStyleDeclaration
https://bugs.webkit.org/show_bug.cgi?id=140829
Reviewed by Andreas Kling.
Leverage CSSValuePool's font family cache in CSSComputedStyleDeclaration
by calling CSSValuePool::createFontFamilyValue() to create the font
family CSSPrimitiveValue instead of cssValuePool().createValue().
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::valueForFamily):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (179016 => 179017)
--- trunk/Source/WebCore/ChangeLog 2015-01-23 19:57:02 UTC (rev 179016)
+++ trunk/Source/WebCore/ChangeLog 2015-01-23 20:01:50 UTC (rev 179017)
@@ -1,3 +1,17 @@
+2015-01-23 Chris Dumez cdu...@apple.com
+
+Leverage CSSValuePool's font family cache in CSSComputedStyleDeclaration
+https://bugs.webkit.org/show_bug.cgi?id=140829
+
+Reviewed by Andreas Kling.
+
+Leverage CSSValuePool's font family cache in CSSComputedStyleDeclaration
+by calling CSSValuePool::createFontFamilyValue() to create the font
+family CSSPrimitiveValue instead of cssValuePool().createValue().
+
+* css/CSSComputedStyleDeclaration.cpp:
+(WebCore::valueForFamily):
+
2015-01-23 Timothy Horton timothy_hor...@apple.com
QLPreviewMenuItem popovers don't close when the page scrolls
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (179016 => 179017)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-01-23 19:57:02 UTC (rev 179016)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-01-23 20:01:50 UTC (rev 179017)
@@ -1333,7 +1333,7 @@
{
if (CSSValueID familyIdentifier = identifierForFamily(family))
return cssValuePool().createIdentifierValue(familyIdentifier);
-return cssValuePool().createValue(family.string(), CSSPrimitiveValue::CSS_STRING);
+return cssValuePool().createFontFamilyValue(family);
}
static RefCSSValue renderTextDecorationFlagsToCSSValue(int textDecoration)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179019] trunk
Title: [179019] trunk
Revision 179019
Author joep...@webkit.org
Date 2015-01-23 12:05:44 -0800 (Fri, 23 Jan 2015)
Log Message
Web Inspector: Object Previews in the Console
https://bugs.webkit.org/show_bug.cgi?id=129204
Reviewed by Timothy Hatcher.
Source/_javascript_Core:
Update the very old, unused object preview code. Part of this comes from
the earlier WebKit legacy implementation, and the Blink implementation.
A RemoteObject may include a preview, if it is asked for, and if the
RemoteObject is an object. Previews are a shallow (single level) list
of a limited number of properties on the object. The previewed
properties are always stringified (even if primatives). Previews are
limited to just 5 properties or 100 indices. Previews are marked
as lossless if they are a complete snapshot of the object.
There is a path to make previews two levels deep, that is currently
unused but should soon be used for tables (e.g. IndexedDB).
* inspector/InjectedScriptSource.js:
- Move some code off of InjectedScript to be generic functions
usable by RemoteObject as well.
- Update preview generation to use
* inspector/protocol/Runtime.json:
- Add a new type, accessor for preview objects. This represents
a getter / setter. We currently don't get the value.
Source/WebInspectorUI:
* UserInterface/Controllers/_javascript_LogViewController.js:
(WebInspector._javascript_LogViewController.prototype.consolePromptTextCommitted):
* UserInterface/Controllers/_javascript_RuntimeCompletionProvider.js:
(get WebInspector._javascript_RuntimeCompletionProvider.prototype.):
Update RuntimeManager callsites that do not need object previews.
* UserInterface/Controllers/RuntimeManager.js:
(WebInspector.RuntimeManager.prototype.evalCallback):
(WebInspector.RuntimeManager.prototype.evaluateInInspectedWindow):
Update the main evaluate method to include a boolean parameter for
object previews. Most callers do not need them. Also, since previews
were not available on iOS 6, switch to invoke, to conditionally
include the command parameter.
* UserInterface/Protocol/RemoteObject.js:
(WebInspector.RemoteObject):
(WebInspector.RemoteObject.fromPayload):
(WebInspector.RemoteObject.prototype.get preview):
Store the preview from the payload.
* UserInterface/Views/ConsoleMessageImpl.js:
(WebInspector.ConsoleMessageImpl.prototype._format):
(WebInspector.ConsoleMessageImpl.prototype._formatParameter):
(WebInspector.ConsoleMessageImpl.prototype._formatParameterAsNode):
(WebInspector.ConsoleMessageImpl.prototype._formatParameterAsString):
(WebInspector.ConsoleMessageImpl.prototype._formatAsArrayEntry):
Pass an explicit false for most formatters to not use a preview if available.
(WebInspector.ConsoleMessageImpl.prototype._formatParameterAsArray):
(WebInspector.ConsoleMessageImpl.prototype._formatParameterAsObject):
Currently only object types are previewed. Though we request previews
for arrays, we don't use the preview because we show a better preview
by just immediately requesting for a full non-preview property list.
(WebInspector.ConsoleMessageImpl.prototype._appendObjectPreview):
Quickly output an object preview into the title element. The format
is ClassName {prop: value...}. Elide the class name if it is Object.
Also skip over certain preview properties that may not be useful
at a glance (like constructor, or accessors without values).
* UserInterface/Views/LogContentView.css:
(.console-object-preview):
(.console-formatted-array .console-object-preview):
(.console-object-preview-lossless):
(.expanded .console-object-preview):
Show lossy previews in italics.
Show lossless previews and array previews without italics.
Do not show the class name in the preview in italics when expanded.
(.console-object-preview .name):
Give preview property names the same color as ObjectPropertiesSection property names.
(.expanded .console-object-preview .console-object-preview-body):
When expanding an object, hide the preview.
(.console-object-preview .console-object-preview-name.console-object-preview-name-Object):
(.expanded .console-object-preview .console-object-preview-name.console-object-preview-name-Object):
For Object previews, hide the name Object when not expanded, and show it when expanded.
LayoutTests:
* inspector/debugger/command-line-api-exception-nested-catch.html:
* inspector/debugger/command-line-api-exception.html:
* inspector/model/remote-object-get-properties.html:
Update RuntimeManager callsites to not ask for previews when evaluating.
* inspector/model/remote-object-expected.txt: Added.
* inspector/model/remote-object.html: Added.
Add a test specifically for Remote Object. This test can also be
opened in a browser. It attempts to run the gamut of all different
types of objects and shows the RemoteObject constructed for it.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations
trunk/LayoutTests/inspector/debugger/command-line-api-exception-nested-catch.html
[webkit-changes] [179012] trunk/Source/WebCore
Title: [179012] trunk/Source/WebCore Revision 179012 Author akl...@apple.com Date 2015-01-23 10:44:22 -0800 (Fri, 23 Jan 2015) Log Message Hang CSSFontSelector off Document instead of StyleResolver. https://webkit.org/b/140820 Reviewed by Antti Koivisto. Move the CSSFontSelector from StyleResolver to Document. This is the first step towards making the CSSFontSelector be able to survive full style recalc. Clearing a Document's StyleResolver will still nuke the CSSFontSelector, though that is done in Document::clearStyleResolver() now. * css/CSSFontSelector.cpp: (WebCore::CSSFontSelector::CSSFontSelector): * css/CSSFontSelector.h: Modernize CSSFontSelector construction a bit by having create() return a Ref and the constructor take a Document instead of a Document*. Also made the constructor explicit. (WebCore::StyleResolver::~StyleResolver): * dom/Document.cpp: (WebCore::Document::clearStyleResolver): Nuke the current CSSFontSelector in clearStyleResolver() instead of in ~StyleResolver. It's a minor change, but shows the way forward. Added a FIXME about how CSSFontSelector should eventually survive this operation. (WebCore::Document::fontSelector): * css/FontLoader.cpp: (WebCore::FontLoader::loadFont): (WebCore::FontLoader::checkFont): (WebCore::FontLoader::resolveFontStyle): * css/RuleSet.cpp: (WebCore::RuleSet::addChildRules): * css/StyleResolver.h: (WebCore::StyleResolver::fontSelector): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::StyleResolver): (WebCore::StyleResolver::appendAuthorStyleSheets): (WebCore::StyleResolver::styleForElement): (WebCore::StyleResolver::defaultStyleForElement): (WebCore::StyleResolver::updateFont): * dom/Document.h: * html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::setFont): * rendering/RenderListBox.cpp: (WebCore::RenderListBox::updateFromElement): (WebCore::RenderListBox::paintItemForeground): * rendering/RenderMenuList.cpp: (RenderMenuList::fontSelector): * rendering/RenderSearchField.cpp: (WebCore::RenderSearchField::fontSelector): * rendering/TextAutoSizing.cpp: (WebCore::TextAutoSizingValue::adjustNodeSizes): (WebCore::TextAutoSizingValue::reset): * rendering/svg/RenderSVGInlineText.cpp: (WebCore::RenderSVGInlineText::computeNewScaledFontForStyle): * style/StyleResolveForDocument.cpp: (WebCore::Style::resolveForDocument): * style/StyleResolveTree.cpp: (WebCore::Style::resolveTree): Move CSSFontSelector ownership from StyleResolver to Document. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/css/CSSFontSelector.cpp trunk/Source/WebCore/css/CSSFontSelector.h trunk/Source/WebCore/css/FontLoader.cpp trunk/Source/WebCore/css/RuleSet.cpp trunk/Source/WebCore/css/StyleResolver.cpp trunk/Source/WebCore/css/StyleResolver.h trunk/Source/WebCore/dom/Document.cpp trunk/Source/WebCore/dom/Document.h trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp trunk/Source/WebCore/rendering/RenderListBox.cpp trunk/Source/WebCore/rendering/RenderMenuList.cpp trunk/Source/WebCore/rendering/RenderSearchField.cpp trunk/Source/WebCore/rendering/RenderThemeSafari.cpp trunk/Source/WebCore/rendering/TextAutoSizing.cpp trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp trunk/Source/WebCore/style/StyleResolveForDocument.cpp trunk/Source/WebCore/style/StyleResolveTree.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (179011 => 179012) --- trunk/Source/WebCore/ChangeLog 2015-01-23 18:28:05 UTC (rev 179011) +++ trunk/Source/WebCore/ChangeLog 2015-01-23 18:44:22 UTC (rev 179012) @@ -1,3 +1,70 @@ +2015-01-23 Andreas Kling akl...@apple.com + +Hang CSSFontSelector off Document instead of StyleResolver. +https://webkit.org/b/140820 + +Reviewed by Antti Koivisto. + +Move the CSSFontSelector from StyleResolver to Document. This is the first +step towards making the CSSFontSelector be able to survive full style recalc. + +Clearing a Document's StyleResolver will still nuke the CSSFontSelector, +though that is done in Document::clearStyleResolver() now. + +* css/CSSFontSelector.cpp: +(WebCore::CSSFontSelector::CSSFontSelector): +* css/CSSFontSelector.h: + +Modernize CSSFontSelector construction a bit by having create() return +a Ref and the constructor take a Document instead of a Document*. +Also made the constructor explicit. + +(WebCore::StyleResolver::~StyleResolver): +* dom/Document.cpp: +(WebCore::Document::clearStyleResolver): + +Nuke the current CSSFontSelector in clearStyleResolver() instead of +in ~StyleResolver. It's a minor change, but shows the way forward. +Added a FIXME about how CSSFontSelector should eventually survive +this operation. + +(WebCore::Document::fontSelector): +* css/FontLoader.cpp: +(WebCore::FontLoader::loadFont): +
[webkit-changes] [179018] branches/safari-600.5-branch/Source
Title: [179018] branches/safari-600.5-branch/Source Revision 179018 Author bshaf...@apple.com Date 2015-01-23 12:03:41 -0800 (Fri, 23 Jan 2015) Log Message Versioning. Modified Paths branches/safari-600.5-branch/Source/_javascript_Core/Configurations/Version.xcconfig branches/safari-600.5-branch/Source/WebCore/Configurations/Version.xcconfig branches/safari-600.5-branch/Source/WebInspectorUI/Configurations/Version.xcconfig branches/safari-600.5-branch/Source/WebKit/mac/Configurations/Version.xcconfig branches/safari-600.5-branch/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: branches/safari-600.5-branch/Source/_javascript_Core/Configurations/Version.xcconfig (179017 => 179018) --- branches/safari-600.5-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2015-01-23 20:01:50 UTC (rev 179017) +++ branches/safari-600.5-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2015-01-23 20:03:41 UTC (rev 179018) @@ -23,7 +23,7 @@ MAJOR_VERSION = 600; MINOR_VERSION = 5; -TINY_VERSION = 3; +TINY_VERSION = 4; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); Modified: branches/safari-600.5-branch/Source/WebCore/Configurations/Version.xcconfig (179017 => 179018) --- branches/safari-600.5-branch/Source/WebCore/Configurations/Version.xcconfig 2015-01-23 20:01:50 UTC (rev 179017) +++ branches/safari-600.5-branch/Source/WebCore/Configurations/Version.xcconfig 2015-01-23 20:03:41 UTC (rev 179018) @@ -23,7 +23,7 @@ MAJOR_VERSION = 600; MINOR_VERSION = 5; -TINY_VERSION = 3; +TINY_VERSION = 4; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); Modified: branches/safari-600.5-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (179017 => 179018) --- branches/safari-600.5-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-01-23 20:01:50 UTC (rev 179017) +++ branches/safari-600.5-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-01-23 20:03:41 UTC (rev 179018) @@ -1,6 +1,6 @@ MAJOR_VERSION = 600; MINOR_VERSION = 5; -TINY_VERSION = 3; +TINY_VERSION = 4; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); Modified: branches/safari-600.5-branch/Source/WebKit/mac/Configurations/Version.xcconfig (179017 => 179018) --- branches/safari-600.5-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2015-01-23 20:01:50 UTC (rev 179017) +++ branches/safari-600.5-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2015-01-23 20:03:41 UTC (rev 179018) @@ -23,7 +23,7 @@ MAJOR_VERSION = 600; MINOR_VERSION = 5; -TINY_VERSION = 3; +TINY_VERSION = 4; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); Modified: branches/safari-600.5-branch/Source/WebKit2/Configurations/Version.xcconfig (179017 => 179018) --- branches/safari-600.5-branch/Source/WebKit2/Configurations/Version.xcconfig 2015-01-23 20:01:50 UTC (rev 179017) +++ branches/safari-600.5-branch/Source/WebKit2/Configurations/Version.xcconfig 2015-01-23 20:03:41 UTC (rev 179018) @@ -23,7 +23,7 @@ MAJOR_VERSION = 600; MINOR_VERSION = 5; -TINY_VERSION = 3; +TINY_VERSION = 4; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179021] tags/Safari-600.5.3/
Title: [179021] tags/Safari-600.5.3/ Revision 179021 Author bshaf...@apple.com Date 2015-01-23 12:10:18 -0800 (Fri, 23 Jan 2015) Log Message New tag. Added Paths tags/Safari-600.5.3/ Diff Property changes: tags/Safari-600.5.3 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179020] branches/safari-600.1.4.15-branch/Source
Title: [179020] branches/safari-600.1.4.15-branch/Source Revision 179020 Author bshaf...@apple.com Date 2015-01-23 12:05:52 -0800 (Fri, 23 Jan 2015) Log Message Versioning. Modified Paths branches/safari-600.1.4.15-branch/Source/_javascript_Core/Configurations/Version.xcconfig branches/safari-600.1.4.15-branch/Source/WebCore/Configurations/Version.xcconfig branches/safari-600.1.4.15-branch/Source/WebInspectorUI/Configurations/Version.xcconfig branches/safari-600.1.4.15-branch/Source/WebKit/mac/Configurations/Version.xcconfig branches/safari-600.1.4.15-branch/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: branches/safari-600.1.4.15-branch/Source/_javascript_Core/Configurations/Version.xcconfig (179019 => 179020) --- branches/safari-600.1.4.15-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2015-01-23 20:05:44 UTC (rev 179019) +++ branches/safari-600.1.4.15-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2015-01-23 20:05:52 UTC (rev 179020) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 4; MICRO_VERSION = 15; -NANO_VERSION = 2; +NANO_VERSION = 3; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-600.1.4.15-branch/Source/WebCore/Configurations/Version.xcconfig (179019 => 179020) --- branches/safari-600.1.4.15-branch/Source/WebCore/Configurations/Version.xcconfig 2015-01-23 20:05:44 UTC (rev 179019) +++ branches/safari-600.1.4.15-branch/Source/WebCore/Configurations/Version.xcconfig 2015-01-23 20:05:52 UTC (rev 179020) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 4; MICRO_VERSION = 15; -NANO_VERSION = 2; +NANO_VERSION = 3; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-600.1.4.15-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (179019 => 179020) --- branches/safari-600.1.4.15-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-01-23 20:05:44 UTC (rev 179019) +++ branches/safari-600.1.4.15-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-01-23 20:05:52 UTC (rev 179020) @@ -2,7 +2,7 @@ MINOR_VERSION = 1; TINY_VERSION = 4; MICRO_VERSION = 15; -NANO_VERSION = 2; +NANO_VERSION = 3; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The system version prefix is based on the current system version. Modified: branches/safari-600.1.4.15-branch/Source/WebKit/mac/Configurations/Version.xcconfig (179019 => 179020) --- branches/safari-600.1.4.15-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2015-01-23 20:05:44 UTC (rev 179019) +++ branches/safari-600.1.4.15-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2015-01-23 20:05:52 UTC (rev 179020) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 4; MICRO_VERSION = 15; -NANO_VERSION = 2; +NANO_VERSION = 3; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/Configurations/Version.xcconfig (179019 => 179020) --- branches/safari-600.1.4.15-branch/Source/WebKit2/Configurations/Version.xcconfig 2015-01-23 20:05:44 UTC (rev 179019) +++ branches/safari-600.1.4.15-branch/Source/WebKit2/Configurations/Version.xcconfig 2015-01-23 20:05:52 UTC (rev 179020) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 4; MICRO_VERSION = 15; -NANO_VERSION = 2; +NANO_VERSION = 3; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179022] tags/Safari-600.1.4.15.2/
Title: [179022] tags/Safari-600.1.4.15.2/ Revision 179022 Author bshaf...@apple.com Date 2015-01-23 12:12:01 -0800 (Fri, 23 Jan 2015) Log Message New tag. Added Paths tags/Safari-600.1.4.15.2/ Diff Property changes: tags/Safari-600.1.4.15.2 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179024] trunk/Tools
Title: [179024] trunk/Tools
Revision 179024
Author bfulg...@apple.com
Date 2015-01-23 13:31:34 -0800 (Fri, 23 Jan 2015)
Log Message
[Win] Update DRT Accessibility implementation to better match Mac.
https://bugs.webkit.org/show_bug.cgi?id=140830
Reviewed by Dean Jackson.
* DumpRenderTree/win/AccessibilityUIElementWin.cpp:
(AccessibilityUIElement::titleUIElement):
(AccessibilityUIElement::parentElement):
(convertToDRTLabel):
(AccessibilityUIElement::role):
(AccessibilityUIElement::title):
(AccessibilityUIElement::description):
(AccessibilityUIElement::stringValue):
(AccessibilityUIElement::helpText):
(AccessibilityUIElement::isFocused):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
Diff
Modified: trunk/Tools/ChangeLog (179023 => 179024)
--- trunk/Tools/ChangeLog 2015-01-23 20:53:41 UTC (rev 179023)
+++ trunk/Tools/ChangeLog 2015-01-23 21:31:34 UTC (rev 179024)
@@ -1,3 +1,21 @@
+2015-01-23 Brent Fulgham bfulg...@apple.com
+
+[Win] Update DRT Accessibility implementation to better match Mac.
+https://bugs.webkit.org/show_bug.cgi?id=140830
+
+Reviewed by Dean Jackson.
+
+* DumpRenderTree/win/AccessibilityUIElementWin.cpp:
+(AccessibilityUIElement::titleUIElement):
+(AccessibilityUIElement::parentElement):
+(convertToDRTLabel):
+(AccessibilityUIElement::role):
+(AccessibilityUIElement::title):
+(AccessibilityUIElement::description):
+(AccessibilityUIElement::stringValue):
+(AccessibilityUIElement::helpText):
+(AccessibilityUIElement::isFocused):
+
2015-01-23 Sergio Villar Senin svil...@igalia.com
REGRESSION: run-perf-tests --profiler= seems to have broken
Modified: trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp (179023 => 179024)
--- trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp 2015-01-23 20:53:41 UTC (rev 179023)
+++ trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp 2015-01-23 21:31:34 UTC (rev 179024)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008, 2013, 2014 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2013, 2014-2015 Apple Inc. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -209,7 +209,7 @@
AccessibilityUIElement AccessibilityUIElement::parentElement()
{
if (!m_element)
-return 0;
+return nullptr;
COMPtrIDispatch parent;
m_element-get_accParent(parent);
@@ -240,18 +240,64 @@
return vSelf;
}
+static _bstr_t convertToDRTLabel(const _bstr_t roleName)
+{
+if (!wcscmp(roleName, Lcell))
+return _bstr_t(LAXCell);
+if (!wcscmp(roleName, Lcheck box))
+return _bstr_t(LAXCheckBox);
+if (!wcscmp(roleName, Lclient))
+return _bstr_t(LAXWebArea);
+if (!wcscmp(roleName, Lcolumn))
+return _bstr_t(LAXColumn);
+if (!wcscmp(roleName, Lcombo box))
+return _bstr_t(LAXComboBox);
+if (!wcscmp(roleName, Lgrouping))
+return _bstr_t(LAXGroup);
+if (!wcscmp(roleName, Leditable text))
+return _bstr_t(LAXStaticText); // Might be AXTextField, too.
+if (!wcscmp(roleName, Lgraphic))
+return _bstr_t(LAXImage);
+if (!wcscmp(roleName, Llink))
+return _bstr_t(LAXLink);
+if (!wcscmp(roleName, Llist item))
+return _bstr_t(LAXTab);
+if (!wcscmp(roleName, Llist))
+return _bstr_t(LAXList);
+if (!wcscmp(roleName, Lmenu bar))
+return _bstr_t(LAXMenuBar);
+if (!wcscmp(roleName, Lpage tab list))
+return _bstr_t(LAXTabGroup);
+if (!wcscmp(roleName, Lpage tab))
+return _bstr_t(LAXTab);
+if (!wcscmp(roleName, Lpush button))
+return _bstr_t(LAXButton);
+if (!wcscmp(roleName, Lprogress bar))
+return _bstr_t(LAXProgressIndicator);
+if (!wcscmp(roleName, Lradio button))
+return _bstr_t(LAXRadioButton);
+if (!wcscmp(roleName, Lrow))
+return _bstr_t(LAXRow);
+if (!wcscmp(roleName, Ltable))
+return _bstr_t(LAXTable);
+if (!wcscmp(roleName, Ltext))
+return _bstr_t(LAXStaticText);
+
+return roleName;
+}
+
JSStringRef AccessibilityUIElement::role()
{
if (!m_element)
-return JSStringCreateWithCharacters(0, 0);
+return JSStringCreateWithBSTR(_bstr_t(LAXRole: ));
_variant_t vRole;
if (FAILED(m_element-get_accRole(self(), vRole.GetVARIANT(
-return JSStringCreateWithCharacters(nullptr, 0);
+return JSStringCreateWithBSTR(_bstr_t(LAXRole: ));
ASSERT(V_VT(vRole) == VT_I4 || V_VT(vRole) == VT_BSTR);
-wstring result;
+_bstr_t result;
if (V_VT(vRole) == VT_I4) {
unsigned roleTextLength = ::GetRoleText(V_I4(vRole), nullptr, 0) + 1;
@@ -261,9 +307,9 @@
result = roleText.data();
} else if (V_VT(vRole) == VT_BSTR)
-result =
[webkit-changes] [179029] branches/safari-600.5-branch
Title: [179029] branches/safari-600.5-branch Revision 179029 Author dburk...@apple.com Date 2015-01-23 15:04:58 -0800 (Fri, 23 Jan 2015) Log Message Merged r174489. rdar://problem/19452129 Modified Paths branches/safari-600.5-branch/LayoutTests/ChangeLog branches/safari-600.5-branch/Source/WebCore/ChangeLog branches/safari-600.5-branch/Source/WebCore/platform/graphics/Font.h branches/safari-600.5-branch/Source/WebCore/rendering/InlineBox.h branches/safari-600.5-branch/Source/WebCore/rendering/InlineTextBox.h branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp branches/safari-600.5-branch/Source/WebCore/rendering/RenderBox.cpp branches/safari-600.5-branch/Source/WebCore/rendering/RenderRubyBase.cpp branches/safari-600.5-branch/Source/WebCore/rendering/RenderRubyRun.h Added Paths branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-expected.html branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-hittest.html branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification.html Diff Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (179028 => 179029) --- branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-01-23 23:03:28 UTC (rev 179028) +++ branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-01-23 23:04:58 UTC (rev 179029) @@ -1,3 +1,27 @@ +2015-01-23 Dana Burkart dburk...@apple.com + +Merged r174489. rdar://problem/19452129 + +2014-10-08 Myles C. Maxfield mmaxfi...@apple.com + +Inline ruby does not get justified correctly +https://bugs.webkit.org/show_bug.cgi?id=137421 + +Reviewed by Dave Hyatt. + +Test that ruby gets spaces inside the ruby base, and that hit testing the +ruby base gives us correct answers. + +* fast/ruby/ruby-justification-expected.html: Added. +* fast/ruby/ruby-justification-hittest-expected.txt: Added. +* fast/ruby/ruby-justification-hittest.html: Added. +* fast/ruby/ruby-justification.html: Added. +* platform/mac/fast/ruby/bopomofo-rl-expected.txt: Ruby text gets the CSS +property text-align: justify, which worked prior to this patch. However, this +patch now justifies ruby bases, so now if there is text that is both a ruby +base and ruby text (such as ruby in ruby) it correctly gets justified. This +test does such, and therefore needs to be rebaselined. + 2015-01-22 Matthew Hanson matthew_han...@apple.com Merge r175264. rdar://problem/19451378 Copied: branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-expected.html (from rev 174489, trunk/LayoutTests/fast/ruby/ruby-justification-expected.html) (0 => 179029) --- branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-expected.html (rev 0) +++ branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-expected.html 2015-01-23 23:04:58 UTC (rev 179029) @@ -0,0 +1,21 @@ +This test makes sure that ruby inside text-align: justify has its contents justified. +div style=text-align: justify; font-size: 16px; +div +abcdefg abcdefg mmm +/div +div +abcdefg abcdefg abcdefg mmm +/div +div +abcdefg rubyabcdefgrtspan style=color: transparent;a/span/ruby abcdefg mmm +/div +/div +div style=font-family: Ahem; font-size: 16px; +rubyabcdefgnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;abcdefgrta/ruby m +/div +div style=text-align: right; +a +/div +div style=text-align: justify; +abcdefg abcdefg mmm +/div Copied: branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt (from rev 174489, trunk/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt) (0 => 179029) --- branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt (rev 0) +++ branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt 2015-01-23 23:04:58 UTC (rev 179029) @@ -0,0 +1,11 @@ +This test makes sure that hit testing works with ruby inside text-align: justify. + +On success, you will see a series of PASS messages, followed by TEST COMPLETE. + + +PASS right is 792 +PASS document.elementFromPoint(right - 1, bottom - 1).id is ruby +PASS successfullyParsed is true + +TEST COMPLETE +abcdefg abcdefga m Copied:
[webkit-changes] [179030] branches/safari-600.1.4.15-branch/Source/WebCore
Title: [179030] branches/safari-600.1.4.15-branch/Source/WebCore
Revision 179030
Author lforsch...@apple.com
Date 2015-01-23 15:05:05 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r174297. rdar://problem/19434944
Modified Paths
branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp
branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.h
branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/WidthIterator.cpp
branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp
branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp
branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp
branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.h
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179029 => 179030)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-23 23:04:58 UTC (rev 179029)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-23 23:05:05 UTC (rev 179030)
@@ -1,5 +1,43 @@
2015-01-23 Lucas Forschler lforsch...@apple.com
+Merge r174297
+
+2014-10-03 Myles C. Maxfield mmaxfi...@apple.com
+
+Clean up interface to Font::expansionOpportunityCount()
+https://bugs.webkit.org/show_bug.cgi?id=137355
+
+Reviewed by Dean Jackson.
+
+There are two overloads of Font::expansionOpportunityCount() which perform the same
+operation. One overload takes a UChar*, the other takes an LChar*, and they both
+take a length. This is the abstraction that StringView was designed to be. Instead
+of forcing each caller to take a different overload based on if their data is
+8 bit or not, allow the caller to construct a StringView and pass that into
+Font::expansionOpportunityCount() instead of a raw pointer/length.
+
+No new tests because there is no behavior change.
+
+* platform/graphics/Font.cpp:
+(WebCore::Font::expansionOpportunityCountInternal): Original two functions,
+renamed.
+(WebCore::Font::expansionOpportunityCount): Takes a StringView, calls
+expansionOpportunityCountInternal().
+* platform/graphics/Font.h: Update signatures.
+* platform/graphics/WidthIterator.cpp:
+(WebCore::WidthIterator::WidthIterator): Use new signature to
+Font::expansionOpportunityCount().
+* platform/graphics/mac/ComplexTextController.cpp:
+(WebCore::ComplexTextController::ComplexTextController): Ditto.
+* rendering/RenderBlockLineLayout.cpp:
+(WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment): Ditto.
+* rendering/RenderText.cpp:
+(WebCore::RenderText::stringView): Accessor to encapsulate character pointer
+and length.
+* rendering/RenderText.h: Signature of new accessor.
+
+2015-01-23 Lucas Forschler lforsch...@apple.com
+
Merge r174233
2014-10-01 Myles C. Maxfield mmaxfi...@apple.com
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp (179029 => 179030)
--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp 2015-01-23 23:04:58 UTC (rev 179029)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp 2015-01-23 23:05:05 UTC (rev 179030)
@@ -968,7 +968,7 @@
return isCJKIdeograph(c);
}
-unsigned Font::expansionOpportunityCount(const LChar* characters, size_t length, TextDirection direction, bool isAfterExpansion)
+unsigned Font::expansionOpportunityCountInternal(const LChar* characters, size_t length, TextDirection direction, bool isAfterExpansion)
{
unsigned count = 0;
if (direction == LTR) {
@@ -991,7 +991,7 @@
return count;
}
-unsigned Font::expansionOpportunityCount(const UChar* characters, size_t length, TextDirection direction, bool isAfterExpansion)
+unsigned Font::expansionOpportunityCountInternal(const UChar* characters, size_t length, TextDirection direction, bool isAfterExpansion)
{
static bool expandAroundIdeographs = canExpandAroundIdeographsInComplexText();
unsigned count = 0;
@@ -1041,6 +1041,13 @@
return count;
}
+unsigned Font::expansionOpportunityCount(const StringView stringView, TextDirection direction, bool isAfterExpansion)
+{
+if (stringView.is8Bit())
+return expansionOpportunityCountInternal(stringView.characters8(), stringView.length(), direction, isAfterExpansion);
+return expansionOpportunityCountInternal(stringView.characters16(), stringView.length(), direction, isAfterExpansion);
+}
+
bool Font::canReceiveTextEmphasis(UChar32 c)
{
if (U_GET_GC_MASK(c) (U_GC_Z_MASK | U_GC_CN_MASK | U_GC_CC_MASK |
[webkit-changes] [179027] trunk
Title: [179027] trunk
Revision 179027
Author enr...@apple.com
Date 2015-01-23 14:16:31 -0800 (Fri, 23 Jan 2015)
Log Message
Hit test returns incorrect results when performed in paginated content over the page gaps.
https://bugs.webkit.org/show_bug.cgi?id=140837
rdar://problem/17494390
Reviewed by Dave Hyatt.
Source/WebCore:
Tests: fast/multicol/pagination/LeftToRight-tb-hittest.html
fast/multicol/pagination/RightToLeft-rl-hittest.html
When hittesting reaches the RenderView we need to check if we are
in paginated content and use the correct class to compute hittest results.
* rendering/RenderView.cpp:
(WebCore::RenderView::updateHitTestResult):
LayoutTests:
* fast/multicol/pagination/LeftToRight-tb-hittest-expected.txt: Added.
* fast/multicol/pagination/LeftToRight-tb-hittest.html: Added.
* fast/multicol/pagination/RightToLeft-rl-hittest-expected.txt: Added.
* fast/multicol/pagination/RightToLeft-rl-hittest.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderView.cpp
Added Paths
trunk/LayoutTests/fast/multicol/pagination/LeftToRight-tb-hittest-expected.txt
trunk/LayoutTests/fast/multicol/pagination/LeftToRight-tb-hittest.html
trunk/LayoutTests/fast/multicol/pagination/RightToLeft-rl-hittest-expected.txt
trunk/LayoutTests/fast/multicol/pagination/RightToLeft-rl-hittest.html
Diff
Modified: trunk/LayoutTests/ChangeLog (179026 => 179027)
--- trunk/LayoutTests/ChangeLog 2015-01-23 21:57:23 UTC (rev 179026)
+++ trunk/LayoutTests/ChangeLog 2015-01-23 22:16:31 UTC (rev 179027)
@@ -1,3 +1,16 @@
+2015-01-23 Enrica Casucci enr...@apple.com
+
+Hit test returns incorrect results when performed in paginated content over the page gaps.
+https://bugs.webkit.org/show_bug.cgi?id=140837
+rdar://problem/17494390
+
+Reviewed by Dave Hyatt.
+
+* fast/multicol/pagination/LeftToRight-tb-hittest-expected.txt: Added.
+* fast/multicol/pagination/LeftToRight-tb-hittest.html: Added.
+* fast/multicol/pagination/RightToLeft-rl-hittest-expected.txt: Added.
+* fast/multicol/pagination/RightToLeft-rl-hittest.html: Added.
+
2015-01-23 Brent Fulgham bfulg...@apple.com
[Win] Unreviewed gardening after landing r179024.
Added: trunk/LayoutTests/fast/multicol/pagination/LeftToRight-tb-hittest-expected.txt (0 => 179027)
--- trunk/LayoutTests/fast/multicol/pagination/LeftToRight-tb-hittest-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/multicol/pagination/LeftToRight-tb-hittest-expected.txt 2015-01-23 22:16:31 UTC (rev 179027)
@@ -0,0 +1,132 @@
+layer at (0,0) size 2460x585
+ RenderView at (0,0) size 800x585
+RenderMultiColumnSet at (0,0) size 800x585
+layer at (0,0) size 385x3122 backgroundClip at (0,0) size 2460x585 clip at (0,0) size 2460x585 outlineClip at (0,0) size 2460x585
+ RenderMultiColumnFlowThread at (0,0) size 385x3122
+layer at (0,0) size 385x3122 backgroundClip at (0,0) size 2460x585 clip at (0,0) size 2460x585 outlineClip at (0,0) size 2460x585
+ RenderBlock {HTML} at (0,0) size 385x3122 [border: (1px solid #008000)]
+RenderBody {BODY} at (4,4) size 377x3114 [border: (1px solid #00)]
+ RenderBlock {P} at (1,25) size 375x364
+RenderText {#text} at (0,0) size 373x364
+ text run at (0,0) width 291: 1 Lorem ipsum dolor sit amet,
+ text run at (0,28) width 332: consectetur adipisicing elit, sed do
+ text run at (0,56) width 373: eiusmod tempor incididunt ut labore et
+ text run at (0,84) width 315: dolore magna aliqua. Ut enim ad
+ text run at (0,112) width 270: minim veniam, quis nostrud
+ text run at (0,140) width 334: exercitation ullamco laboris nisi ut
+ text run at (0,168) width 333: aliquip ex ea commodo consequat.
+ text run at (0,196) width 358: Duis aute irure dolor in reprehenderit
+ text run at (0,224) width 372: in voluptate velit esse cillum dolore eu
+ text run at (0,252) width 340: fugiat nulla pariatur. Excepteur sint
+ text run at (0,280) width 357: occaecat cupidatat non proident, sunt
+ text run at (0,308) width 332: in culpa qui officia deserunt mollit
+ text run at (0,336) width 198: anim id est laborum.
+ RenderBlock {P} at (1,413) size 375x364
+RenderText {#text} at (0,0) size 373x364
+ text run at (0,0) width 291: 2 Lorem ipsum dolor sit amet,
+ text run at (0,28) width 332: consectetur adipisicing elit, sed do
+ text run at (0,56) width 373: eiusmod tempor incididunt ut labore et
+ text run at (0,84) width 315: dolore magna aliqua. Ut enim ad
+ text run at (0,112) width 270: minim veniam, quis nostrud
+ text run at (0,140) width 334: exercitation ullamco laboris nisi ut
+ text run at (0,168) width 333: aliquip ex ea commodo consequat.
+ text run at (0,196) width 358: Duis
[webkit-changes] [179031] branches/safari-600.1.4.15-branch/Source/WebCore
Title: [179031] branches/safari-600.1.4.15-branch/Source/WebCore
Revision 179031
Author lforsch...@apple.com
Date 2015-01-23 15:06:46 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r174373. rdar://problem/19434944
Modified Paths
branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179030 => 179031)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-23 23:05:05 UTC (rev 179030)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-23 23:06:46 UTC (rev 179031)
@@ -1,5 +1,19 @@
2015-01-23 Lucas Forschler lforsch...@apple.com
+Merge r174373
+
+2014-10-06 Myles C. Maxfield mmaxfi...@apple.com
+
+Addressing post-review comment on r174297.
+https://bugs.webkit.org/show_bug.cgi?id=137355
+
+Unreviewed.
+
+* rendering/RenderText.cpp:
+(WebCore::RenderText::stringView):
+
+2015-01-23 Lucas Forschler lforsch...@apple.com
+
Merge r174297
2014-10-03 Myles C. Maxfield mmaxfi...@apple.com
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp (179030 => 179031)
--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp 2015-01-23 23:05:05 UTC (rev 179030)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp 2015-01-23 23:06:46 UTC (rev 179031)
@@ -1527,6 +1527,11 @@
StringView RenderText::stringView(int start, int stop) const
{
+ASSERT(static_castunsigned(start) = length());
+ASSERT(static_castunsigned(stop) = length());
+ASSERT(start = stop);
+ASSERT(start = 0);
+ASSERT(stop = 0);
if (is8Bit())
return StringView(characters8() + start, stop - start);
return StringView(characters16() + start, stop - start);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179026] trunk/LayoutTests
Title: [179026] trunk/LayoutTests Revision 179026 Author bfulg...@apple.com Date 2015-01-23 13:57:23 -0800 (Fri, 23 Jan 2015) Log Message [Win] Unreviewed gardening after landing r179024. Update Windows-specific accessibility tests and test expectations after making Windows AX output match Mac. This allows us to share more Mac results. * platform/win/TestExpectations: * platform/win/accessibility/adjacent-continuations-cause-assertion-failure-expected.txt: * platform/win/accessibility/aria-checkbox-text-expected.txt: Removed. * platform/win/accessibility/aria-combobox-expected.txt: * platform/win/accessibility/aria-fallback-roles-expected.txt: Removed. * platform/win/accessibility/aria-hidden-expected.txt: Removed. * platform/win/accessibility/aria-labelledby-on-input-expected.txt: Removed. * platform/win/accessibility/aria-labelledby-overrides-aria-label-expected.txt: * platform/win/accessibility/aria-labelledby-overrides-label-expected.txt: Removed. * platform/win/accessibility/aria-list-and-listitem-expected.txt: * platform/win/accessibility/aria-mappings-expected.txt: Added. * platform/win/accessibility/aria-menubar-menuitems-expected.txt: * platform/win/accessibility/aria-option-role-expected.txt: * platform/win/accessibility/aria-presentational-role-expected.txt: Removed. * platform/win/accessibility/aria-roles-expected.txt: * platform/win/accessibility/aria-tab-role-on-buttons-expected.txt: * platform/win/accessibility/aria-tab-roles-expected.txt: * platform/win/accessibility/aria-toggle-button-with-title-expected.txt: Removed. * platform/win/accessibility/canvas-description-and-role-expected.txt: * platform/win/accessibility/canvas-fallback-content-expected.txt: * platform/win/accessibility/css-content-attribute-expected.txt: Added. * platform/win/accessibility/deleting-iframe-destroys-axcache-expected.txt: * platform/win/accessibility/div-within-anchors-causes-crash-expected.txt: * platform/win/accessibility/document-enabled-state-expected.txt: * platform/win/accessibility/document-enabled-state.html: * platform/win/accessibility/document-role-expected.txt: * platform/win/accessibility/heading-elements-expected.txt: * platform/win/accessibility/heading-elements.html: * platform/win/accessibility/image-map1-expected.txt: Added. * platform/win/accessibility/image-with-alt-and-map-expected.txt: Added. * platform/win/accessibility/img-alt-attribute-expected.txt: * platform/win/accessibility/img-alt-attribute.html: * platform/win/accessibility/img-alt-tag-only-whitespace-expected.txt: Removed. * platform/win/accessibility/img-aria-button-alt-tag-expected.txt: Removed. * platform/win/accessibility/img-fallsback-to-title-expected.txt: Removed. * platform/win/accessibility/input-image-alt-expected.txt: Removed. * platform/win/accessibility/linked-elements-expected.txt: * platform/win/accessibility/linked-elements.html: * platform/win/accessibility/list-item-role-expected.txt: * platform/win/accessibility/list-item-role.html: * platform/win/accessibility/list-marker-role-expected.txt: * platform/win/accessibility/list-marker-role.html: * platform/win/accessibility/list-role-expected.txt: * platform/win/accessibility/list-role.html: * platform/win/accessibility/multiple-select-element-role-expected.txt: * platform/win/accessibility/multiple-select-element-role.html: * platform/win/accessibility/parent-element-expected.txt: * platform/win/accessibility/parent-element.html: * platform/win/accessibility/select-element-role-expected.txt: * platform/win/accessibility/select-element-role.html: * platform/win/accessibility/selection-and-focus-expected.txt: * platform/win/accessibility/selection-and-focus.html: * platform/win/accessibility/single-select-children.html: * platform/win/accessibility/svg-image-expected.txt: Removed. * platform/win/accessibility/text-role-expected.txt: * platform/win/aria-labelledby-overrides-aria-label-actual.txt: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/win/TestExpectations trunk/LayoutTests/platform/win/accessibility/adjacent-continuations-cause-assertion-failure-expected.txt trunk/LayoutTests/platform/win/accessibility/aria-combobox-expected.txt trunk/LayoutTests/platform/win/accessibility/aria-labelledby-overrides-aria-label-expected.txt trunk/LayoutTests/platform/win/accessibility/aria-list-and-listitem-expected.txt trunk/LayoutTests/platform/win/accessibility/aria-menubar-menuitems-expected.txt trunk/LayoutTests/platform/win/accessibility/aria-option-role-expected.txt trunk/LayoutTests/platform/win/accessibility/aria-roles-expected.txt trunk/LayoutTests/platform/win/accessibility/aria-tab-role-on-buttons-expected.txt trunk/LayoutTests/platform/win/accessibility/aria-tab-roles-expected.txt trunk/LayoutTests/platform/win/accessibility/canvas-description-and-role-expected.txt trunk/LayoutTests/platform/win/accessibility/canvas-fallback-content-expected.txt
[webkit-changes] [179032] branches/safari-600.1.4.15-branch
Title: [179032] branches/safari-600.1.4.15-branch Revision 179032 Author lforsch...@apple.com Date 2015-01-23 15:09:00 -0800 (Fri, 23 Jan 2015) Log Message Merged r174489. rdar://problem/19434944 Modified Paths branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.h branches/safari-600.1.4.15-branch/Source/WebCore/rendering/InlineBox.h branches/safari-600.1.4.15-branch/Source/WebCore/rendering/InlineTextBox.h branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBox.cpp branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderRubyBase.cpp branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderRubyRun.h branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.h Added Paths branches/safari-600.1.4.15-branch/LayoutTests/fast/ruby/ruby-justification-expected.html branches/safari-600.1.4.15-branch/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt branches/safari-600.1.4.15-branch/LayoutTests/fast/ruby/ruby-justification-hittest.html branches/safari-600.1.4.15-branch/LayoutTests/fast/ruby/ruby-justification.html Diff Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (179031 => 179032) --- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-23 23:06:46 UTC (rev 179031) +++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-23 23:09:00 UTC (rev 179032) @@ -1,5 +1,29 @@ 2015-01-23 Lucas Forschler lforsch...@apple.com +Merge r174489 + +2014-10-08 Myles C. Maxfield mmaxfi...@apple.com + +Inline ruby does not get justified correctly +https://bugs.webkit.org/show_bug.cgi?id=137421 + +Reviewed by Dave Hyatt. + +Test that ruby gets spaces inside the ruby base, and that hit testing the +ruby base gives us correct answers. + +* fast/ruby/ruby-justification-expected.html: Added. +* fast/ruby/ruby-justification-hittest-expected.txt: Added. +* fast/ruby/ruby-justification-hittest.html: Added. +* fast/ruby/ruby-justification.html: Added. +* platform/mac/fast/ruby/bopomofo-rl-expected.txt: Ruby text gets the CSS +property text-align: justify, which worked prior to this patch. However, this +patch now justifies ruby bases, so now if there is text that is both a ruby +base and ruby text (such as ruby in ruby) it correctly gets justified. This +test does such, and therefore needs to be rebaselined. + +2015-01-23 Lucas Forschler lforsch...@apple.com + Merge r174233 2014-10-01 Myles C. Maxfield mmaxfi...@apple.com Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/ruby/ruby-justification-expected.html (from rev 174489, trunk/LayoutTests/fast/ruby/ruby-justification-expected.html) (0 => 179032) --- branches/safari-600.1.4.15-branch/LayoutTests/fast/ruby/ruby-justification-expected.html (rev 0) +++ branches/safari-600.1.4.15-branch/LayoutTests/fast/ruby/ruby-justification-expected.html 2015-01-23 23:09:00 UTC (rev 179032) @@ -0,0 +1,21 @@ +This test makes sure that ruby inside text-align: justify has its contents justified. +div style=text-align: justify; font-size: 16px; +div +abcdefg abcdefg mmm +/div +div +abcdefg abcdefg abcdefg mmm +/div +div +abcdefg rubyabcdefgrtspan style=color: transparent;a/span/ruby abcdefg mmm +/div +/div +div style=font-family: Ahem; font-size: 16px; +rubyabcdefgnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;abcdefgrta/ruby m +/div +div style=text-align: right; +a +/div +div style=text-align: justify; +abcdefg abcdefg mmm +/div Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt (from rev 174489, trunk/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt) (0 => 179032) --- branches/safari-600.1.4.15-branch/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt (rev 0) +++ branches/safari-600.1.4.15-branch/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt 2015-01-23 23:09:00 UTC (rev 179032) @@ -0,0 +1,11 @@ +This test makes sure that hit testing works with ruby inside text-align: justify. + +On success, you will see a series of PASS messages, followed
[webkit-changes] [179025] trunk/Source/WebCore
Title: [179025] trunk/Source/WebCore
Revision 179025
Author akl...@apple.com
Date 2015-01-23 13:39:28 -0800 (Fri, 23 Jan 2015)
Log Message
Document should be a FontSelectorClient.
https://webkit.org/b/140833
Reviewed by Antti Koivisto.
Make Document a FontSelectorClient so it can listen to the invalidation
callbacks from FontSelector instead of having code in FontSelector that
calls out to Document on invalidation.
* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::dispatchInvalidationCallbacks):
* dom/Document.cpp:
(WebCore::Document::fontsNeedUpdate):
(WebCore::Document::fontSelector):
(WebCore::Document::clearStyleResolver):
* dom/Document.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSFontSelector.cpp
trunk/Source/WebCore/dom/Document.cpp
trunk/Source/WebCore/dom/Document.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (179024 => 179025)
--- trunk/Source/WebCore/ChangeLog 2015-01-23 21:31:34 UTC (rev 179024)
+++ trunk/Source/WebCore/ChangeLog 2015-01-23 21:39:28 UTC (rev 179025)
@@ -1,3 +1,22 @@
+2015-01-23 Andreas Kling akl...@apple.com
+
+Document should be a FontSelectorClient.
+https://webkit.org/b/140833
+
+Reviewed by Antti Koivisto.
+
+Make Document a FontSelectorClient so it can listen to the invalidation
+callbacks from FontSelector instead of having code in FontSelector that
+calls out to Document on invalidation.
+
+* css/CSSFontSelector.cpp:
+(WebCore::CSSFontSelector::dispatchInvalidationCallbacks):
+* dom/Document.cpp:
+(WebCore::Document::fontsNeedUpdate):
+(WebCore::Document::fontSelector):
+(WebCore::Document::clearStyleResolver):
+* dom/Document.h:
+
2015-01-23 Chris Dumez cdu...@apple.com
Leverage CSSValuePool's font family cache in CSSComputedStyleDeclaration
Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (179024 => 179025)
--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2015-01-23 21:31:34 UTC (rev 179024)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2015-01-23 21:39:28 UTC (rev 179025)
@@ -338,15 +338,6 @@
copyToVector(m_clients, clients);
for (size_t i = 0; i clients.size(); ++i)
clients[i]-fontsNeedUpdate(this);
-
-// FIXME: Make Document a FontSelectorClient so that it can simply register for invalidation callbacks.
-if (!m_document)
-return;
-if (StyleResolver* styleResolver = m_document-styleResolverIfExists())
-styleResolver-invalidateMatchedPropertiesCache();
-if (m_document-inPageCache() || !m_document-renderView())
-return;
-m_document-scheduleForcedStyleRecalc();
}
void CSSFontSelector::fontLoaded()
Modified: trunk/Source/WebCore/dom/Document.cpp (179024 => 179025)
--- trunk/Source/WebCore/dom/Document.cpp 2015-01-23 21:31:34 UTC (rev 179024)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-01-23 21:39:28 UTC (rev 179025)
@@ -1942,10 +1942,21 @@
m_styleSheetCollection.combineCSSFeatureFlags();
}
+void Document::fontsNeedUpdate(FontSelector*)
+{
+if (m_styleResolver)
+m_styleResolver-invalidateMatchedPropertiesCache();
+if (inPageCache() || !renderView())
+return;
+scheduleForcedStyleRecalc();
+}
+
CSSFontSelector Document::fontSelector()
{
-if (!m_fontSelector)
+if (!m_fontSelector) {
m_fontSelector = CSSFontSelector::create(*this);
+m_fontSelector-registerForInvalidationCallbacks(this);
+}
return *m_fontSelector;
}
@@ -1956,6 +1967,7 @@
// FIXME: It would be better if the FontSelector could survive this operation.
if (m_fontSelector) {
m_fontSelector-clearDocument();
+m_fontSelector-unregisterForInvalidationCallbacks(this);
m_fontSelector = nullptr;
}
}
Modified: trunk/Source/WebCore/dom/Document.h (179024 => 179025)
--- trunk/Source/WebCore/dom/Document.h 2015-01-23 21:31:34 UTC (rev 179024)
+++ trunk/Source/WebCore/dom/Document.h 2015-01-23 21:39:28 UTC (rev 179025)
@@ -35,6 +35,7 @@
#include DocumentStyleSheetCollection.h
#include DocumentTiming.h
#include FocusDirection.h
+#include FontSelector.h
#include IconURL.h
#include MutationObserver.h
#include PageVisibilityState.h
@@ -256,7 +257,7 @@
LimitedQuirksMode = 1 2
};
-class Document : public ContainerNode, public TreeScope, public ScriptExecutionContext {
+class Document : public ContainerNode, public TreeScope, public ScriptExecutionContext, public FontSelectorClient {
public:
static RefDocument create(Frame* frame, const URL url)
{
@@ -1307,6 +1308,9 @@
typedef void (*ArgumentsCallback)(const String keyString, const String valueString, Document*, void* data);
void processArguments(const String features, void* data, ArgumentsCallback);
+// FontSelectorClient
+virtual void fontsNeedUpdate(FontSelector*) override final;
+
virtual bool isDocument() const override final { return true; }
[webkit-changes] [178993] branches/safari-600.5-branch/Source/WebKit/mac
Title: [178993] branches/safari-600.5-branch/Source/WebKit/mac
Revision 178993
Author bshaf...@apple.com
Date 2015-01-23 01:18:43 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r178680. rdar://problem/19489593
Modified Paths
branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog
branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm
Diff
Modified: branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog (178992 => 178993)
--- branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-23 09:17:30 UTC (rev 178992)
+++ branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-23 09:18:43 UTC (rev 178993)
@@ -1,5 +1,16 @@
2015-01-23 Babak Shafiei bshaf...@apple.com
+Merge r178680. rdar://problem/19489593
+
+2015-01-19 Beth Dakin bda...@apple.com
+
+Speculative build fix.
+
+* WebView/WebView.mm:
+(-[WebView _convertRectFromRootView:]):
+
+2015-01-23 Babak Shafiei bshaf...@apple.com
+
Merge r178676. rdar://problem/19489593
2015-01-19 Beth Dakin bda...@apple.com
Modified: branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm (178992 => 178993)
--- branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm 2015-01-23 09:17:30 UTC (rev 178992)
+++ branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm 2015-01-23 09:18:43 UTC (rev 178993)
@@ -8578,8 +8578,10 @@
- (NSRect)_convertRectFromRootView:(NSRect)rect
{
+#if PLATFORM(MAC)
if (self.isFlipped)
return rect;
+#endif
return NSMakeRect(rect.origin.x, [self bounds].size.height - rect.origin.y - rect.size.height, rect.size.width, rect.size.height);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179036] trunk/Websites/perf.webkit.org
Title: [179036] trunk/Websites/perf.webkit.org
Revision 179036
Author rn...@webkit.org
Date 2015-01-23 16:21:15 -0800 (Fri, 23 Jan 2015)
Log Message
Unreviewed typo fix. The prefix in triggerable_configurations is trigconfig, not trigrepo.
* public/admin/tests.php:
Modified Paths
trunk/Websites/perf.webkit.org/ChangeLog
trunk/Websites/perf.webkit.org/public/admin/tests.php
Diff
Modified: trunk/Websites/perf.webkit.org/ChangeLog (179035 => 179036)
--- trunk/Websites/perf.webkit.org/ChangeLog 2015-01-23 23:48:14 UTC (rev 179035)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2015-01-24 00:21:15 UTC (rev 179036)
@@ -1,3 +1,9 @@
+2015-01-23 Ryosuke Niwa rn...@webkit.org
+
+Unreviewed typo fix. The prefix in triggerable_configurations is trigconfig, not trigrepo.
+
+* public/admin/tests.php:
+
2015-01-10 Ryosuke Niwa rn...@webkit.org
Unreviewed build fix. Removed the stale code.
Modified: trunk/Websites/perf.webkit.org/public/admin/tests.php (179035 => 179036)
--- trunk/Websites/perf.webkit.org/public/admin/tests.php 2015-01-23 23:48:14 UTC (rev 179035)
+++ trunk/Websites/perf.webkit.org/public/admin/tests.php 2015-01-24 00:21:15 UTC (rev 179036)
@@ -45,7 +45,7 @@
notice(Failed to associate triggerable $triggerable_id with test $test_id on platform $platform_id.);
}
} else {
-$db-query_and_get_affected_rows('DELETE FROM triggerable_configurations WHERE trigrepo_test = $1 AND trigrepo_platform = $2',
+$db-query_and_get_affected_rows('DELETE FROM triggerable_configurations WHERE trigconfig_test = $1 AND trigconfig_platform = $2',
array($test_id, $platform_id));
}
} else if ($action == 'add') {
@@ -120,8 +120,8 @@
$test_url = htmlspecialchars($test['test_url']);
-$triggerable_platforms = $db-query_and_fetch_all('SELECT * FROM platforms LEFT OUTER JOIN triggerable_configurations
-ON trigconfig_platform = platform_id AND trigconfig_test = $1 ORDER BY platform_name', array($test_id));
+$triggerable_platforms = $db-query_and_fetch_all('SELECT * FROM platforms
+LEFT OUTER JOIN triggerable_configurations ON trigconfig_platform = platform_id AND trigconfig_test = $1 ORDER BY platform_name', array($test_id));
$triggerables = '';
foreach ($triggerable_platforms as $platform_row) {
if (!$test_name_resolver-test_exists_on_platform($test_id, $platform_row['platform_id']))
@@ -137,7 +137,7 @@
select name=triggerable _onchange_=this.form.submit();
option value=None/option
END;
-$selected_triggerable = array_get($platform_row, 'trigrepo_triggerable');
+$selected_triggerable = array_get($platform_row, 'trigconfig_triggerable');
foreach ($build_triggerable_table as $triggerable_row) {
$triggerable_id = $triggerable_row['triggerable_id'];
$selected = $triggerable_id == $selected_triggerable ? ' selected' : '';
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179053] trunk/Source
Title: [179053] trunk/Source
Revision 179053
Author commit-qu...@webkit.org
Date 2015-01-23 18:34:18 -0800 (Fri, 23 Jan 2015)
Log Message
Web Inspector: Rename InjectedScriptHost::type to subtype
https://bugs.webkit.org/show_bug.cgi?id=140841
Patch by Joseph Pecoraro pecor...@apple.com on 2015-01-23
Reviewed by Timothy Hatcher.
Source/_javascript_Core:
We were using this to set the subtype of an object type RemoteObject
so we should clean up the name and call it subtype.
* inspector/InjectedScriptHost.h:
* inspector/InjectedScriptSource.js:
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::subtype):
(Inspector::JSInjectedScriptHost::type): Deleted.
* inspector/JSInjectedScriptHost.h:
* inspector/JSInjectedScriptHostPrototype.cpp:
(Inspector::JSInjectedScriptHostPrototype::finishCreation):
(Inspector::jsInjectedScriptHostPrototypeFunctionSubtype):
(Inspector::jsInjectedScriptHostPrototypeFunctionType): Deleted.
Source/WebCore:
* inspector/WebInjectedScriptHost.cpp:
(WebCore::WebInjectedScriptHost::subtype):
(WebCore::WebInjectedScriptHost::type): Deleted.
* inspector/WebInjectedScriptHost.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/inspector/InjectedScriptHost.h
trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js
trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.cpp
trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.h
trunk/Source/_javascript_Core/inspector/JSInjectedScriptHostPrototype.cpp
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/WebInjectedScriptHost.cpp
trunk/Source/WebCore/inspector/WebInjectedScriptHost.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (179052 => 179053)
--- trunk/Source/_javascript_Core/ChangeLog 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-01-24 02:34:18 UTC (rev 179053)
@@ -1,3 +1,24 @@
+2015-01-23 Joseph Pecoraro pecor...@apple.com
+
+Web Inspector: Rename InjectedScriptHost::type to subtype
+https://bugs.webkit.org/show_bug.cgi?id=140841
+
+Reviewed by Timothy Hatcher.
+
+We were using this to set the subtype of an object type RemoteObject
+so we should clean up the name and call it subtype.
+
+* inspector/InjectedScriptHost.h:
+* inspector/InjectedScriptSource.js:
+* inspector/JSInjectedScriptHost.cpp:
+(Inspector::JSInjectedScriptHost::subtype):
+(Inspector::JSInjectedScriptHost::type): Deleted.
+* inspector/JSInjectedScriptHost.h:
+* inspector/JSInjectedScriptHostPrototype.cpp:
+(Inspector::JSInjectedScriptHostPrototype::finishCreation):
+(Inspector::jsInjectedScriptHostPrototypeFunctionSubtype):
+(Inspector::jsInjectedScriptHostPrototypeFunctionType): Deleted.
+
2015-01-23 Michael Saboff msab...@apple.com
LayoutTests/js/script-tests/reentrant-caching.js crashing on 32 bit builds
Modified: trunk/Source/_javascript_Core/inspector/InjectedScriptHost.h (179052 => 179053)
--- trunk/Source/_javascript_Core/inspector/InjectedScriptHost.h 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/_javascript_Core/inspector/InjectedScriptHost.h 2015-01-24 02:34:18 UTC (rev 179053)
@@ -39,7 +39,7 @@
static PassRefPtrInjectedScriptHost create() { return adoptRef(new InjectedScriptHost); }
virtual ~InjectedScriptHost();
-virtual JSC::JSValue type(JSC::ExecState*, JSC::JSValue) { return JSC::jsUndefined(); }
+virtual JSC::JSValue subtype(JSC::ExecState*, JSC::JSValue) { return JSC::jsUndefined(); }
virtual bool isHTMLAllCollection(JSC::JSValue) { return false; }
JSC::JSValue jsWrapper(JSC::ExecState*, JSC::JSGlobalObject*);
Modified: trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js (179052 => 179053)
--- trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js 2015-01-24 02:34:18 UTC (rev 179053)
@@ -104,7 +104,7 @@
var columnNames = null;
if (typeof columns === string)
columns = [columns];
-if (InjectedScriptHost.type(columns) === array) {
+if (InjectedScriptHost.subtype(columns) === array) {
columnNames = [];
for (var i = 0; i columns.length; ++i)
columnNames.push(String(columns[i]));
@@ -611,7 +611,7 @@
if (this._isHTMLAllCollection(obj))
return array;
-var preciseType = InjectedScriptHost.type(obj);
+var preciseType = InjectedScriptHost.subtype(obj);
if (preciseType)
return preciseType;
Modified: trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.cpp (179052 => 179053)
--- trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.cpp 2015-01-24 02:27:31 UTC (rev 179052)
+++ trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.cpp
[webkit-changes] [179033] trunk
Title: [179033] trunk
Revision 179033
Author bfulg...@apple.com
Date 2015-01-23 15:34:08 -0800 (Fri, 23 Jan 2015)
Log Message
Source/WebKit/win:
[Win] Teach WebKit to provide IAccessible2 'get_language'
https://bugs.webkit.org/show_bug.cgi?id=140839
Reviewed by Dean Jackson.
* AccessibleBase.cpp:
(AccessibleBase::get_locale): Wrap the Webore::AccessibleObject::language
result in an IA2Locale structure to statisfy the IAccessible2 specification.
Tools:
[Win] Teach WebKit to provide IAccessible2 'get_language' and access AXLanguage
https://bugs.webkit.org/show_bug.cgi?id=140839
Reviewed by Dean Jackson.
* DumpRenderTree/win/AccessibilityUIElementWin.cpp:
(AccessibilityUIElement::language): Retrieve the 'language' BSTR
from the IA2Locale structure and pass it to DRT.
Modified Paths
trunk/Source/WebKit/win/AccessibleBase.cpp
trunk/Source/WebKit/win/ChangeLog
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
Diff
Modified: trunk/Source/WebKit/win/AccessibleBase.cpp (179032 => 179033)
--- trunk/Source/WebKit/win/AccessibleBase.cpp 2015-01-23 23:09:00 UTC (rev 179032)
+++ trunk/Source/WebKit/win/AccessibleBase.cpp 2015-01-23 23:34:08 UTC (rev 179033)
@@ -311,8 +311,15 @@
HRESULT AccessibleBase::get_locale(IA2Locale* locale)
{
-notImplemented();
-return E_NOTIMPL;
+if (!locale)
+return E_POINTER;
+
+if (!m_object)
+return E_FAIL;
+
+locale-language = BString(m_object-language().createCFString().get()).release();
+
+return S_OK;
}
HRESULT AccessibleBase::get_attributes(BSTR* attributes)
Modified: trunk/Source/WebKit/win/ChangeLog (179032 => 179033)
--- trunk/Source/WebKit/win/ChangeLog 2015-01-23 23:09:00 UTC (rev 179032)
+++ trunk/Source/WebKit/win/ChangeLog 2015-01-23 23:34:08 UTC (rev 179033)
@@ -1,3 +1,14 @@
+2015-01-23 Brent Fulgham bfulg...@apple.com
+
+[Win] Teach WebKit to provide IAccessible2 'get_language'
+https://bugs.webkit.org/show_bug.cgi?id=140839
+
+Reviewed by Dean Jackson.
+
+* AccessibleBase.cpp:
+(AccessibleBase::get_locale): Wrap the Webore::AccessibleObject::language
+result in an IA2Locale structure to statisfy the IAccessible2 specification.
+
2015-01-22 Brent Fulgham bfulg...@apple.com
[Win] Unreviewed test fix after r178965.
Modified: trunk/Tools/ChangeLog (179032 => 179033)
--- trunk/Tools/ChangeLog 2015-01-23 23:09:00 UTC (rev 179032)
+++ trunk/Tools/ChangeLog 2015-01-23 23:34:08 UTC (rev 179033)
@@ -1,5 +1,16 @@
2015-01-23 Brent Fulgham bfulg...@apple.com
+[Win] Teach WebKit to provide IAccessible2 'get_language' and access AXLanguage
+https://bugs.webkit.org/show_bug.cgi?id=140839
+
+Reviewed by Dean Jackson.
+
+* DumpRenderTree/win/AccessibilityUIElementWin.cpp:
+(AccessibilityUIElement::language): Retrieve the 'language' BSTR
+from the IA2Locale structure and pass it to DRT.
+
+2015-01-23 Brent Fulgham bfulg...@apple.com
+
[Win] Update DRT Accessibility implementation to better match Mac.
https://bugs.webkit.org/show_bug.cgi?id=140830
Modified: trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp (179032 => 179033)
--- trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp 2015-01-23 23:09:00 UTC (rev 179032)
+++ trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp 2015-01-23 23:34:08 UTC (rev 179033)
@@ -374,7 +374,18 @@
JSStringRef AccessibilityUIElement::language()
{
-return JSStringCreateWithCharacters(0, 0);
+if (!m_element)
+return JSStringCreateWithBSTR(_bstr_t(LAXLanguage: ));
+
+COMPtrIAccessibleComparable accessible2Element = comparableObject(m_element.get());
+if (!accessible2Element)
+return JSStringCreateWithBSTR(_bstr_t(LAXLanguage: ));
+
+IA2Locale locale;
+if (FAILED(accessible2Element-get_locale(locale)))
+return JSStringCreateWithBSTR(_bstr_t(LAXLanguage: ));
+
+return JSStringCreateWithBSTR(_bstr_t(LAXLanguage: ) + _bstr_t(locale.language, false));
}
JSStringRef AccessibilityUIElement::helpText() const
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179038] branches/safari-600.5-branch
Title: [179038] branches/safari-600.5-branch
Revision 179038
Author dburk...@apple.com
Date 2015-01-23 16:32:01 -0800 (Fri, 23 Jan 2015)
Log Message
Rollout r178467
Modified Paths
branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.h
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.mm
Removed Paths
branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt
branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks.html
branches/safari-600.5-branch/LayoutTests/http/tests/media/resources/hls/audio-tracks.m3u8
branches/safari-600.5-branch/LayoutTests/http/tests/media/resources/hls/bipbop/
branches/safari-600.5-branch/LayoutTests/http/tests/media/resources/hls/french/
branches/safari-600.5-branch/LayoutTests/http/tests/media/resources/hls/spanish/
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm
Diff
Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (179037 => 179038)
--- branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-01-24 00:24:26 UTC (rev 179037)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-01-24 00:32:01 UTC (rev 179038)
@@ -355,29 +355,6 @@
2015-01-14 Dana Burkart dburk...@apple.com
-Merged r174823. rdar://problem/19424155
-
-2014-10-16 Jer Noble jer.no...@apple.com
-
-[Mac] Represent AVMediaSelectionOptions as AudioTracks
-https://bugs.webkit.org/show_bug.cgi?id=137474
-
-Reviewed by Brent Fulgham.
-
-* http/tests/media/hls/hls-audio-tracks-expected.txt: Added.
-* http/tests/media/hls/hls-audio-tracks.html: Added.
-* http/tests/media/resources/hls/audio-tracks.m3u8: Added.
-* http/tests/media/resources/hls/bipbop/iframe_index.m3u8: Added.
-* http/tests/media/resources/hls/bipbop/main0.ts: Added.
-* http/tests/media/resources/hls/bipbop/main1.ts: Added.
-* http/tests/media/resources/hls/bipbop/prog_index.m3u8: Added.
-* http/tests/media/resources/hls/french/main.aac: Added.
-* http/tests/media/resources/hls/french/prog_index.m3u8: Added.
-* http/tests/media/resources/hls/spanish/main.aac: Added.
-* http/tests/media/resources/hls/spanish/prog_index.m3u8: Added.
-
-2015-01-14 Dana Burkart dburk...@apple.com
-
Merged r174402. rdar://problem/19478358
2014-10-07 Jer Noble jer.no...@apple.com
Deleted: branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt (179037 => 179038)
--- branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt 2015-01-24 00:24:26 UTC (rev 179037)
+++ branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt 2015-01-24 00:32:01 UTC (rev 179038)
@@ -1,8 +0,0 @@
-
-EVENT(canplaythrough)
-EXPECTED (video.audioTracks.length == '3') OK
-EXPECTED (video.audioTracks[0].enabled == 'true') OK
-EXPECTED (video.audioTracks[1].enabled == 'false') OK
-EXPECTED (video.audioTracks[2].enabled == 'false') OK
-END OF TEST
-
Deleted: branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks.html (179037 => 179038)
--- branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks.html 2015-01-24 00:24:26 UTC (rev 179037)
+++ branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks.html 2015-01-24 00:32:01 UTC (rev 179038)
@@ -1,30 +0,0 @@
-!DOCTYPE html
-html
-head
-script src=""
-script src=""
-script
-if (window.testRunner) {
-testRunner.dumpAsText();
-testRunner.waitUntilDone();
-}
-
-function start() {
-
[webkit-changes] [179041] tags/Safari-600.5.3
Title: [179041] tags/Safari-600.5.3
Revision 179041
Author dburk...@apple.com
Date 2015-01-23 16:45:38 -0800 (Fri, 23 Jan 2015)
Log Message
Rollout r178467
Modified Paths
tags/Safari-600.5.3/LayoutTests/ChangeLog
tags/Safari-600.5.3/Source/WebCore/ChangeLog
tags/Safari-600.5.3/Source/WebCore/WebCore.xcodeproj/project.pbxproj
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.h
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.mm
Removed Paths
tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt
tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks.html
tags/Safari-600.5.3/LayoutTests/http/tests/media/resources/hls/audio-tracks.m3u8
tags/Safari-600.5.3/LayoutTests/http/tests/media/resources/hls/bipbop/
tags/Safari-600.5.3/LayoutTests/http/tests/media/resources/hls/french/
tags/Safari-600.5.3/LayoutTests/http/tests/media/resources/hls/spanish/
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm
Diff
Modified: tags/Safari-600.5.3/LayoutTests/ChangeLog (179040 => 179041)
--- tags/Safari-600.5.3/LayoutTests/ChangeLog 2015-01-24 00:43:38 UTC (rev 179040)
+++ tags/Safari-600.5.3/LayoutTests/ChangeLog 2015-01-24 00:45:38 UTC (rev 179041)
@@ -310,29 +310,6 @@
2015-01-14 Dana Burkart dburk...@apple.com
-Merged r174823. rdar://problem/19424155
-
-2014-10-16 Jer Noble jer.no...@apple.com
-
-[Mac] Represent AVMediaSelectionOptions as AudioTracks
-https://bugs.webkit.org/show_bug.cgi?id=137474
-
-Reviewed by Brent Fulgham.
-
-* http/tests/media/hls/hls-audio-tracks-expected.txt: Added.
-* http/tests/media/hls/hls-audio-tracks.html: Added.
-* http/tests/media/resources/hls/audio-tracks.m3u8: Added.
-* http/tests/media/resources/hls/bipbop/iframe_index.m3u8: Added.
-* http/tests/media/resources/hls/bipbop/main0.ts: Added.
-* http/tests/media/resources/hls/bipbop/main1.ts: Added.
-* http/tests/media/resources/hls/bipbop/prog_index.m3u8: Added.
-* http/tests/media/resources/hls/french/main.aac: Added.
-* http/tests/media/resources/hls/french/prog_index.m3u8: Added.
-* http/tests/media/resources/hls/spanish/main.aac: Added.
-* http/tests/media/resources/hls/spanish/prog_index.m3u8: Added.
-
-2015-01-14 Dana Burkart dburk...@apple.com
-
Merged r174402. rdar://problem/19478358
2014-10-07 Jer Noble jer.no...@apple.com
Deleted: tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt (179040 => 179041)
--- tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt 2015-01-24 00:43:38 UTC (rev 179040)
+++ tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt 2015-01-24 00:45:38 UTC (rev 179041)
@@ -1,8 +0,0 @@
-
-EVENT(canplaythrough)
-EXPECTED (video.audioTracks.length == '3') OK
-EXPECTED (video.audioTracks[0].enabled == 'true') OK
-EXPECTED (video.audioTracks[1].enabled == 'false') OK
-EXPECTED (video.audioTracks[2].enabled == 'false') OK
-END OF TEST
-
Deleted: tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks.html (179040 => 179041)
--- tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks.html 2015-01-24 00:43:38 UTC (rev 179040)
+++ tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks.html 2015-01-24 00:45:38 UTC (rev 179041)
@@ -1,30 +0,0 @@
-!DOCTYPE html
-html
-head
-script src=""
-script src=""
-script
-if (window.testRunner) {
-testRunner.dumpAsText();
-testRunner.waitUntilDone();
-}
-
-function start() {
-video = document.getElementById('video');
-waitForEvent('canplaythrough', canplaythrough);
-video.src = ""
-}
-
-function canplaythrough() {
-testExpected(video.audioTracks.length, 3);
-
[webkit-changes] [179045] branches/safari-600.1.4.15-branch/Source/WebCore
Title: [179045] branches/safari-600.1.4.15-branch/Source/WebCore
Revision 179045
Author lforsch...@apple.com
Date 2015-01-23 17:03:13 -0800 (Fri, 23 Jan 2015)
Log Message
Build fix after r179028, r179030, r179031, r179032.
Reviewed by Dana Burkart.
* platform/graphics/WidthIterator.cpp:
(WebCore::WidthIterator::WidthIterator):
* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::ComplexTextController::ComplexTextController):
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment):
Modified Paths
branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/WidthIterator.cpp
branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp
branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179044 => 179045)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-24 00:52:42 UTC (rev 179044)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-24 01:03:13 UTC (rev 179045)
@@ -1,5 +1,18 @@
2015-01-23 Lucas Forschler lforsch...@apple.com
+Build fix after r179028, r179030, r179031, r179032.
+
+Reviewed by Dana Burkart.
+
+* platform/graphics/WidthIterator.cpp:
+(WebCore::WidthIterator::WidthIterator):
+* platform/graphics/mac/ComplexTextController.cpp:
+(WebCore::ComplexTextController::ComplexTextController):
+* rendering/RenderBlockLineLayout.cpp:
+(WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment):
+
+2015-01-23 Lucas Forschler lforsch...@apple.com
+
Merge r174489
2014-10-08 Myles C. Maxfield lithe...@gmail.com
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/WidthIterator.cpp (179044 => 179045)
--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/WidthIterator.cpp 2015-01-24 00:52:42 UTC (rev 179044)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/WidthIterator.cpp 2015-01-24 01:03:13 UTC (rev 179045)
@@ -57,7 +57,14 @@
m_expansionPerOpportunity = 0;
else {
bool isAfterExpansion = m_isAfterExpansion;
-unsigned expansionOpportunityCount = Font::expansionOpportunityCount(m_run.text(), m_run.ltr() ? LTR : RTL, isAfterExpansion);
+
+StringView sv;
+if (m_run.is8Bit())
+sv = StringView(m_run.characters8(), m_run.length());
+else
+sv = StringView(m_run.characters16(), m_run.length());
+
+unsigned expansionOpportunityCount = Font::expansionOpportunityCount(sv, m_run.ltr() ? LTR : RTL, isAfterExpansion);
if (isAfterExpansion !m_run.allowsTrailingExpansion())
expansionOpportunityCount--;
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (179044 => 179045)
--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-01-24 00:52:42 UTC (rev 179044)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-01-24 01:03:13 UTC (rev 179045)
@@ -144,7 +144,13 @@
m_expansionPerOpportunity = 0;
else {
bool isAfterExpansion = m_afterExpansion;
-unsigned expansionOpportunityCount = Font::expansionOpportunityCount(m_run.text(), m_run.ltr() ? LTR : RTL, isAfterExpansion);
+
+StringView sv;
+if (m_run.is8Bit())
+sv = StringView(m_run.characters8(), m_run.length());
+else
+sv = StringView(m_run.characters16(), m_run.length());
+unsigned expansionOpportunityCount = Font::expansionOpportunityCount(sv, m_run.ltr() ? LTR : RTL, isAfterExpansion);
if (isAfterExpansion !m_run.allowsTrailingExpansion())
expansionOpportunityCount--;
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp (179044 => 179045)
--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-01-24 00:52:42 UTC (rev 179044)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-01-24 01:03:13 UTC (rev 179045)
@@ -737,7 +737,7 @@
if (!isAfterExpansion)
toInlineTextBox(leafChild)-setCanHaveLeadingExpansion(true);
encounteredJustifiedRuby = true;
-auto renderText = downcastRenderText(leafChild-renderer());
+auto renderText = toRenderText(leafChild-renderer());
unsigned opportunitiesInRun = Font::expansionOpportunityCount(renderText.stringView(), leafChild-direction(), isAfterExpansion);
[webkit-changes] [179050] trunk/Source/WebCore
Title: [179050] trunk/Source/WebCore
Revision 179050
Author cdu...@apple.com
Date 2015-01-23 17:41:30 -0800 (Fri, 23 Jan 2015)
Log Message
Implement system fonts FontDescription caching at RenderTheme level
https://bugs.webkit.org/show_bug.cgi?id=140840
Reviewed by Andreas Kling.
Implement system fonts FontDescription caching at RenderTheme level
instead of duplicating the logic in its subclasses for each platform.
This reduces code / logic duplication and reduces the amount of
platform-specific code. This will also make the refactoring at
Bug 140577 a lot easier.
The caching logic remains in RenderThemeIOS class for iOS because:
- It supports different system font values than all other platforms
- It requires cache invalidation in some cases while other platforms
do not.
This patch is inspired by the following Blink revision:
https://src.chromium.org/viewvc/blink?view=revrevision=184449
Test: fast/css/css2-system-fonts.html
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp
trunk/Source/WebCore/platform/efl/RenderThemeEfl.h
trunk/Source/WebCore/rendering/RenderTheme.cpp
trunk/Source/WebCore/rendering/RenderTheme.h
trunk/Source/WebCore/rendering/RenderThemeGtk.cpp
trunk/Source/WebCore/rendering/RenderThemeGtk.h
trunk/Source/WebCore/rendering/RenderThemeIOS.h
trunk/Source/WebCore/rendering/RenderThemeIOS.mm
trunk/Source/WebCore/rendering/RenderThemeMac.h
trunk/Source/WebCore/rendering/RenderThemeMac.mm
trunk/Source/WebCore/rendering/RenderThemeSafari.cpp
trunk/Source/WebCore/rendering/RenderThemeSafari.h
trunk/Source/WebCore/rendering/RenderThemeWin.cpp
trunk/Source/WebCore/rendering/RenderThemeWin.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (179049 => 179050)
--- trunk/Source/WebCore/ChangeLog 2015-01-24 01:38:10 UTC (rev 179049)
+++ trunk/Source/WebCore/ChangeLog 2015-01-24 01:41:30 UTC (rev 179050)
@@ -1,3 +1,26 @@
+2015-01-23 Chris Dumez cdu...@apple.com
+
+Implement system fonts FontDescription caching at RenderTheme level
+https://bugs.webkit.org/show_bug.cgi?id=140840
+
+Reviewed by Andreas Kling.
+
+Implement system fonts FontDescription caching at RenderTheme level
+instead of duplicating the logic in its subclasses for each platform.
+This reduces code / logic duplication and reduces the amount of
+platform-specific code. This will also make the refactoring at
+Bug 140577 a lot easier.
+
+The caching logic remains in RenderThemeIOS class for iOS because:
+- It supports different system font values than all other platforms
+- It requires cache invalidation in some cases while other platforms
+ do not.
+
+This patch is inspired by the following Blink revision:
+https://src.chromium.org/viewvc/blink?view=revrevision=184449
+
+Test: fast/css/css2-system-fonts.html
+
2015-01-23 Zalan Bujtas za...@apple.com
Simple line layout: Refactor line wrapping logic.
Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (179049 => 179050)
--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2015-01-24 01:38:10 UTC (rev 179049)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2015-01-24 01:41:30 UTC (rev 179050)
@@ -984,7 +984,7 @@
defaultFontSize = size;
}
-void RenderThemeEfl::systemFont(CSSValueID, FontDescription fontDescription) const
+void RenderThemeEfl::updateCachedSystemFontDescription(CSSValueID, FontDescription fontDescription) const
{
// It was called by RenderEmbeddedObject::paintReplaced to render alternative string.
// To avoid cairo_error while rendering, fontDescription should be passed.
Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.h (179049 => 179050)
--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.h 2015-01-24 01:38:10 UTC (rev 179049)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.h 2015-01-24 01:41:30 UTC (rev 179050)
@@ -104,9 +104,6 @@
void adjustSizeConstraints(RenderStyle, FormType) const;
-// System fonts.
-virtual void systemFont(CSSValueID, FontDescription) const override;
-
virtual void adjustCheckboxStyle(StyleResolver, RenderStyle, Element*) const override;
virtual bool paintCheckbox(const RenderObject, const PaintInfo, const IntRect) override;
@@ -189,6 +186,9 @@
return m_edje || (!m_themePath.isEmpty() const_castRenderThemeEfl*(this)-loadTheme());
}
+// System fonts.
+virtual void updateCachedSystemFontDescription(CSSValueID, FontDescription) const override;
+
ALWAYS_INLINE Ecore_Evas* canvas() const { return m_canvas.get(); }
ALWAYS_INLINE Evas_Object* edje() const { return m_edje.get(); }
Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (179049 => 179050)
--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-01-24 01:38:10 UTC (rev 179049)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-01-24 01:41:30 UTC (rev
[webkit-changes] [179043] trunk/Tools
Title: [179043] trunk/Tools Revision 179043 Author o...@webkit.org Date 2015-01-23 16:49:02 -0800 (Fri, 23 Jan 2015) Log Message Fix the false positive build failures on the Windows buildbots https://bugs.webkit.org/show_bug.cgi?id=140819 Reviewed by Brent Fulgham. Increase the build timeout (without producing output) to 2 hours for Windows bots, the default 20 minutes is enough for others since they produce output during the build. * BuildSlaveSupport/build.webkit.org-config/master.cfg: (BuildFactory.__init__): Modified Paths trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg trunk/Tools/ChangeLog Diff Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (179042 => 179043) --- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-01-24 00:48:24 UTC (rev 179042) +++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-01-24 00:49:02 UTC (rev 179043) @@ -812,7 +812,12 @@ class BuildFactory(Factory): def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None): Factory.__init__(self, platform, configuration, architectures, True, additionalArguments, SVNMirror) -self.addStep(CompileWebKit()) + +if platform == win: +self.addStep(CompileWebKit(timeout=2*60*60)) +else: +self.addStep(CompileWebKit()) + if triggers: self.addStep(ArchiveBuiltProduct()) self.addStep(UploadBuiltProduct()) Modified: trunk/Tools/ChangeLog (179042 => 179043) --- trunk/Tools/ChangeLog 2015-01-24 00:48:24 UTC (rev 179042) +++ trunk/Tools/ChangeLog 2015-01-24 00:49:02 UTC (rev 179043) @@ -1,3 +1,16 @@ +2015-01-23 Csaba Osztrogonác o...@webkit.org + +Fix the false positive build failures on the Windows buildbots +https://bugs.webkit.org/show_bug.cgi?id=140819 + +Reviewed by Brent Fulgham. + +Increase the build timeout (without producing output) to 2 hours for Windows bots, +the default 20 minutes is enough for others since they produce output during the build. + +* BuildSlaveSupport/build.webkit.org-config/master.cfg: +(BuildFactory.__init__): + 2015-01-23 Brent Fulgham bfulg...@apple.com [Win] Teach WebKit to provide IAccessible2 'get_language' and access AXLanguage ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179044] trunk
Title: [179044] trunk
Revision 179044
Author commit-qu...@webkit.org
Date 2015-01-23 16:52:42 -0800 (Fri, 23 Jan 2015)
Log Message
[MSE] Implement Range Removal algorithm.
https://bugs.webkit.org/show_bug.cgi?id=140622.
Patch by Bartlomiej Gajda b.ga...@samsung.com on 2015-01-23
Reviewed by Jer Noble.
Source/WebCore:
This extract Range Removal algorithm (Editor's Draft version, bug:26316) from remove(),
to separate function to deal with old FIXME since bug in spec was resolved.
This should both guarantee good order of events, and prevent from switching to 'open' state
during end of stream.
Test: media/media-source/media-source-end-of-stream-readyState.html
* Modules/mediasource/MediaSource.cpp:
(WebCore::MediaSource::setDurationInternal): update to use rangeRemoval(), not remove()
(WebCore::MediaSource::streamEndedWithError): remove FIXME, brigning back correct order of events.
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::remove): comments up to spec, extract rangeRemoval algorithm.
(WebCore::SourceBuffer::rangeRemoval):
(WebCore::SourceBuffer::removeTimerFired): comments up to spec.
* Modules/mediasource/SourceBuffer.h:
LayoutTests:
Added short test to check whether endOfStream incorrectly switches back
to 'open' state.
* media/media-source/media-source-end-of-stream-readyState.html: Added.
* media/media-source/media-source-end-of-stream-readyState-expected.txt: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp
trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp
trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h
Added Paths
trunk/LayoutTests/media/media-source/media-source-end-of-stream-readyState-expected.txt
trunk/LayoutTests/media/media-source/media-source-end-of-stream-readyState.html
Diff
Modified: trunk/LayoutTests/ChangeLog (179043 => 179044)
--- trunk/LayoutTests/ChangeLog 2015-01-24 00:49:02 UTC (rev 179043)
+++ trunk/LayoutTests/ChangeLog 2015-01-24 00:52:42 UTC (rev 179044)
@@ -1,3 +1,16 @@
+2015-01-23 Bartlomiej Gajda b.ga...@samsung.com
+
+[MSE] Implement Range Removal algorithm.
+https://bugs.webkit.org/show_bug.cgi?id=140622.
+
+Reviewed by Jer Noble.
+
+Added short test to check whether endOfStream incorrectly switches back
+to 'open' state.
+
+* media/media-source/media-source-end-of-stream-readyState.html: Added.
+* media/media-source/media-source-end-of-stream-readyState-expected.txt: Added.
+
2015-01-23 Brent Fulgham bfulg...@apple.com
[Win] Test gardening. Mark a few failures after filing bugs.
Added: trunk/LayoutTests/media/media-source/media-source-end-of-stream-readyState-expected.txt (0 => 179044)
--- trunk/LayoutTests/media/media-source/media-source-end-of-stream-readyState-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-end-of-stream-readyState-expected.txt 2015-01-24 00:52:42 UTC (rev 179044)
@@ -0,0 +1,13 @@
+
+RUN(video.src = ""
+EVENT(sourceopen)
+RUN(sourceBuffer = source.addSourceBuffer(video/mock; codecs=mock))
+RUN(sourceBuffer.appendBuffer(mediaSegment))
+EVENT(updateend)
+EXPECTED (source.duration.toFixed(3) == '10') OK
+EXPECTED (sourceBuffer.buffered.end(0).toFixed(3) == '5') OK
+RUN(source.endOfStream())
+EXPECTED (source.duration.toFixed(3) == '5') OK
+EVENT(updateend)
+END OF TEST
+
Added: trunk/LayoutTests/media/media-source/media-source-end-of-stream-readyState.html (0 => 179044)
--- trunk/LayoutTests/media/media-source/media-source-end-of-stream-readyState.html (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-end-of-stream-readyState.html 2015-01-24 00:52:42 UTC (rev 179044)
@@ -0,0 +1,49 @@
+!DOCTYPE html
+html
+head
+titlemock-media-source/title
+script src=""
+script src=""
+script
+var source;
+var sourceBuffer;
+var mediaSegment;
+
+if (window.internals)
+internals.initializeMockMediaSource();
+
+function runTest() {
+findMediaElement();
+
+source = new MediaSource();
+waitForEventOn(source, 'sourceopen', sourceOpen, false, true);
+run('video.src = ""
+}
+
+function sourceOpen() {
+run('sourceBuffer = source.addSourceBuffer(video/mock; codecs=mock)');
+waitForEventOn(sourceBuffer, 'updateend', updateEnd1, false, true);
+mediaSegment = concatenateSamples([
+makeAInit(10, [makeATrack(1, 'mock', TRACK_KIND.VIDEO)]),
+makeASample(0, 0, 5, 1, SAMPLE_FLAG.SYNC, 0),
+]);
+run('sourceBuffer.appendBuffer(mediaSegment)');
+
+}
+
+function updateEnd1() {
+testExpected('source.duration.toFixed(3)', 10);
+testExpected('sourceBuffer.buffered.end(0).toFixed(3)', 5);
+
+waitForEventOn(source, 'sourceopen', function() { failTest(Should not transit to 'open' state during endOfStream().) },
[webkit-changes] [179035] trunk/Source/JavaScriptCore
Title: [179035] trunk/Source/_javascript_Core Revision 179035 Author msab...@apple.com Date 2015-01-23 15:48:14 -0800 (Fri, 23 Jan 2015) Log Message LayoutTests/js/script-tests/reentrant-caching.js crashing on 32 bit builds https://bugs.webkit.org/show_bug.cgi?id=140843 Reviewed by Oliver Hunt. When we are in vmEntryToJavaScript, we keep the stack pointer at an alignment sutiable for pointing to a call frame header, which is the alignment post making a call. We adjust the sp when calling to JS code, but don't adjust it before calling the out of stack handler. * llint/LowLevelInterpreter32_64.asm: Moved stack point down 8 bytes to get it aligned. Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm Diff Modified: trunk/Source/_javascript_Core/ChangeLog (179034 => 179035) --- trunk/Source/_javascript_Core/ChangeLog 2015-01-23 23:37:25 UTC (rev 179034) +++ trunk/Source/_javascript_Core/ChangeLog 2015-01-23 23:48:14 UTC (rev 179035) @@ -1,3 +1,18 @@ +2015-01-23 Michael Saboff msab...@apple.com + +LayoutTests/js/script-tests/reentrant-caching.js crashing on 32 bit builds +https://bugs.webkit.org/show_bug.cgi?id=140843 + +Reviewed by Oliver Hunt. + +When we are in vmEntryToJavaScript, we keep the stack pointer at an +alignment sutiable for pointing to a call frame header, which is the +alignment post making a call. We adjust the sp when calling to JS code, +but don't adjust it before calling the out of stack handler. + +* llint/LowLevelInterpreter32_64.asm: +Moved stack point down 8 bytes to get it aligned. + 2015-01-23 Joseph Pecoraro pecor...@apple.com Web Inspector: Object Previews in the Console Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm (179034 => 179035) --- trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2015-01-23 23:37:25 UTC (rev 179034) +++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2015-01-23 23:48:14 UTC (rev 179035) @@ -259,6 +259,7 @@ move temp3, vm end +subp 8, sp # Align stack for cCall2() to make a call. cCall2(_llint_throw_stack_overflow_error, vm, protoCallFrame) if ARMv7 ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179048] trunk/Source/WebCore
Title: [179048] trunk/Source/WebCore
Revision 179048
Author za...@apple.com
Date 2015-01-23 17:13:44 -0800 (Fri, 23 Jan 2015)
Log Message
Simple line layout: Refactor line wrapping logic.
https://bugs.webkit.org/show_bug.cgi?id=140834
Reviewed by Antti Koivisto.
Use a more readable structure to deal with wrapping logic.
No change in functionality.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::createLineRuns):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/SimpleLineLayout.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (179047 => 179048)
--- trunk/Source/WebCore/ChangeLog 2015-01-24 01:12:06 UTC (rev 179047)
+++ trunk/Source/WebCore/ChangeLog 2015-01-24 01:13:44 UTC (rev 179048)
@@ -1,5 +1,19 @@
2015-01-23 Zalan Bujtas za...@apple.com
+Simple line layout: Refactor line wrapping logic.
+https://bugs.webkit.org/show_bug.cgi?id=140834
+
+Reviewed by Antti Koivisto.
+
+Use a more readable structure to deal with wrapping logic.
+
+No change in functionality.
+
+* rendering/SimpleLineLayout.cpp:
+(WebCore::SimpleLineLayout::createLineRuns):
+
+2015-01-23 Zalan Bujtas za...@apple.com
+
Simple line layout: Use only FlowContents::nextTextFragment() to read fragments from the text flow.
https://bugs.webkit.org/show_bug.cgi?id=140842
Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (179047 => 179048)
--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-24 01:12:06 UTC (rev 179047)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-24 01:13:44 UTC (rev 179048)
@@ -443,41 +443,50 @@
const auto style = flowContents.style();
bool lineCanBeWrapped = style.wrapLines || style.breakWordOnOverflow;
while (!flowContents.isEnd(lineState.position)) {
-// Find the next text fragment. Start from the end of the previous fragment -current line end.
-FlowContents::TextFragment fragment = flowContents.nextTextFragment(lineState.position, lineState.width());
-if ((lineCanBeWrapped !lineState.fits(fragment.width)) || fragment.type == FlowContents::TextFragment::LineBreak) {
+// Find the next text fragment.
+auto fragment = flowContents.nextTextFragment(lineState.position, lineState.width());
+// Hard linebreak.
+if (fragment.type == FlowContents::TextFragment::LineBreak) {
+if (lineState.width()) {
+// No need to add the new line fragment if there's already content on the line. We are about to close this line anyway.
+++lineState.position;
+} else
+lineState.addUncommitted(fragment);
+break;
+}
+if (lineCanBeWrapped !lineState.fits(fragment.width)) {
// Overflow wrapping behaviour:
-// 1. Newline character: wraps the line unless it's treated as whitespace.
-// 2. Whitesapce collapse on: whitespace is skipped.
-// 3. Whitespace collapse off: whitespace is wrapped.
-// 4. First, non-whitespace fragment is either wrapped or kept on the line. (depends on overflow-wrap)
-// 5. Non-whitespace fragment when there's already another fragment on the line gets pushed to the next line.
-bool isFirstFragment = !lineState.width();
-if (fragment.type == FlowContents::TextFragment::LineBreak) {
-if (isFirstFragment)
-lineState.addUncommitted(fragment);
-else {
-// No need to add the new line fragment if there's already content on the line. We are about to close this line anyway.
-++lineState.position;
+// 1. Whitesapce collapse on: whitespace is skipped. Jump to next line.
+// 2. Whitespace collapse off: whitespace is wrapped.
+// 3. First, non-whitespace fragment is either wrapped or kept on the line. (depends on overflow-wrap)
+// 4. Non-whitespace fragment when there's already another fragment on the line gets pushed to the next line.
+bool emptyLine = !lineState.width();
+// Whitespace fragment.
+if (fragment.type == FlowContents::TextFragment::Whitespace) {
+if (style.collapseWhitespace) {
+// Whitespace collapse is on: whitespace that doesn't fit is simply skipped.
+lineState.position = fragment.end;
+break;
}
-} else if (style.collapseWhitespace fragment.type == FlowContents::TextFragment::Whitespace) {
-// Whitespace collapse is on: whitespace that doesn't fit is simply skipped.
-lineState.position = fragment.end;
-} else if (fragment.type == FlowContents::TextFragment::Whitespace || ((isFirstFragment style.breakWordOnOverflow) || !style.wrapLines)) { //
[webkit-changes] [179047] trunk/Source/WebCore
Title: [179047] trunk/Source/WebCore
Revision 179047
Author za...@apple.com
Date 2015-01-23 17:12:06 -0800 (Fri, 23 Jan 2015)
Log Message
Simple line layout: Use only FlowContents::nextTextFragment() to read fragments from the text flow.
https://bugs.webkit.org/show_bug.cgi?id=140842
Reviewed by Antti Koivisto.
This is in preparation to make FlowContents a content iterator class.
No change in functionality.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::initializeNewLine):
* rendering/SimpleLineLayoutFlowContents.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/SimpleLineLayout.cpp
trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (179046 => 179047)
--- trunk/Source/WebCore/ChangeLog 2015-01-24 01:05:32 UTC (rev 179046)
+++ trunk/Source/WebCore/ChangeLog 2015-01-24 01:12:06 UTC (rev 179047)
@@ -1,3 +1,18 @@
+2015-01-23 Zalan Bujtas za...@apple.com
+
+Simple line layout: Use only FlowContents::nextTextFragment() to read fragments from the text flow.
+https://bugs.webkit.org/show_bug.cgi?id=140842
+
+Reviewed by Antti Koivisto.
+
+This is in preparation to make FlowContents a content iterator class.
+
+No change in functionality.
+
+* rendering/SimpleLineLayout.cpp:
+(WebCore::SimpleLineLayout::initializeNewLine):
+* rendering/SimpleLineLayoutFlowContents.h:
+
2015-01-23 Bartlomiej Gajda b.ga...@samsung.com
[MSE] Implement Range Removal algorithm.
Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (179046 => 179047)
--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-24 01:05:32 UTC (rev 179046)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-24 01:12:06 UTC (rev 179047)
@@ -378,8 +378,12 @@
}
if (overflowedFragment.isEmpty()) {
-unsigned spaceCount = 0;
-lineState.jumpTo(style.collapseWhitespace ? flowContents.findNextNonWhitespacePosition(linePositon, spaceCount) : linePositon, 0);
+if (style.collapseWhitespace) {
+auto firstFragment = flowContents.nextTextFragment(linePositon, 0);
+if (firstFragment.type == FlowContents::TextFragment::Whitespace)
+linePositon = firstFragment.end;
+}
+lineState.jumpTo(linePositon, 0);
return lineState;
}
Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h (179046 => 179047)
--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2015-01-24 01:05:32 UTC (rev 179046)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2015-01-24 01:12:06 UTC (rev 179047)
@@ -63,12 +63,8 @@
bool isBreakable = false;
float width = 0;
};
-
TextFragment nextTextFragment(unsigned position, float xPosition) const;
-unsigned findNextNonWhitespacePosition(unsigned position, unsigned spaceCount) const;
-
float textWidth(unsigned from, unsigned to, float xPosition) const;
-
bool isLineBreak(unsigned position) const;
bool isEnd(unsigned position) const;
@@ -100,6 +96,7 @@
const Style style() const { return m_style; }
private:
+unsigned findNextNonWhitespacePosition(unsigned position, unsigned spaceCount) const;
unsigned findNextBreakablePosition(unsigned position) const;
unsigned segmentIndexForPosition(unsigned position) const;
unsigned segmentIndexForPositionSlow(unsigned position) const;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179049] trunk/LayoutTests
Title: [179049] trunk/LayoutTests Revision 179049 Author bfulg...@apple.com Date 2015-01-23 17:38:10 -0800 (Fri, 23 Jan 2015) Log Message [Win] Unreviewed gardening: Correct some typos in Failure entries. * platform/win/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/win/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (179048 => 179049) --- trunk/LayoutTests/ChangeLog 2015-01-24 01:13:44 UTC (rev 179048) +++ trunk/LayoutTests/ChangeLog 2015-01-24 01:38:10 UTC (rev 179049) @@ -1,3 +1,9 @@ +2015-01-23 Brent Fulgham bfulg...@apple.com + +[Win] Unreviewed gardening: Correct some typos in Failure entries. + +* platform/win/TestExpectations: + 2015-01-23 Bartlomiej Gajda b.ga...@samsung.com [MSE] Implement Range Removal algorithm. Modified: trunk/LayoutTests/platform/win/TestExpectations (179048 => 179049) --- trunk/LayoutTests/platform/win/TestExpectations 2015-01-24 01:13:44 UTC (rev 179048) +++ trunk/LayoutTests/platform/win/TestExpectations 2015-01-24 01:38:10 UTC (rev 179049) @@ -1214,9 +1214,9 @@ webkit.org/b/140798 accessibility/aria-hidden-negates-no-visibility.html [ Failure ] webkit.org/b/140798 accessibility/aria-hidden-with-elements.html [ Failure ] webkit.org/b/140798 accessibility/aria-labeled-with-hidden-node.html [ Failure ] -webkit.org/b/140798 accessibility/aria-labelledby-overrides-aria-labeledby [ Failure ] -webkit.org/b/140798 accessibility/aria-labelledby-with-descendants [ Failure ] -webkit.org/b/140798 accessibility/aria-namefrom-author [ Failure ] +webkit.org/b/140798 accessibility/aria-labelledby-overrides-aria-labeledby.html [ Failure ] +webkit.org/b/140798 accessibility/aria-labelledby-with-descendants.html [ Failure ] +webkit.org/b/140798 accessibility/aria-namefrom-author.html [ Failure ] webkit.org/b/140798 accessibility/aria-sort.html [ Failure ] webkit.org/b/140798 accessibility/aria-tables.html [ Failure ] webkit.org/b/140798 accessibility/aria-text-role.html [ Failure ] ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179052] trunk/Source/WebKit2
Title: [179052] trunk/Source/WebKit2
Revision 179052
Author an...@apple.com
Date 2015-01-23 18:27:31 -0800 (Fri, 23 Jan 2015)
Log Message
Implement cache size limit
https://bugs.webkit.org/show_bug.cgi?id=140844
Reviewed by Andreas Kling.
Prevent the cache from growing without bounds. The simple scheme implemented here
estimates the cache size from number of entries. When the estimated size exceeds
the maximum size we randomly clear 1/4 of the entries.
* NetworkProcess/cache/NetworkCacheStorage.h:
* NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
(WebKit::NetworkCacheStorage::NetworkCacheStorage):
(WebKit::NetworkCacheStorage::initialize):
(WebKit::NetworkCacheStorage::removeEntry):
(WebKit::NetworkCacheStorage::store):
(WebKit::NetworkCacheStorage::setMaximumSize):
(WebKit::NetworkCacheStorage::clear):
(WebKit::NetworkCacheStorage::shrinkIfNeeded):
(WebKit::NetworkCacheStorage::initializeKeyFilter): Deleted.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h
trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (179051 => 179052)
--- trunk/Source/WebKit2/ChangeLog 2015-01-24 02:20:22 UTC (rev 179051)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-24 02:27:31 UTC (rev 179052)
@@ -1,3 +1,25 @@
+2015-01-23 Antti Koivisto an...@apple.com
+
+Implement cache size limit
+https://bugs.webkit.org/show_bug.cgi?id=140844
+
+Reviewed by Andreas Kling.
+
+Prevent the cache from growing without bounds. The simple scheme implemented here
+estimates the cache size from number of entries. When the estimated size exceeds
+the maximum size we randomly clear 1/4 of the entries.
+
+* NetworkProcess/cache/NetworkCacheStorage.h:
+* NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
+(WebKit::NetworkCacheStorage::NetworkCacheStorage):
+(WebKit::NetworkCacheStorage::initialize):
+(WebKit::NetworkCacheStorage::removeEntry):
+(WebKit::NetworkCacheStorage::store):
+(WebKit::NetworkCacheStorage::setMaximumSize):
+(WebKit::NetworkCacheStorage::clear):
+(WebKit::NetworkCacheStorage::shrinkIfNeeded):
+(WebKit::NetworkCacheStorage::initializeKeyFilter): Deleted.
+
2015-01-23 Timothy Horton timothy_hor...@apple.com
Fix the pre-Yosemite build.
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (179051 => 179052)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-01-24 02:20:22 UTC (rev 179051)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-01-24 02:27:31 UTC (rev 179052)
@@ -96,7 +96,8 @@
private:
NetworkCacheStorage(const String directoryPath);
-void initializeKeyFilter();
+void initialize();
+void shrinkIfNeeded();
void removeEntry(const NetworkCacheKey);
@@ -109,12 +110,14 @@
const String m_directoryPath;
-size_t m_maximumSize;
+size_t m_maximumSize { std::numeric_limitssize_t::max() };
BloomFilter20 m_keyFilter;
+std::atomicsize_t m_approximateEntryCount { 0 };
+std::atomicbool m_shrinkInProgress { false };
VectorDequeRetrieveOperation m_pendingRetrieveOperationsByPriority;
-unsigned m_activeRetrieveOperationCount;
+unsigned m_activeRetrieveOperationCount { 0 };
#if PLATFORM(COCOA)
mutable OSObjectPtrdispatch_queue_t m_ioQueue;
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm (179051 => 179052)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-01-24 02:20:22 UTC (rev 179051)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-01-24 02:27:31 UTC (rev 179052)
@@ -122,30 +122,30 @@
NetworkCacheStorage::NetworkCacheStorage(const String directoryPath)
: m_directoryPath(directoryPath)
-, m_maximumSize(std::numeric_limitssize_t::max())
-, m_activeRetrieveOperationCount(0)
, m_ioQueue(adoptOSObject(dispatch_queue_create(com.apple.WebKit.Cache.Storage, DISPATCH_QUEUE_CONCURRENT)))
, m_backgroundIOQueue(adoptOSObject(dispatch_queue_create(com.apple.WebKit.Cache.Storage.Background, DISPATCH_QUEUE_CONCURRENT)))
{
dispatch_set_target_queue(m_backgroundIOQueue.get(), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0));
-initializeKeyFilter();
+initialize();
}
-void NetworkCacheStorage::initializeKeyFilter()
+void NetworkCacheStorage::initialize()
{
ASSERT(RunLoop::isMain());
StringCapture cachePathCapture(m_directoryPath);
auto keyFilter = m_keyFilter;
+auto entryCount = m_approximateEntryCount;
-dispatch_async(m_backgroundIOQueue.get(), [cachePathCapture, keyFilter] {
+dispatch_async(m_backgroundIOQueue.get(), [cachePathCapture, keyFilter, entryCount] {
String cachePath = cachePathCapture.string();
-
[webkit-changes] [179054] trunk
Title: [179054] trunk
Revision 179054
Author commit-qu...@webkit.org
Date 2015-01-23 19:05:36 -0800 (Fri, 23 Jan 2015)
Log Message
Unreviewed, rolling out r179051.
https://bugs.webkit.org/show_bug.cgi?id=140850
broke the 32-bit build (Requested by thorton on #webkit).
Reverted changeset:
[Mac][EME] Support ClearKey encryption with AES128-encrypted
HLS
https://bugs.webkit.org/show_bug.cgi?id=140825
http://trac.webkit.org/changeset/179051
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/media/video-test.js
trunk/Source/WebCore/CMakeLists.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp
trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp
trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h
trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp
trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.h
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/html/HTMLMediaElement.cpp
trunk/Source/WebCore/html/HTMLMediaElement.h
trunk/Source/WebCore/platform/graphics/CDMSession.h
trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp
trunk/Source/WebCore/platform/graphics/MediaPlayer.h
trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Removed Paths
trunk/LayoutTests/http/tests/media/clearkey/
trunk/LayoutTests/http/tests/media/resources/hls/clearkey/
trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.cpp
trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.h
trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp
trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.h
Diff
Modified: trunk/LayoutTests/ChangeLog (179053 => 179054)
--- trunk/LayoutTests/ChangeLog 2015-01-24 02:34:18 UTC (rev 179053)
+++ trunk/LayoutTests/ChangeLog 2015-01-24 03:05:36 UTC (rev 179054)
@@ -1,3 +1,17 @@
+2015-01-23 Commit Queue commit-qu...@webkit.org
+
+Unreviewed, rolling out r179051.
+https://bugs.webkit.org/show_bug.cgi?id=140850
+
+broke the 32-bit build (Requested by thorton on #webkit).
+
+Reverted changeset:
+
+[Mac][EME] Support ClearKey encryption with AES128-encrypted
+HLS
+https://bugs.webkit.org/show_bug.cgi?id=140825
+http://trac.webkit.org/changeset/179051
+
2015-01-23 Jer Noble jer.no...@apple.com
[Mac][EME] Support ClearKey encryption with AES128-encrypted HLS
Modified: trunk/LayoutTests/media/video-test.js (179053 => 179054)
--- trunk/LayoutTests/media/video-test.js 2015-01-24 02:34:18 UTC (rev 179053)
+++ trunk/LayoutTests/media/video-test.js 2015-01-24 03:05:36 UTC (rev 179054)
@@ -203,11 +203,6 @@
mediaElement.addEventListener(eventName, _eventCallback, true);
}
-function waitForEventOnceOn(element, eventName, func, endit)
-{
-waitForEventOn(element, eventName, func, endit, true);
-}
-
function waitForEventOn(element, eventName, func, endit, oneTimeOnly)
{
waitForEvent(eventName, func, endit, oneTimeOnly, element);
Modified: trunk/Source/WebCore/CMakeLists.txt (179053 => 179054)
--- trunk/Source/WebCore/CMakeLists.txt 2015-01-24 02:34:18 UTC (rev 179053)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-01-24 03:05:36 UTC (rev 179054)
@@ -2734,8 +2734,6 @@
list(APPEND WebCore_SOURCES
Modules/encryptedmedia/CDM.cpp
Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp
-Modules/encryptedmedia/CDMPrivateClearKey.cpp
-Modules/encryptedmedia/CDMSessionClearKey.cpp
Modules/encryptedmedia/MediaKeyMessageEvent.cpp
Modules/encryptedmedia/MediaKeyNeededEvent.cpp
Modules/encryptedmedia/MediaKeys.cpp
Modified: trunk/Source/WebCore/ChangeLog (179053 => 179054)
--- trunk/Source/WebCore/ChangeLog 2015-01-24 02:34:18 UTC (rev 179053)
+++ trunk/Source/WebCore/ChangeLog 2015-01-24 03:05:36 UTC (rev 179054)
@@ -1,3 +1,17 @@
+2015-01-23 Commit Queue commit-qu...@webkit.org
+
+Unreviewed, rolling out r179051.
+https://bugs.webkit.org/show_bug.cgi?id=140850
+
+broke the 32-bit build (Requested by thorton on #webkit).
+
+Reverted changeset:
+
+[Mac][EME] Support ClearKey encryption with AES128-encrypted
+HLS
+https://bugs.webkit.org/show_bug.cgi?id=140825
+http://trac.webkit.org/changeset/179051
+
2015-01-23 Joseph Pecoraro pecor...@apple.com
Web Inspector: Rename InjectedScriptHost::type to subtype
Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp (179053 => 179054)
--- trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2015-01-24 02:34:18 UTC (rev 179053)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp
[webkit-changes] [179034] branches/safari-600.5-branch
Title: [179034] branches/safari-600.5-branch Revision 179034 Author dburk...@apple.com Date 2015-01-23 15:37:25 -0800 (Fri, 23 Jan 2015) Log Message Merged r176354. rdar://19451336 Modified Paths branches/safari-600.5-branch/LayoutTests/ChangeLog branches/safari-600.5-branch/Source/WebCore/ChangeLog branches/safari-600.5-branch/Source/WebCore/rendering/InlineFlowBox.cpp branches/safari-600.5-branch/Source/WebCore/rendering/InlineFlowBox.h branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockFlow.cpp Added Paths branches/safari-600.5-branch/LayoutTests/fast/multicol/tall-image-behavior-lr.html branches/safari-600.5-branch/LayoutTests/fast/multicol/tall-image-behavior-rl.html branches/safari-600.5-branch/LayoutTests/fast/multicol/tall-image-behavior.html branches/safari-600.5-branch/LayoutTests/platform/mac/fast/multicol/tall-image-behavior-expected.png branches/safari-600.5-branch/LayoutTests/platform/mac/fast/multicol/tall-image-behavior-expected.txt branches/safari-600.5-branch/LayoutTests/platform/mac/fast/multicol/tall-image-behavior-lr-expected.png branches/safari-600.5-branch/LayoutTests/platform/mac/fast/multicol/tall-image-behavior-lr-expected.txt branches/safari-600.5-branch/LayoutTests/platform/mac/fast/multicol/tall-image-behavior-rl-expected.png branches/safari-600.5-branch/LayoutTests/platform/mac/fast/multicol/tall-image-behavior-rl-expected.txt Diff Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (179033 => 179034) --- branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-01-23 23:34:08 UTC (rev 179033) +++ branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-01-23 23:37:25 UTC (rev 179034) @@ -1,5 +1,26 @@ 2015-01-23 Dana Burkart dburk...@apple.com +Merged r176354. rdar://problem/19451336 + +2014-11-19 David Hyatt hy...@apple.com + +Images/replaced elements that are as tall as a page should be on their own page +https://bugs.webkit.org/show_bug.cgi?id=138886 - rdar://problem/18296371 + +Reviewed by Dean Jackson. + +* fast/multicol/tall-image-behavior-lr.html: Added. +* fast/multicol/tall-image-behavior-rl.html: Added. +* fast/multicol/tall-image-behavior.html: Added. +* platform/mac/fast/multicol/tall-image-behavior-expected.png: Added. +* platform/mac/fast/multicol/tall-image-behavior-expected.txt: Added. +* platform/mac/fast/multicol/tall-image-behavior-lr-expected.png: Added. +* platform/mac/fast/multicol/tall-image-behavior-lr-expected.txt: Added. +* platform/mac/fast/multicol/tall-image-behavior-rl-expected.png: Added. +* platform/mac/fast/multicol/tall-image-behavior-rl-expected.txt: Added. + +2015-01-23 Dana Burkart dburk...@apple.com + Merged r174489. rdar://problem/19452129 2014-10-08 Myles C. Maxfield mmaxfi...@apple.com Copied: branches/safari-600.5-branch/LayoutTests/fast/multicol/tall-image-behavior-lr.html (from rev 176354, trunk/LayoutTests/fast/multicol/tall-image-behavior-lr.html) (0 => 179034) --- branches/safari-600.5-branch/LayoutTests/fast/multicol/tall-image-behavior-lr.html (rev 0) +++ branches/safari-600.5-branch/LayoutTests/fast/multicol/tall-image-behavior-lr.html 2015-01-23 23:37:25 UTC (rev 179034) @@ -0,0 +1,12 @@ +!doctype html +body style=-webkit-writing-mode:vertical-lr +div style=-webkit-columns:2; width:300px; border:2px solid blue;-webkit-line-box-contain:glyphs replaced +pThis image should not be split across columns.br +The reason it should not be split is that the line contains no +text and so we should be willing to allow it to sit at the top of a new +page. +/p +div style=display:inline-block; width:100%; height:50px;background-color:lime/div + +div style=display:inline-block; height:100%; width:50px;background-color:purple/div +/div/div \ No newline at end of file Copied: branches/safari-600.5-branch/LayoutTests/fast/multicol/tall-image-behavior-rl.html (from rev 176354, trunk/LayoutTests/fast/multicol/tall-image-behavior-rl.html) (0 => 179034) --- branches/safari-600.5-branch/LayoutTests/fast/multicol/tall-image-behavior-rl.html (rev 0) +++ branches/safari-600.5-branch/LayoutTests/fast/multicol/tall-image-behavior-rl.html 2015-01-23 23:37:25 UTC (rev 179034) @@ -0,0 +1,12 @@ +!doctype html +body style=-webkit-writing-mode:vertical-rl +div style=-webkit-columns:2; width:300px; border:2px solid blue;-webkit-line-box-contain:glyphs replaced +pThis image should not be split across columns.br +The reason it should not be split is that the line contains no +text and so we should be willing to allow it to sit at the top of a new +page. +/p +div style=display:inline-block; width:100%; height:50px;background-color:lime/div + +div style=display:inline-block; height:100%; width:50px;background-color:purple/div +/div/div \ No newline at end of file Copied:
[webkit-changes] [179037] trunk/Websites/perf.webkit.org
Title: [179037] trunk/Websites/perf.webkit.org
Revision 179037
Author rn...@webkit.org
Date 2015-01-23 16:24:26 -0800 (Fri, 23 Jan 2015)
Log Message
Perf dashboard always assigns the result of A/B testing with build request 1
https://bugs.webkit.org/show_bug.cgi?id=140382
Reviewed by Darin Adler.
The bug was caused by the _expression_ array_get($report, 'jobId') or array_get($report, 'buildRequest')
which always evaluated to 1 when the report contained jobId. Fixed the bug by cascading array_get instead.
Also fixed a typo as well as a bug that reports were never associated with builds.
* public/include/report-processor.php:
(ReportProcessor::process): Don't use or to find the non-null value since that always evaluates to 1
instead of the first non-null value.
(ReportProcessor::resolve_build_id): Fixed the typo by adding the missing $this-.
(ReportProcessor::commit): Associate the report with the corresponding build as intended.
Modified Paths
trunk/Websites/perf.webkit.org/ChangeLog
trunk/Websites/perf.webkit.org/public/include/report-processor.php
Diff
Modified: trunk/Websites/perf.webkit.org/ChangeLog (179036 => 179037)
--- trunk/Websites/perf.webkit.org/ChangeLog 2015-01-24 00:21:15 UTC (rev 179036)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2015-01-24 00:24:26 UTC (rev 179037)
@@ -1,5 +1,23 @@
2015-01-23 Ryosuke Niwa rn...@webkit.org
+Perf dashboard always assigns the result of A/B testing with build request 1
+https://bugs.webkit.org/show_bug.cgi?id=140382
+
+Reviewed by Darin Adler.
+
+The bug was caused by the _expression_ array_get($report, 'jobId') or array_get($report, 'buildRequest')
+which always evaluated to 1 when the report contained jobId. Fixed the bug by cascading array_get instead.
+
+Also fixed a typo as well as a bug that reports were never associated with builds.
+
+* public/include/report-processor.php:
+(ReportProcessor::process): Don't use or to find the non-null value since that always evaluates to 1
+instead of the first non-null value.
+(ReportProcessor::resolve_build_id): Fixed the typo by adding the missing $this-.
+(ReportProcessor::commit): Associate the report with the corresponding build as intended.
+
+2015-01-23 Ryosuke Niwa rn...@webkit.org
+
Unreviewed typo fix. The prefix in triggerable_configurations is trigconfig, not trigrepo.
* public/admin/tests.php:
Modified: trunk/Websites/perf.webkit.org/public/include/report-processor.php (179036 => 179037)
--- trunk/Websites/perf.webkit.org/public/include/report-processor.php 2015-01-24 00:21:15 UTC (rev 179036)
+++ trunk/Websites/perf.webkit.org/public/include/report-processor.php 2015-01-24 00:24:26 UTC (rev 179037)
@@ -90,7 +90,7 @@
// FIXME: Deprecate and unsupport jobId.
$build_id = $this-resolve_build_id($build_data, array_get($report, 'revisions', array()),
-array_get($report, 'jobId') or array_get($report, 'buildRequest'));
+array_get($report, 'jobId', array_get($report, 'buildRequest')));
$this-runs-commit($platform_id, $build_id);
}
@@ -129,7 +129,7 @@
$this-exit_with_error('FailedToInsertBuild', $build_data);
if ($build_request_id) {
-if ($db-update_row('build_requests', 'request', array('id' = $build_request_id), array('status' = 'completed', 'build' = $build_id))
+if ($this-db-update_row('build_requests', 'request', array('id' = $build_request_id), array('status' = 'completed', 'build' = $build_id))
!= $build_request_id)
$this-exit_with_error('FailedToUpdateBuildRequest', array('buildRequest' = $build_request_id, 'build' = $build_id));
}
@@ -439,8 +439,9 @@
}
}
-$this-db-query_and_get_affected_rows(UPDATE reports SET report_committed_at = CURRENT_TIMESTAMP AT TIME ZONE 'UTC'
-WHERE report_id = $1, array($this-report_id));
+$this-db-query_and_get_affected_rows(UPDATE reports
+SET (report_committed_at, report_build) = (CURRENT_TIMESTAMP AT TIME ZONE 'UTC', $2)
+WHERE report_id = $1, array($this-report_id, $build_id));
$this-db-commit_transaction() or $this-exit_with_error('FailedToCommitTransaction');
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179039] trunk/LayoutTests
Title: [179039] trunk/LayoutTests Revision 179039 Author bfulg...@apple.com Date 2015-01-23 16:38:49 -0800 (Fri, 23 Jan 2015) Log Message [Win] Test gardening. Mark a few failures after filing bugs. Also rebaseline a few tests. * platform/win/TestExpectations: * platform/win/accessibility/parent-element-expected.txt: * platform/win/editing/input/caret-at-the-edge-of-input-expected.png: Added. * platform/win/editing/input/caret-at-the-edge-of-input-expected.txt: Added. * platform/win/js/dom/global-constructors-attributes-expected.txt: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/win/TestExpectations trunk/LayoutTests/platform/win/accessibility/parent-element-expected.txt trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt Added Paths trunk/LayoutTests/platform/win/editing/input/caret-at-the-edge-of-input-expected.png trunk/LayoutTests/platform/win/editing/input/caret-at-the-edge-of-input-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (179038 => 179039) --- trunk/LayoutTests/ChangeLog 2015-01-24 00:32:01 UTC (rev 179038) +++ trunk/LayoutTests/ChangeLog 2015-01-24 00:38:49 UTC (rev 179039) @@ -1,3 +1,15 @@ +2015-01-23 Brent Fulgham bfulg...@apple.com + +[Win] Test gardening. Mark a few failures after filing bugs. + +Also rebaseline a few tests. + +* platform/win/TestExpectations: +* platform/win/accessibility/parent-element-expected.txt: +* platform/win/editing/input/caret-at-the-edge-of-input-expected.png: Added. +* platform/win/editing/input/caret-at-the-edge-of-input-expected.txt: Added. +* platform/win/js/dom/global-constructors-attributes-expected.txt: + 2015-01-23 Enrica Casucci enr...@apple.com Hit test returns incorrect results when performed in paginated content over the page gaps. Modified: trunk/LayoutTests/platform/win/TestExpectations (179038 => 179039) --- trunk/LayoutTests/platform/win/TestExpectations 2015-01-24 00:32:01 UTC (rev 179038) +++ trunk/LayoutTests/platform/win/TestExpectations 2015-01-24 00:38:49 UTC (rev 179039) @@ -1214,6 +1214,9 @@ webkit.org/b/140798 accessibility/aria-hidden-negates-no-visibility.html [ Failure ] webkit.org/b/140798 accessibility/aria-hidden-with-elements.html [ Failure ] webkit.org/b/140798 accessibility/aria-labeled-with-hidden-node.html [ Failure ] +webkit.org/b/140798 accessibility/aria-labelledby-overrides-aria-labeledby [ Failure ] +webkit.org/b/140798 accessibility/aria-labelledby-with-descendants [ Failure ] +webkit.org/b/140798 accessibility/aria-namefrom-author [ Failure ] webkit.org/b/140798 accessibility/aria-sort.html [ Failure ] webkit.org/b/140798 accessibility/aria-tables.html [ Failure ] webkit.org/b/140798 accessibility/aria-text-role.html [ Failure ] @@ -1585,7 +1588,7 @@ webkit.org/b/136484 fast/css-generated-content/initial-letter-sunken.html [ Failure ] fast/css/direct-adjacent-style-update-optimization.html [ Failure ] fast/css/indirect-adjacent-style-update-optimization.html [ Failure ] -fast/css/read-only-read-write-input-basics.html [ Failure ] +fast/css/read-only-read-write-input-basics.html [ ImageOnlyFailure ] # https://bugs.webkit.org/show_bug.cgi?id=138025 # Larger text and as a result, larger elements containing said text (as compared to Mac port) @@ -1814,6 +1817,7 @@ # Tests generating new results printing/return-from-printing-mode.html +webkit.org/b/140847 js/dom/date-negative-setmonth.html [ Failure ] # Start list of UNREVIEWED failures @@ -2522,6 +2526,8 @@ webkit.org/b/140250 fast/loader/stateobjects/document-destroyed-navigate-back-with-fragment-scroll.html [ Failure ] webkit.org/b/140250 fast/loader/stateobjects/document-destroyed-navigate-back.html [ Failure ] webkit.org/b/140250 fast/loader/stateobjects/replacestate-in-iframe.html [ Failure ] + +platform/win/fast/text/uniscribe-missing-glyph.html [ Failure ] # End list of UNREVIEWED failures ## Modified: trunk/LayoutTests/platform/win/accessibility/parent-element-expected.txt (179038 => 179039) --- trunk/LayoutTests/platform/win/accessibility/parent-element-expected.txt 2015-01-24 00:32:01 UTC (rev 179038) +++ trunk/LayoutTests/platform/win/accessibility/parent-element-expected.txt 2015-01-24 00:38:49 UTC (rev 179039) @@ -1,5 +1,6 @@ Received unknown event for object ''. Received unknown event for object ''. +Received unknown event for object ''. This tests that elements return their correct parent element. Added: trunk/LayoutTests/platform/win/editing/input/caret-at-the-edge-of-input-expected.png (Binary files differ) Property changes
[webkit-changes] [179046] trunk/Tools
Title: [179046] trunk/Tools
Revision 179046
Author ddkil...@apple.com
Date 2015-01-23 17:05:32 -0800 (Fri, 23 Jan 2015)
Log Message
test-webkitpy: webkitpy.tool.commands.earlywarningsystem_unittest.EarlyWarningSystemTest.test_ewses fails on EFL, GTK, Win ports
http://webkit.org/b/140787
Reviewed by Daniel Bates.
* Scripts/webkitpy/port/ios.py:
(IOSPort.determine_full_port_name): Instead of checking the type
of the current host, test if /usr/bin/xcrun exists before trying
to use it.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/port/ios.py
Diff
Modified: trunk/Tools/ChangeLog (179045 => 179046)
--- trunk/Tools/ChangeLog 2015-01-24 01:03:13 UTC (rev 179045)
+++ trunk/Tools/ChangeLog 2015-01-24 01:05:32 UTC (rev 179046)
@@ -1,3 +1,15 @@
+2015-01-23 David Kilzer ddkil...@apple.com
+
+test-webkitpy: webkitpy.tool.commands.earlywarningsystem_unittest.EarlyWarningSystemTest.test_ewses fails on EFL, GTK, Win ports
+http://webkit.org/b/140787
+
+Reviewed by Daniel Bates.
+
+* Scripts/webkitpy/port/ios.py:
+(IOSPort.determine_full_port_name): Instead of checking the type
+of the current host, test if /usr/bin/xcrun exists before trying
+to use it.
+
2015-01-23 Csaba Osztrogonác o...@webkit.org
Fix the false positive build failures on the Windows buildbots
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (179045 => 179046)
--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-24 01:03:13 UTC (rev 179045)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-24 01:05:32 UTC (rev 179046)
@@ -53,7 +53,9 @@
def determine_full_port_name(cls, host, options, port_name):
if port_name == cls.port_name:
sdk_version = '8.0'
-if host.platform.is_mac():
+# FIXME: We should move the call to xcrun to the PlatformInfo object so that
+# we can use MockPlatformInfo to set an expectation when running the unit tests.
+if os.path.isfile('/usr/bin/xcrun'):
sdk_command_output = subprocess.check_output(['/usr/bin/xcrun', '--sdk', 'iphoneos', '--show-sdk-version'], stderr=None).rstrip()
if sdk_command_output:
sdk_version = sdk_command_output
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [178989] trunk/LayoutTests
Title: [178989] trunk/LayoutTests
Revision 178989
Author a...@apple.com
Date 2015-01-23 00:52:56 -0800 (Fri, 23 Jan 2015)
Log Message
svg-resource-fragment-identifier-img-src.html is a hidpi reftest, but its -expected.html
counterpart isn't hidpi
https://bugs.webkit.org/show_bug.cgi?id=140815
Reviewed by Simon Fraser.
* svg/css/svg-resource-fragment-identifier-img-src-expected.html: Make the expectation
match its test.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/svg/css/svg-resource-fragment-identifier-img-src-expected.html
Diff
Modified: trunk/LayoutTests/ChangeLog (178988 => 178989)
--- trunk/LayoutTests/ChangeLog 2015-01-23 08:49:39 UTC (rev 178988)
+++ trunk/LayoutTests/ChangeLog 2015-01-23 08:52:56 UTC (rev 178989)
@@ -1,3 +1,14 @@
+2015-01-23 Alexey Proskuryakov a...@apple.com
+
+svg-resource-fragment-identifier-img-src.html is a hidpi reftest, but its -expected.html
+counterpart isn't hidpi
+https://bugs.webkit.org/show_bug.cgi?id=140815
+
+Reviewed by Simon Fraser.
+
+* svg/css/svg-resource-fragment-identifier-img-src-expected.html: Make the expectation
+match its test.
+
2015-01-23 Chris Dumez cdu...@apple.com
Rewrite the fast/css/css2-system-fonts.html test to be more useful on all platforms
Modified: trunk/LayoutTests/svg/css/svg-resource-fragment-identifier-img-src-expected.html (178988 => 178989)
--- trunk/LayoutTests/svg/css/svg-resource-fragment-identifier-img-src-expected.html 2015-01-23 08:49:39 UTC (rev 178988)
+++ trunk/LayoutTests/svg/css/svg-resource-fragment-identifier-img-src-expected.html 2015-01-23 08:52:56 UTC (rev 178989)
@@ -1,6 +1,10 @@
!DOCTYPE html
html
head
+script
+window.targetScaleFactor = 2;
+/script
+script src=""
style type=text/css media=screen
div {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179055] trunk
Title: [179055] trunk Revision 179055 Author benja...@webkit.org Date 2015-01-23 20:15:56 -0800 (Fri, 23 Jan 2015) Log Message Add pointer/hover media queries https://bugs.webkit.org/show_bug.cgi?id=134822 Patch by Benjamin Poulain bpoul...@apple.com on 2015-01-23 Reviewed by Antti Koivisto. Source/WebCore: Media Queries Level 4 introduces two types of Interaction Media Features: pointer and hover. Those media features are useful for adapting the design to the type of input: http://dev.w3.org/csswg/mediaqueries-4/#mf-interaction This implementation is trivial: just #ifdef the return value depending on the support for touch events. In the future we should move that to a client interface but let's start easy for now. Tests: fast/media/mq-any-hover-cssom.html fast/media/mq-any-hover-invalid.html fast/media/mq-any-hover-matchMedia.html fast/media/mq-any-hover-styling.html fast/media/mq-any-pointer-cssom.html fast/media/mq-any-pointer-invalid.html fast/media/mq-any-pointer-matchMedia.html fast/media/mq-any-pointer-styling.html fast/media/mq-hover-cssom.html fast/media/mq-hover-invalid.html fast/media/mq-hover-matchMedia.html fast/media/mq-hover-styling.html fast/media/mq-pointer-cssom.html fast/media/mq-pointer-invalid.html fast/media/mq-pointer-matchMedia.html fast/media/mq-pointer-styling.html * css/CSSValueKeywords.in: * css/MediaFeatureNames.h: * css/MediaQueryEvaluator.cpp: (WebCore::hoverMediaFeatureEval): (WebCore::any_hoverMediaFeatureEval): (WebCore::pointerMediaFeatureEval): (WebCore::any_pointerMediaFeatureEval): (WebCore::leastCapablePrimaryPointerDeviceType): Deleted. * css/MediaQueryExp.cpp: (WebCore::featureWithCSSValueID): (WebCore::featureWithZeroOrOne): (WebCore::featureWithoutValue): * page/EventHandler.cpp: (WebCore::EventHandler::dispatchFakeMouseMoveEventSoon): (WebCore::EventHandler::fakeMouseMoveEventTimerFired): * page/Settings.in: LayoutTests: * fast/media/mq-any-hover-cssom-expected.txt: Added. * fast/media/mq-any-hover-cssom.html: Added. * fast/media/mq-any-hover-invalid-expected.txt: Added. * fast/media/mq-any-hover-invalid.html: Added. * fast/media/mq-any-hover-matchMedia-expected.txt: Added. * fast/media/mq-any-hover-matchMedia.html: Added. * fast/media/mq-any-hover-styling-expected.txt: Added. * fast/media/mq-any-hover-styling.html: Added. * fast/media/mq-any-pointer-cssom-expected.txt: Added. * fast/media/mq-any-pointer-cssom.html: Added. * fast/media/mq-any-pointer-invalid-expected.txt: Added. * fast/media/mq-any-pointer-invalid.html: Added. * fast/media/mq-any-pointer-matchMedia-expected.txt: Added. * fast/media/mq-any-pointer-matchMedia.html: Added. * fast/media/mq-any-pointer-styling-expected.txt: Added. * fast/media/mq-any-pointer-styling.html: Added. * fast/media/mq-hover-cssom-expected.txt: Added. * fast/media/mq-hover-cssom.html: Added. * fast/media/mq-hover-invalid-expected.txt: Added. * fast/media/mq-hover-invalid.html: Added. * fast/media/mq-hover-matchMedia-expected.txt: Added. * fast/media/mq-hover-matchMedia.html: Added. * fast/media/mq-hover-styling-expected.txt: Added. * fast/media/mq-hover-styling.html: Added. * fast/media/mq-pointer-cssom-expected.txt: Added. * fast/media/mq-pointer-cssom.html: Added. * fast/media/mq-pointer-expected.txt: * fast/media/mq-pointer-invalid-expected.txt: Added. * fast/media/mq-pointer-invalid.html: Added. * fast/media/mq-pointer-matchMedia-expected.txt: Added. * fast/media/mq-pointer-matchMedia.html: Added. * fast/media/mq-pointer-styling-expected.txt: Added. * fast/media/mq-pointer-styling.html: Added. * fast/media/mq-pointer.html: * platform/ios-simulator/fast/media/mq-any-hover-matchMedia-expected.txt: Added. * platform/ios-simulator/fast/media/mq-any-hover-styling-expected.txt: Added. * platform/ios-simulator/fast/media/mq-any-pointer-matchMedia-expected.txt: Added. * platform/ios-simulator/fast/media/mq-any-pointer-styling-expected.txt: Added. * platform/ios-simulator/fast/media/mq-hover-matchMedia-expected.txt: Added. * platform/ios-simulator/fast/media/mq-hover-styling-expected.txt: Added. * platform/ios-simulator/fast/media/mq-pointer-expected.txt: Added. * platform/ios-simulator/fast/media/mq-pointer-matchMedia-expected.txt: Added. * platform/ios-simulator/fast/media/mq-pointer-styling-expected.txt: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/fast/media/mq-pointer-expected.txt trunk/LayoutTests/fast/media/mq-pointer.html trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/css/CSSValueKeywords.in trunk/Source/WebCore/css/MediaFeatureNames.h trunk/Source/WebCore/css/MediaQueryEvaluator.cpp trunk/Source/WebCore/css/MediaQueryExp.cpp trunk/Source/WebCore/page/EventHandler.cpp trunk/Source/WebCore/page/Settings.in Added Paths trunk/LayoutTests/fast/media/mq-any-hover-cssom-expected.txt trunk/LayoutTests/fast/media/mq-any-hover-cssom.html
[webkit-changes] [179057] trunk/Source/WebCore
Title: [179057] trunk/Source/WebCore
Revision 179057
Author a...@apple.com
Date 2015-01-23 21:33:40 -0800 (Fri, 23 Jan 2015)
Log Message
Try to fix the build after r179056.
* platform/Cursor.h: (WebCore::Cursor::Cursor): Initialize dadat members in correct order.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/Cursor.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (179056 => 179057)
--- trunk/Source/WebCore/ChangeLog 2015-01-24 05:26:41 UTC (rev 179056)
+++ trunk/Source/WebCore/ChangeLog 2015-01-24 05:33:40 UTC (rev 179057)
@@ -1,3 +1,9 @@
+2015-01-23 Alexey Proskuryakov a...@apple.com
+
+Try to fix the build after r179056.
+
+* platform/Cursor.h: (WebCore::Cursor::Cursor): Initialize dadat members in correct order.
+
2015-01-23 Brent Fulgham bfulg...@apple.com
[Win] Cursor copy constructor does not initialize scale factor
Modified: trunk/Source/WebCore/platform/Cursor.h (179056 => 179057)
--- trunk/Source/WebCore/platform/Cursor.h 2015-01-24 05:26:41 UTC (rev 179056)
+++ trunk/Source/WebCore/platform/Cursor.h 2015-01-24 05:33:40 UTC (rev 179057)
@@ -132,10 +132,10 @@
#if !PLATFORM(IOS)
// This is an invalid Cursor and should never actually get used.
: m_type(static_castType(-1))
-, m_platformCursor(0)
#if ENABLE(MOUSE_CURSOR_SCALE)
, m_imageScaleFactor(1)
#endif
+, m_platformCursor(0)
#endif // !PLATFORM(IOS)
{
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179059] trunk/Source/WebCore
Title: [179059] trunk/Source/WebCore Revision 179059 Author bfulg...@apple.com Date 2015-01-23 23:04:01 -0800 (Fri, 23 Jan 2015) Log Message [Win] Cursor assignment operator is skipping scale factor https://bugs.webkit.org/show_bug.cgi?id=140852 Reviewed by Chris Dumez. Found by fast/events/mouse-cursor-image-set.html * platform/win/CursorWin.cpp: (WebCore::Cursor::operator=): Make sure to also assign the scale factor. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/win/CursorWin.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (179058 => 179059) --- trunk/Source/WebCore/ChangeLog 2015-01-24 05:36:59 UTC (rev 179058) +++ trunk/Source/WebCore/ChangeLog 2015-01-24 07:04:01 UTC (rev 179059) @@ -1,3 +1,16 @@ +2015-01-23 Brent Fulgham bfulg...@apple.com + +[Win] Cursor assignment operator is skipping scale factor +https://bugs.webkit.org/show_bug.cgi?id=140852 + +Reviewed by Chris Dumez. + +Found by fast/events/mouse-cursor-image-set.html + +* platform/win/CursorWin.cpp: +(WebCore::Cursor::operator=): Make sure to also assign the +scale factor. + 2015-01-23 David Kilzer ddkil...@apple.com [iOS] Attempt to fix the build after AVValueTiming.h moved Modified: trunk/Source/WebCore/platform/win/CursorWin.cpp (179058 => 179059) --- trunk/Source/WebCore/platform/win/CursorWin.cpp 2015-01-24 05:36:59 UTC (rev 179058) +++ trunk/Source/WebCore/platform/win/CursorWin.cpp 2015-01-24 07:04:01 UTC (rev 179059) @@ -284,6 +284,9 @@ m_type = other.m_type; m_image = other.m_image; m_hotSpot = other.m_hotSpot; +#if ENABLE(MOUSE_CURSOR_SCALE) +m_imageScaleFactor = other.m_imageScaleFactor; +#endif m_platformCursor = other.m_platformCursor; return *this; } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179060] trunk/LayoutTests
Title: [179060] trunk/LayoutTests Revision 179060 Author bfulg...@apple.com Date 2015-01-23 23:05:45 -0800 (Fri, 23 Jan 2015) Log Message [Win] Unreviewed gardening. Add Windows baseline for mouse-cursor-image-set. * platform/win/fast/events/mouse-cursor-image-set-expected.txt: Added. Modified Paths trunk/LayoutTests/ChangeLog Added Paths trunk/LayoutTests/platform/win/fast/events/mouse-cursor-image-set-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (179059 => 179060) --- trunk/LayoutTests/ChangeLog 2015-01-24 07:04:01 UTC (rev 179059) +++ trunk/LayoutTests/ChangeLog 2015-01-24 07:05:45 UTC (rev 179060) @@ -1,3 +1,10 @@ +2015-01-23 Brent Fulgham bfulg...@apple.com + +[Win] Unreviewed gardening. Add Windows baseline for +mouse-cursor-image-set. + +* platform/win/fast/events/mouse-cursor-image-set-expected.txt: Added. + 2015-01-23 Benjamin Poulain bpoul...@apple.com Add pointer/hover media queries Added: trunk/LayoutTests/platform/win/fast/events/mouse-cursor-image-set-expected.txt (0 => 179060) --- trunk/LayoutTests/platform/win/fast/events/mouse-cursor-image-set-expected.txt (rev 0) +++ trunk/LayoutTests/platform/win/fast/events/mouse-cursor-image-set-expected.txt 2015-01-24 07:05:45 UTC (rev 179060) @@ -0,0 +1,82 @@ +Test that mouse cursors are applied correctly. + +On success, you will see a series of PASS messages, followed by TEST COMPLETE. + + +Bug 99493 + + +Checking cursors with device pixel ratio of 1 +-- +TEST CASE: 25x25 image at 1x +Cursor Info: type=Custom hotSpot=0,0 image=25x25 + +TEST CASE: 25x25 image at 2x +Cursor Info: type=Custom hotSpot=0,0 image=25x25 scale=2 + +TEST CASE: 25x25 image at 1x, 30x30 image at 2x +Cursor Info: type=Custom hotSpot=0,0 image=25x25 + +TEST CASE: 25x25 image at 1.5x, 30x30 image at 5x +Cursor Info: type=Custom hotSpot=0,0 image=25x25 scale=1.5 + +TEST CASE: Invalid tiny scale with fallback to pointer +Cursor Info: type=Hand hotSpot=0,0 + +TEST CASE: Over-large image with fallback to pointer +Cursor Info: type=Hand hotSpot=0,0 + +TEST CASE: 200x200 image at 4x (not over-large in UI pixels) +Cursor Info: type=Custom hotSpot=0,0 image=200x200 scale=4 + +TEST CASE: Non-existent image in image-set with fallback to 25x25 image +Cursor Info: type=Custom hotSpot=0,0 image=25x25 + +TEST CASE: Explicit hotspot at (5,3) logical in 1x and 2x +Cursor Info: type=Custom hotSpot=5,3 image=25x25 + +TEST CASE: Explicit hotspot at (7,3) logical in 0.7x and 1.4x - should round to nearest integer +Cursor Info: type=Custom hotSpot=10,4 image=30x30 scale=1.4 + +TEST CASE: Implicit hot-spot at (5,4) physical for 1x and (28,3) physical for 2x +Cursor Info: type=Custom hotSpot=5,4 image=25x25 + +Checking cursors with device pixel ratio of 1 +-- +TEST CASE: 25x25 image at 1x +Cursor Info: type=Custom hotSpot=0,0 image=25x25 + +TEST CASE: 25x25 image at 2x +Cursor Info: type=Custom hotSpot=0,0 image=25x25 scale=2 + +TEST CASE: 25x25 image at 1x, 30x30 image at 2x +Cursor Info: type=Custom hotSpot=0,0 image=25x25 + +TEST CASE: 25x25 image at 1.5x, 30x30 image at 5x +Cursor Info: type=Custom hotSpot=0,0 image=25x25 scale=1.5 + +TEST CASE: Invalid tiny scale with fallback to pointer +Cursor Info: type=Hand hotSpot=0,0 + +TEST CASE: Over-large image with fallback to pointer +Cursor Info: type=Hand hotSpot=0,0 + +TEST CASE: 200x200 image at 4x (not over-large in UI pixels) +Cursor Info: type=Custom hotSpot=0,0 image=200x200 scale=4 + +TEST CASE: Non-existent image in image-set with fallback to 25x25 image +Cursor Info: type=Custom hotSpot=0,0 image=25x25 + +TEST CASE: Explicit hotspot at (5,3) logical in 1x and 2x +Cursor Info: type=Custom hotSpot=5,3 image=25x25 + +TEST CASE: Explicit hotspot at (7,3) logical in 0.7x and 1.4x - should round to nearest integer +Cursor Info: type=Custom hotSpot=10,4 image=30x30 scale=1.4 + +TEST CASE: Implicit hot-spot at (5,4) physical for 1x and (28,3) physical for 2x +Cursor Info: type=Custom hotSpot=5,4 image=25x25 + +PASS successfullyParsed is true + +TEST COMPLETE + ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179056] trunk/Source/WebCore
Title: [179056] trunk/Source/WebCore
Revision 179056
Author bfulg...@apple.com
Date 2015-01-23 21:26:41 -0800 (Fri, 23 Jan 2015)
Log Message
[Win] Cursor copy constructor does not initialize scale factor
https://bugs.webkit.org/show_bug.cgi?id=140849
Reviewed by Antti Koivisto.
Found by fast/events/mouse-cursor-image-set.html
Make sure the scale factor is captured during copy construction. Also make sure
it is properly initialized in the default constructor, since it it used in the
Windows port for some default cursors.
* platform/CursorWin.h:
* platform/win/CursorWin.cpp:
(WebCore::Cursor::Cursor): Make sure copy constructor captures
the scale factor.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/Cursor.h
trunk/Source/WebCore/platform/win/CursorWin.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (179055 => 179056)
--- trunk/Source/WebCore/ChangeLog 2015-01-24 04:15:56 UTC (rev 179055)
+++ trunk/Source/WebCore/ChangeLog 2015-01-24 05:26:41 UTC (rev 179056)
@@ -1,3 +1,21 @@
+2015-01-23 Brent Fulgham bfulg...@apple.com
+
+[Win] Cursor copy constructor does not initialize scale factor
+https://bugs.webkit.org/show_bug.cgi?id=140849
+
+Reviewed by Antti Koivisto.
+
+Found by fast/events/mouse-cursor-image-set.html
+
+Make sure the scale factor is captured during copy construction. Also make sure
+it is properly initialized in the default constructor, since it it used in the
+Windows port for some default cursors.
+
+* platform/CursorWin.h:
+* platform/win/CursorWin.cpp:
+(WebCore::Cursor::Cursor): Make sure copy constructor captures
+the scale factor.
+
2015-01-23 Benjamin Poulain bpoul...@apple.com
Add pointer/hover media queries
Modified: trunk/Source/WebCore/platform/Cursor.h (179055 => 179056)
--- trunk/Source/WebCore/platform/Cursor.h 2015-01-24 04:15:56 UTC (rev 179055)
+++ trunk/Source/WebCore/platform/Cursor.h 2015-01-24 05:26:41 UTC (rev 179056)
@@ -133,6 +133,9 @@
// This is an invalid Cursor and should never actually get used.
: m_type(static_castType(-1))
, m_platformCursor(0)
+#if ENABLE(MOUSE_CURSOR_SCALE)
+, m_imageScaleFactor(1)
+#endif
#endif // !PLATFORM(IOS)
{
}
Modified: trunk/Source/WebCore/platform/win/CursorWin.cpp (179055 => 179056)
--- trunk/Source/WebCore/platform/win/CursorWin.cpp 2015-01-24 04:15:56 UTC (rev 179055)
+++ trunk/Source/WebCore/platform/win/CursorWin.cpp 2015-01-24 05:26:41 UTC (rev 179056)
@@ -272,6 +272,9 @@
: m_type(other.m_type)
, m_image(other.m_image)
, m_hotSpot(other.m_hotSpot)
+#if ENABLE(MOUSE_CURSOR_SCALE)
+, m_imageScaleFactor(other.m_imageScaleFactor)
+#endif
, m_platformCursor(other.m_platformCursor)
{
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179058] trunk/Source/WebCore
Title: [179058] trunk/Source/WebCore Revision 179058 Author ddkil...@apple.com Date 2015-01-23 21:36:59 -0800 (Fri, 23 Jan 2015) Log Message [iOS] Attempt to fix the build after AVValueTiming.h moved * platform/spi/ios/AVKitSPI.h: The AVValueTiming.h header moved to an unexpected location, so work around it by using local SPI declarations. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/spi/ios/AVKitSPI.h Diff Modified: trunk/Source/WebCore/ChangeLog (179057 => 179058) --- trunk/Source/WebCore/ChangeLog 2015-01-24 05:33:40 UTC (rev 179057) +++ trunk/Source/WebCore/ChangeLog 2015-01-24 05:36:59 UTC (rev 179058) @@ -1,3 +1,11 @@ +2015-01-23 David Kilzer ddkil...@apple.com + +[iOS] Attempt to fix the build after AVValueTiming.h moved + +* platform/spi/ios/AVKitSPI.h: The AVValueTiming.h header moved +to an unexpected location, so work around it by using local SPI +declarations. + 2015-01-23 Alexey Proskuryakov a...@apple.com Try to fix the build after r179056. Modified: trunk/Source/WebCore/platform/spi/ios/AVKitSPI.h (179057 => 179058) --- trunk/Source/WebCore/platform/spi/ios/AVKitSPI.h 2015-01-24 05:33:40 UTC (rev 179057) +++ trunk/Source/WebCore/platform/spi/ios/AVKitSPI.h 2015-01-24 05:36:59 UTC (rev 179058) @@ -32,7 +32,6 @@ #import AVKit/AVPlayerController.h #import AVKit/AVPlayerViewController_Private.h #import AVKit/AVPlayerViewController_WebKitOnly.h -#import AVKit/AVValueTiming.h #import AVKit/AVVideoLayer.h #else @@ -93,6 +92,14 @@ @property (nonatomic, weak) id AVPlayerViewControllerDelegate delegate; @end +#endif + +#if USE(APPLE_INTERNAL_SDK) __IPHONE_OS_VERSION_MIN_REQUIRED 9 + +#import AVKit/AVValueTiming.h + +#else + @interface AVValueTiming : NSObject NSCoding, NSCopying, NSMutableCopying @end ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [178990] branches/safari-600.5-branch/Source/WebKit2
Title: [178990] branches/safari-600.5-branch/Source/WebKit2
Revision 178990
Author bshaf...@apple.com
Date 2015-01-23 01:14:55 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r178595. rdar://problem/19490114
Modified Paths
branches/safari-600.5-branch/Source/WebKit2/ChangeLog
branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm
Diff
Modified: branches/safari-600.5-branch/Source/WebKit2/ChangeLog (178989 => 178990)
--- branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-23 08:52:56 UTC (rev 178989)
+++ branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-23 09:14:55 UTC (rev 178990)
@@ -1,3 +1,27 @@
+2015-01-23 Babak Shafiei bshaf...@apple.com
+
+Merge r178595. rdar://problem/19490114
+
+2015-01-16 Beth Dakin bda...@apple.com
+
+Should cancel immediate action sooner in WK2
+https://bugs.webkit.org/show_bug.cgi?id=140561
+-and corresponding-
+rdar://problem/19490114
+
+Reviewed by Tim Horton.
+
+_cancelImmediateActionIfNeeded will cancel the immediate action if there is no
+animation controller or if the DDActionContext doesn’t want to use its actions.
+* UIProcess/mac/WKImmediateActionController.mm:
+(-[WKImmediateActionController _cancelImmediateActionIfNeeded]):
+
+Call _cancelImmediateActionIfNeeded to cancel earlier.
+(-[WKImmediateActionController didPerformActionMenuHitTest:userData:]):
+
+Re-factor this code to use the newly-added method _cancelImmediateActionIfNeeded
+(-[WKImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
+
2015-01-22 Matthew Hanson matthew_han...@apple.com
Merge r174708. rdar://problem/19451256
Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (178989 => 178990)
--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-23 08:52:56 UTC (rev 178989)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-23 09:14:55 UTC (rev 178990)
@@ -93,6 +93,18 @@
[self _clearImmediateActionState];
}
+- (void)_cancelImmediateActionIfNeeded
+{
+if (!_immediateActionRecognizer.animationController)
+[self _cancelImmediateAction];
+
+if (_currentActionContext) {
+_hasActivatedActionContext = YES;
+if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()])
+[self _cancelImmediateAction];
+}
+}
+
- (void)_clearImmediateActionState
{
_page-clearTextIndicator();
@@ -117,6 +129,7 @@
_userData = userData;
[self _updateImmediateActionItem];
+[self _cancelImmediateActionIfNeeded];
}
#pragma mark NSImmediateActionGestureRecognizerDelegate
@@ -154,19 +167,10 @@
}
}
-if (_state != ImmediateActionState::Ready)
+if (_state != ImmediateActionState::Ready) {
[self _updateImmediateActionItem];
-
-if (!_immediateActionRecognizer.animationController) {
-[self _cancelImmediateAction];
-return;
+[self _cancelImmediateActionIfNeeded];
}
-
-if (_currentActionContext) {
-_hasActivatedActionContext = YES;
-if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()])
-[self _cancelImmediateAction];
-}
}
- (void)immediateActionRecognizerDidUpdateAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [178988] trunk/Source/WebCore
Title: [178988] trunk/Source/WebCore
Revision 178988
Author g.czajkow...@samsung.com
Date 2015-01-23 00:49:39 -0800 (Fri, 23 Jan 2015)
Log Message
Rename ChildNodeRemovalNotifier::m_insertionPoint to m_removalPoint
https://bugs.webkit.org/show_bug.cgi?id=140766
Reviewed by Andreas Kling.
ChildNodeRemovalNotifier::ChildNodeRemovalNotifier(...) should take
a node as removal point.
It's probably Copy/Paste from ChildNodeInsertionNotifier::m_insertionPoint.
No new tests. No behavior change.
* dom/ContainerNodeAlgorithms.h:
(WebCore::ChildNodeRemovalNotifier::ChildNodeRemovalNotifier):
(WebCore::ChildNodeRemovalNotifier::notifyNodeRemovedFromDocument):
(WebCore::ChildNodeRemovalNotifier::notifyNodeRemovedFromTree):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/ContainerNodeAlgorithms.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (178987 => 178988)
--- trunk/Source/WebCore/ChangeLog 2015-01-23 08:25:22 UTC (rev 178987)
+++ trunk/Source/WebCore/ChangeLog 2015-01-23 08:49:39 UTC (rev 178988)
@@ -1,3 +1,21 @@
+2015-01-23 Grzegorz Czajkowski g.czajkow...@samsung.com
+
+Rename ChildNodeRemovalNotifier::m_insertionPoint to m_removalPoint
+https://bugs.webkit.org/show_bug.cgi?id=140766
+
+Reviewed by Andreas Kling.
+
+ChildNodeRemovalNotifier::ChildNodeRemovalNotifier(...) should take
+a node as removal point.
+It's probably Copy/Paste from ChildNodeInsertionNotifier::m_insertionPoint.
+
+No new tests. No behavior change.
+
+* dom/ContainerNodeAlgorithms.h:
+(WebCore::ChildNodeRemovalNotifier::ChildNodeRemovalNotifier):
+(WebCore::ChildNodeRemovalNotifier::notifyNodeRemovedFromDocument):
+(WebCore::ChildNodeRemovalNotifier::notifyNodeRemovedFromTree):
+
2015-01-23 Hunseop Jeong hs85.je...@samsung.com
[GTK] Fix debug build after r178940
Modified: trunk/Source/WebCore/dom/ContainerNodeAlgorithms.h (178987 => 178988)
--- trunk/Source/WebCore/dom/ContainerNodeAlgorithms.h 2015-01-23 08:25:22 UTC (rev 178987)
+++ trunk/Source/WebCore/dom/ContainerNodeAlgorithms.h 2015-01-23 08:49:39 UTC (rev 178988)
@@ -55,8 +55,8 @@
class ChildNodeRemovalNotifier {
public:
-explicit ChildNodeRemovalNotifier(ContainerNode insertionPoint)
-: m_insertionPoint(insertionPoint)
+explicit ChildNodeRemovalNotifier(ContainerNode removalPoint)
+: m_removalPoint(removalPoint)
{
}
@@ -68,7 +68,7 @@
void notifyNodeRemovedFromDocument(Node);
void notifyNodeRemovedFromTree(ContainerNode);
-ContainerNode m_insertionPoint;
+ContainerNode m_removalPoint;
};
namespace Private {
@@ -234,8 +234,8 @@
inline void ChildNodeRemovalNotifier::notifyNodeRemovedFromDocument(Node node)
{
-ASSERT(m_insertionPoint.inDocument());
-node.removedFrom(m_insertionPoint);
+ASSERT(m_removalPoint.inDocument());
+node.removedFrom(m_removalPoint);
if (isContainerNode(node))
notifyDescendantRemovedFromDocument(downcastContainerNode(node));
@@ -244,9 +244,9 @@
inline void ChildNodeRemovalNotifier::notifyNodeRemovedFromTree(ContainerNode node)
{
NoEventDispatchAssertion assertNoEventDispatch;
-ASSERT(!m_insertionPoint.inDocument());
+ASSERT(!m_removalPoint.inDocument());
-node.removedFrom(m_insertionPoint);
+node.removedFrom(m_removalPoint);
notifyDescendantRemovedFromTree(node);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [178987] trunk/LayoutTests
Title: [178987] trunk/LayoutTests Revision 178987 Author cdu...@apple.com Date 2015-01-23 00:25:22 -0800 (Fri, 23 Jan 2015) Log Message Rewrite the fast/css/css2-system-fonts.html test to be more useful on all platforms https://bugs.webkit.org/show_bug.cgi?id=140810 Reviewed by Andreas Kling. Make the fast/css/css2-system-fonts.html explicit about the font styles expected on each platform instead of just Mac. It also converts the test to be text only as the style information is now displayed in text format. This change is in preparation for a refactor of system font handling. This change is based on the following Blink revision by alancut...@chromium.org: http://src.chromium.org/viewvc/blink?view=revisionrevision=169612 * fast/css/css2-system-fonts.html: * platform/efl/fast/css/css2-system-fonts-expected.png: Removed. * platform/efl/fast/css/css2-system-fonts-expected.txt: Removed. * platform/gtk/fast/css/css2-system-fonts-expected.png: Removed. * platform/gtk/fast/css/css2-system-fonts-expected.txt: Removed. * platform/ios-simulator-wk2/fast/css/css2-system-fonts-expected.txt: * platform/mac-mavericks/fast/css/css2-system-fonts-expected.png: Removed. * platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt: * platform/mac-mountainlion/fast/css/css2-system-fonts-expected.txt: Removed. * platform/mac/fast/css/css2-system-fonts-expected.png: Removed. * platform/mac/fast/css/css2-system-fonts-expected.txt: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/fast/css/css2-system-fonts.html trunk/LayoutTests/platform/ios-simulator-wk2/fast/css/css2-system-fonts-expected.txt trunk/LayoutTests/platform/mac/fast/css/css2-system-fonts-expected.txt trunk/LayoutTests/platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt Removed Paths trunk/LayoutTests/platform/efl/fast/css/css2-system-fonts-expected.png trunk/LayoutTests/platform/efl/fast/css/css2-system-fonts-expected.txt trunk/LayoutTests/platform/gtk/fast/css/css2-system-fonts-expected.png trunk/LayoutTests/platform/gtk/fast/css/css2-system-fonts-expected.txt trunk/LayoutTests/platform/mac/fast/css/css2-system-fonts-expected.png trunk/LayoutTests/platform/mac-mavericks/fast/css/css2-system-fonts-expected.png trunk/LayoutTests/platform/mac-mountainlion/fast/css/css2-system-fonts-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (178986 => 178987) --- trunk/LayoutTests/ChangeLog 2015-01-23 08:19:47 UTC (rev 178986) +++ trunk/LayoutTests/ChangeLog 2015-01-23 08:25:22 UTC (rev 178987) @@ -1,3 +1,34 @@ +2015-01-23 Chris Dumez cdu...@apple.com + +Rewrite the fast/css/css2-system-fonts.html test to be more useful on all platforms +https://bugs.webkit.org/show_bug.cgi?id=140810 + +Reviewed by Andreas Kling. + +Make the fast/css/css2-system-fonts.html explicit about the font styles +expected on each platform instead of just Mac. + +It also converts the test to be text only as the style information is +now displayed in text format. + +This change is in preparation for a refactor of system font handling. + +This change is based on the following Blink revision by +alancut...@chromium.org: +http://src.chromium.org/viewvc/blink?view=revisionrevision=169612 + +* fast/css/css2-system-fonts.html: +* platform/efl/fast/css/css2-system-fonts-expected.png: Removed. +* platform/efl/fast/css/css2-system-fonts-expected.txt: Removed. +* platform/gtk/fast/css/css2-system-fonts-expected.png: Removed. +* platform/gtk/fast/css/css2-system-fonts-expected.txt: Removed. +* platform/ios-simulator-wk2/fast/css/css2-system-fonts-expected.txt: +* platform/mac-mavericks/fast/css/css2-system-fonts-expected.png: Removed. +* platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt: +* platform/mac-mountainlion/fast/css/css2-system-fonts-expected.txt: Removed. +* platform/mac/fast/css/css2-system-fonts-expected.png: Removed. +* platform/mac/fast/css/css2-system-fonts-expected.txt: + 2015-01-22 Chris Dumez cdu...@apple.com Import fast/css/font-shorthand-line-height.html layout test from Blink Modified: trunk/LayoutTests/fast/css/css2-system-fonts.html (178986 => 178987) --- trunk/LayoutTests/fast/css/css2-system-fonts.html 2015-01-23 08:19:47 UTC (rev 178986) +++ trunk/LayoutTests/fast/css/css2-system-fonts.html 2015-01-23 08:25:22 UTC (rev 178987) @@ -1,15 +1,26 @@ -html - body - h1CSS2 System Fonts/h1 - pThe following should appear with the fonts specified, per the a href="" specs/a. If they appear in a monospace font, the test has failed./p - ul style=font-family: monospace; - li style=font: caption;Caption (on Mac will be Lucida Grande 13.0 Regular)/li - li style=font: icon;Icon (on Mac will be Lucida Grande 13.0 Regular for now, not sure how to get this info from Finder) - li style=font: menu;Menu (on Mac will be Lucida Grande 13.0
[webkit-changes] [178992] branches/safari-600.5-branch/Source/WebKit/mac
Title: [178992] branches/safari-600.5-branch/Source/WebKit/mac
Revision 178992
Author bshaf...@apple.com
Date 2015-01-23 01:17:30 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r178676. rdar://problem/19489593
Modified Paths
branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog
branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm
Diff
Modified: branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog (178991 => 178992)
--- branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-23 09:16:11 UTC (rev 178991)
+++ branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-23 09:17:30 UTC (rev 178992)
@@ -1,5 +1,25 @@
2015-01-23 Babak Shafiei bshaf...@apple.com
+Merge r178676. rdar://problem/19489593
+
+2015-01-19 Beth Dakin bda...@apple.com
+
+REGRESSION (r178290): Yellow highlight from context menu Lookup in Dictionary is
+offset by flipped-ness
+https://bugs.webkit.org/show_bug.cgi?id=140643
+-and corresponding-
+rdar://problem/19489593
+
+Reviewed by Tim Horton.
+
+We universally flipped because we assumed that the root view was flipped and the
+WebView was not. However, in Dictionary, the WebView is flipped! So this patch
+fixes that assumption by checking the WebView’s flipped-ness.
+* WebView/WebView.mm:
+(-[WebView _convertRectFromRootView:]):
+
+2015-01-23 Babak Shafiei bshaf...@apple.com
+
Merge r178605. rdar://problem/19490114
2015-01-16 Beth Dakin bda...@apple.com
Modified: branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm (178991 => 178992)
--- branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm 2015-01-23 09:16:11 UTC (rev 178991)
+++ branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm 2015-01-23 09:17:30 UTC (rev 178992)
@@ -8578,6 +8578,8 @@
- (NSRect)_convertRectFromRootView:(NSRect)rect
{
+if (self.isFlipped)
+return rect;
return NSMakeRect(rect.origin.x, [self bounds].size.height - rect.origin.y - rect.size.height, rect.size.width, rect.size.height);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [178991] branches/safari-600.5-branch/Source/WebKit/mac
Title: [178991] branches/safari-600.5-branch/Source/WebKit/mac
Revision 178991
Author bshaf...@apple.com
Date 2015-01-23 01:16:11 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r178605. rdar://problem/19490114
Modified Paths
branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog
branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm
Diff
Modified: branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog (178990 => 178991)
--- branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-23 09:14:55 UTC (rev 178990)
+++ branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-23 09:16:11 UTC (rev 178991)
@@ -1,3 +1,21 @@
+2015-01-23 Babak Shafiei bshaf...@apple.com
+
+Merge r178605. rdar://problem/19490114
+
+2015-01-16 Beth Dakin bda...@apple.com
+
+Make sure early cancellation of immediate action actually does that in WK1
+https://bugs.webkit.org/show_bug.cgi?id=140566
+-and corresponding-
+rdar://problem/19490114
+
+Reviewed by Tim Horton.
+
+Work around an AppKit bug by dispatching the call to _cancelImmediateAction
+asynchronously.
+* WebView/WebImmediateActionController.mm:
+(-[WebImmediateActionController immediateActionRecognizerWillPrepare:]):
+
2015-01-22 Matthew Hanson matthew_han...@apple.com
Merge r177611. rdar://problem/19451361
Modified: branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm (178990 => 178991)
--- branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-23 09:14:55 UTC (rev 178990)
+++ branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-23 09:16:11 UTC (rev 178991)
@@ -133,8 +133,12 @@
[self performHitTestAtPoint:locationInDocumentView];
[self _updateImmediateActionItem];
-if (!_immediateActionRecognizer.animationController)
-[self _cancelImmediateAction];
+if (!_immediateActionRecognizer.animationController) {
+// FIXME: We should be able to remove the dispatch_async when rdar://problem/19502927 is resolved.
+dispatch_async(dispatch_get_main_queue(), ^{
+[self _cancelImmediateAction];
+});
+}
}
- (void)immediateActionRecognizerWillBeginAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [178998] branches/safari-600.1.4.15-branch/Source/WebKit2
Title: [178998] branches/safari-600.1.4.15-branch/Source/WebKit2 Revision 178998 Author ddkil...@apple.com Date 2015-01-23 02:04:46 -0800 (Fri, 23 Jan 2015) Log Message Merged r174232. rdar://problem/19395075 Modified Paths branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.h branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.mm branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm Diff Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (178997 => 178998) --- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:43 UTC (rev 178997) +++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:46 UTC (rev 178998) @@ -1,5 +1,50 @@ 2015-01-22 David Kilzer ddkil...@apple.com +Merge r174232. + +2014-10-02 Andy Estes aes...@apple.com + +[iOS] Teach WKPDFView to navigate to pageNumber links +https://bugs.webkit.org/show_bug.cgi?id=137358 + +Reviewed by Tim Horton. + +Treat PDF pageNumber annotations as if they were fragment navigations in an HTML document. For a given page +number N, create a fragment called #pageN and tell WebKit to navigate to it. By doing this we create history +entries for each pageNumber navigation and allow for proper back/forward. When navigating to a page, reset to +the initial scale factor and scroll to the beginning of the Nth page. + +* UIProcess/API/Cocoa/WKWebView.mm: +(-[WKWebView _zoomToPoint:atScale:animated:]): Added an animated parameter. If animated is NO, use a duration of 0. +(-[WKWebView _zoomToRect:atScale:origin:animated:]): Added an animated parameter and passed it to _zoomToPoint:atScale:animated:. +(-[WKWebView _zoomOutWithOrigin:animated:]): Ditto. +(-[WKWebView _zoomToRect:withOrigin:fitEntireRect:minimumScale:maximumScale:minimumScrollDistance:]): Called _zoomToRect:atScale:origin:animated:, +setting animated to YES. +(-[WKWebView _didSameDocumentNavigationForMainFrame:]): Called web_didSameDocumentNavigation: on _customContentView. +(-[WKWebView _zoomToPoint:atScale:]): Deleted. +(-[WKWebView _zoomToRect:atScale:origin:]): Deleted. +(-[WKWebView _zoomOutWithOrigin:]): Deleted. +* UIProcess/API/Cocoa/WKWebViewInternal.h: +* UIProcess/Cocoa/WKWebViewContentProvider.h: +* UIProcess/ios/PageClientImplIOS.mm: +(WebKit::PageClientImpl::didSameDocumentNavigationForMainFrame): Called _didSameDocumentNavigationForMainFrame on m_webView. +* UIProcess/ios/WKContentView.mm: +(-[WKContentView _zoomOutWithOrigin:]): Called _zoomOutWithOrigin:animated: on m_webView, setting animated to YES. +* UIProcess/ios/WKPDFPageNumberIndicator.h: +* UIProcess/ios/WKPDFPageNumberIndicator.mm: +(-[WKPDFPageNumberIndicator hide]): Added a method to hide the page number indicator. +* UIProcess/ios/WKPDFView.mm: +(-[WKPDFView web_setContentProviderData:suggestedFilename:]): Added a FIXME for restoring scroll position and page scale when loading from the back/forward list. +(-[WKPDFView scrollViewDidScroll:]): Stopped showing the page number indicator if a same-document navigation is occurring (to match UIWebPDFView). +(-[WKPDFView _updatePageNumberIndicator]): Ditto. +(-[WKPDFView web_didSameDocumentNavigation:]): +(-[WKPDFView _resetZoomAnimated:]): For same-document navigations of type kWKSameDocumentNavigationSessionStatePop, extracted the page index from the URL fragment +identifier, hid the page number indicator, reset the zoom (without an animation to match UIWebPDFView), and scrolled to the beginning of the given page. +(-[WKPDFView resetZoom:]): Called _resetZoomAnimated:, setting animated to YES. +(-[WKPDFView annotation:wasTouchedAtPoint:controller:]): If there is a non-zero pageNumber in the link annotation, construct a #pageN fragment and navigate to it. + +2015-01-22 David Kilzer ddkil...@apple.com + Merge r174072. 2014-09-27 Andy Estes aes...@apple.com Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (178997 => 178998) --- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-01-23 10:04:43 UTC (rev 178997) +++
[webkit-changes] [178999] branches/safari-600.1.4.15-branch/Source
Title: [178999] branches/safari-600.1.4.15-branch/Source
Revision 178999
Author ddkil...@apple.com
Date 2015-01-23 02:04:50 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r174250. rdar://problem/19395075
Modified Paths
branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
Added Paths
branches/safari-600.1.4.15-branch/Source/WebCore/platform/spi/
branches/safari-600.1.4.15-branch/Source/WebCore/platform/spi/ios/
branches/safari-600.1.4.15-branch/Source/WebCore/platform/spi/ios/_UIHighlightViewSPI.h
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178998 => 178999)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-23 10:04:46 UTC (rev 178998)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-23 10:04:50 UTC (rev 178999)
@@ -1,5 +1,21 @@
2015-01-22 David Kilzer ddkil...@apple.com
+Merge r174250.
+
+2014-10-02 Andy Estes aes...@apple.com
+
+[iOS] Create an SPI wrapper for _UIHighlightView and use it in WKContentView
+https://bugs.webkit.org/show_bug.cgi?id=137370
+
+Reviewed by Tim Horton.
+
+Added _UIHighlightViewSPI.h. When building against the internal SDK it imports UIKit/_UIHighlightView.h. Otherwise, it redeclares the SPI we use in WebKit2.
+
+* WebCore.xcodeproj/project.pbxproj:
+* platform/spi/ios/_UIHighlightViewSPI.h: Added.
+
+2015-01-22 David Kilzer ddkil...@apple.com
+
Merge r173741.
2014-09-18 Jeremy Jones jere...@apple.com
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (178998 => 178999)
--- branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-23 10:04:46 UTC (rev 178998)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-23 10:04:50 UTC (rev 178999)
@@ -3740,6 +3740,7 @@
A14832CD187F682E00DA63A6 /* WebCoreThreadSafe.h in Headers */ = {isa = PBXBuildFile; fileRef = A148329F187F508700DA63A6 /* WebCoreThreadSafe.h */; };
A14832CE187F683400DA63A6 /* WebCoreThreadSystemInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A14832A0187F508700DA63A6 /* WebCoreThreadSystemInterface.cpp */; };
A14832CF187F684700DA63A6 /* WebCoreThreadSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = A14832A1187F508700DA63A6 /* WebCoreThreadSystemInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A172182619DE183F00464D17 /* _UIHighlightViewSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A172182519DE183F00464D17 /* _UIHighlightViewSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
A17C81220F2A5CF7005DAAEB /* HTMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */; };
A17C81230F2A5CF7005DAAEB /* HTMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */; };
A1C797181883DD82000F5E1F /* DOMGestureEvent.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCDD1880F901003EEDBB /* DOMGestureEvent.h */; };
@@ -10919,6 +10920,7 @@
A14832A9187F508700DA63A6 /* WKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKView.h; path = ios/wak/WKView.h; sourceTree = group; };
A14832AA187F508700DA63A6 /* WKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKView.mm; path = ios/wak/WKView.mm; sourceTree = group; };
A14832AB187F508700DA63A6 /* WKViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKViewPrivate.h; path = ios/wak/WKViewPrivate.h; sourceTree = group; };
+ A172182519DE183F00464D17 /* _UIHighlightViewSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = _UIHighlightViewSPI.h; path = ios/_UIHighlightViewSPI.h; sourceTree = group; };
A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLElementFactory.cpp; sourceTree = group; };
A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLElementFactory.h; sourceTree = group; };
A1C7971C1883E51F000F5E1F /* DOMHTMLTextAreaElementPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMHTMLTextAreaElementPrivate.h; sourceTree = group; };
@@ -16221,6 +16223,14 @@
path = plugins;
sourceTree = group;
};
+ 653EF83619A043AE0052202C /* spi */ = {
+ isa = PBXGroup;
+ children = (
+
[webkit-changes] [178997] branches/safari-600.1.4.15-branch/Source/WebKit2
Title: [178997] branches/safari-600.1.4.15-branch/Source/WebKit2
Revision 178997
Author ddkil...@apple.com
Date 2015-01-23 02:04:43 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r174072. rdar://problem/19395075
Modified Paths
branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.h
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.h
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm
branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h
branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (178996 => 178997)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:40 UTC (rev 178996)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:43 UTC (rev 178997)
@@ -1,5 +1,36 @@
2015-01-22 David Kilzer ddkil...@apple.com
+Merge r174072.
+
+2014-09-27 Andy Estes aes...@apple.com
+
+[iOS] Add basic support for link navigation in WKPDFView
+https://bugs.webkit.org/show_bug.cgi?id=137182
+
+Reviewed by Tim Horton.
+
+Teach WKPDFView to navigate to URLs when PDF link annotations are tapped.
+
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::navigateToURLWithSimulatedClick): Sent Messages::WebPage::NavigateToURLWithSimulatedClick.
+* UIProcess/WebPageProxy.h:
+* UIProcess/ios/WKPDFView.h:
+* UIProcess/ios/WKPDFView.mm:
+(-[WKPDFView _clearPages]): Removed self as the UIPDFAnnotationControllerDelegate.
+(-[WKPDFView _revalidateViews]): Added self as the UIPDFAnnotationControllerDelegate.
+(-[WKPDFView annotation:wasTouchedAtPoint:controller:]): Retrieved the URL from the touched annotation,
+computed the touched point relative to the WKPDFView and to the screen, and called
+navigateToURLWithSimulatedClick() after a 200 ms delay in order to show a soon-to-be-added tap highlight
+(this value matches the delay in UIWebPDFView).
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::navigateToURLWithSimulatedClick): Created a fake single-click MouseEvent and called
+FrameLoader::urlSelected(). Creating a mouse event ensures that the navigation appears as a
+NavigationTypeLinkClicked in navigation policy delegates.
+* WebProcess/WebPage/WebPage.h:
+* WebProcess/WebPage/WebPage.messages.in:
+
+2015-01-22 David Kilzer ddkil...@apple.com
+
Merge r172966.
2014-08-26 Tim Horton timothy_hor...@apple.com
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (178996 => 178997)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-23 10:04:40 UTC (rev 178996)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-23 10:04:43 UTC (rev 178997)
@@ -845,6 +845,18 @@
m_process-responsivenessTimer()-start();
}
+void WebPageProxy::navigateToURLWithSimulatedClick(const String url, IntPoint documentPoint, IntPoint screenPoint)
+{
+if (m_isClosed)
+return;
+
+if (!isValid())
+reattachToWebProcess();
+
+m_process-send(Messages::WebPage::NavigateToURLWithSimulatedClick(url, documentPoint, screenPoint), m_pageID);
+m_process-responsivenessTimer()-start();
+}
+
void WebPageProxy::stopLoading()
{
if (!isValid())
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.h (178996 => 178997)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-23 10:04:40 UTC (rev 178996)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-23 10:04:43 UTC (rev 178997)
@@ -308,6 +308,7 @@
void loadAlternateHTMLString(const String htmlString, const String baseURL, const String unreachableURL, API::Object* userData = nullptr);
void loadPlainTextString(const String, API::Object* userData = nullptr);
void loadWebArchiveData(API::Data*, API::Object* userData = nullptr);
+void navigateToURLWithSimulatedClick(const String url, WebCore::IntPoint documentPoint, WebCore::IntPoint screenPoint);
void stopLoading();
uint64_t reload(bool reloadFromOrigin);
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.h (178996 => 178997)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.h 2015-01-23 10:04:40 UTC (rev 178996)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.h 2015-01-23 10:04:43 UTC (rev 178997)
@@ -26,10 +26,11 @@
#if PLATFORM(IOS)
[webkit-changes] [179006] trunk/Source/WebCore
Title: [179006] trunk/Source/WebCore
Revision 179006
Author commit-qu...@webkit.org
Date 2015-01-23 02:33:33 -0800 (Fri, 23 Jan 2015)
Log Message
Initialization for some member variable of FontPlatformData
https://bugs.webkit.org/show_bug.cgi?id=136327
Patch by Byeongha Cho byeongha@samsung.com on 2015-01-23
Reviewed by Myles C. Maxfield.
No new tests. There's no functional change.
* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
(WebCore::FontPlatformData::FontPlatformData):
(WebCore::FontPlatformData::operator=):
(WebCore::FontPlatformData::~FontPlatformData):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (179005 => 179006)
--- trunk/Source/WebCore/ChangeLog 2015-01-23 10:05:05 UTC (rev 179005)
+++ trunk/Source/WebCore/ChangeLog 2015-01-23 10:33:33 UTC (rev 179006)
@@ -1,3 +1,17 @@
+2015-01-23 Byeongha Cho byeongha@samsung.com
+
+Initialization for some member variable of FontPlatformData
+https://bugs.webkit.org/show_bug.cgi?id=136327
+
+Reviewed by Myles C. Maxfield.
+
+No new tests. There's no functional change.
+
+* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+(WebCore::FontPlatformData::FontPlatformData):
+(WebCore::FontPlatformData::operator=):
+(WebCore::FontPlatformData::~FontPlatformData):
+
2015-01-23 Grzegorz Czajkowski g.czajkow...@samsung.com
Rename ChildNodeRemovalNotifier::m_insertionPoint to m_removalPoint
Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (179005 => 179006)
--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2015-01-23 10:05:05 UTC (rev 179005)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2015-01-23 10:33:33 UTC (rev 179006)
@@ -127,12 +127,12 @@
FontPlatformData::FontPlatformData(FcPattern* pattern, const FontDescription fontDescription)
: m_pattern(pattern)
-, m_fallbacks(0)
+, m_fallbacks(nullptr)
, m_size(fontDescription.computedPixelSize())
, m_syntheticBold(false)
, m_syntheticOblique(false)
, m_fixedWidth(false)
-, m_scaledFont(0)
+, m_scaledFont(nullptr)
, m_orientation(fontDescription.orientation())
{
RefPtrcairo_font_face_t fontFace = adoptRef(cairo_ft_font_face_create_for_pattern(m_pattern.get()));
@@ -156,24 +156,24 @@
}
FontPlatformData::FontPlatformData(float size, bool bold, bool italic)
-: m_fallbacks(0)
+: m_fallbacks(nullptr)
, m_size(size)
, m_syntheticBold(bold)
, m_syntheticOblique(italic)
, m_fixedWidth(false)
-, m_scaledFont(0)
+, m_scaledFont(nullptr)
, m_orientation(Horizontal)
{
// We cannot create a scaled font here.
}
FontPlatformData::FontPlatformData(cairo_font_face_t* fontFace, float size, bool bold, bool italic, FontOrientation orientation)
-: m_fallbacks(0)
+: m_fallbacks(nullptr)
, m_size(size)
, m_syntheticBold(bold)
, m_syntheticOblique(italic)
, m_fixedWidth(false)
-, m_scaledFont(0)
+, m_scaledFont(nullptr)
, m_orientation(orientation)
{
initializeWithFontFace(fontFace);
@@ -202,7 +202,7 @@
if (m_fallbacks) {
FcFontSetDestroy(m_fallbacks);
// This will be re-created on demand.
-m_fallbacks = 0;
+m_fallbacks = nullptr;
}
if (m_scaledFont m_scaledFont != hashTableDeletedFontValue())
@@ -215,15 +215,17 @@
}
FontPlatformData::FontPlatformData(const FontPlatformData other)
-: m_fallbacks(0)
-, m_scaledFont(0)
+: m_fallbacks(nullptr)
+, m_scaledFont(nullptr)
, m_harfBuzzFace(other.m_harfBuzzFace)
{
*this = other;
}
FontPlatformData::FontPlatformData(const FontPlatformData other, float size)
-: m_harfBuzzFace(other.m_harfBuzzFace)
+: m_fallbacks(nullptr)
+, m_scaledFont(nullptr)
+, m_harfBuzzFace(other.m_harfBuzzFace)
{
*this = other;
@@ -237,7 +239,7 @@
{
if (m_fallbacks) {
FcFontSetDestroy(m_fallbacks);
-m_fallbacks = 0;
+m_fallbacks = nullptr;
}
if (m_scaledFont m_scaledFont != hashTableDeletedFontValue())
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179005] branches/safari-600.1.4.15-branch/Source/WebKit2
Title: [179005] branches/safari-600.1.4.15-branch/Source/WebKit2
Revision 179005
Author ddkil...@apple.com
Date 2015-01-23 02:05:05 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r175608. rdar://problem/19395075
Modified Paths
branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (179004 => 179005)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:05:03 UTC (rev 179004)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:05:05 UTC (rev 179005)
@@ -1,5 +1,25 @@
2015-01-22 David Kilzer ddkil...@apple.com
+Merge r175608.
+
+2014-11-04 Andy Estes aes...@apple.com
+
+[iOS] WKPDFView should scroll to a fragment when loading a PDF
+https://bugs.webkit.org/show_bug.cgi?id=138404
+
+Reviewed by Tim Horton.
+
+WKPDFView already knew how to scroll to a page number fragment during a same-document navigation, but it didn't
+know to do so when loading a PDF whose URL already contained a page number fragment. This could happen if the
+user long-presses a page number link and taps 'Open in New Tab'.
+
+* UIProcess/ios/WKPDFView.mm:
+(-[WKPDFView web_setContentProviderData:suggestedFilename:]): Called _scrollToFragment:.
+(-[WKPDFView _scrollToFragment:]): Moved fragment scrolling code to here from web_didSameDocumentNavigation:.
+(-[WKPDFView web_didSameDocumentNavigation:]): Called _scrollToFragment.
+
+2015-01-22 David Kilzer ddkil...@apple.com
+
Merge r175607.
2014-11-04 Andy Estes aes...@apple.com
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm (179004 => 179005)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-01-23 10:05:03 UTC (rev 179004)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-01-23 10:05:05 UTC (rev 179005)
@@ -147,6 +147,7 @@
[self _computePageAndDocumentFrames];
[self _revalidateViews];
+[self _scrollToFragment:_webView.URL.fragment];
}
- (void)web_setMinimumSize:(CGSize)size
@@ -250,17 +251,8 @@
[_fixedOverlayView addSubview:_pageNumberIndicator.get()];
}
-- (void)web_didSameDocumentNavigation:(WKSameDocumentNavigationType)navigationType
+- (void)_scrollToFragment:(NSString *)fragment
{
-// Check for kWKSameDocumentNavigationSessionStatePop instead of kWKSameDocumentNavigationAnchorNavigation since the
-// latter is only called once when navigating to the same anchor in succession. If the user navigates to a page
-// then scrolls back and clicks on the same link a second time, we want to scroll again.
-if (navigationType != kWKSameDocumentNavigationSessionStatePop)
-return;
-
-// FIXME: restore the scroll position and page scale if navigating back from a fragment.
-
-NSString *fragment = _webView.URL.fragment;
if (![fragment hasPrefix:@page])
return;
@@ -280,6 +272,19 @@
_isPerformingSameDocumentNavigation = NO;
}
+- (void)web_didSameDocumentNavigation:(WKSameDocumentNavigationType)navigationType
+{
+// Check for kWKSameDocumentNavigationSessionStatePop instead of kWKSameDocumentNavigationAnchorNavigation since the
+// latter is only called once when navigating to the same anchor in succession. If the user navigates to a page
+// then scrolls back and clicks on the same link a second time, we want to scroll again.
+if (navigationType != kWKSameDocumentNavigationSessionStatePop)
+return;
+
+// FIXME: restore the scroll position and page scale if navigating back from a fragment.
+
+[self _scrollToFragment:_webView.URL.fragment];
+}
+
- (void)_computePageAndDocumentFrames
{
NSUInteger pageCount = [_pdfDocument numberOfPages];
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179001] branches/safari-600.1.4.15-branch/Source/WebKit2
Title: [179001] branches/safari-600.1.4.15-branch/Source/WebKit2 Revision 179001 Author ddkil...@apple.com Date 2015-01-23 02:04:56 -0800 (Fri, 23 Jan 2015) Log Message Merged r174885. rdar://problem/19395075 Modified Paths branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKElementActionInternal.h branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKActionSheet.h branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKActionSheet.mm branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm Diff Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (179000 => 179001) --- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:52 UTC (rev 179000) +++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:56 UTC (rev 179001) @@ -1,5 +1,61 @@ 2015-01-22 David Kilzer ddkil...@apple.com +Merge r174885. + +2014-10-16 Andy Estes aes...@apple.com + +[iOS] Capture WKActionSheetAssistant's interaction with WKContentView in a @protocol +https://bugs.webkit.org/show_bug.cgi?id=137792 + +Reviewed by Tim Horton. + +WKPDFView would like to use WKActionSheetAssistant to show an action sheet when long-pressing a link, but it +can't so long as WKActionSheetAssistant is tightly coupled to WKContentView. Resolve this by factoring +WKActionSheetAssistant's interaction with WKContentView into a new protocol called +WKActionSheetAssistantDelegate and having WKContentView conform to this protocol. + +* UIProcess/API/Cocoa/_WKElementAction.mm: +(+[_WKElementAction elementActionWithTitle:actionHandler:]): Changed instances of WKContentView * to id WKActionSheetAssistantDelegate. +(+[_WKElementAction elementActionWithType:customTitle:]): Ditto. +(-[_WKElementAction _runActionWithElementInfo:delegate:]): Ditto. +(copyElement): Deleted. +(saveImage): Deleted. +(-[_WKElementAction _runActionWithElementInfo:view:]): Deleted. +* UIProcess/API/Cocoa/_WKElementActionInternal.h: +* UIProcess/ios/WKActionSheet.h: +* UIProcess/ios/WKActionSheet.mm: +(-[WKActionSheet init]): Renamed from initWithView: since WKActionSheet no longer needs to know about a view. +(-[WKActionSheet _didRotateAndLayout]): Called -[WKActionSheetDelegate updatePositionInformation]. +(-[WKActionSheet initWithView:]): Deleted. +* UIProcess/ios/WKActionSheetAssistant.h: +* UIProcess/ios/WKActionSheetAssistant.mm: +(-[WKActionSheetAssistant delegate]): Added a getter for the delegate property. +(-[WKActionSheetAssistant setDelegate:]): Added a setter for the delegate property. +(-[WKActionSheetAssistant initWithView:]): Changed argument type from WKContentView * to UIView *. +(-[WKActionSheetAssistant initialPresentationRectInHostViewForSheet]): Returned CGRectZero if there is no delegate. +Otherwise, retrieved positionInformation from the delegate. +(-[WKActionSheetAssistant presentationRectInHostViewForSheet]): Ditto. +(-[WKActionSheetAssistant updatePositionInformation]): Called -[WKActionSheetAssistantDelegate updatePositionInformation]. +(-[WKActionSheetAssistant _createSheetWithElementActions:showLinkTitle:]): Returned early if there is no delegate. +Otherwise, retrieved positionInformation from the delegate. +(-[WKActionSheetAssistant showImageSheet]): Ditto. +(-[WKActionSheetAssistant showLinkSheet]): Ditto. +(-[WKActionSheetAssistant showDataDetectorsSheet]): Ditto. +(-[WKActionSheetAssistant cleanupSheet]): +* UIProcess/ios/WKContentViewInteraction.h: +* UIProcess/ios/WKContentViewInteraction.mm: +(-[WKContentView setupInteraction]): Installed self as WKActionSheetAssistant's delegate. +(-[WKContentView updatePositionInformation]): Renamed from _updatePositionInformation. +(-[WKContentView performAction:]): Renamed from _performAction:. +(-[WKContentView openElementAtLocation:]): Called _attemptClickAtLocation:. +(-[WKContentView actionsForElement:defaultActions:]): Called API::UIClient::actionsForElement(). +(-[WKContentView startInteractionWithElement:]): Called WebPageProxy::startInteractionWithElementAtPosition(). +(-[WKContentView stopInteraction]): Called WebPageProxy::stopInteraction(). +(-[WKContentView
[webkit-changes] [179002] branches/safari-600.1.4.15-branch/Source/WebKit2
Title: [179002] branches/safari-600.1.4.15-branch/Source/WebKit2
Revision 179002
Author ddkil...@apple.com
Date 2015-01-23 02:04:58 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r175577. rdar://problem/19395075
Modified Paths
branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKElementActionInternal.h
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (179001 => 179002)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:56 UTC (rev 179001)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:58 UTC (rev 179002)
@@ -1,5 +1,40 @@
2015-01-22 David Kilzer ddkil...@apple.com
+Merge r175577.
+
+2014-11-04 Andy Estes aes...@apple.com
+
+[iOS] Include a WKActionSheetAssistant parameter in WKActionSheetAssistantDelegate methods
+https://bugs.webkit.org/show_bug.cgi?id=137792
+
+Reviewed by Dan Bernstein.
+
+* UIProcess/API/Cocoa/_WKElementAction.mm:
+(+[_WKElementAction elementActionWithTitle:actionHandler:]):
+(+[_WKElementAction elementActionWithType:customTitle:]):
+(-[_WKElementAction _runActionWithElementInfo:forActionSheetAssistant:]):
+* UIProcess/API/Cocoa/_WKElementActionInternal.h:
+* UIProcess/ios/WKActionSheetAssistant.h:
+* UIProcess/ios/WKActionSheetAssistant.mm:
+(-[WKActionSheetAssistant initialPresentationRectInHostViewForSheet]):
+(-[WKActionSheetAssistant presentationRectInHostViewForSheet]):
+(-[WKActionSheetAssistant updatePositionInformation]):
+(-[WKActionSheetAssistant _createSheetWithElementActions:showLinkTitle:]):
+(-[WKActionSheetAssistant showImageSheet]):
+(-[WKActionSheetAssistant showLinkSheet]):
+(-[WKActionSheetAssistant showDataDetectorsSheet]):
+(-[WKActionSheetAssistant cleanupSheet]):
+* UIProcess/ios/WKContentViewInteraction.mm:
+(-[WKContentView positionInformationForActionSheetAssistant:]):
+(-[WKContentView updatePositionInformationForActionSheetAssistant:]):
+(-[WKContentView actionSheetAssistant:performAction:]):
+(-[WKContentView actionSheetAssistant:openElementAtLocation:]):
+(-[WKContentView actionSheetAssistant:decideActionsForElement:defaultActions:]):
+(-[WKContentView actionSheetAssistant:willStartInteractionWithElement:]):
+(-[WKContentView actionSheetAssistantDidStopInteraction:]):
+
+2015-01-22 David Kilzer ddkil...@apple.com
+
Merge r174885.
2014-10-16 Andy Estes aes...@apple.com
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm (179001 => 179002)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm 2015-01-23 10:04:56 UTC (rev 179001)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm 2015-01-23 10:04:58 UTC (rev 179002)
@@ -43,7 +43,7 @@
SOFT_LINK_FRAMEWORK(SafariServices);
SOFT_LINK_CLASS(SafariServices, SSReadingList);
-typedef void (^WKElementActionHandlerInternal)(id WKActionSheetAssistantDelegate, _WKActivatedElementInfo *);
+typedef void (^WKElementActionHandlerInternal)(WKActionSheetAssistant *, _WKActivatedElementInfo *);
@implementation _WKElementAction {
RetainPtrNSString _title;
@@ -72,7 +72,7 @@
+ (instancetype)elementActionWithTitle:(NSString *)title actionHandler:(WKElementActionHandler)handler
{
-return [[[self alloc] _initWithTitle:title actionHandler:^(id WKActionSheetAssistantDelegate, _WKActivatedElementInfo *actionInfo) { handler(actionInfo); }
+return [[[self alloc] _initWithTitle:title actionHandler:^(WKActionSheetAssistant *, _WKActivatedElementInfo *actionInfo) { handler(actionInfo); }
type:_WKElementActionTypeCustom] autorelease];
}
@@ -91,25 +91,25 @@
switch (type) {
case _WKElementActionTypeCopy:
title = WEB_UI_STRING_KEY(Copy, Copy ActionSheet Link, Title for Copy Link or Image action button);
-handler = ^(id WKActionSheetAssistantDelegate delegate, _WKActivatedElementInfo *actionInfo) {
-[delegate performAction:WebKit::SheetAction::Copy];
+handler = ^(WKActionSheetAssistant *assistant, _WKActivatedElementInfo *actionInfo) {
+[assistant.delegate actionSheetAssistant:assistant performAction:WebKit::SheetAction::Copy];
};
break;
case _WKElementActionTypeOpen:
title = WEB_UI_STRING_KEY(Open, Open ActionSheet Link,
[webkit-changes] [179000] branches/safari-600.1.4.15-branch/Source/WebKit2
Title: [179000] branches/safari-600.1.4.15-branch/Source/WebKit2
Revision 179000
Author ddkil...@apple.com
Date 2015-01-23 02:04:52 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r174286. rdar://problem/19395075
Modified Paths
branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (178999 => 179000)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:50 UTC (rev 178999)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:52 UTC (rev 179000)
@@ -1,5 +1,22 @@
2015-01-22 David Kilzer ddkil...@apple.com
+Merge r174286.
+
+2014-10-03 Andy Estes aes...@apple.com
+
+[iOS] Highlight clicked links in WKPDFView
+https://bugs.webkit.org/show_bug.cgi?id=137400
+
+Reviewed by Tim Horton.
+
+Show a _UIHighlightView on top of clicked links for 200 ms before starting the navigation. This matches the behavior of UIWebPDFView.
+
+* UIProcess/ios/WKPDFView.mm:
+(-[WKPDFView _createHighlightViewWithFrame:]): Created a _UIHighlightView with a color and border radius matching the values used by UIWebPDFView.
+(-[WKPDFView annotation:wasTouchedAtPoint:controller:]): Displayed the highlight, then removed it after the navigation began.
+
+2015-01-22 David Kilzer ddkil...@apple.com
+
Merge r174250.
2014-10-02 Andy Estes aes...@apple.com
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm (178999 => 179000)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-01-23 10:04:50 UTC (rev 178999)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-01-23 10:04:52 UTC (rev 179000)
@@ -38,6 +38,7 @@
#import CorePDF/UIPDFPageView.h
#import UIKit/UIScrollView_Private.h
#import WebCore/FloatRect.h
+#import WebCore/_UIHighlightViewSPI.h
#import chrono
#import wtf/RetainPtr.h
#import wtf/Vector.h
@@ -318,6 +319,19 @@
_isStartingZoom = NO;
}
+- (RetainPtr_UIHighlightView)_createHighlightViewWithFrame:(CGRect)frame
+{
+static const CGFloat highlightBorderRadius = 3;
+static const CGFloat highlightColorComponent = 26.0 / 255;
+static UIColor *highlightColor = [[UIColor alloc] initWithRed:highlightColorComponent green:highlightColorComponent blue:highlightColorComponent alpha:0.3];
+
+RetainPtr_UIHighlightView highlightView = adoptNS([[_UIHighlightView alloc] initWithFrame:CGRectInset(frame, -highlightBorderRadius, -highlightBorderRadius)]);
+[highlightView setOpaque:NO];
+[highlightView setCornerRadius:highlightBorderRadius];
+[highlightView setColor:highlightColor];
+return highlightView;
+}
+
#pragma mark UIPDFPageViewDelegate
- (void)zoom:(UIPDFPageView *)pageView to:(CGRect)targetRect atPoint:(CGPoint)origin kind:(UIPDFObjectKind)kind
@@ -368,9 +382,12 @@
static const int64_t dispatchOffset = std::chrono::duration_caststd::chrono::nanoseconds(std::chrono::milliseconds(200)).count();
RetainPtrWKWebView retainedWebView = _webView;
-// Call navigateToURLWithSimulatedClick() on a delay so that a tap highlight can be shown.
+CGRect highlightViewFrame = [self convertRect:[controller.pageView convertRectFromPDFPageSpace:annotation.Rect] fromView:controller.pageView];
+RetainPtr_UIHighlightView highlightView = [self _createHighlightViewWithFrame:highlightViewFrame];
+[self addSubview:highlightView.get()];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, dispatchOffset), dispatch_get_main_queue(), ^ {
retainedWebView-_page-navigateToURLWithSimulatedClick(urlString, roundedIntPoint(documentPoint), roundedIntPoint(screenPoint));
+[highlightView removeFromSuperview];
});
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179004] branches/safari-600.1.4.15-branch/Source/WebKit2
Title: [179004] branches/safari-600.1.4.15-branch/Source/WebKit2
Revision 179004
Author ddkil...@apple.com
Date 2015-01-23 02:05:03 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r175607. rdar://problem/19395075
Modified Paths
branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (179003 => 179004)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:05:01 UTC (rev 179003)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:05:03 UTC (rev 179004)
@@ -1,5 +1,24 @@
2015-01-22 David Kilzer ddkil...@apple.com
+Merge r175607.
+
+2014-11-04 Andy Estes aes...@apple.com
+
+[iOS] Stop using +[NSURL _web_URLWithWTFString:relativeToURL:] in WKPDFView
+https://bugs.webkit.org/show_bug.cgi?id=138357
+
+Rubber-stamped by Dan Bernstein.
+
+During patch review for r175595 I changed from using +URLWithString:relativeToURL: to using
++_web_URLWithWTFString:relativeToURL: to append a page number fragment to the document URL.
+If the base URL already contains a fragment, +_web_URLWithWTFString:relativeToURL: appends to the existing
+fragment whereas +URLWithString:relativeToURL: replaces the existing fragment. I want the latter behavior.
+
+* UIProcess/ios/WKPDFView.mm:
+(-[WKPDFView _URLForLinkAnnotation:]):
+
+2015-01-22 David Kilzer ddkil...@apple.com
+
Merge r175595.
2014-11-04 Andy Estes aes...@apple.com
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm (179003 => 179004)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-01-23 10:05:01 UTC (rev 179003)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-01-23 10:05:03 UTC (rev 179004)
@@ -30,7 +30,6 @@
#import APIUIClient.h
#import SessionState.h
-#import WKNSURLExtras.h
#import WKPDFPageNumberIndicator.h
#import WKWebViewInternal.h
#import WebPageProxy.h
@@ -358,7 +357,7 @@
if (NSUInteger pageNumber = linkAnnotation.pageNumber) {
String anchorString = ASCIILiteral(#page);
anchorString.append(String::number(pageNumber));
-return [NSURL _web_URLWithWTFString:anchorString relativeToURL:documentURL];
+return [NSURL URLWithString:anchorString relativeToURL:documentURL];
}
return nil;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [178996] branches/safari-600.1.4.15-branch/Source/WebKit2
Title: [178996] branches/safari-600.1.4.15-branch/Source/WebKit2 Revision 178996 Author ddkil...@apple.com Date 2015-01-23 02:04:40 -0800 (Fri, 23 Jan 2015) Log Message Merged r172966. rdar://problem/19395075 Modified Paths branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/PageClient.h branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.h branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm Diff Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (178995 => 178996) --- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:37 UTC (rev 178995) +++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:40 UTC (rev 178996) @@ -1,5 +1,83 @@ 2015-01-22 David Kilzer ddkil...@apple.com +Merge r172966. + +2014-08-26 Tim Horton timothy_hor...@apple.com + +REGRESSION (r172771): Amazon product page becomes unresponsive after swiping back to it +https://bugs.webkit.org/show_bug.cgi?id=136260 +rdar://problem/18107826 + +Reviewed by Dan Bernstein. + +Previously, when a swipe ended up performing a same-document navigation, +we would never get didFinishLoadForMainFrame nor didFirstVisuallyNonEmptyLayoutForMainFrame +nor would we even get didHitRenderTreeSizeThreshold in all cases, so we would never +remove the swipe snapshot. Previous implementations removed the snapshot on +didSameDocumentNavigation for the main frame if the navigation type was Replace or Pop, +so we will match that behavior. + +Also, reinstate the watchdog that starts at swipe-end which would have prevented +this bug from forever breaking the view it was associated with. + +Also, defend against removing the snapshot before the swipe has finished (before +we have even caused the navigation that we're watching for the effects of). + +* UIProcess/API/mac/WKView.mm: +(-[WKView _didSameDocumentNavigationForMainFrame:]): +* UIProcess/API/mac/WKViewInternal.h: +* UIProcess/PageClient.h: +* UIProcess/WebPageProxy.cpp: +(WebKit::WebPageProxy::didSameDocumentNavigationForFrame): +* UIProcess/ios/PageClientImplIOS.h: +* UIProcess/ios/PageClientImplIOS.mm: +(WebKit::PageClientImpl::didSameDocumentNavigationForMainFrame): +* UIProcess/mac/PageClientImpl.h: +* UIProcess/mac/PageClientImpl.mm: +(WebKit::PageClientImpl::didSameDocumentNavigationForMainFrame): +Plumb main-frame same-document navigation notification from WebPageProxy +to ViewGestureControllerMac via PageClient and WKView. + +* UIProcess/mac/ViewGestureController.h: +* UIProcess/mac/ViewGestureControllerMac.mm: +(WebKit::ViewGestureController::ViewGestureController): +(WebKit::ViewGestureController::beginSwipeGesture): +(WebKit::ViewGestureController::endSwipeGesture): +Keep track of whether a swipe is currently occurring. We can't use +activeGestureType for this because the swipe currently remains the active +gesture until the snapshot is removed. + +Reintroduce the old swipeWatchdogTimer (and rename the shorter timer that starts +when we get a visually non-empty layout) so that we will always remove the +snapshot after 5 seconds, even if we haven't committed the load. +This could lead to flashing back to the old content if we fail to get a single +byte for 5 seconds, but that is a rare case and should eventually get additional +special treatment (dropping the tiles until we do get content, or some such). + +(WebKit::ViewGestureController::didHitRenderTreeSizeThreshold): +If a swipe is still in progress, we haven't done our navigation and thus +don't care about render tree size changes. + +(WebKit::ViewGestureController::didFirstVisuallyNonEmptyLayoutForMainFrame): +If a swipe is still in progress, we haven't done our navigation and thus +don't care about layouts. + +Stop the 5 second overall watchdog if we start the 3 second after-visuallyNonEmptyLayout +watchdog. This means that the snapshot could stay up for a maximum of 8 seconds +for a very, very slow load. + +(WebKit::ViewGestureController::didFinishLoadForMainFrame): +If a swipe is still in progress, we haven't done our
[webkit-changes] [178994] branches/safari-600.1.4.15-branch/Source
Title: [178994] branches/safari-600.1.4.15-branch/Source
Revision 178994
Author ddkil...@apple.com
Date 2015-01-23 02:04:34 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r173741. rdar://problem/19420088
Modified Paths
branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm
branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h
branches/safari-600.1.4.15-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm
branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm
branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.h
branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.messages.in
branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178993 => 178994)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-23 09:18:43 UTC (rev 178993)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-23 10:04:34 UTC (rev 178994)
@@ -1,3 +1,26 @@
+2015-01-22 David Kilzer ddkil...@apple.com
+
+Merge r173741.
+
+2014-09-18 Jeremy Jones jere...@apple.com
+
+Improve fullscreen video rotation animation.
+https://bugs.webkit.org/show_bug.cgi?id=136870
+
+Reviewed by Simon Fraser.
+
+Instead of setting the frame on the video layer, set position and bounds separately. This allows the position to be synchronized with the rest of the animation.
+When using a fencePort to synchronize animations, if the fence times out, pivoting around the center provides a better fallback.
+
+* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+(-[WebAVVideoLayer setVideoSublayer:]): added
+(-[WebAVVideoLayer videoSublayer]): added
+(-[WebAVVideoLayer setBounds:]): set position and bounds insted of frame.
+(WebVideoFullscreenInterfaceAVKit::setupFullscreen): use setVideoSublayer
+* platform/ios/WebVideoFullscreenModelVideoElement.mm:
+(WebVideoFullscreenModelVideoElement::setVideoFullscreenLayer): set bounds and anchorPoint instead of frame
+(WebVideoFullscreenModelVideoElement::setVideoLayerFrame): set bounds instead of frame.
+
2015-01-21 Babak Shafiei bshaf...@apple.com
Merge r178072.
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (178993 => 178994)
--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-01-23 09:18:43 UTC (rev 178993)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-01-23 10:04:34 UTC (rev 178994)
@@ -476,12 +476,14 @@
@property (nonatomic) CGRect videoRect;
- (void)setPlayerViewController:(AVPlayerViewController *)playerViewController;
- (void)setPlayerController:(AVPlayerController *)playerController;
+@property (nonatomic, retain) CALayer* videoSublayer;
@end
@implementation WebAVVideoLayer
{
RetainPtrWebAVPlayerController _avPlayerController;
RetainPtrAVPlayerViewController _avPlayerViewController;
+RetainPtrCALayer _videoSublayer;
AVVideoLayerGravity _videoLayerGravity;
}
@@ -511,6 +513,17 @@
_avPlayerViewController = playerViewController;
}
+- (void)setVideoSublayer:(CALayer *)videoSublayer
+{
+_videoSublayer = videoSublayer;
+[self addSublayer:videoSublayer];
+}
+
+- (CALayer*)videoSublayer
+{
+return _videoSublayer.get();
+}
+
- (void)setBounds:(CGRect)bounds
{
[super setBounds:bounds];
@@ -521,14 +534,22 @@
UIView* rootView = [[_avPlayerViewController view] window];
if (!rootView)
return;
+
+[CATransaction begin];
+NSTimeInterval animationDuration = [self animationForKey:@bounds].duration;
+if (!animationDuration) // a duration of 0 for CA means 0.25. This is a way to approximate 0.
+animationDuration = 0.001;
+[CATransaction setAnimationDuration:animationDuration];
+[CATransaction setAnimationTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]];
FloatRect rootBounds = [rootView bounds];
[_avPlayerController delegate]-setVideoLayerFrame(rootBounds);
FloatRect sourceBounds = largestRectWithAspectRatioInsideRect(CGRectGetWidth(bounds) / CGRectGetHeight(bounds), rootBounds);
CATransform3D transform = CATransform3DMakeScale(bounds.size.width / sourceBounds.width(), bounds.size.height / sourceBounds.height(), 1);
-transform = CATransform3DTranslate(transform, bounds.origin.x -
[webkit-changes] [178995] branches/safari-600.1.4.15-branch/Source/WebKit2
Title: [178995] branches/safari-600.1.4.15-branch/Source/WebKit2
Revision 178995
Author ddkil...@apple.com
Date 2015-01-23 02:04:37 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r173762. rdar://problem/19420088
Modified Paths
branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h
branches/safari-600.1.4.15-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (178994 => 178995)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:34 UTC (rev 178994)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:37 UTC (rev 178995)
@@ -1,5 +1,16 @@
2015-01-22 David Kilzer ddkil...@apple.com
+Merge r173762.
+
+2014-09-19 Simon Fraser simon.fra...@apple.com
+
+Fix the Mac Mavericks build. Only iOS cares about fencing.
+
+* Platform/mac/LayerHostingContext.h:
+* Platform/mac/LayerHostingContext.mm:
+
+2015-01-22 David Kilzer ddkil...@apple.com
+
Merge r173741.
2014-09-18 Jeremy Jones jere...@apple.com
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h (178994 => 178995)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h 2015-01-23 10:04:34 UTC (rev 178994)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h 2015-01-23 10:04:37 UTC (rev 178995)
@@ -58,7 +58,9 @@
void setColorSpace(CGColorSpaceRef);
CGColorSpaceRef colorSpace() const;
+#if PLATFORM(IOS)
void setFencePort(mach_port_t);
+#endif
private:
LayerHostingMode m_layerHostingMode;
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm (178994 => 178995)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-01-23 10:04:34 UTC (rev 178994)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-01-23 10:04:37 UTC (rev 178995)
@@ -116,9 +116,11 @@
return [m_context colorSpace];
}
+#if PLATFORM(IOS)
void LayerHostingContext::setFencePort(mach_port_t fencePort)
{
[m_context setFencePort:fencePort];
}
+#endif
} // namespace WebKit
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179003] branches/safari-600.1.4.15-branch/Source/WebKit2
Title: [179003] branches/safari-600.1.4.15-branch/Source/WebKit2 Revision 179003 Author ddkil...@apple.com Date 2015-01-23 02:05:01 -0800 (Fri, 23 Jan 2015) Log Message Merged r175595. rdar://problem/19395075 Modified Paths branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.h branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm Diff Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (179002 => 179003) --- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:04:58 UTC (rev 179002) +++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-23 10:05:01 UTC (rev 179003) @@ -1,5 +1,46 @@ 2015-01-22 David Kilzer ddkil...@apple.com +Merge r175595. + +2014-11-04 Andy Estes aes...@apple.com + +[iOS] Add long press support for links in WKPDFView +https://bugs.webkit.org/show_bug.cgi?id=138357 + +Reviewed by Dan Bernstein. + +Use WKActionSheetAssistant to show a link action sheet in response to long-pressing on a link. Have WKPDFView +conform to WKActionSheetAssistantDelegate in order to respond to the open and copy actions as well as to +provide the link's URL and position information to WKActionSheetAssistant. The long-pressed link is highlighted +for .75 seconds before the sheet is displayed in order to match UIWebPDFView. + +* UIProcess/ios/WKActionSheetAssistant.h: Made protocol methods that WKPDFView doesn't implement optional. +* UIProcess/ios/WKActionSheetAssistant.mm: +(-[WKActionSheetAssistant updatePositionInformation]): Checked if delegate responds to +updatePositionInformationForActionSheetAssistant: before calling. +(-[WKActionSheetAssistant _createSheetWithElementActions:showLinkTitle:]): Checked if delegate responds to +actionSheetAssistant:willStartInteractionWithElement: before calling. +(-[WKActionSheetAssistant cleanupSheet]): Checked if delegate responds to actionSheetAssistantDidStopInteraction: +before calling. +* UIProcess/ios/WKPDFView.h: Conformed to WKActionSheetAssistantDelegate. +* UIProcess/ios/WKPDFView.mm: +(-[WKPDFView web_initWithFrame:webView:]): Instantiated a WKActionSheetAssistant and set self as its delegate. +(-[WKPDFView _highlightLinkAnnotation:forDuration:completionHandler:]): Moved highlight drawing to here from +annotation:wasTouchedAtPoint:controller: in order to be reused for long-press. +(-[WKPDFView _URLForLinkAnnotation:]): Moved URL creation to here from annotation:wasTouchedAtPoint:controller: +in order to be reused for long-press. Generated an absolute URL since this URL might go into the pasteboard. +(-[WKPDFView annotation:wasTouchedAtPoint:controller:]): Changed to call +_highlightLinkAnnotation:forDuration:completionHandler: and _URLForLinkAnnotation:. +(-[WKPDFView annotation:isBeingPressedAtPoint:controller:]): Set values on _positionInformation and called +-[WKActionSheetAssistant showLinkSheet] after showing a highlight for .75 seconds. +(-[WKPDFView positionInformation]): Returned _positionInformation. +(-[WKPDFView performAction:]): Added a UTF-8 text and URL representation of the pressed URL to the pasteboard. +(-[WKPDFView openElementAtLocation:]): Called WebPage::navigateToURLWithSimulatedClick(). +(-[WKPDFView actionsForElement:defaultActions:]): Returned actions from UIClient::actionsForElement(). +(-[WKPDFView _createHighlightViewWithFrame:]): Deleted. + +2015-01-22 David Kilzer ddkil...@apple.com + Merge r175577. 2014-11-04 Andy Estes aes...@apple.com Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h (179002 => 179003) --- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h 2015-01-23 10:04:58 UTC (rev 179002) +++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h 2015-01-23 10:05:01 UTC (rev 179003) @@ -40,15 +40,18 @@ @class _WKActivatedElementInfo; @protocol WKActionSheetDelegate; -@protocol WKActionSheetAssistantDelegate +@protocol WKActionSheetAssistantDelegate NSObject @required - (const WebKit::InteractionInformationAtPosition)positionInformationForActionSheetAssistant:(WKActionSheetAssistant *)assistant; -- (void)updatePositionInformationForActionSheetAssistant:(WKActionSheetAssistant *)assistant; - (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant performAction:(WebKit::SheetAction)action; - (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant
[webkit-changes] [178986] trunk/Source/WebCore
Title: [178986] trunk/Source/WebCore
Revision 178986
Author commit-qu...@webkit.org
Date 2015-01-23 00:19:47 -0800 (Fri, 23 Jan 2015)
Log Message
[GTK] Fix debug build after r178940
https://bugs.webkit.org/show_bug.cgi?id=140814
Patch by Hunseop Jeong hs85.je...@samsung.com on 2015-01-23
Reviewed by Carlos Garcia Campos.
* platform/graphics/opentype/OpenTypeVerticalData.cpp:
(WebCore::OpenTypeVerticalData::substituteWithVerticalGlyphs):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (178985 => 178986)
--- trunk/Source/WebCore/ChangeLog 2015-01-23 07:31:56 UTC (rev 178985)
+++ trunk/Source/WebCore/ChangeLog 2015-01-23 08:19:47 UTC (rev 178986)
@@ -1,3 +1,13 @@
+2015-01-23 Hunseop Jeong hs85.je...@samsung.com
+
+[GTK] Fix debug build after r178940
+https://bugs.webkit.org/show_bug.cgi?id=140814
+
+Reviewed by Carlos Garcia Campos.
+
+* platform/graphics/opentype/OpenTypeVerticalData.cpp:
+(WebCore::OpenTypeVerticalData::substituteWithVerticalGlyphs):
+
2015-01-22 Zalan Bujtas za...@apple.com
Simple line layout: Move leading whitespace handling from removeTrailingWhitespace() to initializeNewLine().
Modified: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp (178985 => 178986)
--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp 2015-01-23 07:31:56 UTC (rev 178985)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp 2015-01-23 08:19:47 UTC (rev 178986)
@@ -544,7 +544,7 @@
for (unsigned index = offset, end = offset + length; index end; ++index) {
Glyph glyph = glyphPage-glyphAt(index);
if (glyph) {
-ASSERT(glyphPage-glyphDataForIndex(index).fontData == font);
+ASSERT(glyphPage-glyphDataForIndex(index).font == font);
Glyph to = map.get(glyph);
if (to)
glyphPage-setGlyphDataForIndex(index, to, font);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [179007] trunk
Title: [179007] trunk Revision 179007 Author carlo...@webkit.org Date 2015-01-23 06:30:21 -0800 (Fri, 23 Jan 2015) Log Message [GTK] Add initial database process support https://bugs.webkit.org/show_bug.cgi?id=139491 Reviewed by Sergio Villar Senin. .: * Source/cmake/OptionsGTK.cmake: Set WebKit2_DatabaseProcess_OUTPUT_NAME. Source/WebCore: * platform/sql/SQLiteFileSystem.cpp: (WebCore::SQLiteFileSystem::openDatabase): Use WebCore::fileSystemRepresentation() for the database filename, otherwise sqlite3_open() fails when the filename contains %2E. Source/WebKit2: Add initial support for DatabaseProcess, disabled by default for now. * CMakeLists.txt: Add required files to compilation. * DatabaseProcess/DatabaseProcess.cpp: (WebKit::DatabaseProcess::createDatabaseToWebProcessConnection): Add the unix domain sockets implementation. * DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp: Added. (main): * DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp: Added. (WebKit::DatabaseProcessMainUnix): * DatabaseProcess/unix/DatabaseProcessMainUnix.h: Added. * PlatformGTK.cmake: Add required files to compilation. * Shared/ProcessExecutablePath.h: * Shared/gtk/KeyedDecoder.cpp: Added. (WebKit::KeyedDecoder::KeyedDecoder): (WebKit::KeyedDecoder::~KeyedDecoder): (WebKit::KeyedDecoder::buildDictionaryFromGVariant): (WebKit::KeyedDecoder::decodeBytes): (WebKit::KeyedDecoder::decodeBool): (WebKit::KeyedDecoder::decodeUInt32): (WebKit::KeyedDecoder::decodeInt32): (WebKit::KeyedDecoder::decodeInt64): (WebKit::KeyedDecoder::decodeFloat): (WebKit::KeyedDecoder::decodeDouble): (WebKit::KeyedDecoder::decodeString): (WebKit::KeyedDecoder::beginObject): (WebKit::KeyedDecoder::endObject): (WebKit::KeyedDecoder::beginArray): (WebKit::KeyedDecoder::beginArrayElement): (WebKit::KeyedDecoder::endArrayElement): (WebKit::KeyedDecoder::endArray): * Shared/gtk/KeyedDecoder.h: Added. * Shared/gtk/KeyedEncoder.cpp: Added. (WebKit::KeyedEncoder::KeyedEncoder): (WebKit::KeyedEncoder::~KeyedEncoder): (WebKit::KeyedEncoder::encodeBytes): (WebKit::KeyedEncoder::encodeBool): (WebKit::KeyedEncoder::encodeUInt32): (WebKit::KeyedEncoder::encodeInt32): (WebKit::KeyedEncoder::encodeInt64): (WebKit::KeyedEncoder::encodeFloat): (WebKit::KeyedEncoder::encodeDouble): (WebKit::KeyedEncoder::encodeString): (WebKit::KeyedEncoder::beginObject): (WebKit::KeyedEncoder::endObject): (WebKit::KeyedEncoder::beginArray): (WebKit::KeyedEncoder::beginArrayElement): (WebKit::KeyedEncoder::endArrayElement): (WebKit::KeyedEncoder::endArray): (WebKit::KeyedEncoder::finishEncoding): * Shared/gtk/KeyedEncoder.h: Added. * Shared/gtk/ProcessExecutablePathGtk.cpp: (WebKit::executablePathOfDatabaseProcess): * UIProcess/Databases/DatabaseProcessProxy.cpp: (WebKit::DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection): Add the unix domain sockets implementation. * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp: (WebKit::ProcessLauncher::launchProcess): Handle the DatabaseProcess too. * UIProcess/gtk/WebContextGtk.cpp: (WebKit::WebContext::platformDefaultIndexedDBDatabaseDirectory): * WebProcess/WebProcess.cpp: (WebKit::WebProcess::ensureWebToDatabaseProcessConnection): Add the unix domain sockets implementation. Source/WTF: Add support for using GRefPtr with GVariantBuilder. * wtf/gobject/GRefPtr.cpp: (WTF::refGPtr): (WTF::derefGPtr): * wtf/gobject/GRefPtr.h: * wtf/gobject/GTypedefs.h: Modified Paths trunk/ChangeLog trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/gobject/GRefPtr.cpp trunk/Source/WTF/wtf/gobject/GRefPtr.h trunk/Source/WTF/wtf/gobject/GTypedefs.h trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp trunk/Source/WebKit2/CMakeLists.txt trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp trunk/Source/WebKit2/PlatformGTK.cmake trunk/Source/WebKit2/Shared/ProcessExecutablePath.h trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp trunk/Source/WebKit2/WebProcess/WebProcess.cpp trunk/Source/cmake/OptionsGTK.cmake Added Paths trunk/Source/WebKit2/DatabaseProcess/EntryPoint/unix/ trunk/Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp trunk/Source/WebKit2/DatabaseProcess/gtk/ trunk/Source/WebKit2/DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp trunk/Source/WebKit2/DatabaseProcess/unix/ trunk/Source/WebKit2/DatabaseProcess/unix/DatabaseProcessMainUnix.h trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.cpp trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.h trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.cpp trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.h trunk/Source/WebKit2/UIProcess/Databases/gtk/ trunk/Source/WebKit2/UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp Diff Modified:
