date:20150826

[webkit-changes] [188972] trunk/Source/JavaScriptCore

2015-08-26 Thread commit-queue

Title: [188972] trunk/Source/_javascript_Core








Revision 188972
Author commit-qu...@webkit.org
Date 2015-08-26 11:34:38 -0700 (Wed, 26 Aug 2015)


Log Message
Remove the unused *Executable::unlinkCalls() and CodeBlock::unlinkCalls()
https://bugs.webkit.org/show_bug.cgi?id=148469

Patch by Sukolsak Sakshuwong sukol...@gmail.com on 2015-08-26
Reviewed by Geoffrey Garen.

We use CodeBlock::unlinkIncomingCalls() to unlink calls.
(...)Executable::unlinkCalls() and CodeBlock::unlinkCalls() are no longer used.

* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::unlinkCalls): Deleted.
* bytecode/CodeBlock.h:
* runtime/Executable.cpp:
(JSC::EvalExecutable::unlinkCalls): Deleted.
(JSC::ProgramExecutable::unlinkCalls): Deleted.
(JSC::FunctionExecutable::unlinkCalls): Deleted.
* runtime/Executable.h:
(JSC::ScriptExecutable::unlinkCalls): Deleted.

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/runtime/Executable.cpp
trunk/Source/_javascript_Core/runtime/Executable.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (188971 => 188972)

--- trunk/Source/_javascript_Core/ChangeLog	2015-08-26 18:18:14 UTC (rev 188971)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-08-26 18:34:38 UTC (rev 188972)
@@ -1,3 +1,23 @@
+2015-08-26  Sukolsak Sakshuwong  sukol...@gmail.com
+
+Remove the unused *Executable::unlinkCalls() and CodeBlock::unlinkCalls()
+https://bugs.webkit.org/show_bug.cgi?id=148469
+
+Reviewed by Geoffrey Garen.
+
+We use CodeBlock::unlinkIncomingCalls() to unlink calls.
+(...)Executable::unlinkCalls() and CodeBlock::unlinkCalls() are no longer used.
+
+* bytecode/CodeBlock.cpp:
+(JSC::CodeBlock::unlinkCalls): Deleted.
+* bytecode/CodeBlock.h:
+* runtime/Executable.cpp:
+(JSC::EvalExecutable::unlinkCalls): Deleted.
+(JSC::ProgramExecutable::unlinkCalls): Deleted.
+(JSC::FunctionExecutable::unlinkCalls): Deleted.
+* runtime/Executable.h:
+(JSC::ScriptExecutable::unlinkCalls): Deleted.
+
 2015-08-25  Brian Burg  bb...@apple.com
 
 Web Inspector: no need to allocate protocolErrors array for every dispatched backend command


Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (188971 => 188972)

--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp	2015-08-26 18:18:14 UTC (rev 188971)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp	2015-08-26 18:34:38 UTC (rev 188972)
@@ -2973,27 +2973,6 @@
 }
 
 #if ENABLE(JIT)
-void CodeBlock::unlinkCalls()
-{
-if (!!m_alternative)
-m_alternative-unlinkCalls();
-for (size_t i = 0; i  m_llintCallLinkInfos.size(); ++i) {
-if (m_llintCallLinkInfos[i].isLinked())
-m_llintCallLinkInfos[i].unlink();
-}
-if (m_callLinkInfos.isEmpty())
-return;
-if (!m_vm-canUseJIT())
-return;
-RepatchBuffer repatchBuffer(this);
-for (auto iter = m_callLinkInfos.begin(); !!iter; ++iter) {
-CallLinkInfo info = **iter;
-if (!info.isLinked())
-continue;
-info.unlink(repatchBuffer);
-}
-}
-
 void CodeBlock::linkIncomingCall(ExecState* callerFrame, CallLinkInfo* incoming)
 {
 noticeIncomingCall(callerFrame);


Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (188971 => 188972)

--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2015-08-26 18:18:14 UTC (rev 188971)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2015-08-26 18:34:38 UTC (rev 188972)
@@ -230,8 +230,6 @@
 void unlinkIncomingCalls();
 
 #if ENABLE(JIT)
-void unlinkCalls();
-
 void linkIncomingCall(ExecState* callerFrame, CallLinkInfo*);
 void linkIncomingPolymorphicCall(ExecState* callerFrame, PolymorphicCallNode*);
 #endif // ENABLE(JIT)


Modified: trunk/Source/_javascript_Core/runtime/Executable.cpp (188971 => 188972)

--- trunk/Source/_javascript_Core/runtime/Executable.cpp	2015-08-26 18:18:14 UTC (rev 188971)
+++ trunk/Source/_javascript_Core/runtime/Executable.cpp	2015-08-26 18:34:38 UTC (rev 188972)
@@ -442,16 +442,6 @@
 visitor.append(thisObject-m_unlinkedEvalCodeBlock);
 }
 
-void EvalExecutable::unlinkCalls()
-{
-#if ENABLE(JIT)
-if (!m_jitCodeForCall)
-return;
-RELEASE_ASSERT(m_evalCodeBlock);
-m_evalCodeBlock-unlinkCalls();
-#endif
-}
-
 void EvalExecutable::clearCode()
 {
 m_evalCodeBlock = nullptr;
@@ -473,16 +463,6 @@
 return error.toErrorObject(lexicalGlobalObject, m_source);
 }
 
-void ProgramExecutable::unlinkCalls()
-{
-#if ENABLE(JIT)
-if (!m_jitCodeForCall)
-return;
-RELEASE_ASSERT(m_programCodeBlock);
-m_programCodeBlock-unlinkCalls();
-#endif
-}
-
 JSObject* ProgramExecutable::initializeGlobalProperties(VM vm, CallFrame* callFrame, JSScope* scope)
 {
 RELEASE_ASSERT(scope);
@@ -569,20 +549,6 @@
 Base::clearCode();
 }

[webkit-changes] [188973] trunk

2015-08-26 Thread mcatanzaro

Title: [188973] trunk








Revision 188973
Author mcatanz...@igalia.com
Date 2015-08-26 11:46:04 -0700 (Wed, 26 Aug 2015)


Log Message
[GTK] Disable ACCELERATED_2D_CANVAS by default
https://bugs.webkit.org/show_bug.cgi?id=148473

Reviewed by Martin Robinson.

Currently ACCELERATED_2D_CANVAS is enabled by default on most systems (which have CairoGL)
but not on Debian (which does not). We've known this was problematic for a while, since it
means we have two different sets of distro-dependent bugs, but never decided whether that
outweighed the benefits of CarioGL or not. I'm making the call now: it's more important to
have the same bugs everywhere. We can turn this on again for other distros when we're ready
to turn it on for Debian.

Also, properly fail the build if ENABLE_ACCELERATED_2D_CANVAS is enabled but CairoGL is not
available.

* Source/cmake/OptionsGTK.cmake:

Modified Paths

trunk/ChangeLog
trunk/Source/cmake/OptionsGTK.cmake




Diff

Modified: trunk/ChangeLog (188972 => 188973)

--- trunk/ChangeLog	2015-08-26 18:34:38 UTC (rev 188972)
+++ trunk/ChangeLog	2015-08-26 18:46:04 UTC (rev 188973)
@@ -1,3 +1,22 @@
+2015-08-26  Michael Catanzaro  mcatanz...@igalia.com
+
+[GTK] Disable ACCELERATED_2D_CANVAS by default
+https://bugs.webkit.org/show_bug.cgi?id=148473
+
+Reviewed by Martin Robinson.
+
+Currently ACCELERATED_2D_CANVAS is enabled by default on most systems (which have CairoGL)
+but not on Debian (which does not). We've known this was problematic for a while, since it
+means we have two different sets of distro-dependent bugs, but never decided whether that
+outweighed the benefits of CarioGL or not. I'm making the call now: it's more important to
+have the same bugs everywhere. We can turn this on again for other distros when we're ready
+to turn it on for Debian.
+
+Also, properly fail the build if ENABLE_ACCELERATED_2D_CANVAS is enabled but CairoGL is not
+available.
+
+* Source/cmake/OptionsGTK.cmake:
+
 2015-08-25  Commit Queue  commit-qu...@webkit.org
 
 Unreviewed, rolling out r188919.


Modified: trunk/Source/cmake/OptionsGTK.cmake (188972 => 188973)

--- trunk/Source/cmake/OptionsGTK.cmake	2015-08-26 18:34:38 UTC (rev 188972)
+++ trunk/Source/cmake/OptionsGTK.cmake	2015-08-26 18:46:04 UTC (rev 188973)
@@ -112,27 +112,7 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PUBLIC OFF)
 endif ()
 
-if (OPENGL_FOUND)
-if (GLX_FOUND)
-list(APPEND CAIROGL_COMPONENTS cairo-glx)
-endif ()
-if (EGL_FOUND)
-list(APPEND CAIROGL_COMPONENTS cairo-egl)
-endif ()
-endif ()
-find_package(CairoGL 1.10.2 COMPONENTS ${CAIROGL_COMPONENTS})
-
-# Normally we do not set the value of options automatically. However, CairoGL is special. Currently
-# most major distros compile Cario with --enable-gl, but Debian and derivitives are a major
-# exception. You very probably want accelerated 2D canvas if Cario has been compiled with CarioGL,
-# and very probably do not want to recompile Cario otherwise. So we expect some major distros will
-# enable this feature, and others will not, and that is just fine for the time being. Once Debian
-# enables CairoGL, then it will be time to force this ON by default. Note that if GLX is installed,
-# EGL is not, and ENABLE_X11_TARGET is OFF, this guess is wrong and the user must override it. We
-# can't check ENABLE_X11_TARGET at this point because we don't know whether it's enabled until
-# WEBKIT_OPTION_END has been called, and at that point it's too late to change default values.
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC CAIROGL_FOUND)
-
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CREDENTIAL_STORAGE PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON)
@@ -241,6 +221,20 @@
 endif ()
 find_package(GLIB 2.36 REQUIRED COMPONENTS ${glib_components})
 
+if (ENABLE_ACCELERATED_2D_CANVAS)
+if (GLX_FOUND)
+list(APPEND CAIROGL_COMPONENTS cairo-glx)
+endif ()
+if (EGL_FOUND)
+list(APPEND CAIROGL_COMPONENTS cairo-egl)
+endif ()
+
+find_package(CairoGL 1.10.2 COMPONENTS ${CAIROGL_COMPONENTS})
+if (NOT CAIROGL_FOUND)
+message(FATAL_ERROR CairoGL is needed for ENABLE_ACCELERATED_2D_CANVAS)
+endif ()
+endif ()
+
 if (ENABLE_CREDENTIAL_STORAGE)
 find_package(Libsecret)
 if (NOT LIBSECRET_FOUND)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188971] trunk

2015-08-26 Thread timothy_horton

Title: [188971] trunk








Revision 188971
Author timothy_hor...@apple.com
Date 2015-08-26 11:18:14 -0700 (Wed, 26 Aug 2015)


Log Message
Layout Test platform/mac/fast/events/content-inset-hit-testing-in-frame.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=148409

Reviewed by Beth Dakin.

* WebView/WebDynamicScrollBarsView.mm:
(-[WebDynamicScrollBarsView setContentInsets:]):
Explicitly force our NSScrollView to lay out after updating
content insets. We depend on this happening synchronously (specifically,
we need our frame/bounds change callbacks to fire), because the layout
which will happen subsequently needs up-to-date information in order to
correctly a) enable scrollbars and then b) update the scroll position.

* platform/mac/fast/events/resources/iframe-to-hit-test.html:
Adjust the test so that it logs something useful if it fails
instead of complaining about not being run in WKTR/DRT.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/mac/fast/events/resources/iframe-to-hit-test.html
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm




Diff

Modified: trunk/LayoutTests/ChangeLog (188970 => 188971)

--- trunk/LayoutTests/ChangeLog	2015-08-26 17:54:28 UTC (rev 188970)
+++ trunk/LayoutTests/ChangeLog	2015-08-26 18:18:14 UTC (rev 188971)
@@ -1,3 +1,14 @@
+2015-08-26  Tim Horton  timothy_hor...@apple.com
+
+Layout Test platform/mac/fast/events/content-inset-hit-testing-in-frame.html is flaky
+https://bugs.webkit.org/show_bug.cgi?id=148409
+
+Reviewed by Beth Dakin.
+
+* platform/mac/fast/events/resources/iframe-to-hit-test.html:
+Adjust the test so that it logs something useful if it fails
+instead of complaining about not being run in WKTR/DRT.
+
 2015-08-26  Commit Queue  commit-qu...@webkit.org
 
 Unreviewed, rolling out r188960.


Modified: trunk/LayoutTests/platform/mac/fast/events/resources/iframe-to-hit-test.html (188970 => 188971)

--- trunk/LayoutTests/platform/mac/fast/events/resources/iframe-to-hit-test.html	2015-08-26 17:54:28 UTC (rev 188970)
+++ trunk/LayoutTests/platform/mac/fast/events/resources/iframe-to-hit-test.html	2015-08-26 18:18:14 UTC (rev 188971)
@@ -8,13 +8,24 @@
 }
 /style
 script
-function clicked() {
+function clicked(e) {
 var result = parent.document.getElementById(result);
 result.innerHTML = Pass!;
+e.stopPropagation();
 }
+
+function bodyClicked() {
+var result = parent.document.getElementById(result);
+result.innerHTML = Failed! Hit the body.;
+}
+
+window._onload_ = function () {
+document.getElementById(target).addEventListener(click, clicked);
+document.body.addEventListener(click, bodyClicked);
+}
 /script
 /head
 body
-div id=target _onclick_=clicked()/div
+div id=target/div
 /body
 /html


Modified: trunk/Source/WebKit/mac/ChangeLog (188970 => 188971)

--- trunk/Source/WebKit/mac/ChangeLog	2015-08-26 17:54:28 UTC (rev 188970)
+++ trunk/Source/WebKit/mac/ChangeLog	2015-08-26 18:18:14 UTC (rev 188971)
@@ -1,3 +1,18 @@
+2015-08-26  Tim Horton  timothy_hor...@apple.com
+
+Layout Test platform/mac/fast/events/content-inset-hit-testing-in-frame.html is flaky
+https://bugs.webkit.org/show_bug.cgi?id=148409
+
+Reviewed by Beth Dakin.
+
+* WebView/WebDynamicScrollBarsView.mm:
+(-[WebDynamicScrollBarsView setContentInsets:]):
+Explicitly force our NSScrollView to lay out after updating
+content insets. We depend on this happening synchronously (specifically,
+we need our frame/bounds change callbacks to fire), because the layout
+which will happen subsequently needs up-to-date information in order to
+correctly a) enable scrollbars and then b) update the scroll position.
+
 2015-08-23  Andy Estes  aes...@apple.com
 
 [Content Filtering] REGRESSION (r182356): Provisional URL is incorrect in didReceiveServerRedirectForProvisionalLoadForFrame when Content Filtering is enabled


Modified: trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm (188970 => 188971)

--- trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm	2015-08-26 17:54:28 UTC (rev 188970)
+++ trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm	2015-08-26 18:18:14 UTC (rev 188971)
@@ -624,4 +624,12 @@
 return _private-inProgrammaticScroll;
 }
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED = 101000
+- (void)setContentInsets:(NSEdgeInsets)edgeInsets
+{
+[super setContentInsets:edgeInsets];
+[self tile];
+}
+#endif
+
 @end






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188975] branches/safari-601.1.46-branch/Source

2015-08-26 Thread bshafiei

Title: [188975] branches/safari-601.1.46-branch/Source








Revision 188975
Author bshaf...@apple.com
Date 2015-08-26 11:52:44 -0700 (Wed, 26 Aug 2015)


Log Message
Versioning.

Modified Paths

branches/safari-601.1.46-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-601.1.46-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-601.1.46-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-601.1.46-branch/Source/WebKit/mac/Configurations/Version.xcconfig
branches/safari-601.1.46-branch/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: branches/safari-601.1.46-branch/Source/_javascript_Core/Configurations/Version.xcconfig (188974 => 188975)

--- branches/safari-601.1.46-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2015-08-26 18:50:06 UTC (rev 188974)
+++ branches/safari-601.1.46-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2015-08-26 18:52:44 UTC (rev 188975)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 601;
 MINOR_VERSION = 1;
 TINY_VERSION = 46;
-MICRO_VERSION = 20;
+MICRO_VERSION = 21;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-601.1.46-branch/Source/WebCore/Configurations/Version.xcconfig (188974 => 188975)

--- branches/safari-601.1.46-branch/Source/WebCore/Configurations/Version.xcconfig	2015-08-26 18:50:06 UTC (rev 188974)
+++ branches/safari-601.1.46-branch/Source/WebCore/Configurations/Version.xcconfig	2015-08-26 18:52:44 UTC (rev 188975)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 601;
 MINOR_VERSION = 1;
 TINY_VERSION = 46;
-MICRO_VERSION = 20;
+MICRO_VERSION = 21;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (188974 => 188975)

--- branches/safari-601.1.46-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-08-26 18:50:06 UTC (rev 188974)
+++ branches/safari-601.1.46-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-08-26 18:52:44 UTC (rev 188975)
@@ -1,7 +1,7 @@
 MAJOR_VERSION = 601;
 MINOR_VERSION = 1;
 TINY_VERSION = 46;
-MICRO_VERSION = 20;
+MICRO_VERSION = 21;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-601.1.46-branch/Source/WebKit/mac/Configurations/Version.xcconfig (188974 => 188975)

--- branches/safari-601.1.46-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2015-08-26 18:50:06 UTC (rev 188974)
+++ branches/safari-601.1.46-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2015-08-26 18:52:44 UTC (rev 188975)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 601;
 MINOR_VERSION = 1;
 TINY_VERSION = 46;
-MICRO_VERSION = 20;
+MICRO_VERSION = 21;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-601.1.46-branch/Source/WebKit2/Configurations/Version.xcconfig (188974 => 188975)

--- branches/safari-601.1.46-branch/Source/WebKit2/Configurations/Version.xcconfig	2015-08-26 18:50:06 UTC (rev 188974)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Configurations/Version.xcconfig	2015-08-26 18:52:44 UTC (rev 188975)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 601;
 MINOR_VERSION = 1;
 TINY_VERSION = 46;
-MICRO_VERSION = 20;
+MICRO_VERSION = 21;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188968] trunk/Source/WebCore

2015-08-26 Thread commit-queue

Title: [188968] trunk/Source/WebCore








Revision 188968
Author commit-qu...@webkit.org
Date 2015-08-26 09:44:43 -0700 (Wed, 26 Aug 2015)


Log Message
[Cairo] Accelerated canvas should fall back to non-accelerated canvas on creation failure
https://bugs.webkit.org/show_bug.cgi?id=148476

Patch by Jinyoung Hur hur@navercorp.com on 2015-08-26
Reviewed by Brent Fulgham.

Cairo-gl backed surface might fail to be created with large dimensions, e.g., 50x32000, depending on
the gl implementations. In case of Mac port, ImageBufferCG falls back to a software surface when it fails to create
IOSurface, an accelerated surface. Though the unaccelerated surface could be slower, it would be better
to create a working surface than nothing.

Because the max dimensions of gl texture might vary among the OpenGL implementations, below test can't guarantee
the verification of behavior difference depending on the running platform.

Test: fast/canvas/canvas-large-dimensions.html

* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBuffer::ImageBuffer):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (188967 => 188968)

--- trunk/Source/WebCore/ChangeLog	2015-08-26 16:06:21 UTC (rev 188967)
+++ trunk/Source/WebCore/ChangeLog	2015-08-26 16:44:43 UTC (rev 188968)
@@ -1,3 +1,23 @@
+2015-08-26  Jinyoung Hur  hur@navercorp.com
+
+[Cairo] Accelerated canvas should fall back to non-accelerated canvas on creation failure
+https://bugs.webkit.org/show_bug.cgi?id=148476
+
+Reviewed by Brent Fulgham.
+
+Cairo-gl backed surface might fail to be created with large dimensions, e.g., 50x32000, depending on 
+the gl implementations. In case of Mac port, ImageBufferCG falls back to a software surface when it fails to create
+IOSurface, an accelerated surface. Though the unaccelerated surface could be slower, it would be better
+to create a working surface than nothing.
+
+Because the max dimensions of gl texture might vary among the OpenGL implementations, below test can't guarantee
+the verification of behavior difference depending on the running platform.
+
+Test: fast/canvas/canvas-large-dimensions.html
+
+* platform/graphics/cairo/ImageBufferCairo.cpp:
+(WebCore::ImageBuffer::ImageBuffer):
+
 2015-08-26  Commit Queue  commit-qu...@webkit.org
 
 Unreviewed, rolling out r188960.


Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (188967 => 188968)

--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp	2015-08-26 16:06:21 UTC (rev 188967)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp	2015-08-26 16:44:43 UTC (rev 188968)
@@ -117,9 +117,12 @@
 return;
 
 #if ENABLE(ACCELERATED_2D_CANVAS)
-if (renderingMode == Accelerated)
+if (renderingMode == Accelerated) {
 m_data.m_surface = createCairoGLSurface(size, m_data.m_texture);
-else
+if (!m_data.m_surface || cairo_surface_status(m_data.m_surface.get()) != CAIRO_STATUS_SUCCESS)
+renderingMode = Unaccelerated; // If allocation fails, fall back to non-accelerated path.
+}
+if (renderingMode == Unaccelerated)
 #else
 ASSERT_UNUSED(renderingMode, renderingMode != Accelerated);
 #endif






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188970] branches/jsc-tailcall/Source/JavaScriptCore

2015-08-26 Thread msaboff

Title: [188970] branches/jsc-tailcall/Source/_javascript_Core








Revision 188970
Author msab...@apple.com
Date 2015-08-26 10:54:28 -0700 (Wed, 26 Aug 2015)


Log Message
Unreviewed build fix for release builds after r188937.

* jit/CallFrameShuffler.cpp:
(JSC::CallFrameShuffler::prepareAny): Changed ASSERT to ASSERT_UNUSED.
* jit/CallFrameShuffler.h:
(JSC::CallFrameShuffler::removeTarget): Changed ASSERT to ASSERT_UNUSED.
(JSC::CachedRecovery::removeTarget):
* jit/CallFrameShuffler32_64.cpp: Added #include JSCJSValueInline.h.
* jit/CallFrameShuffler64.cpp: Added #include JSCJSValueInline.h.

Modified Paths

branches/jsc-tailcall/Source/_javascript_Core/ChangeLog
branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler.cpp
branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler.h
branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler32_64.cpp
branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler64.cpp




Diff

Modified: branches/jsc-tailcall/Source/_javascript_Core/ChangeLog (188969 => 188970)

--- branches/jsc-tailcall/Source/_javascript_Core/ChangeLog	2015-08-26 17:33:49 UTC (rev 188969)
+++ branches/jsc-tailcall/Source/_javascript_Core/ChangeLog	2015-08-26 17:54:28 UTC (rev 188970)
@@ -1,3 +1,15 @@
+2015-08-26  Michael Saboff  msab...@apple.com
+
+Unreviewed build fix for release builds after r188937.
+
+* jit/CallFrameShuffler.cpp:
+(JSC::CallFrameShuffler::prepareAny): Changed ASSERT to ASSERT_UNUSED.
+* jit/CallFrameShuffler.h:
+(JSC::CallFrameShuffler::removeTarget): Changed ASSERT to ASSERT_UNUSED. 
+(JSC::CachedRecovery::removeTarget):
+* jit/CallFrameShuffler32_64.cpp: Added #include JSCJSValueInline.h.
+* jit/CallFrameShuffler64.cpp: Added #include JSCJSValueInline.h.
+
 2015-08-24  Basile Clement  basile_clem...@apple.com
 
 jsc-tailcall: We should reuse the frame efficiently in the DFG instead of doing a memmove


Modified: branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler.cpp (188969 => 188970)

--- branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler.cpp	2015-08-26 17:33:49 UTC (rev 188969)
+++ branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler.cpp	2015-08-26 17:54:28 UTC (rev 188970)
@@ -597,7 +597,7 @@
 emitLoad(*cachedRecovery);
 emitBox(*cachedRecovery);
 bool writesOK = tryWrites(*cachedRecovery);
-ASSERT(writesOK);
+ASSERT_UNUSED(writesOK, writesOK);
 } else if (verbose)
 dataLog(   - , cachedRecovery-recovery(),  can't be handled just yet.\n);
 }
@@ -637,7 +637,7 @@
 emitLoad(*cachedRecovery);
 emitBox(*cachedRecovery);
 bool writesOK = tryWrites(*cachedRecovery);
-ASSERT(writesOK);
+ASSERT_UNUSED(writesOK, writesOK);
 }
 
 // Handle 2) by loading all registers. We don't have to do any


Modified: branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler.h (188969 => 188970)

--- branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler.h	2015-08-26 17:33:49 UTC (rev 188969)
+++ branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler.h	2015-08-26 17:54:28 UTC (rev 188970)
@@ -64,7 +64,7 @@
 
 void removeTarget(VirtualRegister reg)
 {
-ASSERT(m_targets.last() == reg);
+ASSERT_UNUSED(reg, m_targets.last() == reg);
 m_targets.shrink(m_targets.size() - 1);
 }
 


Modified: branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler32_64.cpp (188969 => 188970)

--- branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler32_64.cpp	2015-08-26 17:33:49 UTC (rev 188969)
+++ branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler32_64.cpp	2015-08-26 17:54:28 UTC (rev 188970)
@@ -30,7 +30,7 @@
 
 #include CCallHelpers.h
 #include DataFormat.h
-#include JSCJSValue.h
+#include JSCJSValueInlines.h
 
 namespace JSC {
 


Modified: branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler64.cpp (188969 => 188970)

--- branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler64.cpp	2015-08-26 17:33:49 UTC (rev 188969)
+++ branches/jsc-tailcall/Source/_javascript_Core/jit/CallFrameShuffler64.cpp	2015-08-26 17:54:28 UTC (rev 188970)
@@ -30,6 +30,7 @@
 
 #include CCallHelpers.h
 #include DataFormat.h
+#include JSCJSValueInlines.h
 
 namespace JSC {
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188978] trunk/Source/JavaScriptCore

2015-08-26 Thread akling

Title: [188978] trunk/Source/_javascript_Core








Revision 188978
Author akl...@apple.com
Date 2015-08-26 12:21:19 -0700 (Wed, 26 Aug 2015)


Log Message
[JSC] StructureTransitionTable should eagerly deallocate single-transition WeakImpls.
https://webkit.org/b/148478

Reviewed by Geoffrey Garen.

Use a WeakHandleOwner to eagerly deallocate StructureTransitionTable's Weak pointers
when it's using the single-transition optimization and the Structure it transitioned
to has been GC'd.

This prevents Structures from keeping WeakBlocks alive longer than necessary when
they've been transitioned away from but are still in use themselves.

* runtime/Structure.cpp:
(JSC::singleSlotTransitionWeakOwner):
(JSC::StructureTransitionTable::singleTransition):
(JSC::StructureTransitionTable::setSingleTransition):
(JSC::StructureTransitionTable::add):
* runtime/StructureTransitionTable.h:
(JSC::StructureTransitionTable::singleTransition): Deleted.
(JSC::StructureTransitionTable::setSingleTransition): Deleted.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/Structure.cpp
trunk/Source/_javascript_Core/runtime/StructureTransitionTable.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (188977 => 188978)

--- trunk/Source/_javascript_Core/ChangeLog	2015-08-26 19:01:44 UTC (rev 188977)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-08-26 19:21:19 UTC (rev 188978)
@@ -1,3 +1,26 @@
+2015-08-26  Andreas Kling  akl...@apple.com
+
+[JSC] StructureTransitionTable should eagerly deallocate single-transition WeakImpls.
+https://webkit.org/b/148478
+
+Reviewed by Geoffrey Garen.
+
+Use a WeakHandleOwner to eagerly deallocate StructureTransitionTable's Weak pointers
+when it's using the single-transition optimization and the Structure it transitioned
+to has been GC'd.
+
+This prevents Structures from keeping WeakBlocks alive longer than necessary when
+they've been transitioned away from but are still in use themselves.
+
+* runtime/Structure.cpp:
+(JSC::singleSlotTransitionWeakOwner):
+(JSC::StructureTransitionTable::singleTransition):
+(JSC::StructureTransitionTable::setSingleTransition):
+(JSC::StructureTransitionTable::add):
+* runtime/StructureTransitionTable.h:
+(JSC::StructureTransitionTable::singleTransition): Deleted.
+(JSC::StructureTransitionTable::setSingleTransition): Deleted.
+
 2015-08-26  Brian Burg  bb...@apple.com
 
 Web Inspector: REGRESSION(r188965): BackendDispatcher loses request ids when called re-entrantly


Modified: trunk/Source/_javascript_Core/runtime/Structure.cpp (188977 => 188978)

--- trunk/Source/_javascript_Core/runtime/Structure.cpp	2015-08-26 19:01:44 UTC (rev 188977)
+++ trunk/Source/_javascript_Core/runtime/Structure.cpp	2015-08-26 19:21:19 UTC (rev 188978)
@@ -38,6 +38,7 @@
 #include StructureRareDataInlines.h
 #include WeakGCMapInlines.h
 #include wtf/CommaPrinter.h
+#include wtf/NeverDestroyed.h
 #include wtf/ProcessID.h
 #include wtf/RefCountedLeakCounter.h
 #include wtf/RefPtr.h
@@ -60,6 +61,41 @@
 static HashSetStructure* liveStructureSet = *(new HashSetStructure*);
 #endif
 
+class SingleSlotTransitionWeakOwner final : public WeakHandleOwner {
+void finalize(HandleUnknown, void* context) override
+{
+StructureTransitionTable* table = reinterpret_castStructureTransitionTable*(context);
+ASSERT(table-isUsingSingleSlot());
+WeakSet::deallocate(table-weakImpl());
+table-m_data = StructureTransitionTable::UsingSingleSlotFlag;
+}
+};
+
+static SingleSlotTransitionWeakOwner singleSlotTransitionWeakOwner()
+{
+static NeverDestroyedSingleSlotTransitionWeakOwner owner;
+return owner;
+}
+
+inline Structure* StructureTransitionTable::singleTransition() const
+{
+ASSERT(isUsingSingleSlot());
+if (WeakImpl* impl = this-weakImpl()) {
+if (impl-state() == WeakImpl::Live)
+return jsCastStructure*(impl-jsValue().asCell());
+}
+return nullptr;
+}
+
+inline void StructureTransitionTable::setSingleTransition(Structure* structure)
+{
+ASSERT(isUsingSingleSlot());
+if (WeakImpl* impl = this-weakImpl())
+WeakSet::deallocate(impl);
+WeakImpl* impl = WeakSet::allocate(structure, singleSlotTransitionWeakOwner(), this);
+m_data = reinterpret_castintptr_t(impl) | UsingSingleSlotFlag;
+}
+
 bool StructureTransitionTable::contains(UniquedStringImpl* rep, unsigned attributes) const
 {
 if (isUsingSingleSlot()) {
@@ -85,7 +121,7 @@
 
 // This handles the first transition being added.
 if (!existingTransition) {
-setSingleTransition(vm, structure);
+setSingleTransition(structure);
 return;
 }
 


Modified: trunk/Source/_javascript_Core/runtime/StructureTransitionTable.h (188977 => 188978)

--- trunk/Source/_javascript_Core/runtime/StructureTransitionTable.h

[webkit-changes] [188976] trunk/Source/JavaScriptCore

2015-08-26 Thread bburg

Title: [188976] trunk/Source/_javascript_Core








Revision 188976
Author bb...@apple.com
Date 2015-08-26 11:53:36 -0700 (Wed, 26 Aug 2015)


Log Message
Web Inspector: REGRESSION(r188965): BackendDispatcher loses request ids when called re-entrantly
https://bugs.webkit.org/show_bug.cgi?id=148480

Reviewed by Joseph Pecoraro.

I added an assertion that m_currentRequestId is Nullopt when dispatch() is called, but this should
not hold if dispatching a backend command while debugger is paused. I will remove the assertion
and add proper scoping for all dispatch() branches.

No new tests, this wrong assert caused inspector/dom-debugger/node-removed.html to crash reliably.

* inspector/InspectorBackendDispatcher.cpp:
(Inspector::BackendDispatcher::dispatch): Cover each exit with an appropriate TemporaryChange scope.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/inspector/InspectorBackendDispatcher.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (188975 => 188976)

--- trunk/Source/_javascript_Core/ChangeLog	2015-08-26 18:52:44 UTC (rev 188975)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-08-26 18:53:36 UTC (rev 188976)
@@ -1,3 +1,19 @@
+2015-08-26  Brian Burg  bb...@apple.com
+
+Web Inspector: REGRESSION(r188965): BackendDispatcher loses request ids when called re-entrantly
+https://bugs.webkit.org/show_bug.cgi?id=148480
+
+Reviewed by Joseph Pecoraro.
+
+I added an assertion that m_currentRequestId is Nullopt when dispatch() is called, but this should
+not hold if dispatching a backend command while debugger is paused. I will remove the assertion
+and add proper scoping for all dispatch() branches.
+
+No new tests, this wrong assert caused inspector/dom-debugger/node-removed.html to crash reliably.
+
+* inspector/InspectorBackendDispatcher.cpp:
+(Inspector::BackendDispatcher::dispatch): Cover each exit with an appropriate TemporaryChange scope.
+
 2015-08-26  Sukolsak Sakshuwong  sukol...@gmail.com
 
 Remove the unused *Executable::unlinkCalls() and CodeBlock::unlinkCalls()


Modified: trunk/Source/_javascript_Core/inspector/InspectorBackendDispatcher.cpp (188975 => 188976)

--- trunk/Source/_javascript_Core/inspector/InspectorBackendDispatcher.cpp	2015-08-26 18:52:44 UTC (rev 188975)
+++ trunk/Source/_javascript_Core/inspector/InspectorBackendDispatcher.cpp	2015-08-26 18:53:36 UTC (rev 188976)
@@ -86,72 +86,81 @@
 
 ASSERT(!m_protocolErrors.size());
 
-RefPtrInspectorValue parsedMessage;
-if (!InspectorValue::parseJSON(message, parsedMessage)) {
-reportProtocolError(ParseError, ASCIILiteral(Message must be in JSON format));
-sendPendingErrors();
-return;
-}
-
+long requestId = 0;
 RefPtrInspectorObject messageObject;
-if (!parsedMessage-asObject(messageObject)) {
-reportProtocolError(InvalidRequest, ASCIILiteral(Message must be a JSONified object));
-sendPendingErrors();
-return;
-}
 
-RefPtrInspectorValue requestIdValue;
-if (!messageObject-getValue(ASCIILiteral(id), requestIdValue)) {
-reportProtocolError(InvalidRequest, ASCIILiteral('id' property was not found));
-sendPendingErrors();
-return;
-}
+{
+// In case this is a re-entrant call from a nested run loop, we don't want to lose
+// the outer request's id just because the inner request is bogus.
+TemporaryChangeOptionallong scopedRequestId(m_currentRequestId, Nullopt);
 
-long requestId = 0;
-if (!requestIdValue-asInteger(requestId)) {
-reportProtocolError(InvalidRequest, ASCIILiteral(The type of 'id' property must be integer));
-sendPendingErrors();
-return;
-}
+RefPtrInspectorValue parsedMessage;
+if (!InspectorValue::parseJSON(message, parsedMessage)) {
+reportProtocolError(ParseError, ASCIILiteral(Message must be in JSON format));
+sendPendingErrors();
+return;
+}
 
-ASSERT(!m_currentRequestId);
-TemporaryChangeOptionallong scopedRequestId(m_currentRequestId, requestId);
+if (!parsedMessage-asObject(messageObject)) {
+reportProtocolError(InvalidRequest, ASCIILiteral(Message must be a JSONified object));
+sendPendingErrors();
+return;
+}
 
-RefPtrInspectorValue methodValue;
-if (!messageObject-getValue(ASCIILiteral(method), methodValue)) {
-reportProtocolError(InvalidRequest, ASCIILiteral('method' property wasn't found));
-sendPendingErrors();
-return;
-}
+RefPtrInspectorValue requestIdValue;
+if (!messageObject-getValue(ASCIILiteral(id), requestIdValue)) {
+reportProtocolError(InvalidRequest, ASCIILiteral('id' property was not found));
+sendPendingErrors();
+return;
+}
 
-String methodString;
-if

[webkit-changes] [188981] trunk/Source/WTF

2015-08-26 Thread andersca

Title: [188981] trunk/Source/WTF








Revision 188981
Author ander...@apple.com
Date 2015-08-26 12:44:10 -0700 (Wed, 26 Aug 2015)


Log Message
Add and implement WorkQueue::concurrentApply
https://bugs.webkit.org/show_bug.cgi?id=148488

Reviewed by Geoffrey Garen.

WorkQueue::concurrentApply is modeled after dispatch_apply, and on Cocoa it uses dispatch_apply directly.
For other ports there's a generic concurrentApply implemented using our threading primitives.

* wtf/NeverDestroyed.h:
(WTF::LazyNeverDestroyed::operator-):
* wtf/WorkQueue.cpp:
(WTF::WorkQueue::concurrentApply):
* wtf/WorkQueue.h:
* wtf/cocoa/WorkQueueCocoa.cpp:
(WTF::WorkQueue::concurrentApply):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/NeverDestroyed.h
trunk/Source/WTF/wtf/WorkQueue.cpp
trunk/Source/WTF/wtf/WorkQueue.h
trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (188980 => 188981)

--- trunk/Source/WTF/ChangeLog	2015-08-26 19:30:50 UTC (rev 188980)
+++ trunk/Source/WTF/ChangeLog	2015-08-26 19:44:10 UTC (rev 188981)
@@ -1,3 +1,21 @@
+2015-08-26  Anders Carlsson  ander...@apple.com
+
+Add and implement WorkQueue::concurrentApply
+https://bugs.webkit.org/show_bug.cgi?id=148488
+
+Reviewed by Geoffrey Garen.
+
+WorkQueue::concurrentApply is modeled after dispatch_apply, and on Cocoa it uses dispatch_apply directly.
+For other ports there's a generic concurrentApply implemented using our threading primitives.
+
+* wtf/NeverDestroyed.h:
+(WTF::LazyNeverDestroyed::operator-):
+* wtf/WorkQueue.cpp:
+(WTF::WorkQueue::concurrentApply):
+* wtf/WorkQueue.h:
+* wtf/cocoa/WorkQueueCocoa.cpp:
+(WTF::WorkQueue::concurrentApply):
+
 2015-08-25  Filip Pizlo  fpi...@apple.com
 
 Node::origin should be able to tell you if it's OK to exit


Modified: trunk/Source/WTF/wtf/NeverDestroyed.h (188980 => 188981)

--- trunk/Source/WTF/wtf/NeverDestroyed.h	2015-08-26 19:30:50 UTC (rev 188980)
+++ trunk/Source/WTF/wtf/NeverDestroyed.h	2015-08-26 19:44:10 UTC (rev 188981)
@@ -94,6 +94,8 @@
 operator T() { return *asPtr(); }
 T get() { return *asPtr(); }
 
+T* operator-() { return asPtr(); }
+
 private:
 typedef typename std::remove_constT::type* PointerType;
 


Modified: trunk/Source/WTF/wtf/WorkQueue.cpp (188980 => 188981)

--- trunk/Source/WTF/wtf/WorkQueue.cpp	2015-08-26 19:30:50 UTC (rev 188980)
+++ trunk/Source/WTF/wtf/WorkQueue.cpp	2015-08-26 19:44:10 UTC (rev 188981)
@@ -26,7 +26,14 @@
 #include config.h
 #include WorkQueue.h
 
-#include Ref.h
+#include mutex
+#include wtf/BinarySemaphore.h
+#include wtf/MessageQueue.h
+#include wtf/NeverDestroyed.h
+#include wtf/NumberOfCores.h
+#include wtf/Ref.h
+#include wtf/Threading.h
+#include wtf/text/WTFString.h
 
 namespace WTF {
 
@@ -45,4 +52,105 @@
 platformInvalidate();
 }
 
+#if !PLATFORM(COCOA)
+void WorkQueue::concurrentApply(size_t iterations, const std::functionvoid (size_t index) function)
+{
+if (!iterations)
+return;
+
+if (iterations == 1) {
+function(0);
+return;
+}
+
+class ThreadPool {
+public:
+ThreadPool()
+{
+// We don't need a thread for the current core.
+unsigned threadCount = numberOfProcessorCores() - 1;
+
+m_workers.reserveInitialCapacity(threadCount);
+for (unsigned i = 0; i  threadCount; ++i) {
+m_workers.append(createThread(String::format(ThreadPool Worker %u, i).utf8().data(), [this] {
+threadBody();
+}));
+}
+}
+
+size_t workerCount() const { return m_workers.size(); }
+
+void dispatch(const std::functionvoid ()* function)
+{
+LockHolder holder(m_lock);
+
+m_queue.append(function);
+m_condition.notifyOne();
+}
+
+private:
+NO_RETURN void threadBody()
+{
+while (true) {
+const std::functionvoid ()* function;
+
+{
+LockHolder holder(m_lock);
+
+m_condition.wait(m_lock, [this] {
+return !m_queue.isEmpty();
+});
+
+function = m_queue.takeFirst();
+}
+
+(*function)();
+}
+}
+
+Lock m_lock;
+Condition m_condition;
+Dequeconst std::functionvoid ()* m_queue;
+
+VectorThreadIdentifier m_workers;
+};
+
+static LazyNeverDestroyedThreadPool threadPool;
+static std::once_flag onceFlag;
+std::call_once(onceFlag, [] {
+threadPool.construct();
+});
+
+// Cap the worker count to the number of iterations (excluding this thread)
+const size_t workerCount = std::min(iterations - 1, threadPool-workerCount());
+
+std::atomicsize_t currentIndex(0);
+std::atomicsize_t

[webkit-changes] [188980] trunk/Source/WebKit2

2015-08-26 Thread zandobersek

Title: [188980] trunk/Source/WebKit2








Revision 188980
Author zandober...@gmail.com
Date 2015-08-26 12:30:50 -0700 (Wed, 26 Aug 2015)


Log Message
Unreviewed.

Fix the crashes in GTK+'s WebKitTestRunner by setting the process pool
on the API::PageConfiguration object in webkitWebViewBaseCreate().

* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseCreate):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (188979 => 188980)

--- trunk/Source/WebKit2/ChangeLog	2015-08-26 19:24:41 UTC (rev 188979)
+++ trunk/Source/WebKit2/ChangeLog	2015-08-26 19:30:50 UTC (rev 188980)
@@ -1,3 +1,13 @@
+2015-08-26  Zan Dobersek  zdober...@igalia.com
+
+Unreviewed.
+
+Fix the crashes in GTK+'s WebKitTestRunner by setting the process pool
+on the API::PageConfiguration object in webkitWebViewBaseCreate().
+
+* UIProcess/API/gtk/WebKitWebViewBase.cpp:
+(webkitWebViewBaseCreate):
+
 2015-08-25  Beth Dakin  bda...@apple.com
 
 Speculative build fix.


Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (188979 => 188980)

--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp	2015-08-26 19:24:41 UTC (rev 188979)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp	2015-08-26 19:30:50 UTC (rev 188980)
@@ -1048,6 +1048,7 @@
 WebKitWebViewBase* webkitWebViewBase = WEBKIT_WEB_VIEW_BASE(g_object_new(WEBKIT_TYPE_WEB_VIEW_BASE, nullptr));
 
 auto pageConfiguration = API::PageConfiguration::create();
+pageConfiguration-setProcessPool(context);
 pageConfiguration-setPreferences(preferences);
 pageConfiguration-setPageGroup(pageGroup);
 pageConfiguration-setRelatedPage(relatedPage);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188946] trunk/Source/WebInspectorUI

2015-08-26 Thread bburg

Title: [188946] trunk/Source/WebInspectorUI








Revision 188946
Author bb...@apple.com
Date 2015-08-25 23:29:48 -0700 (Tue, 25 Aug 2015)


Log Message
Web Inspector: message dispatch metrics should use high-resolution timing data
https://bugs.webkit.org/show_bug.cgi?id=135467

Reviewed by Timothy Hatcher.

Use performance.now if it's available, otherwise fallback to Date.now().
Format timestamps with fixed decimal point, and sprinkle some ES6.

* UserInterface/Base/Utilities.js:
(timestamp): Added.
* UserInterface/Protocol/InspectorBackend.js:
(InspectorBackendClass):
(InspectorBackendClass.prototype._sendCommandToBackendWithCallback):
(InspectorBackendClass.prototype._dispatchEvent):
* UserInterface/Protocol/MessageDispatcher.js:
(WebInspector.dispatchNextQueuedMessageFromBackend):
(WebInspector.dispatchMessageFromBackend): Be consistent about using `this`.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js
trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js
trunk/Source/WebInspectorUI/UserInterface/Protocol/MessageDispatcher.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (188945 => 188946)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-08-26 05:47:59 UTC (rev 188945)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-08-26 06:29:48 UTC (rev 188946)
@@ -1,3 +1,23 @@
+2015-08-25  Brian Burg  bb...@apple.com
+
+Web Inspector: message dispatch metrics should use high-resolution timing data
+https://bugs.webkit.org/show_bug.cgi?id=135467
+
+Reviewed by Timothy Hatcher.
+
+Use performance.now if it's available, otherwise fallback to Date.now().
+Format timestamps with fixed decimal point, and sprinkle some ES6.
+
+* UserInterface/Base/Utilities.js:
+(timestamp): Added.
+* UserInterface/Protocol/InspectorBackend.js:
+(InspectorBackendClass):
+(InspectorBackendClass.prototype._sendCommandToBackendWithCallback):
+(InspectorBackendClass.prototype._dispatchEvent):
+* UserInterface/Protocol/MessageDispatcher.js:
+(WebInspector.dispatchNextQueuedMessageFromBackend):
+(WebInspector.dispatchMessageFromBackend): Be consistent about using `this`.
+
 2015-08-25  Matt Baker  mattba...@apple.com
 
 Web Inspector: Rendering Frames pie chart should use the needsLayout/updateLayout idiom


Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (188945 => 188946)

--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js	2015-08-26 05:47:59 UTC (rev 188945)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js	2015-08-26 06:29:48 UTC (rev 188946)
@@ -1124,3 +1124,9 @@
 
 return new Blob(byteArrays, {type: mimeType});
 }
+
+// FIXME: This can be removed when WEB_TIMING is enabled for all platforms.
+function timestamp()
+{
+return window.performance ? performance.now() : Date.now();
+}


Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js (188945 => 188946)

--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js	2015-08-26 05:47:59 UTC (rev 188945)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js	2015-08-26 06:29:48 UTC (rev 188946)
@@ -135,9 +135,8 @@
 
 let responseData = {command, callback};
 
-// FIXME: https://webkit.org/b/135467 use performance.now() where available.
 if (this.dumpInspectorTimeStats)
-responseData.sendRequestTime = Date.now();
+responseData.sendRequestTimestamp = timestamp();
 
 this._pendingResponses.set(sequenceId, responseData);
 this._sendMessageToBackend(messageObject);
@@ -157,9 +156,8 @@
 
 let responseData = {command};
 
-// FIXME: https://webkit.org/b/135467 use performance.now() where available.
 if (this.dumpInspectorTimeStats)
-responseData.sendRequestTime = Date.now();
+responseData.sendRequestTimestamp = timestamp();
 
 let responsePromise = new Promise(function(resolve, reject) {
 responseData.promise = {resolve, reject};
@@ -195,9 +193,9 @@
 let responseData = this._pendingResponses.take(sequenceId);
 let {command, callback, promise} = responseData;
 
-var processingStartTime;
+var processingStartTimestamp;
 if (this.dumpInspectorTimeStats)
-processingStartTime = Date.now();
+processingStartTimestamp = timestamp();
 
 if (typeof callback === function)
 this._dispatchResponseToCallback(command, messageObject, callback);
@@ -206,12 +204,14 @@
 else
 console.error(Received a command response without a corresponding callback or promise., messageObject, command);
 
-var processingDuration = Date.now() - processingStartTime;
+let processingDuration = (timestamp() - processingStartTimestamp).toFixed(3);
 if

[webkit-changes] [188948] trunk/Tools

2015-08-26 Thread gyuyoung . kim

Title: [188948] trunk/Tools








Revision 188948
Author gyuyoung@webkit.org
Date 2015-08-26 00:03:24 -0700 (Wed, 26 Aug 2015)


Log Message
[EFL][GTK] REGRESSION(r188828): All performance tests and almost all layout tests crash
https://bugs.webkit.org/show_bug.cgi?id=148377

Reviewed by Carlos Garcia Campos.

EFL and GTK don't support TestController::platformPreferences() yet which was introduced by r188828.
It caused all crashes of layout test and performance test on EFL and GTK. So this patch implements
TestController::platformPreferences() using WKPageGroupGetPreferences() which was previous thing for
EFL and GTK at the moment.

* WebKitTestRunner/TestController.cpp:
(WTR::TestController::platformWillRunTest):
* WebKitTestRunner/efl/TestControllerEfl.cpp:
(WTR::TestController::platformPreferences):
* WebKitTestRunner/gtk/TestControllerGtk.cpp:
(WTR::TestController::platformPreferences):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/WebKitTestRunner/TestController.cpp
trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp
trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp




Diff

Modified: trunk/Tools/ChangeLog (188947 => 188948)

--- trunk/Tools/ChangeLog	2015-08-26 06:49:45 UTC (rev 188947)
+++ trunk/Tools/ChangeLog	2015-08-26 07:03:24 UTC (rev 188948)
@@ -1,3 +1,22 @@
+2015-08-26  Gyuyoung Kim  gyuyoung@webkit.org
+
+[EFL][GTK] REGRESSION(r188828): All performance tests and almost all layout tests crash
+https://bugs.webkit.org/show_bug.cgi?id=148377
+
+Reviewed by Carlos Garcia Campos.
+
+EFL and GTK don't support TestController::platformPreferences() yet which was introduced by r188828.
+It caused all crashes of layout test and performance test on EFL and GTK. So this patch implements
+TestController::platformPreferences() using WKPageGroupGetPreferences() which was previous thing for
+EFL and GTK at the moment.
+
+* WebKitTestRunner/TestController.cpp:
+(WTR::TestController::platformWillRunTest):
+* WebKitTestRunner/efl/TestControllerEfl.cpp:
+(WTR::TestController::platformPreferences):
+* WebKitTestRunner/gtk/TestControllerGtk.cpp:
+(WTR::TestController::platformPreferences):
+
 2015-08-25  Nan Wang  n_w...@apple.com
 
 AX: Enable accessibility/aria-controls.html test for mac


Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (188947 => 188948)

--- trunk/Tools/WebKitTestRunner/TestController.cpp	2015-08-26 06:49:45 UTC (rev 188947)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp	2015-08-26 07:03:24 UTC (rev 188948)
@@ -1600,17 +1600,19 @@
 m_currentInvocation-outputText(String::format(WebView updated the title for history URL \%s\ to \%s\.\n, toSTD(urlStringWK).c_str(), toSTD(title).c_str()));
 }
 
-#if !PLATFORM(COCOA)
-void TestController::platformWillRunTest(const TestInvocation)
-{
-}
-
+#if !PLATFORM(EFL)  !PLATFORM(GTK)  !PLATFORM(COCOA)
 WKPreferencesRef TestController::platformPreferences()
 {
 WKRetainPtrWKPageConfigurationRef configuration = adoptWK(WKPageCopyPageConfiguration(m_mainWebView-page())); 
 return WKPageConfigurationGetPreferences(configuration.get());
 }
+#endif
 
+#if !PLATFORM(COCOA)
+void TestController::platformWillRunTest(const TestInvocation)
+{
+}
+
 void TestController::platformCreateWebView(WKPageConfigurationRef configuration, const ViewOptions options)
 {
 m_mainWebView = std::make_uniquePlatformWebView(configuration, options);


Modified: trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp (188947 => 188948)

--- trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp	2015-08-26 06:49:45 UTC (rev 188947)
+++ trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp	2015-08-26 07:03:24 UTC (rev 188948)
@@ -60,6 +60,11 @@
 }
 }
 
+WKPreferencesRef TestController::platformPreferences()
+{
+return WKPageGroupGetPreferences(m_pageGroup.get());
+}
+
 void TestController::platformDestroy()
 {
 }


Modified: trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp (188947 => 188948)

--- trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp	2015-08-26 06:49:45 UTC (rev 188947)
+++ trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp	2015-08-26 07:03:24 UTC (rev 188948)
@@ -48,6 +48,11 @@
 {
 }
 
+WKPreferencesRef TestController::platformPreferences()
+{
+return WKPageGroupGetPreferences(m_pageGroup.get());
+}
+
 void TestController::platformDestroy()
 {
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188947] trunk

2015-08-26 Thread commit-queue

Title: [188947] trunk








Revision 188947
Author commit-qu...@webkit.org
Date 2015-08-25 23:49:45 -0700 (Tue, 25 Aug 2015)


Log Message
AX: Enable accessibility/aria-controls.html test for mac
https://bugs.webkit.org/show_bug.cgi?id=148458

Patch by Nan Wang n_w...@apple.com on 2015-08-25
Reviewed by Chris Fleizach.

Source/WebCore:

Re-enabled accessibility/aria-controls.html test for mac.

* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):

Tools:

Implemented ariaControlsElementAtIndex(unsigned index).

* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(AccessibilityUIElement::ariaControlsElementAtIndex):
(AccessibilityUIElement::disclosedRowAtIndex):
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::AccessibilityUIElement::ariaControlsElementAtIndex):

LayoutTests:

* accessibility/aria-controls.html:
* platform/mac/TestExpectations:
* platform/mac/accessibility/aria-controls-expected.txt: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/accessibility/aria-controls.html
trunk/LayoutTests/platform/mac/TestExpectations
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm
trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm


Added Paths

trunk/LayoutTests/platform/mac/accessibility/aria-controls-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (188946 => 188947)

--- trunk/LayoutTests/ChangeLog	2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/LayoutTests/ChangeLog	2015-08-26 06:49:45 UTC (rev 188947)
@@ -1,3 +1,14 @@
+2015-08-25  Nan Wang  n_w...@apple.com
+
+AX: Enable accessibility/aria-controls.html test for mac
+https://bugs.webkit.org/show_bug.cgi?id=148458
+
+Reviewed by Chris Fleizach.
+
+* accessibility/aria-controls.html:
+* platform/mac/TestExpectations:
+* platform/mac/accessibility/aria-controls-expected.txt: Added.
+
 2015-08-25  Myles C. Maxfield  mmaxfi...@apple.com
 
 More test gardening of css3/line-break-language-sensitive.


Modified: trunk/LayoutTests/accessibility/aria-controls.html (188946 => 188947)

--- trunk/LayoutTests/accessibility/aria-controls.html	2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/LayoutTests/accessibility/aria-controls.html	2015-08-26 06:49:45 UTC (rev 188947)
@@ -22,8 +22,13 @@
 var tablist = accessibilityController.accessibleElementById(tablist);
 var tab1 = tablist.childAtIndex(0);
 
-shouldBe(tab1.ariaControlsElementAtIndex(0).stringValue, 'AXValue: Panel 1');
-shouldBe(tab1.ariaControlsElementAtIndex(1).stringValue, 'AXValue: Panel 2');
+if (accessibilityController.platformName == mac) {
+shouldBe(tab1.ariaControlsElementAtIndex(0).childAtIndex(0).stringValue, 'AXValue: Panel 1');
+shouldBe(tab1.ariaControlsElementAtIndex(1).childAtIndex(0).stringValue, 'AXValue: Panel 2');
+} else {
+shouldBe(tab1.ariaControlsElementAtIndex(0).stringValue, 'AXValue: Panel 1');
+shouldBe(tab1.ariaControlsElementAtIndex(1).stringValue, 'AXValue: Panel 2');
+}
 }
 
 /script


Modified: trunk/LayoutTests/platform/mac/TestExpectations (188946 => 188947)

--- trunk/LayoutTests/platform/mac/TestExpectations	2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/LayoutTests/platform/mac/TestExpectations	2015-08-26 06:49:45 UTC (rev 188947)
@@ -47,9 +47,6 @@
 # Missing implementation of some functions in mac.
 webkit.org/b/129039 accessibility/select-element-at-index.html [ Skip ]
 
-# ariaControlsElementAtIndex is not implemented in mac
-webkit.org/b/127908 accessibility/aria-controls.html [ Skip ]
-
 # Need to add functionality to DumpRenderTree to handle error pages
 fast/history/back-forward-reset-after-error-handling.html
 


Added: trunk/LayoutTests/platform/mac/accessibility/aria-controls-expected.txt (0 => 188947)

--- trunk/LayoutTests/platform/mac/accessibility/aria-controls-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-controls-expected.txt	2015-08-26 06:49:45 UTC (rev 188947)
@@ -0,0 +1,13 @@
+Panel 1
+Panel 2
+This tests that aria-controls returns correct element at the given index
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS tab1.ariaControlsElementAtIndex(0).childAtIndex(0).stringValue is 'AXValue: Panel 1'
+PASS tab1.ariaControlsElementAtIndex(1).childAtIndex(0).stringValue is 'AXValue: Panel 2'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Modified: trunk/Source/WebCore/ChangeLog (188946 => 188947)

--- trunk/Source/WebCore/ChangeLog	2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/Source/WebCore/ChangeLog	2015-08-26 06:49:45 UTC (rev 188947)
@@ -1,3 +1,15 @@
+2015-08-25  Nan Wang  n_w...@apple.com
+
+AX: Enable

[webkit-changes] [188967] trunk/Source/WebInspectorUI

2015-08-26 Thread nvasilyev

Title: [188967] trunk/Source/WebInspectorUI








Revision 188967
Author nvasil...@apple.com
Date 2015-08-26 09:06:21 -0700 (Wed, 26 Aug 2015)


Log Message
Web Inspector: Command-Enter should evaluate selected JS in Debugger/Sources
https://bugs.webkit.org/show_bug.cgi?id=148368

Reviewed by Timothy Hatcher.

* UserInterface/Controllers/CodeMirrorCompletionController.js:
(WebInspector.CodeMirrorCompletionController):
(WebInspector.CodeMirrorCompletionController.prototype._generateJavaScriptCompletions):
Evaluate selected text in the console only for JS and HTML resources. HTML resources
should be allowed because they can have commented out (inside !-- --) and
inline (_onclick_=) _javascript_.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (188966 => 188967)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-08-26 15:53:00 UTC (rev 188966)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-08-26 16:06:21 UTC (rev 188967)
@@ -1,3 +1,17 @@
+2015-08-26  Nikita Vasilyev  nvasil...@apple.com
+
+Web Inspector: Command-Enter should evaluate selected JS in Debugger/Sources
+https://bugs.webkit.org/show_bug.cgi?id=148368
+
+Reviewed by Timothy Hatcher.
+
+* UserInterface/Controllers/CodeMirrorCompletionController.js:
+(WebInspector.CodeMirrorCompletionController):
+(WebInspector.CodeMirrorCompletionController.prototype._generateJavaScriptCompletions):
+Evaluate selected text in the console only for JS and HTML resources. HTML resources
+should be allowed because they can have commented out (inside !-- --) and
+inline (_onclick_=) _javascript_.
+
 2015-08-25  Brian Burg  bb...@apple.com
 
 Web Inspector: no need to allocate protocolErrors array for every dispatched backend command


Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js (188966 => 188967)

--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js	2015-08-26 15:53:00 UTC (rev 188966)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js	2015-08-26 16:06:21 UTC (rev 188967)
@@ -51,6 +51,7 @@
 Right: this._handleRightOrEnterKey.bind(this),
 Esc: this._handleEscapeKey.bind(this),
 Enter: this._handleRightOrEnterKey.bind(this),
+Cmd-Enter: this._handleCommandEnterKey.bind(this),
 Tab: this._handleTabKey.bind(this),
 Cmd-A: this._handleHideKey.bind(this),
 Cmd-Z: this._handleHideKey.bind(this),
@@ -723,6 +724,19 @@
 this._commitCompletionHint();
 }
 
+_handleCommandEnterKey(codeMirror)
+{
+const modeName = codeMirror.getMode().name;
+if (modeName !== _javascript_  modeName !== htmlmixed)
+return CodeMirror.Pass;
+
+const selectedText = codeMirror.getSelection();
+if (!selectedText)
+return CodeMirror.Pass;
+
+WebInspector.consoleLogViewController.consolePromptTextCommitted(null, selectedText);
+}
+
 _handleEscapeKey(codeMirror)
 {
 var delegateImplementsShouldAllowEscapeCompletion = this._delegate  typeof this._delegate.completionControllerShouldAllowEscapeCompletion === function;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188969] trunk/Tools

2015-08-26 Thread bfulgham

Title: [188969] trunk/Tools








Revision 188969
Author bfulg...@apple.com
Date 2015-08-26 10:33:49 -0700 (Wed, 26 Aug 2015)


Log Message
[Win] Simplify menu handling code in WinLauncher
https://bugs.webkit.org/show_bug.cgi?id=148461

Reviewed by Zalan Bujtas.

Revise 'ToggleMenuItem' to return a boolean value indicating if
it handled the message. Revise WndProc to use this to decide if it
should pass the message on to the default handler, rather than
duplicating the logic in both places.

* WinLauncher/Common.cpp:
(ToggleMenuItem): Return true if the menu item message was handled.
(WndProc): If 'ToggleMenuItem' did not handle the message, pass
the message tothe default handler.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/WinLauncher/Common.cpp




Diff

Modified: trunk/Tools/ChangeLog (188968 => 188969)

--- trunk/Tools/ChangeLog	2015-08-26 16:44:43 UTC (rev 188968)
+++ trunk/Tools/ChangeLog	2015-08-26 17:33:49 UTC (rev 188969)
@@ -1,3 +1,20 @@
+2015-08-26  Brent Fulgham  bfulg...@apple.com
+
+[Win] Simplify menu handling code in WinLauncher
+https://bugs.webkit.org/show_bug.cgi?id=148461
+
+Reviewed by Zalan Bujtas.
+
+Revise 'ToggleMenuItem' to return a boolean value indicating if
+it handled the message. Revise WndProc to use this to decide if it
+should pass the message on to the default handler, rather than
+duplicating the logic in both places.
+
+* WinLauncher/Common.cpp:
+(ToggleMenuItem): Return true if the menu item message was handled.
+(WndProc): If 'ToggleMenuItem' did not handle the message, pass
+the message tothe default handler.
+
 2015-08-26  Csaba Osztrogonác  o...@webkit.org
 
 Remove unused code after r188948


Modified: trunk/Tools/WinLauncher/Common.cpp (188968 => 188969)

--- trunk/Tools/WinLauncher/Common.cpp	2015-08-26 16:44:43 UTC (rev 188968)
+++ trunk/Tools/WinLauncher/Common.cpp	2015-08-26 17:33:49 UTC (rev 188969)
@@ -359,8 +359,11 @@
 }
 }
 
-static void ToggleMenuItem(HWND hWnd, UINT menuID)
+static bool ToggleMenuItem(HWND hWnd, UINT menuID)
 {
+if (!gWinLauncher)
+return false;
+
 HMENU menu = ::GetMenu(hWnd);
 
 MENUITEMINFO info;
@@ -369,12 +372,12 @@
 info.fMask = MIIM_STATE;
 
 if (!::GetMenuItemInfo(menu, menuID, FALSE, info))
-return;
+return false;
 
 BOOL newState = !menuItemIsChecked(info);
 
 if (!gWinLauncher-standardPreferences() || !gWinLauncher-privatePreferences())
-return;
+return false;
 
 switch (menuID) {
 case IDM_AVFOUNDATION:
@@ -422,11 +425,15 @@
 // The actual user agent string will be set by the custom user agent dialog
 turnOffOtherUserAgents(menu);
 break;
+default:
+return false;
 }
 
 info.fState = (newState) ? MFS_CHECKED : MFS_UNCHECKED;
 
 ::SetMenuItemInfo(menu, menuID, FALSE, info);
+
+return true;
 }
 
 static const int dragBarHeight = 30;
@@ -487,26 +494,6 @@
 if (gWinLauncher)
 gWinLauncher-navigateForwardOrBackward(hWnd, wmId);
 break;
-case IDM_AVFOUNDATION:
-case IDM_ACC_COMPOSITING:
-case IDM_WK_FULLSCREEN:
-case IDM_COMPOSITING_BORDERS:
-case IDM_INVERT_COLORS:
-case IDM_DISABLE_IMAGES:
-case IDM_DISABLE_STYLES:
-case IDM_DISABLE_JAVASCRIPT:
-case IDM_DISABLE_LOCAL_FILE_RESTRICTIONS:
-case IDM_UA_DEFAULT:
-case IDM_UA_SAFARI_8_0:
-case IDM_UA_SAFARI_IOS_8_IPHONE:
-case IDM_UA_SAFARI_IOS_8_IPAD:
-case IDM_UA_IE_11:
-case IDM_UA_CHROME_MAC:
-case IDM_UA_CHROME_WIN:
-case IDM_UA_FIREFOX_MAC:
-case IDM_UA_FIREFOX_WIN:
-ToggleMenuItem(hWnd, wmId);
-break;
 case IDM_UA_OTHER:
 if (wmEvent)
 ToggleMenuItem(hWnd, wmId);
@@ -526,7 +513,8 @@
 gWinLauncher-zoomOut();
 break;
 default:
-return CallWindowProc(parentProc, hWnd, message, wParam, lParam);
+if (!ToggleMenuItem(hWnd, wmId))
+return CallWindowProc(parentProc, hWnd, message, wParam, lParam);
 }
 }
 break;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188966] trunk

2015-08-26 Thread commit-queue

Title: [188966] trunk








Revision 188966
Author commit-qu...@webkit.org
Date 2015-08-26 08:53:00 -0700 (Wed, 26 Aug 2015)


Log Message
Unreviewed, rolling out r188960.
https://bugs.webkit.org/show_bug.cgi?id=148479

Broke all the tests (Requested by ap on #webkit).

Reverted changeset:

Add some new emoji with modifiers and new sequence.
https://bugs.webkit.org/show_bug.cgi?id=148202
http://trac.webkit.org/changeset/188960

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt
trunk/LayoutTests/editing/deleting/delete-emoji.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/FontCascade.cpp
trunk/Source/WebCore/platform/text/CharacterProperties.h
trunk/Source/WebCore/platform/text/TextBreakIterator.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (188965 => 188966)

--- trunk/LayoutTests/ChangeLog	2015-08-26 14:34:38 UTC (rev 188965)
+++ trunk/LayoutTests/ChangeLog	2015-08-26 15:53:00 UTC (rev 188966)
@@ -1,3 +1,16 @@
+2015-08-26  Commit Queue  commit-qu...@webkit.org
+
+Unreviewed, rolling out r188960.
+https://bugs.webkit.org/show_bug.cgi?id=148479
+
+Broke all the tests (Requested by ap on #webkit).
+
+Reverted changeset:
+
+Add some new emoji with modifiers and new sequence.
+https://bugs.webkit.org/show_bug.cgi?id=148202
+http://trac.webkit.org/changeset/188960
+
 2015-08-25  Brian Burg  bb...@apple.com
 
 Web Inspector: no need to allocate protocolErrors array for every dispatched backend command


Modified: trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt (188965 => 188966)

--- trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt	2015-08-26 14:34:38 UTC (rev 188965)
+++ trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt	2015-08-26 15:53:00 UTC (rev 188966)
@@ -1,65 +1,38 @@
 This test verifies that emoji groups and emoji with variations are deleted correctly
 
 Dump of markup 1:
-| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹落‍#selection-caret
+| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️#selection-caret
 
 
 Dump of markup 2:
-| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹落#selection-caret
-
-Dump of markup 3:
-| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹落#selection-caret
-
-Dump of markup 4:
-| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹落#selection-caret
-
-Dump of markup 5:
-| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹落#selection-caret
-
-Dump of markup 6:
-| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹#selection-caret
-
-Dump of markup 7:
-| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹#selection-caret
-
-Dump of markup 8:
-| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹#selection-caret
-
-Dump of markup 9:
-| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍#selection-caret
-
-Dump of markup 10:
-| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️#selection-caret
-
-Dump of markup 11:
 | ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍#selection-caret
 
-Dump of markup 12:
+Dump of markup 3:
 | ‍‍‍❤️‍‍❤️‍‍❤️‍‍#selection-caret
 
-Dump of markup 13:
+Dump of markup 4:
 | ‍‍‍❤️‍‍❤️‍#selection-caret
 
-Dump of markup 14:
+Dump of markup 5:
 | ‍‍‍❤️‍#selection-caret
 
-Dump of markup 15:
+Dump of markup 6:
 | ‍‍#selection-caret
 
-Dump of markup 16:
+Dump of markup 7:
 | #selection-caret
 
-Dump of markup 17:
+Dump of markup 8:
 | #selection-caret
 
-Dump of markup 18:
+Dump of markup 9:
 | #selection-caret
 
-Dump of markup 19:
+Dump of markup 10:
 | #selection-caret
 
-Dump of markup 20:
+Dump of markup 11:
 | #selection-caret
 
-Dump of markup 21:
+Dump of markup 12:
 | br


Modified: trunk/LayoutTests/editing/deleting/delete-emoji.html (188965 => 188966)

--- trunk/LayoutTests/editing/deleting/delete-emoji.html	2015-08-26 14:34:38 UTC (rev 188965)
+++ trunk/LayoutTests/editing/deleting/delete-emoji.html	2015-08-26 15:53:00 UTC (rev 188966)
@@ -1,7 +1,7 @@
 !DOCTYPE html
 html
 body
-div id=test contenteditable=true#x1F466;#x1F3FB;#x1F466;#x1F3FE;#x1F3FB;#x1F466;#x1F3FE;#x1F466;#x1F469;#x200D;#x1F469;#x200D;#x1F466;#x1F469;#x200D;#x2764;#xFE0F;#x200D;#x1F469;#x1F468;#x200D;#x2764;#xFE0F;#x200D;#x1F468;#x1F469;#x200D;#x2764;#xFE0F;#x200D;#x1F48B;#x200D;#x1F469;#x1F468;#x200D;#x2764;#xFE0F;#x200D;#x1F48B;#x200D;#x1F468;#x261D;#xFE0F;#x1F3FB;#x270D;#x1F3FE;#x26F9;#x1F3FE;#x1F590;#x1F3FE;#x1F595;#x1F3FE;#x1F918;#x1F3FE;#x1F575;#x1F3FE;#x1F574;#x1F3FE;#x1F3CB;#x1F3FE;#x1F441;#x200D;#x1F5E8;
+div id=test contenteditable=true#x1F466;#x1F3FB;#x1F466;#x1F3FE;#x1F3FB;#x1F466;#x1F3FE;#x1F466;#x1F469;#x200D;#x1F469;#x200D;#x1F466;#x1F469;#x200D;#x2764;#xFE0F;#x200D;#x1F469;#x1F468;#x200D;#x2764;#xFE0F;#x200D;#x1F468;#x1F469;#x200D;#x2764;#xFE0F;#x200D;#x1F48B;#x200D;#x1F469;#x1F468;#x200D;#x2764;#xFE0F;#x200D;#x1F48B;#x200D;#x1F468;#x261D;#xFE0F;#x1F3FB;
 /div
 script src=""

[webkit-changes] [188999] branches/safari-601.1.46-branch/Source/WebKit2

2015-08-26 Thread bshafiei

Title: [188999] branches/safari-601.1.46-branch/Source/WebKit2








Revision 188999
Author bshaf...@apple.com
Date 2015-08-26 15:24:26 -0700 (Wed, 26 Aug 2015)


Log Message
Merged r188933.  rdar://problem/22441181

Modified Paths

branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm




Diff

Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188998 => 188999)

--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog	2015-08-26 22:23:30 UTC (rev 188998)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog	2015-08-26 22:24:26 UTC (rev 188999)
@@ -1,5 +1,16 @@
 2015-08-26  Babak Shafiei  bshaf...@apple.com
 
+Merge r188933.
+
+2015-08-25  Beth Dakin  bda...@apple.com
+
+Speculative build fix.
+
+* UIProcess/ios/WKContentViewInteraction.mm:
+(-[WKContentView setupInteraction]):
+
+2015-08-26  Babak Shafiei  bshaf...@apple.com
+
 Merge r188924.
 
 2015-08-25  Beth Dakin  bda...@apple.com


Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188998 => 188999)

--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2015-08-26 22:23:30 UTC (rev 188998)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2015-08-26 22:24:26 UTC (rev 188999)
@@ -349,7 +349,7 @@
 _longPressGestureRecognizer = adoptNS([[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_longPressRecognized:)]);
 [_longPressGestureRecognizer setDelay:tapAndHoldDelay];
 [_longPressGestureRecognizer setDelegate:self];
-#if __has_include(WebKitAdditions/WKContentViewInteraction.mm)
+#if __has_include(WebKitAdditions/WKContentViewInteraction.mm)  HAVE(LINK_PREVIEW)
 if ([_longPressGestureRecognizer respondsToSelector:@selector(_setAdjustsDelayBasedOnOtherRecognizers:)])
 [_longPressGestureRecognizer _setAdjustsDelayBasedOnOtherRecognizers:YES];
 #endif






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188988] trunk

2015-08-26 Thread aestes

Title: [188988] trunk








Revision 188988
Author aes...@apple.com
Date 2015-08-26 14:15:49 -0700 (Wed, 26 Aug 2015)


Log Message
Crash when following a Google search link to Twitter with Limit Adult Content enabled
https://bugs.webkit.org/show_bug.cgi?id=147651

Rubber-stamped by Brady Eidson.

Tools:

Taught TestRunner how to decide the navigation policy after a delay.

* WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::decidePolicyForNavigationAction):
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::setShouldDecideNavigationPolicyAfterDelay):
* WebKitTestRunner/InjectedBundle/TestRunner.h:
(WTR::TestRunner::shouldDecideNavigationPolicyAfterDelay):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize):
(WTR::TestController::resetStateToConsistentValues):
(WTR::TestController::decidePolicyForNavigationAction):
* WebKitTestRunner/TestController.h:
(WTR::TestController::setShouldDecideNavigationPolicyAfterDelay):
* WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::didReceiveMessageFromInjectedBundle):

LayoutTests:

Added a layout test.

* http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt: Added.
* http/tests/contentfiltering/load-substitute-data-from-appcache.html: Added.
* http/tests/contentfiltering/resources/appcache.html: Added.
* http/tests/contentfiltering/resources/appcache.manifest: Added.
* platform/mac-wk1/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/mac-wk1/TestExpectations
trunk/Tools/ChangeLog
trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
trunk/Tools/WebKitTestRunner/TestController.cpp
trunk/Tools/WebKitTestRunner/TestController.h
trunk/Tools/WebKitTestRunner/TestInvocation.cpp


Added Paths

trunk/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt
trunk/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache.html
trunk/LayoutTests/http/tests/contentfiltering/resources/appcache.html
trunk/LayoutTests/http/tests/contentfiltering/resources/appcache.manifest




Diff

Modified: trunk/LayoutTests/ChangeLog (188987 => 188988)

--- trunk/LayoutTests/ChangeLog	2015-08-26 20:44:04 UTC (rev 188987)
+++ trunk/LayoutTests/ChangeLog	2015-08-26 21:15:49 UTC (rev 188988)
@@ -1,3 +1,18 @@
+2015-08-26  Andy Estes  aes...@apple.com
+
+Crash when following a Google search link to Twitter with Limit Adult Content enabled
+https://bugs.webkit.org/show_bug.cgi?id=147651
+
+Rubber-stamped by Brady Eidson.
+
+Added a layout test.
+
+* http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt: Added.
+* http/tests/contentfiltering/load-substitute-data-from-appcache.html: Added.
+* http/tests/contentfiltering/resources/appcache.html: Added.
+* http/tests/contentfiltering/resources/appcache.manifest: Added.
+* platform/mac-wk1/TestExpectations:
+
 2015-08-26  Tim Horton  timothy_hor...@apple.com
 
 Layout Test platform/mac/fast/events/content-inset-hit-testing-in-frame.html is flaky


Added: trunk/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt (0 => 188988)

--- trunk/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt	(rev 0)
+++ trunk/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt	2015-08-26 21:15:49 UTC (rev 188988)
@@ -0,0 +1,3 @@
+This is a regression test for webkit.org/b/147651. The test passes if it does not crash.
+
+


Added: trunk/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache.html (0 => 188988)

--- trunk/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache.html	(rev 0)
+++ trunk/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache.html	2015-08-26 21:15:49 UTC (rev 188988)
@@ -0,0 +1,24 @@
+!DOCTYPE html
+script
+if (window.internals) {
+var settings = window.internals.mockContentFilterSettings;
+settings.enabled = true;
+settings.decisionPoint = settings.DECISION_POINT_AFTER_ADD_DATA;
+settings.decision = settings.DECISION_ALLOW;
+}
+
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+testRunner.setShouldDecideNavigationPolicyAfterDelay(true);
+}
+
+window.addEventListener(message, function() {
+frames[0].location = /resources/redirect.php?url=""
+});
+/script
+body
+pThis is a regression test for a href="" The test passes if it does not crash./p
+iframe src=""
+/body
+/html


Added:

[webkit-changes] [188991] trunk/Source/WebKit2

2015-08-26 Thread wenson_hsieh

Title: [188991] trunk/Source/WebKit2








Revision 188991
Author wenson_hs...@apple.com
Date 2015-08-26 14:54:41 -0700 (Wed, 26 Aug 2015)


Log Message
Fix crash due to animationDidEnd called on deallocated RemoteLayerTreeHost
https://bugs.webkit.org/show_bug.cgi?id=148442
rdar://problem/21609257

Reviewed by Tim Horton.

A PlatformCAAnimationRemote's backpointer to a deallocated RemoteLayerTreeHost is not
invalidated when its host removes its reference to it.

* UIProcess/mac/RemoteLayerTreeHost.mm:
(WebKit::RemoteLayerTreeHost::layerWillBeRemoved): Invalidate a backpointer from the
PlatformCAAnimationRemotes to the RemoteLayerTreeHost.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (188990 => 188991)

--- trunk/Source/WebKit2/ChangeLog	2015-08-26 21:51:12 UTC (rev 188990)
+++ trunk/Source/WebKit2/ChangeLog	2015-08-26 21:54:41 UTC (rev 188991)
@@ -1,3 +1,18 @@
+2015-08-26  Wenson Hsieh  wenson_hs...@apple.com
+
+Fix crash due to animationDidEnd called on deallocated RemoteLayerTreeHost
+https://bugs.webkit.org/show_bug.cgi?id=148442
+rdar://problem/21609257
+
+Reviewed by Tim Horton.
+
+A PlatformCAAnimationRemote's backpointer to a deallocated RemoteLayerTreeHost is not
+invalidated when its host removes its reference to it.
+
+* UIProcess/mac/RemoteLayerTreeHost.mm:
+(WebKit::RemoteLayerTreeHost::layerWillBeRemoved): Invalidate a backpointer from the
+PlatformCAAnimationRemotes to the RemoteLayerTreeHost.
+
 2015-08-26  Beth Dakin  bda...@apple.com
 
 REGRESSION: Safari navigates after a cancelled force click


Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (188990 => 188991)

--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm	2015-08-26 21:51:12 UTC (rev 188990)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm	2015-08-26 21:54:41 UTC (rev 188991)
@@ -138,7 +138,11 @@
 
 void RemoteLayerTreeHost::layerWillBeRemoved(WebCore::GraphicsLayer::PlatformLayerID layerID)
 {
-m_animationDelegates.remove(layerID);
+auto iter = m_animationDelegates.find(layerID);
+if (iter != m_animationDelegates.end()) {
+[iter-value invalidate];
+m_animationDelegates.remove(iter);
+}
 m_layers.remove(layerID);
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188996] branches/safari-601.1.46-branch

2015-08-26 Thread bshafiei

Title: [188996] branches/safari-601.1.46-branch








Revision 188996
Author bshaf...@apple.com
Date 2015-08-26 15:20:03 -0700 (Wed, 26 Aug 2015)


Log Message
Merged r188271.  rdar://problem/22425724

Modified Paths

branches/safari-601.1.46-branch/LayoutTests/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/filters/FEMorphology.cpp


Added Paths

branches/safari-601.1.46-branch/LayoutTests/fast/hidpi/filters-morphology-expected.html
branches/safari-601.1.46-branch/LayoutTests/fast/hidpi/filters-morphology.html




Diff

Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (188995 => 188996)

--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-08-26 22:15:02 UTC (rev 188995)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-08-26 22:20:03 UTC (rev 188996)
@@ -1,3 +1,20 @@
+2015-08-26  Babak Shafiei  bshaf...@apple.com
+
+Merge r188271.
+
+2015-08-11  Said Abou-Hallawa  sabouhall...@apple.com
+
+feMorphology is not rendered correctly on Retina display
+https://bugs.webkit.org/show_bug.cgi?id=147589
+
+Reviewed by Dean Jackson.
+
+Ensure we take the filter scale factor into consideration when applying
+the FEMorphology.
+
+* fast/hidpi/filters-morphology-expected.html: Added.
+* fast/hidpi/filters-morphology.html: Added.
+
 2015-08-21  Babak Shafiei  bshaf...@apple.com
 
 Merge r188340.


Copied: branches/safari-601.1.46-branch/LayoutTests/fast/hidpi/filters-morphology-expected.html (from rev 188271, trunk/LayoutTests/fast/hidpi/filters-morphology-expected.html) (0 => 188996)

--- branches/safari-601.1.46-branch/LayoutTests/fast/hidpi/filters-morphology-expected.html	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/hidpi/filters-morphology-expected.html	2015-08-26 22:20:03 UTC (rev 188996)
@@ -0,0 +1,19 @@
+!DOCTYPE html
+html
+head
+  script src=""
+  style
+div {
+  width: 120px;
+  height: 120px;
+  margin: 10px 10px 10px 10px;
+  border: none;
+  display: inline-block;
+  background-color: lime;
+}
+  /style
+/head
+body
+  div/div
+/body
+/html


Copied: branches/safari-601.1.46-branch/LayoutTests/fast/hidpi/filters-morphology.html (from rev 188271, trunk/LayoutTests/fast/hidpi/filters-morphology.html) (0 => 188996)

--- branches/safari-601.1.46-branch/LayoutTests/fast/hidpi/filters-morphology.html	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/hidpi/filters-morphology.html	2015-08-26 22:20:03 UTC (rev 188996)
@@ -0,0 +1,26 @@
+!DOCTYPE html
+html
+head
+  script src=""
+  style
+div {
+  width: 100px;
+  height: 100px;
+  margin: 20px 20px 20px 16px;
+  border: none;
+  display: inline-block;
+  background-color: lime;
+}
+  /style
+/head
+body
+  svg xmlns=http://www.w3.org/2000/svg version=1.1 width=0 height=0
+defs
+	  filter id=filter primitiveUnits=userSpaceOnUse
+		feMorphology in=SourceGraphic operator=dilate radius=10/
+	  /filter
+	/defs
+  /svg
+  div style=-webkit-filter: url('#filter'); filter: url('#filter');/div
+/body
+/html


Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (188995 => 188996)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-08-26 22:15:02 UTC (rev 188995)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-08-26 22:20:03 UTC (rev 188996)
@@ -1,3 +1,23 @@
+2015-08-26  Babak Shafiei  bshaf...@apple.com
+
+Merge r188271.
+
+2015-08-11  Said Abou-Hallawa  sabouhall...@apple.com
+
+feMorphology is not rendered correctly on Retina display
+https://bugs.webkit.org/show_bug.cgi?id=147589
+
+Reviewed by Dean Jackson.
+
+The result ImageBuffer of any FilterEffect is already scaled up for 2x
+display. The FEMorphology needs to fix its painting data dimension and
+radius by multiplying them by the filter scale factor.
+
+Test: fast/hidpi/filters-morphology.html
+
+* platform/graphics/filters/FEMorphology.cpp:
+(WebCore::FEMorphology::platformApplySoftware):
+
 2015-08-21  Babak Shafiei  bshaf...@apple.com
 
 Merge r188659.


Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/filters/FEMorphology.cpp (188995 => 188996)

--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/filters/FEMorphology.cpp	2015-08-26 22:15:02 UTC (rev 188995)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/filters/FEMorphology.cpp	2015-08-26 22:20:03 UTC (rev 188996)
@@ -238,10 +238,10 @@
 PaintingData paintingData;
 paintingData.srcPixelArray = srcPixelArray.get();
 paintingData.dstPixelArray = dstPixelArray;
-paintingData.width = effectDrawingRect.width();
-paintingData.height =

[webkit-changes] [188989] trunk/Source/WebCore

2015-08-26 Thread andersca

Title: [188989] trunk/Source/WebCore








Revision 188989
Author ander...@apple.com
Date 2015-08-26 14:37:43 -0700 (Wed, 26 Aug 2015)


Log Message
Fix failing tests.

Add fallback code for the case when iterations is 0.

* platform/graphics/filters/FEConvolveMatrix.cpp:
(WebCore::FEConvolveMatrix::platformApplySoftware):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (188988 => 188989)

--- trunk/Source/WebCore/ChangeLog	2015-08-26 21:15:49 UTC (rev 188988)
+++ trunk/Source/WebCore/ChangeLog	2015-08-26 21:37:43 UTC (rev 188989)
@@ -1,5 +1,14 @@
 2015-08-26  Anders Carlsson  ander...@apple.com
 
+Fix failing tests.
+
+Add fallback code for the case when iterations is 0.
+
+* platform/graphics/filters/FEConvolveMatrix.cpp:
+(WebCore::FEConvolveMatrix::platformApplySoftware):
+
+2015-08-26  Anders Carlsson  ander...@apple.com
+
 Use WorkQueue::concurrentApply in FEConvolveMatrix
 https://bugs.webkit.org/show_bug.cgi?id=148490
 


Modified: trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp (188988 => 188989)

--- trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp	2015-08-26 21:15:49 UTC (rev 188988)
+++ trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp	2015-08-26 21:37:43 UTC (rev 188989)
@@ -448,6 +448,11 @@
 }
 
 int iterations = (absolutePaintRect().width() * absolutePaintRect().height()) / s_minimalRectDimension;
+if (!iterations) {
+setInteriorPixels(paintingData, clipRight, clipBottom, 0, clipBottom);
+return;
+}
+
 int stride = clipBottom / iterations;
 int chunkCount = (clipBottom + stride - 1) / stride;
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188990] trunk/Source

2015-08-26 Thread bdakin

Title: [188990] trunk/Source








Revision 188990
Author bda...@apple.com
Date 2015-08-26 14:51:12 -0700 (Wed, 26 Aug 2015)


Log Message
REGRESSION: Safari navigates after a cancelled force click
https://bugs.webkit.org/show_bug.cgi?id=148491
-and corresponding-
rdar://problem/22394323

Reviewed by Tim Horton.

Source/WebCore:

This regression was introduced on El Capitan because AppKit sends ‘cancel’ to 
gesture recognizer BEFORE it sends the mouseUp. So the ImmediateActionStage needs 
to track whether a cancel happened after updates or without any updates since they 
signify different things. 

Don’t perform default behaviors when the stage is ActionCancelledAfterUpdate.
* page/EventHandler.cpp:
(WebCore::EventHandler::handleMouseReleaseEvent):

New possible stages, and new getter for the current stage.
* page/EventHandler.h:
(WebCore::EventHandler::immediateActionStage):

Source/WebKit/mac:

Use the current stage to determine which type of cancel this is.
* WebView/WebImmediateActionController.mm:
(-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):

Source/WebKit2:

Use the current stage to determine which type of cancel this is.
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::immediateActionDidCancel):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/EventHandler.cpp
trunk/Source/WebCore/page/EventHandler.h
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (188989 => 188990)

--- trunk/Source/WebCore/ChangeLog	2015-08-26 21:37:43 UTC (rev 188989)
+++ trunk/Source/WebCore/ChangeLog	2015-08-26 21:51:12 UTC (rev 188990)
@@ -1,3 +1,25 @@
+2015-08-26  Beth Dakin  bda...@apple.com
+
+REGRESSION: Safari navigates after a cancelled force click
+https://bugs.webkit.org/show_bug.cgi?id=148491
+-and corresponding-
+rdar://problem/22394323
+
+Reviewed by Tim Horton.
+
+This regression was introduced on El Capitan because AppKit sends ‘cancel’ to 
+gesture recognizer BEFORE it sends the mouseUp. So the ImmediateActionStage needs 
+to track whether a cancel happened after updates or without any updates since they 
+signify different things. 
+
+Don’t perform default behaviors when the stage is ActionCancelledAfterUpdate.
+* page/EventHandler.cpp:
+(WebCore::EventHandler::handleMouseReleaseEvent):
+
+New possible stages, and new getter for the current stage.
+* page/EventHandler.h:
+(WebCore::EventHandler::immediateActionStage):
+
 2015-08-26  Anders Carlsson  ander...@apple.com
 
 Fix failing tests.


Modified: trunk/Source/WebCore/page/EventHandler.cpp (188989 => 188990)

--- trunk/Source/WebCore/page/EventHandler.cpp	2015-08-26 21:37:43 UTC (rev 188989)
+++ trunk/Source/WebCore/page/EventHandler.cpp	2015-08-26 21:51:12 UTC (rev 188990)
@@ -2101,7 +2101,7 @@
 
 // If an immediate action began or was completed using this series of mouse events, then we should send mouseup to
 // the DOM and return now so that we don't perform our own default behaviors.
-if (m_immediateActionStage == ImmediateActionStage::ActionCompleted || m_immediateActionStage == ImmediateActionStage::ActionUpdated) {
+if (m_immediateActionStage == ImmediateActionStage::ActionCompleted || m_immediateActionStage == ImmediateActionStage::ActionUpdated || m_immediateActionStage == ImmediateActionStage::ActionCancelledAfterUpdate) {
 m_immediateActionStage = ImmediateActionStage::None;
 return !dispatchMouseEvent(eventNames().mouseupEvent, m_lastElementUnderMouse.get(), true, m_clickCount, platformMouseEvent, false);
 }


Modified: trunk/Source/WebCore/page/EventHandler.h (188989 => 188990)

--- trunk/Source/WebCore/page/EventHandler.h	2015-08-26 21:37:43 UTC (rev 188989)
+++ trunk/Source/WebCore/page/EventHandler.h	2015-08-26 21:51:12 UTC (rev 188990)
@@ -121,7 +121,8 @@
 None,
 PerformedHitTest,
 ActionUpdated,
-ActionCancelled,
+ActionCancelledWithoutUpdate,
+ActionCancelledAfterUpdate,
 ActionCompleted
 };
 
@@ -313,6 +314,7 @@
 bool isHandlingWheelEvent() const { return m_isHandlingWheelEvent; }
 
 WEBCORE_EXPORT void setImmediateActionStage(ImmediateActionStage stage);
+WEBCORE_EXPORT ImmediateActionStage immediateActionStage() const { return m_immediateActionStage; }
 
 private:
 #if ENABLE(DRAG_SUPPORT)


Modified: trunk/Source/WebKit/mac/ChangeLog (188989 => 188990)

--- trunk/Source/WebKit/mac/ChangeLog	2015-08-26 21:37:43 UTC (rev 188989)
+++ trunk/Source/WebKit/mac/ChangeLog	2015-08-26 21:51:12 UTC (rev 188990)
@@ -1,3 +1,16 @@
+2015-08-26  Beth Dakin  bda...@apple.com
+
+REGRESSION: Safari navigates after a cancelled force click
+

[webkit-changes] [188987] trunk/Source/WebCore

2015-08-26 Thread andersca

Title: [188987] trunk/Source/WebCore








Revision 188987
Author ander...@apple.com
Date 2015-08-26 13:44:04 -0700 (Wed, 26 Aug 2015)


Log Message
Use WorkQueue::concurrentApply in FEConvolveMatrix
https://bugs.webkit.org/show_bug.cgi?id=148490

Reviewed by Tim Horton.

Using WorkQueue::concurrentApply lets us simplify the code a lot, and measurements show
no difference in performance. The striding has been slightly tweaked to make more sense
(we no longer divide up the remainder across some of the iterations, instead we just process
it separately last).

* platform/graphics/filters/FEConvolveMatrix.cpp:
(WebCore::FEConvolveMatrix::platformApplySoftware):
(WebCore::FEConvolveMatrix::setInteriorPixelsWorker): Deleted.
* platform/graphics/filters/FEConvolveMatrix.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp
trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (188986 => 188987)

--- trunk/Source/WebCore/ChangeLog	2015-08-26 20:43:35 UTC (rev 188986)
+++ trunk/Source/WebCore/ChangeLog	2015-08-26 20:44:04 UTC (rev 188987)
@@ -1,3 +1,20 @@
+2015-08-26  Anders Carlsson  ander...@apple.com
+
+Use WorkQueue::concurrentApply in FEConvolveMatrix
+https://bugs.webkit.org/show_bug.cgi?id=148490
+
+Reviewed by Tim Horton.
+
+Using WorkQueue::concurrentApply lets us simplify the code a lot, and measurements show
+no difference in performance. The striding has been slightly tweaked to make more sense
+(we no longer divide up the remainder across some of the iterations, instead we just process 
+it separately last).
+
+* platform/graphics/filters/FEConvolveMatrix.cpp:
+(WebCore::FEConvolveMatrix::platformApplySoftware):
+(WebCore::FEConvolveMatrix::setInteriorPixelsWorker): Deleted.
+* platform/graphics/filters/FEConvolveMatrix.h:
+
 2015-08-26  Eric Carlson  eric.carl...@apple.com
 
 Media Session: make MediaSessionMetadata a class


Modified: trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp (188986 => 188987)

--- trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp	2015-08-26 20:43:35 UTC (rev 188986)
+++ trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp	2015-08-26 20:44:04 UTC (rev 188987)
@@ -29,6 +29,7 @@
 
 #include runtime/Uint8ClampedArray.h
 #include wtf/ParallelJobs.h
+#include wtf/WorkQueue.h
 
 namespace WebCore {
 
@@ -408,11 +409,6 @@
 fastSetOuterPixelsfalse(paintingData, x1, y1, x2, y2);
 }
 
-void FEConvolveMatrix::setInteriorPixelsWorker(InteriorPixelParameters* param)
-{
-param-filter-setInteriorPixels(*param-paintingData, param-clipRight, param-clipBottom, param-yStart, param-yEnd);
-}
-
 void FEConvolveMatrix::platformApplySoftware()
 {
 FilterEffect* in = inputEffect(0);
@@ -445,50 +441,33 @@
 int clipRight = paintSize.width() - m_kernelSize.width();
 int clipBottom = paintSize.height() - m_kernelSize.height();
 
-if (clipRight = 0  clipBottom = 0) {
+if (clipRight  0 || clipBottom  0) {
+// Rare situation, not optimizied for speed
+setOuterPixels(paintingData, 0, 0, paintSize.width(), paintSize.height());
+return;
+}
 
-int optimalThreadNumber = (absolutePaintRect().width() * absolutePaintRect().height()) / s_minimalRectDimension;
-if (optimalThreadNumber  1) {
-WTF::ParallelJobsInteriorPixelParameters parallelJobs(WebCore::FEConvolveMatrix::setInteriorPixelsWorker, optimalThreadNumber);
-const int numOfThreads = parallelJobs.numberOfJobs();
+int iterations = (absolutePaintRect().width() * absolutePaintRect().height()) / s_minimalRectDimension;
+int stride = clipBottom / iterations;
+int chunkCount = (clipBottom + stride - 1) / stride;
 
-// Split the job into heightPerThread jobs but there a few jobs that need to be slightly larger since
-// heightPerThread * jobs  total size. These extras are handled by the remainder jobsWithExtra.
-const int heightPerThread = clipBottom / numOfThreads;
-const int jobsWithExtra = clipBottom % numOfThreads;
+WorkQueue::concurrentApply(chunkCount, [](size_t index) {
+int yStart = (stride * index);
+int yEnd = std::minint(stride * (index + 1), clipBottom);
 
-int startY = 0;
-for (int job = 0; job  numOfThreads; ++job) {
-InteriorPixelParameters param = parallelJobs.parameter(job);
-param.filter = this;
-param.paintingData = paintingData;
-param.clipRight = clipRight;
-param.clipBottom = clipBottom;
-param.yStart = startY;
-startY += job  jobsWithExtra ? heightPerThread + 1 : heightPerThread;
-param.yEnd = startY;
-}
+

[webkit-changes] [188994] trunk/Source

2015-08-26 Thread cdumez

Title: [188994] trunk/Source








Revision 188994
Author cdu...@apple.com
Date 2015-08-26 15:09:29 -0700 (Wed, 26 Aug 2015)


Log Message
Distinguish Web IDL callback interfaces from Web IDL callback functions
https://bugs.webkit.org/show_bug.cgi?id=148434

Reviewed by Geoffrey Garen.

Source/_javascript_Core:

Add isNull() convenience method on PropertyName.

* runtime/PropertyName.h:
(JSC::PropertyName::isNull):

Source/WebCore:

Distinguish Web IDL callback interfaces [1] from Web IDL callback
functions [2].

One Web-exposed difference is that when using a callback interface,
the user can pass either a function / callable object or a non-callable
object that has a method with the same name as the callback interface
operation:
https://heycam.github.io/webidl/#es-user-objects

When using a callback function, the user needs to pass a function /
callable object:
https://heycam.github.io/webidl/#es-callback-function

This patch adds a new [Callback=FunctionOnly] IDL extended attribute to
indicate that a callback interface should be function-only (i.e. a callback
function in the latest Web IDL specification). Without this IDL extended
attribute, the callback interface will be treated as a regular callback
interface. This will be needed for Bug 148415, as NodeFilter should be
an actual callback interface.

Note that longer term, we should really drop the old-style
[Callback=FunctionOnly] extendd attribute and use actual IDL callback
functions as per the latest Web IDL specification. However, I did not
do this in this patch to minimize patch size.

This patch adds Callback=FunctionOnly] IDL extended attribute to all
our pre-existing callback interfaces so that there is no behavior
change.

   [1] https://heycam.github.io/webidl/#dfn-callback-interface
   [2] https://heycam.github.io/webidl/#idl-callback-functions

* Modules/geolocation/PositionCallback.idl:
* Modules/geolocation/PositionErrorCallback.idl:
* Modules/mediastream/MediaStreamTrackSourcesCallback.idl:
* Modules/mediastream/NavigatorUserMediaErrorCallback.idl:
* Modules/mediastream/NavigatorUserMediaSuccessCallback.idl:
* Modules/mediastream/RTCPeerConnectionErrorCallback.idl:
* Modules/mediastream/RTCSessionDescriptionCallback.idl:
* Modules/mediastream/RTCStatsCallback.idl:
* Modules/notifications/NotificationPermissionCallback.idl:
* Modules/quota/StorageErrorCallback.idl:
* Modules/quota/StorageQuotaCallback.idl:
* Modules/quota/StorageUsageCallback.idl:
* Modules/webaudio/AudioBufferCallback.idl:
* Modules/webdatabase/DatabaseCallback.idl:
* Modules/webdatabase/SQLStatementCallback.idl:
* Modules/webdatabase/SQLStatementErrorCallback.idl:
* Modules/webdatabase/SQLTransactionCallback.idl:
* Modules/webdatabase/SQLTransactionErrorCallback.idl:
* bindings/js/JSCallbackData.cpp:
(WebCore::JSCallbackData::invokeCallback):
* bindings/js/JSCallbackData.h:
* bindings/js/JSCustomSQLStatementErrorCallback.cpp:
(WebCore::JSSQLStatementErrorCallback::handleEvent):
* bindings/scripts/CodeGenerator.pm:
(trim):
(IsFunctionOnlyCallbackInterface):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateParametersCheckExpression):
(GenerateParametersCheck):
(GenerateCallbackImplementation):
* bindings/scripts/IDLAttributes.txt:
* bindings/scripts/test/GObject/WebKitDOMTestCallbackFunction.cpp: Added.
(WebKit::kit):
(WebKit::core):
(WebKit::wrapTestCallbackFunction):
(webkit_dom_test_callback_function_finalize):
(webkit_dom_test_callback_function_constructor):
(webkit_dom_test_callback_function_class_init):
(webkit_dom_test_callback_function_init):
(webkit_dom_test_callback_function_callback_with_no_param):
(webkit_dom_test_callback_function_callback_with_array_param):
(webkit_dom_test_callback_function_callback_with_serialized_script_value_param):
(webkit_dom_test_callback_function_callback_with_non_bool_return_type):
(webkit_dom_test_callback_function_callback_with_string_list):
(webkit_dom_test_callback_function_callback_with_boolean):
(webkit_dom_test_callback_function_callback_requires_this_to_pass):
* bindings/scripts/test/GObject/WebKitDOMTestCallbackFunction.h: Added.
* bindings/scripts/test/GObject/WebKitDOMTestCallbackFunctionPrivate.h: Copied from Source/WebCore/css/MediaQueryListListener.idl.
* bindings/scripts/test/JS/JSTestCallback.cpp:
(WebCore::JSTestCallback::callbackWithNoParam):
(WebCore::JSTestCallback::callbackWithArrayParam):
(WebCore::JSTestCallback::callbackWithSerializedScriptValueParam):
(WebCore::JSTestCallback::callbackWithStringList):
(WebCore::JSTestCallback::callbackWithBoolean):
(WebCore::JSTestCallback::callbackRequiresThisToPass):
* bindings/scripts/test/JS/JSTestCallbackFunction.cpp: Copied from Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp.
(WebCore::JSTestCallbackFunction::JSTestCallbackFunction):
(WebCore::JSTestCallbackFunction::~JSTestCallbackFunction):
(WebCore::JSTestCallbackFunction::callbackWithNoParam):
(WebCore::JSTestCallbackFunction::callbackWithArrayParam):

[webkit-changes] [188986] branches/jsc-tailcall/Source/JavaScriptCore

2015-08-26 Thread msaboff

Title: [188986] branches/jsc-tailcall/Source/_javascript_Core








Revision 188986
Author msab...@apple.com
Date 2015-08-26 13:43:35 -0700 (Wed, 26 Aug 2015)


Log Message
jsc-tailcall: Integrate FTL OSR entry / exit and exceptions handling of callee save registers with other tiers
https://bugs.webkit.org/show_bug.cgi?id=148099

Reviewed by Basile Clement.

Turned off register preservation thunks for outgoing calls from FTL generated code.
Handled callee saves registers for DFG to FTL OSR entry.
Fxed the FTL OSR exit compiler to restore the callee saves from an FTL function to
either the baseline call frame for callee saves the baseline handles or directly to
the callee save register itself.

* bytecode/CallLinkInfo.h:
(JSC::CallLinkInfo::setUpCallFromFTL):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* ftl/FTLCompile.cpp:
(JSC::FTL::fixFunctionBasedOnStackMaps):
* ftl/FTLOSRExitCompiler.cpp:
(JSC::FTL::compileStub):

Modified Paths

branches/jsc-tailcall/Source/_javascript_Core/ChangeLog
branches/jsc-tailcall/Source/_javascript_Core/bytecode/CallLinkInfo.h
branches/jsc-tailcall/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp
branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLCompile.cpp
branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLOSRExitCompiler.cpp




Diff

Modified: branches/jsc-tailcall/Source/_javascript_Core/ChangeLog (188985 => 188986)

--- branches/jsc-tailcall/Source/_javascript_Core/ChangeLog	2015-08-26 20:38:42 UTC (rev 188985)
+++ branches/jsc-tailcall/Source/_javascript_Core/ChangeLog	2015-08-26 20:43:35 UTC (rev 188986)
@@ -1,5 +1,27 @@
 2015-08-26  Michael Saboff  msab...@apple.com
 
+jsc-tailcall: Integrate FTL OSR entry / exit and exceptions handling of callee save registers with other tiers
+https://bugs.webkit.org/show_bug.cgi?id=148099
+
+Reviewed by Basile Clement.
+
+Turned off register preservation thunks for outgoing calls from FTL generated code.
+Handled callee saves registers for DFG to FTL OSR entry.
+Fxed the FTL OSR exit compiler to restore the callee saves from an FTL function to
+either the baseline call frame for callee saves the baseline handles or directly to
+the callee save register itself.
+
+* bytecode/CallLinkInfo.h:
+(JSC::CallLinkInfo::setUpCallFromFTL):
+* dfg/DFGSpeculativeJIT64.cpp:
+(JSC::DFG::SpeculativeJIT::compile):
+* ftl/FTLCompile.cpp:
+(JSC::FTL::fixFunctionBasedOnStackMaps):
+* ftl/FTLOSRExitCompiler.cpp:
+(JSC::FTL::compileStub):
+
+2015-08-26  Michael Saboff  msab...@apple.com
+
 Unreviewed build fix for release builds after r188937.
 
 * jit/CallFrameShuffler.cpp:


Modified: branches/jsc-tailcall/Source/_javascript_Core/bytecode/CallLinkInfo.h (188985 => 188986)

--- branches/jsc-tailcall/Source/_javascript_Core/bytecode/CallLinkInfo.h	2015-08-26 20:38:42 UTC (rev 188985)
+++ branches/jsc-tailcall/Source/_javascript_Core/bytecode/CallLinkInfo.h	2015-08-26 20:43:35 UTC (rev 188986)
@@ -161,7 +161,7 @@
 CodeLocationNearCall callReturnLocation, CodeLocationDataLabelPtr hotPathBegin,
 CodeLocationNearCall hotPathOther, unsigned calleeGPR)
 {
-m_registerPreservationMode = static_castunsigned(MustPreserveRegisters);
+m_registerPreservationMode = static_castunsigned(RegisterPreservationNotRequired);
 m_callType = callType;
 m_codeOrigin = codeOrigin;
 m_callReturnLocation = callReturnLocation;


Modified: branches/jsc-tailcall/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp (188985 => 188986)

--- branches/jsc-tailcall/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp	2015-08-26 20:38:42 UTC (rev 188985)
+++ branches/jsc-tailcall/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp	2015-08-26 20:43:35 UTC (rev 188986)
@@ -4818,6 +4818,7 @@
 TrustedImm32(m_stream-size()));
 appendCallSetResult(triggerOSREntryNow, tempGPR);
 MacroAssembler::Jump dontEnter = m_jit.branchTestPtr(MacroAssembler::Zero, tempGPR);
+m_jit.emitRestoreCalleeSaves();
 m_jit.jump(tempGPR);
 dontEnter.link(m_jit);
 silentFillAllRegisters(tempGPR);


Modified: branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLCompile.cpp (188985 => 188986)

--- branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLCompile.cpp	2015-08-26 20:38:42 UTC (rev 188985)
+++ branches/jsc-tailcall/Source/_javascript_Core/ftl/FTLCompile.cpp	2015-08-26 20:43:35 UTC (rev 188986)
@@ -366,12 +366,14 @@
 
 // At this point it's perfectly fair to just blow away all state and restore the
 // JS JIT view of the universe.
+checkJIT.copyCalleeSavesToVMCalleeSavesBuffer();
 checkJIT.move(MacroAssembler::TrustedImmPtr(vm), GPRInfo::argumentGPR0);
 checkJIT.move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR1);
 MacroAssembler::Call callLookupExceptionHandler =

[webkit-changes] [188995] trunk/Source/WebKit

2015-08-26 Thread bfulgham

Title: [188995] trunk/Source/WebKit








Revision 188995
Author bfulg...@apple.com
Date 2015-08-26 15:15:02 -0700 (Wed, 26 Aug 2015)


Log Message
Correct build after r188982.

* WebKit.vcxproj/WebKit.sln:

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln




Diff

Modified: trunk/Source/WebKit/ChangeLog (188994 => 188995)

--- trunk/Source/WebKit/ChangeLog	2015-08-26 22:09:29 UTC (rev 188994)
+++ trunk/Source/WebKit/ChangeLog	2015-08-26 22:15:02 UTC (rev 188995)
@@ -1,3 +1,9 @@
+2015-08-26  Brent Fulgham  bfulg...@apple.com
+
+Correct build after r188982.
+
+* WebKit.vcxproj/WebKit.sln:
+
 2015-08-20  Alex Christensen  achristen...@webkit.org
 
 Clean up CMake build after r188673


Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln (188994 => 188995)

--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln	2015-08-26 22:09:29 UTC (rev 188994)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln	2015-08-26 22:15:02 UTC (rev 188995)
@@ -84,14 +84,14 @@
 		{1659B1B6-F2A3-46B3-AE02-FE65B4A607EB} = {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}
 	EndProjectSection
 EndProject
-Project({2150E333-8FDC-42A3-9474-1A3956D46DE8}) = WinLauncher Projects, WinLauncher Projects, {20A8616C-E56B-4649-A910-8E97751DE145}
+Project({2150E333-8FDC-42A3-9474-1A3956D46DE8}) = MiniBrowser Projects, MiniBrowser Projects, {20A8616C-E56B-4649-A910-8E97751DE145}
 EndProject
-Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = WinLauncherLib, ..\..\..\Tools\WinLauncher\WinLauncher.vcxproj\WinLauncherLib.vcxproj, {114FCA11-216B-4C8C-957E-30A75AE80443}
+Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = MiniBrowserLib, ..\..\..\Tools\MiniBrowser\MiniBrowser.vcxproj\MiniBrowserLib.vcxproj, {114FCA11-216B-4C8C-957E-30A75AE80443}
 	ProjectSection(ProjectDependencies) = postProject
 		{0473724F-0AB3-4F12-892E-9FAB0186C804} = {0473724F-0AB3-4F12-892E-9FAB0186C804}
 	EndProjectSection
 EndProject
-Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = WinLauncher, ..\..\..\Tools\WinLauncher\WinLauncher.vcxproj\WinLauncher.vcxproj, {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}
+Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = MiniBrowser, ..\..\..\Tools\MiniBrowser\MiniBrowser.vcxproj\MiniBrowser.vcxproj, {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}
 	ProjectSection(ProjectDependencies) = postProject
 		{114FCA11-216B-4C8C-957E-30A75AE80443} = {114FCA11-216B-4C8C-957E-30A75AE80443}
 	EndProjectSection






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188998] branches/safari-601.1.46-branch/Source/WebKit2

2015-08-26 Thread bshafiei

Title: [188998] branches/safari-601.1.46-branch/Source/WebKit2








Revision 188998
Author bshaf...@apple.com
Date 2015-08-26 15:23:30 -0700 (Wed, 26 Aug 2015)


Log Message
Merged r188924.  rdar://problem/22441181

Modified Paths

branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm




Diff

Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188997 => 188998)

--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog	2015-08-26 22:22:29 UTC (rev 188997)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog	2015-08-26 22:23:30 UTC (rev 188998)
@@ -1,3 +1,20 @@
+2015-08-26  Babak Shafiei  bshaf...@apple.com
+
+Merge r188924.
+
+2015-08-25  Beth Dakin  bda...@apple.com
+
+Long press gesture recognizer should adjust delay based on other recognizers
+https://bugs.webkit.org/show_bug.cgi?id=148402
+-and corresponding-
+rdar://problem/22278723
+
+Reviewed by Tim Horton.
+
+Call _setAdjustsDelayBasedOnOtherRecognizers with a value of YES.
+* UIProcess/ios/WKContentViewInteraction.mm:
+(-[WKContentView setupInteraction]):
+
 2015-08-12  Babak Shafiei  bshaf...@apple.com
 
 Merge r188349.


Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188997 => 188998)

--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2015-08-26 22:22:29 UTC (rev 188997)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2015-08-26 22:23:30 UTC (rev 188998)
@@ -70,6 +70,9 @@
 #import WebCore/TextIndicator.h
 #import WebCore/WebEvent.h
 #import WebKit/WebSelectionRect.h // FIXME: WK2 should not include WebKit headers!
+#if __has_include(WebKitAdditions/WKContentViewInteraction.mm)
+#import WebKitAdditions/WKContentViewInteraction.mm
+#endif
 #import WebKitSystemInterfaceIOS.h
 #import wtf/RetainPtr.h
 
@@ -346,6 +349,10 @@
 _longPressGestureRecognizer = adoptNS([[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_longPressRecognized:)]);
 [_longPressGestureRecognizer setDelay:tapAndHoldDelay];
 [_longPressGestureRecognizer setDelegate:self];
+#if __has_include(WebKitAdditions/WKContentViewInteraction.mm)
+if ([_longPressGestureRecognizer respondsToSelector:@selector(_setAdjustsDelayBasedOnOtherRecognizers:)])
+[_longPressGestureRecognizer _setAdjustsDelayBasedOnOtherRecognizers:YES];
+#endif
 [self addGestureRecognizer:_longPressGestureRecognizer.get()];
 
 #if HAVE(LINK_PREVIEW)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188956] releases/WebKitGTK/webkit-2.10/Source/WebCore

2015-08-26 Thread carlosgc

Title: [188956] releases/WebKitGTK/webkit-2.10/Source/WebCore








Revision 188956
Author carlo...@webkit.org
Date 2015-08-26 01:04:25 -0700 (Wed, 26 Aug 2015)


Log Message
Merge r188472 - [GStreamer] Handle missing plugins better at runtime
https://bugs.webkit.org/show_bug.cgi?id=146999

Reviewed by Carlos Garcia Campos.

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::createAudioSink): Warn the
user if autoaudiosink wasn't found at runtime. In that case
playbin will try to be smart by itself, hopefully. Also moved a
couple GST_WARNING calls to WARN_MEDIA_MESSAGE.
(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin): Use
WARN_MEDIA_MESSAGE here as well.

Modified Paths

releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (188955 => 188956)

--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2015-08-26 08:03:04 UTC (rev 188955)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2015-08-26 08:04:25 UTC (rev 188956)
@@ -1,3 +1,18 @@
+2015-08-14  Philippe Normand  pnorm...@igalia.com
+
+[GStreamer] Handle missing plugins better at runtime
+https://bugs.webkit.org/show_bug.cgi?id=146999
+
+Reviewed by Carlos Garcia Campos.
+
+* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+(WebCore::MediaPlayerPrivateGStreamer::createAudioSink): Warn the
+user if autoaudiosink wasn't found at runtime. In that case
+playbin will try to be smart by itself, hopefully. Also moved a
+couple GST_WARNING calls to WARN_MEDIA_MESSAGE.
+(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin): Use
+WARN_MEDIA_MESSAGE here as well.
+
 2015-08-24  Jinyoung Hur  hur@navercorp.com
 
 Clear cairo-gl surface for initialization


Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (188955 => 188956)

--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2015-08-26 08:03:04 UTC (rev 188955)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2015-08-26 08:04:25 UTC (rev 188956)
@@ -1858,6 +1858,11 @@
 GstElement* MediaPlayerPrivateGStreamer::createAudioSink()
 {
 m_autoAudioSink = gst_element_factory_make(autoaudiosink, 0);
+if (!m_autoAudioSink) {
+WARN_MEDIA_MESSAGE(GStreamer's autoaudiosink not found. Please check your gst-plugins-good installation);
+return nullptr;
+}
+
 g_signal_connect(m_autoAudioSink.get(), child-added, G_CALLBACK(setAudioStreamPropertiesCallback), this);
 
 GstElement* audioSinkBin;
@@ -1877,7 +1882,7 @@
 if (m_preservesPitch) {
 GstElement* scale = gst_element_factory_make(scaletempo, nullptr);
 if (!scale) {
-GST_WARNING(Failed to create scaletempo);
+WARN_MEDIA_MESSAGE(Failed to create scaletempo);
 return m_autoAudioSink.get();
 }
 
@@ -1895,7 +1900,7 @@
 gst_bin_add_many(GST_BIN(audioSinkBin), convert, resample, m_autoAudioSink.get(), nullptr);
 
 if (!gst_element_link_many(scale, convert, resample, m_autoAudioSink.get(), nullptr)) {
-GST_WARNING(Failed to link audio sink elements);
+WARN_MEDIA_MESSAGE(Failed to link audio sink elements);
 gst_object_unref(audioSinkBin);
 return m_autoAudioSink.get();
 }
@@ -1909,7 +1914,7 @@
 return audioSinkBin;
 #endif
 ASSERT_NOT_REACHED();
-return 0;
+return nullptr;
 }
 
 GstElement* MediaPlayerPrivateGStreamer::audioSink() const
@@ -1967,7 +1972,7 @@
 GstElement* scale = gst_element_factory_make(scaletempo, 0);
 
 if (!scale)
-GST_WARNING(Failed to create scaletempo);
+WARN_MEDIA_MESSAGE(Failed to create scaletempo);
 else
 g_object_set(m_pipeline.get(), audio-filter, scale, nullptr);
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188957] releases/WebKitGTK/webkit-2.10

2015-08-26 Thread carlosgc

Title: [188957] releases/WebKitGTK/webkit-2.10








Revision 188957
Author carlo...@webkit.org
Date 2015-08-26 01:34:30 -0700 (Wed, 26 Aug 2015)


Log Message
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.9.91 release.

.:

* Source/cmake/OptionsGTK.cmake: Bump version numbers.

Source/WebKit2:

* gtk/NEWS: Add release notes for 2.9.91.

Modified Paths

releases/WebKitGTK/webkit-2.10/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebKit2/gtk/NEWS
releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.10/ChangeLog (188956 => 188957)

--- releases/WebKitGTK/webkit-2.10/ChangeLog	2015-08-26 08:04:25 UTC (rev 188956)
+++ releases/WebKitGTK/webkit-2.10/ChangeLog	2015-08-26 08:34:30 UTC (rev 188957)
@@ -1,3 +1,9 @@
+2015-08-26  Carlos Garcia Campos  cgar...@igalia.com
+
+Unreviewed. Update OptionsGTK.cmake and NEWS for 2.9.91 release.
+
+* Source/cmake/OptionsGTK.cmake: Bump version numbers.
+
 2015-08-25  Michael Catanzaro  mcatanz...@igalia.com
 
 [GTK] r186800 broke the build on Ubuntu 14.04


Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (188956 => 188957)

--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2015-08-26 08:04:25 UTC (rev 188956)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2015-08-26 08:34:30 UTC (rev 188957)
@@ -1,3 +1,9 @@
+2015-08-26  Carlos Garcia Campos  cgar...@igalia.com
+
+Unreviewed. Update OptionsGTK.cmake and NEWS for 2.9.91 release.
+
+* gtk/NEWS: Add release notes for 2.9.91.
+
 2015-08-21  Chris Dumez  cdu...@apple.com
 
 Regression(r188698): http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header.html is very flaky


Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/gtk/NEWS (188956 => 188957)

--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/gtk/NEWS	2015-08-26 08:04:25 UTC (rev 188956)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/gtk/NEWS	2015-08-26 08:34:30 UTC (rev 188957)
@@ -1,4 +1,14 @@
 =
+WebKitGTK+ 2.9.91
+=
+
+What's new in WebKitGTK+ 2.9.91?
+
+  - Fix performance regression introduced in previous release when scaling images.
+  - Fix runtime critical warning when there are missing media plugins.
+  - Fix the build on systems with GTK+ compiled with an old version of wayland.
+
+=
 WebKitGTK+ 2.9.90
 =
 


Modified: releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake (188956 => 188957)

--- releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake	2015-08-26 08:04:25 UTC (rev 188956)
+++ releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake	2015-08-26 08:34:30 UTC (rev 188957)
@@ -2,7 +2,7 @@
 
 set(PROJECT_VERSION_MAJOR 2)
 set(PROJECT_VERSION_MINOR 9)
-set(PROJECT_VERSION_MICRO 90)
+set(PROJECT_VERSION_MICRO 91)
 set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
 set(WEBKITGTK_API_VERSION 4.0)
 
@@ -15,8 +15,8 @@
 
 # Libtool library version, not to be confused with API version.
 # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 48 0 11)
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(_javascript_CORE 20 5 2)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 48 1 11)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(_javascript_CORE 20 6 2)
 
 # These are shared variables, but we special case their definition so that we can use the
 # CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188959] releases/WebKitGTK/webkit-2.9.91/

2015-08-26 Thread carlosgc

Title: [188959] releases/WebKitGTK/webkit-2.9.91/








Revision 188959
Author carlo...@webkit.org
Date 2015-08-26 02:11:24 -0700 (Wed, 26 Aug 2015)


Log Message
WebKitGTK+ 2.9.91

Added Paths

releases/WebKitGTK/webkit-2.9.91/




Diff

Property changes: releases/WebKitGTK/webkit-2.9.91



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] [188960] trunk

2015-08-26 Thread enrica

Title: [188960] trunk








Revision 188960
Author enr...@apple.com
Date 2015-08-26 02:26:14 -0700 (Wed, 26 Aug 2015)


Log Message
Add some new emoji with modifiers and new sequence.
https://bugs.webkit.org/show_bug.cgi?id=148202
rdar://problem/21849857

Reviewed by Sam Weinig.

Source/WebCore:

Adding support for some new emoji with modifiers and
one new emoji sequence.

* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::characterRangeCodePath):
* platform/text/CharacterProperties.h:
(WebCore::isEmojiGroupCandidate):
(WebCore::isEmojiModifier):
* platform/text/TextBreakIterator.cpp:
(WebCore::cursorMovementIterator):

LayoutTests:

Updated test to reflect the changes.

* editing/deleting/delete-emoji-expected.txt:
* editing/deleting/delete-emoji.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt
trunk/LayoutTests/editing/deleting/delete-emoji.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/FontCascade.cpp
trunk/Source/WebCore/platform/text/CharacterProperties.h
trunk/Source/WebCore/platform/text/TextBreakIterator.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (188959 => 188960)

--- trunk/LayoutTests/ChangeLog	2015-08-26 09:11:24 UTC (rev 188959)
+++ trunk/LayoutTests/ChangeLog	2015-08-26 09:26:14 UTC (rev 188960)
@@ -1,3 +1,16 @@
+2015-08-26  Enrica Casucci  enr...@apple.com
+
+Add some new emoji with modifiers and new sequence.
+https://bugs.webkit.org/show_bug.cgi?id=148202
+rdar://problem/21849857
+
+Reviewed by Sam Weinig.
+
+Updated test to reflect the changes.
+
+* editing/deleting/delete-emoji-expected.txt:
+* editing/deleting/delete-emoji.html:
+
 2015-08-25  Nan Wang  n_w...@apple.com
 
 AX: Enable accessibility/aria-controls.html test for mac


Modified: trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt (188959 => 188960)

--- trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt	2015-08-26 09:11:24 UTC (rev 188959)
+++ trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt	2015-08-26 09:26:14 UTC (rev 188960)
@@ -1,38 +1,65 @@
 This test verifies that emoji groups and emoji with variations are deleted correctly
 
 Dump of markup 1:
-| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️#selection-caret
+| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹落‍#selection-caret
 
 
 Dump of markup 2:
+| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹落#selection-caret
+
+Dump of markup 3:
+| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹落#selection-caret
+
+Dump of markup 4:
+| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹落#selection-caret
+
+Dump of markup 5:
+| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹落#selection-caret
+
+Dump of markup 6:
+| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹#selection-caret
+
+Dump of markup 7:
+| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹#selection-caret
+
+Dump of markup 8:
+| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍⛹#selection-caret
+
+Dump of markup 9:
+| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️✍#selection-caret
+
+Dump of markup 10:
+| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍☝️#selection-caret
+
+Dump of markup 11:
 | ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍#selection-caret
 
-Dump of markup 3:
+Dump of markup 12:
 | ‍‍‍❤️‍‍❤️‍‍❤️‍‍#selection-caret
 
-Dump of markup 4:
+Dump of markup 13:
 | ‍‍‍❤️‍‍❤️‍#selection-caret
 
-Dump of markup 5:
+Dump of markup 14:
 | ‍‍‍❤️‍#selection-caret
 
-Dump of markup 6:
+Dump of markup 15:
 | ‍‍#selection-caret
 
-Dump of markup 7:
+Dump of markup 16:
 | #selection-caret
 
-Dump of markup 8:
+Dump of markup 17:
 | #selection-caret
 
-Dump of markup 9:
+Dump of markup 18:
 | #selection-caret
 
-Dump of markup 10:
+Dump of markup 19:
 | #selection-caret
 
-Dump of markup 11:
+Dump of markup 20:
 | #selection-caret
 
-Dump of markup 12:
+Dump of markup 21:
 | br


Modified: trunk/LayoutTests/editing/deleting/delete-emoji.html (188959 => 188960)

--- trunk/LayoutTests/editing/deleting/delete-emoji.html	2015-08-26 09:11:24 UTC (rev 188959)
+++ trunk/LayoutTests/editing/deleting/delete-emoji.html	2015-08-26 09:26:14 UTC (rev 188960)
@@ -1,7 +1,7 @@
 !DOCTYPE html
 html
 body
-div id=test contenteditable=true#x1F466;#x1F3FB;#x1F466;#x1F3FE;#x1F3FB;#x1F466;#x1F3FE;#x1F466;#x1F469;#x200D;#x1F469;#x200D;#x1F466;#x1F469;#x200D;#x2764;#xFE0F;#x200D;#x1F469;#x1F468;#x200D;#x2764;#xFE0F;#x200D;#x1F468;#x1F469;#x200D;#x2764;#xFE0F;#x200D;#x1F48B;#x200D;#x1F469;#x1F468;#x200D;#x2764;#xFE0F;#x200D;#x1F48B;#x200D;#x1F468;#x261D;#xFE0F;#x1F3FB;
+div id=test

[webkit-changes] [188961] trunk/Source/WebCore

2015-08-26 Thread philn

Title: [188961] trunk/Source/WebCore








Revision 188961
Author ph...@webkit.org
Date 2015-08-26 02:51:11 -0700 (Wed, 26 Aug 2015)


Log Message
[GStreamer] method property for the webkitwebsrc element
https://bugs.webkit.org/show_bug.cgi?id=148433

Reviewed by Carlos Garcia Campos.

This new property is sometimes used by the GStreamer uridownloader
when time synchronization is required for DASH. The same property
was added to the souphttpsrc element.

* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcSetProperty):
(webKitWebSrcGetProperty):
(webKitWebSrcStart):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (188960 => 188961)

--- trunk/Source/WebCore/ChangeLog	2015-08-26 09:26:14 UTC (rev 188960)
+++ trunk/Source/WebCore/ChangeLog	2015-08-26 09:51:11 UTC (rev 188961)
@@ -1,3 +1,19 @@
+2015-08-25  Philippe Normand  pnorm...@igalia.com
+
+[GStreamer] method property for the webkitwebsrc element
+https://bugs.webkit.org/show_bug.cgi?id=148433
+
+Reviewed by Carlos Garcia Campos.
+
+This new property is sometimes used by the GStreamer uridownloader
+when time synchronization is required for DASH. The same property
+was added to the souphttpsrc element.
+
+* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+(webKitWebSrcSetProperty):
+(webKitWebSrcGetProperty):
+(webKitWebSrcStart):
+
 2015-08-26  Enrica Casucci  enr...@apple.com
 
 Add some new emoji with modifiers and new sequence.


Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (188960 => 188961)

--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2015-08-26 09:26:14 UTC (rev 188960)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2015-08-26 09:51:11 UTC (rev 188961)
@@ -113,6 +113,7 @@
 bool keepAlive;
 GUniquePtrGstStructure extraHeaders;
 bool compress;
+GUniquePtrgchar httpMethod;
 
 WebCore::MediaPlayer* player;
 
@@ -152,7 +153,8 @@
 PROP_LOCATION,
 PROP_KEEP_ALIVE,
 PROP_EXTRA_HEADERS,
-PROP_COMPRESS
+PROP_COMPRESS,
+PROP_METHOD
 };
 
 static GstStaticPadTemplate srcTemplate = GST_STATIC_PAD_TEMPLATE(src,
@@ -262,6 +264,10 @@
 g_param_spec_boolean(compress, Compress, Allow compressed content encodings,
 FALSE, static_castGParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
+g_object_class_install_property(oklass, PROP_METHOD,
+g_param_spec_string(method, method, The HTTP method to use (default: GET),
+nullptr, static_castGParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
 eklass-change_state = webKitWebSrcChangeState;
 
 g_type_class_add_private(klass, sizeof(WebKitWebSrcPrivate));
@@ -358,6 +364,9 @@
 case PROP_COMPRESS:
 src-priv-compress = g_value_get_boolean(value);
 break;
+case PROP_METHOD:
+src-priv-httpMethod.reset(g_value_dup_string(value));
+break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, pspec);
 break;
@@ -395,6 +404,9 @@
 case PROP_COMPRESS:
 g_value_set_boolean(value, priv-compress);
 break;
+case PROP_METHOD:
+g_value_set_string(value, priv-httpMethod.get());
+break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, pspec);
 break;
@@ -542,6 +554,7 @@
 
 ASSERT(!priv-client);
 
+GST_DEBUG_OBJECT(src, Fetching %s, priv-uri);
 URL url = "" priv-uri);
 
 ResourceRequest request(url);
@@ -553,6 +566,9 @@
 if (priv-player)
 request.setHTTPReferrer(priv-player-referrer());
 
+if (priv-httpMethod.get())
+request.setHTTPMethod(priv-httpMethod.get());
+
 #if USE(SOUP)
 // By default, HTTP Accept-Encoding is disabled here as we don't
 // want the received response to be encoded in any way as we need






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188950] releases/WebKitGTK/webkit-2.10/Tools

2015-08-26 Thread carlosgc

Title: [188950] releases/WebKitGTK/webkit-2.10/Tools








Revision 188950
Author carlo...@webkit.org
Date 2015-08-26 00:32:28 -0700 (Wed, 26 Aug 2015)


Log Message
Merge r188618 - Fix conversion-null warning in conversion.cpp of TestWebKitAPI
https://bugs.webkit.org/show_bug.cgi?id=148073

Reviewed by Alexey Proskuryakov.

* TestWebKitAPI/Tests/WTF/Condition.cpp: Use EXPECT_FALSE instead of EXPECT_EQ.
(TestWebKitAPI::TEST):

Modified Paths

releases/WebKitGTK/webkit-2.10/Tools/ChangeLog
releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WTF/Condition.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.10/Tools/ChangeLog (188949 => 188950)

--- releases/WebKitGTK/webkit-2.10/Tools/ChangeLog	2015-08-26 07:31:32 UTC (rev 188949)
+++ releases/WebKitGTK/webkit-2.10/Tools/ChangeLog	2015-08-26 07:32:28 UTC (rev 188950)
@@ -1,3 +1,13 @@
+2015-08-18  Gyuyoung Kim  gyuyoung@webkit.org
+
+Fix conversion-null warning in conversion.cpp of TestWebKitAPI
+https://bugs.webkit.org/show_bug.cgi?id=148073
+
+Reviewed by Alexey Proskuryakov.
+
+* TestWebKitAPI/Tests/WTF/Condition.cpp: Use EXPECT_FALSE instead of EXPECT_EQ.
+(TestWebKitAPI::TEST):
+
 2015-08-20  Filip Pizlo  fpi...@apple.com
 
 Unreviewed, shorten a test that runs too long and times out.


Modified: releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WTF/Condition.cpp (188949 => 188950)

--- releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WTF/Condition.cpp	2015-08-26 07:31:32 UTC (rev 188949)
+++ releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WTF/Condition.cpp	2015-08-26 07:32:28 UTC (rev 188950)
@@ -250,7 +250,7 @@
 lock, std::chrono::microseconds(1), [] () - bool { return false; });
 lock.unlock();
 
-EXPECT_EQ(false, result);
+EXPECT_FALSE(result);
 }
 
 } // namespace TestWebKitAPI






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188949] releases/WebKitGTK/webkit-2.10/Source

2015-08-26 Thread carlosgc

Title: [188949] releases/WebKitGTK/webkit-2.10/Source








Revision 188949
Author carlo...@webkit.org
Date 2015-08-26 00:31:32 -0700 (Wed, 26 Aug 2015)


Log Message
Merge r188633 - [GLib] GMainLoopSource should receive the std::function objects through rvalue references
https://bugs.webkit.org/show_bug.cgi?id=147981

Reviewed by Carlos Garcia Campos.

Source/WebKit2:

* NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
(WebKit::NetworkCache::runTaskInQueue): Move the std::function into the scheduling call.

Source/WTF:

Scheduling methods on GMainLoopSource and GThreadSafeMainLoopSource should
have the std::function objects passed through rvalue references, and should
move the passed-in objects forward when required.

* wtf/glib/GMainLoopSource.cpp:
(WTF::GMainLoopSource::schedule):
(WTF::GMainLoopSource::scheduleAfterDelay):
(WTF::GMainLoopSource::scheduleAndDeleteOnDestroy):
(WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy):
* wtf/glib/GMainLoopSource.h:
* wtf/glib/GThreadSafeMainLoopSource.cpp:
(WTF::GThreadSafeMainLoopSource::schedule):
(WTF::GThreadSafeMainLoopSource::scheduleAfterDelay):
* wtf/glib/GThreadSafeMainLoopSource.h:

Modified Paths

releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/glib/GMainLoopSource.cpp
releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/glib/GMainLoopSource.h
releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/glib/GThreadSafeMainLoopSource.cpp
releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/glib/GThreadSafeMainLoopSource.h
releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog (188948 => 188949)

--- releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog	2015-08-26 07:03:24 UTC (rev 188948)
+++ releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog	2015-08-26 07:31:32 UTC (rev 188949)
@@ -1,3 +1,25 @@
+2015-08-18  Zan Dobersek  zdober...@igalia.com
+
+[GLib] GMainLoopSource should receive the std::function objects through rvalue references
+https://bugs.webkit.org/show_bug.cgi?id=147981
+
+Reviewed by Carlos Garcia Campos.
+
+Scheduling methods on GMainLoopSource and GThreadSafeMainLoopSource should
+have the std::function objects passed through rvalue references, and should
+move the passed-in objects forward when required.
+
+* wtf/glib/GMainLoopSource.cpp:
+(WTF::GMainLoopSource::schedule):
+(WTF::GMainLoopSource::scheduleAfterDelay):
+(WTF::GMainLoopSource::scheduleAndDeleteOnDestroy):
+(WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy):
+* wtf/glib/GMainLoopSource.h:
+* wtf/glib/GThreadSafeMainLoopSource.cpp:
+(WTF::GThreadSafeMainLoopSource::schedule):
+(WTF::GThreadSafeMainLoopSource::scheduleAfterDelay):
+* wtf/glib/GThreadSafeMainLoopSource.h:
+
 2015-08-19  Filip Pizlo  fpi...@apple.com
 
 Remove WTF::SpinLock


Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/glib/GMainLoopSource.cpp (188948 => 188949)

--- releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/glib/GMainLoopSource.cpp	2015-08-26 07:03:24 UTC (rev 188948)
+++ releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/glib/GMainLoopSource.cpp	2015-08-26 07:31:32 UTC (rev 188949)
@@ -97,7 +97,7 @@
 g_source_attach(m_context.source.get(), context);
 }
 
-void GMainLoopSource::schedule(const char* name, std::functionvoid () function, int priority, std::functionvoid () destroyFunction, GMainContext* context)
+void GMainLoopSource::schedule(const char* name, std::functionvoid () function, int priority, std::functionvoid () destroyFunction, GMainContext* context)
 {
 cancel();
 
@@ -114,7 +114,7 @@
 scheduleIdleSource(name, reinterpret_castGSourceFunc(voidSourceCallback), priority, context);
 }
 
-void GMainLoopSource::schedule(const char* name, std::functionbool () function, int priority, std::functionvoid () destroyFunction, GMainContext* context)
+void GMainLoopSource::schedule(const char* name, std::functionbool () function, int priority, std::functionvoid () destroyFunction, GMainContext* context)
 {
 cancel();
 
@@ -131,7 +131,7 @@
 scheduleIdleSource(name, reinterpret_castGSourceFunc(boolSourceCallback), priority, context);
 }
 
-void GMainLoopSource::schedule(const char* name, std::functionbool (GIOCondition) function, GSocket* socket, GIOCondition condition, std::functionvoid () destroyFunction, GMainContext* context)
+void GMainLoopSource::schedule(const char* name, std::functionbool (GIOCondition) function, GSocket* socket, GIOCondition condition, std::functionvoid () destroyFunction, GMainContext* context)
 {
 cancel();
 
@@ -166,7 +166,7 @@
 g_source_attach(m_context.source.get(), context);
 }
 
-void GMainLoopSource::scheduleAfterDelay(const char* name, std::functionvoid () function, std::chrono::milliseconds delay,

[webkit-changes] [188962] trunk/Source/WebInspectorUI

2015-08-26 Thread commit-queue

Title: [188962] trunk/Source/WebInspectorUI








Revision 188962
Author commit-qu...@webkit.org
Date 2015-08-26 03:18:46 -0700 (Wed, 26 Aug 2015)


Log Message
Web Inspector: Add Refresh button to Cookie Content View
https://bugs.webkit.org/show_bug.cgi?id=148468

Patch by Joseph Pecoraro pecor...@apple.com on 2015-08-26
Reviewed by Timothy Hatcher.

* UserInterface/Views/CookieStorageContentView.js:
(WebInspector.CookieStorageContentView):
(WebInspector.CookieStorageContentView.prototype.get navigationItems):
(WebInspector.CookieStorageContentView.prototype._refreshButtonClicked):

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (188961 => 188962)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-08-26 09:51:11 UTC (rev 188961)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-08-26 10:18:46 UTC (rev 188962)
@@ -1,3 +1,15 @@
+2015-08-26  Joseph Pecoraro  pecor...@apple.com
+
+Web Inspector: Add Refresh button to Cookie Content View
+https://bugs.webkit.org/show_bug.cgi?id=148468
+
+Reviewed by Timothy Hatcher.
+
+* UserInterface/Views/CookieStorageContentView.js:
+(WebInspector.CookieStorageContentView):
+(WebInspector.CookieStorageContentView.prototype.get navigationItems):
+(WebInspector.CookieStorageContentView.prototype._refreshButtonClicked):
+
 2015-08-25  Brian Burg  bb...@apple.com
 
 Web Inspector: message dispatch metrics should use high-resolution timing data


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js (188961 => 188962)

--- trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js	2015-08-26 09:51:11 UTC (rev 188961)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js	2015-08-26 10:18:46 UTC (rev 188962)
@@ -31,6 +31,9 @@
 
 this.element.classList.add(cookie-storage);
 
+this._refreshButtonNavigationItem = new WebInspector.ButtonNavigationItem(cookie-storage-refresh, WebInspector.UIString(Refresh), Images/ReloadFull.svg, 13, 13);
+this._refreshButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._refreshButtonClicked, this);
+
 this.update();
 }
 
@@ -56,6 +59,11 @@
 
 // Public
 
+get navigationItems()
+{
+return [this._refreshButtonNavigationItem];
+}
+
 update()
 {
 function callback(error, cookies)
@@ -254,6 +262,11 @@
 
 this.update();
 }
+
+_refreshButtonClicked(event)
+{
+this.update();
+}
 };
 
 WebInspector.CookieType = {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188952] releases/WebKitGTK/webkit-2.10

2015-08-26 Thread carlosgc

Title: [188952] releases/WebKitGTK/webkit-2.10








Revision 188952
Author carlo...@webkit.org
Date 2015-08-26 00:44:58 -0700 (Wed, 26 Aug 2015)


Log Message
Merge r188640 - WebKit may keep outdated entry in the disk cache after a reload
https://bugs.webkit.org/show_bug.cgi?id=148137
rdar://problem/22299547

Reviewed by Antti Koivisto.

Source/WebKit2:

WebKit would keep outdated entry in the disk cache after a reload
in the following scenario:
1. We have an entry in the cache
2. The user reloads
3. We get a fresh resource from the network but this one is not cacheable

In this case, we now remove the stale entry from the cache to make sure
it is not served to following requests (e.g. history navigations).

* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::didFinishLoading):
Remove the entry from the cache if its redirection is no longer
cacheable.

* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::store):
If we make the decision not to store the response, then remove the
entry in the cache for this resource if it exists.

(WebKit::NetworkCache::Cache::remove):
* NetworkProcess/cache/NetworkCache.h:
Add new remove() overload taking a ResourceRequest argument so the
call site does not have the compute the key.

* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::removeFromPendingWriteOperations):
(WebKit::NetworkCache::Storage::remove):
* NetworkProcess/cache/NetworkCacheStorage.h:
When we're asked to remove an entry with a given key, also remove
it from the pending write operations. This pre-existing bug would
prevent the new layout test from passing.

LayoutTests:

Add layout test to make sure that stale disk cached entries are removed
when it becomes uncacheable.

* http/tests/cache/disk-cache/resource-becomes-uncacheable-expected.txt: Added.
* http/tests/cache/disk-cache/resource-becomes-uncacheable.html: Added.
* http/tests/cache/disk-cache/resources/generate-response-optionally-cacheable.cgi: Added.

Modified Paths

releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp
releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/cache/NetworkCache.h
releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp
releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h


Added Paths

releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/cache/disk-cache/resource-becomes-uncacheable-expected.txt
releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/cache/disk-cache/resource-becomes-uncacheable.html
releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/cache/disk-cache/resources/generate-response-optionally-cacheable.cgi




Diff

Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (188951 => 188952)

--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog	2015-08-26 07:44:24 UTC (rev 188951)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog	2015-08-26 07:44:58 UTC (rev 188952)
@@ -1,3 +1,18 @@
+2015-08-19  Chris Dumez  cdu...@apple.com
+
+WebKit may keep outdated entry in the disk cache after a reload
+https://bugs.webkit.org/show_bug.cgi?id=148137
+rdar://problem/22299547
+
+Reviewed by Antti Koivisto.
+
+Add layout test to make sure that stale disk cached entries are removed
+when it becomes uncacheable.
+
+* http/tests/cache/disk-cache/resource-becomes-uncacheable-expected.txt: Added.
+* http/tests/cache/disk-cache/resource-becomes-uncacheable.html: Added.
+* http/tests/cache/disk-cache/resources/generate-response-optionally-cacheable.cgi: Added.
+
 2015-08-13  Joseph Pecoraro  pecor...@apple.com
 
 Web Inspector: Reduce flakiness of inspector/indexeddb/requestDatabaseNames


Added: releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/cache/disk-cache/resource-becomes-uncacheable-expected.txt (0 => 188952)

--- releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/cache/disk-cache/resource-becomes-uncacheable-expected.txt	(rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/cache/disk-cache/resource-becomes-uncacheable-expected.txt	2015-08-26 07:44:58 UTC (rev 188952)
@@ -0,0 +1,21 @@
+Tests that resources are removed from the cache if they become uncacheable
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+Resource should be in the cache now.
+Load resource again using default cache policy.
+PASS internals.xhrResponseSource(xhr) is Disk cache
+
+Now load again the same resource, ignoring the cached data.
+This time the resource will not be cacheable
+PASS internals.xhrResponseSource(xhr) is Network
+
+Stale resource should have been removed from the cache.
+
+Now try to

[webkit-changes] [188951] releases/WebKitGTK/webkit-2.10/Source/WebCore

2015-08-26 Thread carlosgc

Title: [188951] releases/WebKitGTK/webkit-2.10/Source/WebCore








Revision 188951
Author carlo...@webkit.org
Date 2015-08-26 00:44:24 -0700 (Wed, 26 Aug 2015)


Log Message
Merge r188931 - IconDatabase: syncThreadMainLoop() is unlocking m_syncLock twice when thread termination is requested
https://bugs.webkit.org/show_bug.cgi?id=148429

Patch by Carlos Garcia Campos cgar...@igalia.com on 2015-08-25
Reviewed by Filip Pizlo.

The lock is released an locked on every loop iteration, and then
unlocked again after the loop. There's an early break in the loop
when thread termination is requested that happens after the lock
is released but before is locked again, so that the unlock after
the loop is trying to unlock the lock again. This was not a
problem before, but the new Lock has an assertion to ensure that a
lock is not released twice.

* loader/icon/IconDatabase.cpp:
(WebCore::IconDatabase::syncThreadMainLoop): Clean up the thread
and return instead of breaking the loop when thread termination is
requested.

Modified Paths

releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/icon/IconDatabase.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (188950 => 188951)

--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2015-08-26 07:32:28 UTC (rev 188950)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2015-08-26 07:44:24 UTC (rev 188951)
@@ -1,3 +1,23 @@
+2015-08-25  Carlos Garcia Campos  cgar...@igalia.com
+
+IconDatabase: syncThreadMainLoop() is unlocking m_syncLock twice when thread termination is requested
+https://bugs.webkit.org/show_bug.cgi?id=148429
+
+Reviewed by Filip Pizlo.
+
+The lock is released an locked on every loop iteration, and then
+unlocked again after the loop. There's an early break in the loop
+when thread termination is requested that happens after the lock
+is released but before is locked again, so that the unlock after
+the loop is trying to unlock the lock again. This was not a
+problem before, but the new Lock has an assertion to ensure that a
+lock is not released twice.
+
+* loader/icon/IconDatabase.cpp:
+(WebCore::IconDatabase::syncThreadMainLoop): Clean up the thread
+and return instead of breaking the loop when thread termination is
+requested.
+
 2015-08-18  Filip Pizlo  fpi...@apple.com
 
 Replace all uses of std::mutex/std::condition_variable with WTF::Lock/WTF::Condition


Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/icon/IconDatabase.cpp (188950 => 188951)

--- releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/icon/IconDatabase.cpp	2015-08-26 07:32:28 UTC (rev 188950)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/icon/IconDatabase.cpp	2015-08-26 07:44:24 UTC (rev 188951)
@@ -1367,8 +1367,10 @@
 }
 
 // Then, if the thread should be quitting, quit now!
-if (m_threadTerminationRequested)
-break;
+if (m_threadTerminationRequested) {
+cleanupSyncThread();
+return;
+}
 
 {
 LockHolder locker(m_urlAndIconLock);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188954] releases/WebKitGTK/webkit-2.10

2015-08-26 Thread carlosgc

Title: [188954] releases/WebKitGTK/webkit-2.10








Revision 188954
Author carlo...@webkit.org
Date 2015-08-26 00:52:01 -0700 (Wed, 26 Aug 2015)


Log Message
Merge r188929 - [GTK] r186800 broke the build on Ubuntu 14.04
https://bugs.webkit.org/show_bug.cgi?id=147559

Reviewed by Martin Robinson.

* Source/cmake/FindGTK3.cmake: Always define GTK3_SUPPORTS_X11 and GTK3_SUPPORTS_WAYLAND.
* Source/cmake/OptionsGTK.cmake: Autodetect support for X11 and Wayland backends.

Modified Paths

releases/WebKitGTK/webkit-2.10/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/cmake/FindGTK3.cmake
releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.10/ChangeLog (188953 => 188954)

--- releases/WebKitGTK/webkit-2.10/ChangeLog	2015-08-26 07:49:53 UTC (rev 188953)
+++ releases/WebKitGTK/webkit-2.10/ChangeLog	2015-08-26 07:52:01 UTC (rev 188954)
@@ -1,3 +1,13 @@
+2015-08-25  Michael Catanzaro  mcatanz...@igalia.com
+
+[GTK] r186800 broke the build on Ubuntu 14.04
+https://bugs.webkit.org/show_bug.cgi?id=147559
+
+Reviewed by Martin Robinson.
+
+* Source/cmake/FindGTK3.cmake: Always define GTK3_SUPPORTS_X11 and GTK3_SUPPORTS_WAYLAND.
+* Source/cmake/OptionsGTK.cmake: Autodetect support for X11 and Wayland backends.
+
 2015-08-14  Carlos Garcia Campos  cgar...@igalia.com
 
 Unreviewed. Update OptionsGTK.cmake and NEWS for 2.9.90 release.


Modified: releases/WebKitGTK/webkit-2.10/Source/cmake/FindGTK3.cmake (188953 => 188954)

--- releases/WebKitGTK/webkit-2.10/Source/cmake/FindGTK3.cmake	2015-08-26 07:49:53 UTC (rev 188953)
+++ releases/WebKitGTK/webkit-2.10/Source/cmake/FindGTK3.cmake	2015-08-26 07:52:01 UTC (rev 188954)
@@ -52,11 +52,15 @@
 pkg_check_modules(GTK3_X11 gtk+-x11-3.0)
 if (${GTK3_X11_VERSION} VERSION_EQUAL ${GTK3_VERSION})
 set(GTK3_SUPPORTS_X11 TRUE)
+else ()
+set(GTK3_SUPPORTS_X11 FALSE)
 endif ()
 
 pkg_check_modules(GTK3_WAYLAND gtk+-wayland-3.0)
 if (${GTK3_WAYLAND_VERSION} VERSION_EQUAL ${GTK3_VERSION})
 set(GTK3_SUPPORTS_WAYLAND TRUE)
+else ()
+set(GTK3_SUPPORTS_WAYLAND FALSE)
 endif ()
 
 if (NOT(${GTK3_VERSION} VERSION_LESS 3.14.0))


Modified: releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake (188953 => 188954)

--- releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake	2015-08-26 07:49:53 UTC (rev 188953)
+++ releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake	2015-08-26 07:52:01 UTC (rev 188954)
@@ -33,6 +33,8 @@
 find_package(Cairo 1.10.2 REQUIRED)
 find_package(Fontconfig 2.8.0 REQUIRED)
 find_package(Freetype2 2.4.2 REQUIRED)
+find_package(GTK3 3.6.0 REQUIRED)
+find_package(GDK3 3.6.0 REQUIRED)
 find_package(HarfBuzz 0.9.2 REQUIRED)
 find_package(ICU REQUIRED)
 find_package(JPEG REQUIRED)
@@ -47,6 +49,7 @@
 find_package(WebP REQUIRED)
 find_package(ATSPI 2.5.3)
 find_package(EGL)
+find_package(GTKUnixPrint)
 find_package(OpenGL)
 find_package(OpenGLES2)
 
@@ -68,8 +71,8 @@
 WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION Whether to enable GObject introspection. PUBLIC ON)
 WEBKIT_OPTION_DEFINE(ENABLE_OPENGL Whether to use OpenGL. PUBLIC ON)
 WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 Whether to build WebKitPluginProcess2 to load GTK2 based plugins. PUBLIC ON)
-WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET Whether to enable support for the X11 windowing target. PUBLIC ON)
-WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET Whether to enable support for the Wayland windowing target. PUBLIC ON)
+WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET Whether to enable support for the X11 windowing target. PUBLIC ${GTK3_SUPPORTS_X11})
+WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET Whether to enable support for the Wayland windowing target. PUBLIC ${GTK3_SUPPORTS_WAYLAND})
 WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY Whether to enable the default web notification implementation. PUBLIC ON)
 WEBKIT_OPTION_DEFINE(USE_LIBHYPHEN Whether to enable the default automatic hyphenation implementation. PUBLIC ON)
 
@@ -224,16 +227,6 @@
 add_definitions(-DUSER_AGENT_GTK_MINOR_VERSION=1)
 add_definitions(-DWEBKITGTK_API_VERSION_STRING=${WEBKITGTK_API_VERSION})
 
-if (ENABLE_WAYLAND_TARGET)
-set(GTK3_REQUIRED_VERSION 3.12.0)
-else ()
-set(GTK3_REQUIRED_VERSION 3.6.0)
-endif ()
-
-find_package(GTK3 ${GTK3_REQUIRED_VERSION} REQUIRED)
-find_package(GDK3 ${GTK3_REQUIRED_VERSION} REQUIRED)
-find_package(GTKUnixPrint)
-
 set(GTK_LIBRARIES ${GTK3_LIBRARIES})
 set(GTK_INCLUDE_DIRS ${GTK3_INCLUDE_DIRS})
 set(GDK_LIBRARIES ${GDK3_LIBRARIES})
@@ -424,6 +417,10 @@
 message(FATAL_ERROR Recompile GTK+ with Wayland backend to use ENABLE_WAYLAND_TARGET)
 endif ()
 
+if (ENABLE_WAYLAND_TARGET AND GTK3_VERSION VERSION_LESS 3.12)
+message(FATAL_ERROR GTK+ 3.12 is required to use ENABLE_WAYLAND_TARGET)
+endif ()
+
 find_package(Wayland REQUIRED)
 endif ()
 






___
webkit-changes mailing list

[webkit-changes] [188958] trunk/Tools

2015-08-26 Thread ossy

Title: [188958] trunk/Tools








Revision 188958
Author o...@webkit.org
Date 2015-08-26 01:38:24 -0700 (Wed, 26 Aug 2015)


Log Message
Remove unused code after r188948
https://bugs.webkit.org/show_bug.cgi?id=148467

Reviewed by Gyuyoung Kim.

* WebKitTestRunner/TestController.cpp:
(WTR::TestController::platformPreferences): Deleted.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/WebKitTestRunner/TestController.cpp




Diff

Modified: trunk/Tools/ChangeLog (188957 => 188958)

--- trunk/Tools/ChangeLog	2015-08-26 08:34:30 UTC (rev 188957)
+++ trunk/Tools/ChangeLog	2015-08-26 08:38:24 UTC (rev 188958)
@@ -1,3 +1,13 @@
+2015-08-26  Csaba Osztrogonác  o...@webkit.org
+
+Remove unused code after r188948
+https://bugs.webkit.org/show_bug.cgi?id=148467
+
+Reviewed by Gyuyoung Kim.
+
+* WebKitTestRunner/TestController.cpp:
+(WTR::TestController::platformPreferences): Deleted.
+
 2015-08-26  Gyuyoung Kim  gyuyoung@webkit.org
 
 [EFL][GTK] REGRESSION(r188828): All performance tests and almost all layout tests crash


Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (188957 => 188958)

--- trunk/Tools/WebKitTestRunner/TestController.cpp	2015-08-26 08:34:30 UTC (rev 188957)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp	2015-08-26 08:38:24 UTC (rev 188958)
@@ -1600,14 +1600,6 @@
 m_currentInvocation-outputText(String::format(WebView updated the title for history URL \%s\ to \%s\.\n, toSTD(urlStringWK).c_str(), toSTD(title).c_str()));
 }
 
-#if !PLATFORM(EFL)  !PLATFORM(GTK)  !PLATFORM(COCOA)
-WKPreferencesRef TestController::platformPreferences()
-{
-WKRetainPtrWKPageConfigurationRef configuration = adoptWK(WKPageCopyPageConfiguration(m_mainWebView-page())); 
-return WKPageConfigurationGetPreferences(configuration.get());
-}
-#endif
-
 #if !PLATFORM(COCOA)
 void TestController::platformWillRunTest(const TestInvocation)
 {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188953] releases/WebKitGTK/webkit-2.10

2015-08-26 Thread carlosgc

Title: [188953] releases/WebKitGTK/webkit-2.10








Revision 188953
Author carlo...@webkit.org
Date 2015-08-26 00:49:53 -0700 (Wed, 26 Aug 2015)


Log Message
Merge r188755 - Regression(r188698): http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header.html is very flaky
https://bugs.webkit.org/show_bug.cgi?id=148205

Reviewed by Antti Koivisto.

Source/WebKit2:

After r188640, successful revalidation of resources in the memory cache
would cause us to drop the corresponding resource in the disk cache.
This patch addresses the issue by not removing the cache entry if the
response is a successful revalidation (i.e. status code == 304).

Longer term, we should probably update the entry in the disk cache (if
it exists) when it is revalidated by the memory cache. Currently,
revalidation by the memory cache bypasses the disk cache and goes
straight to the network. Then, when the response comes back as a 304,
we try and store the response in the cache. However, a 304 status code
is not cacheable so the cache rejects it.

* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::store):

LayoutTests:

* http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header.html:
Drop temporary fix landed in r188698 to make the test less flaky.

Modified Paths

releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (188952 => 188953)

--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog	2015-08-26 07:44:58 UTC (rev 188952)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog	2015-08-26 07:49:53 UTC (rev 188953)
@@ -1,3 +1,25 @@
+2015-08-21  Chris Dumez  cdu...@apple.com
+
+Regression(r188698): http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header.html is very flaky
+https://bugs.webkit.org/show_bug.cgi?id=148205
+
+Reviewed by Antti Koivisto.
+
+* http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header.html:
+Drop temporary fix landed in r188698 to make the test less flaky.
+
+2015-08-20  Chris Dumez  cdu...@apple.com
+
+REGRESSION: http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header.html is very flaky
+https://bugs.webkit.org/show_bug.cgi?id=148205
+
+Unreviewed, give the disk cache a chance to settle down before querying
+the resource again. This fixes the flakiness locally. Longer term, I will
+try and figure out why the cache is sometimes revalidating if the resource
+is requested very quickly after.
+
+* http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header.html:
+
 2015-08-19  Chris Dumez  cdu...@apple.com
 
 WebKit may keep outdated entry in the disk cache after a reload


Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (188952 => 188953)

--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2015-08-26 07:44:58 UTC (rev 188952)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2015-08-26 07:49:53 UTC (rev 188953)
@@ -1,3 +1,25 @@
+2015-08-21  Chris Dumez  cdu...@apple.com
+
+Regression(r188698): http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header.html is very flaky
+https://bugs.webkit.org/show_bug.cgi?id=148205
+
+Reviewed by Antti Koivisto.
+
+After r188640, successful revalidation of resources in the memory cache
+would cause us to drop the corresponding resource in the disk cache.
+This patch addresses the issue by not removing the cache entry if the
+response is a successful revalidation (i.e. status code == 304).
+
+Longer term, we should probably update the entry in the disk cache (if
+it exists) when it is revalidated by the memory cache. Currently,
+revalidation by the memory cache bypasses the disk cache and goes
+straight to the network. Then, when the response comes back as a 304,
+we try and store the response in the cache. However, a 304 status code
+is not cacheable so the cache rejects it.
+
+* NetworkProcess/cache/NetworkCache.cpp:
+(WebKit::NetworkCache::Cache::store):
+
 2015-08-19  Chris Dumez  cdu...@apple.com
 
 WebKit may keep outdated entry in the disk cache after a reload


Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (188952 => 188953)

--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp	2015-08-26 07:44:58 UTC (rev 188952)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp	2015-08-26 07:49:53 UTC (rev 188953)
@@ -407,8 +407,11 @@
 LOG(NetworkCache, (NetworkProcess) didn't store, storeDecision=%d, storeDecision);
 auto key = makeCacheKey(originalRequest);
 
-

[webkit-changes] [188963] trunk/Source/WebInspectorUI

2015-08-26 Thread nvasilyev

Title: [188963] trunk/Source/WebInspectorUI








Revision 188963
Author nvasil...@apple.com
Date 2015-08-26 03:22:22 -0700 (Wed, 26 Aug 2015)


Log Message
Web Inspector: Make DOM node attribute changes highlighting less obnoxious
https://bugs.webkit.org/show_bug.cgi?id=148050

Reviewed by Timothy Hatcher.

* UserInterface/Views/DOMTreeOutline.css:
(@keyframes node-state-changed): Change color to a light green.
(.node-state-changed): Add a slight ease-in for the animation function.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.css




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (188962 => 188963)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-08-26 10:18:46 UTC (rev 188962)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-08-26 10:22:22 UTC (rev 188963)
@@ -1,3 +1,14 @@
+2015-08-26  Nikita Vasilyev  nvasil...@apple.com
+
+Web Inspector: Make DOM node attribute changes highlighting less obnoxious
+https://bugs.webkit.org/show_bug.cgi?id=148050
+
+Reviewed by Timothy Hatcher.
+
+* UserInterface/Views/DOMTreeOutline.css:
+(@keyframes node-state-changed): Change color to a light green.
+(.node-state-changed): Add a slight ease-in for the animation function.
+
 2015-08-26  Joseph Pecoraro  pecor...@apple.com
 
 Web Inspector: Add Refresh button to Cookie Content View


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.css (188962 => 188963)

--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.css	2015-08-26 10:18:46 UTC (rev 188962)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.css	2015-08-26 10:22:22 UTC (rev 188963)
@@ -167,10 +167,9 @@
 }
 
 @keyframes node-state-changed {
-from { background-color: hsla(212, 92%, 54%, 0.5); }
+from { background-color: hsla(83, 100%, 48%, 0.4); }
 }
 
 .node-state-changed {
-animation: node-state-changed 1s cubic-bezier(0, 0, 0.25, 1);
-border-radius: 3px;
+animation: node-state-changed 1s cubic-bezier(0.25, 0, 0.25, 1);
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188955] releases/WebKitGTK/webkit-2.10/Source/WebCore

2015-08-26 Thread carlosgc

Title: [188955] releases/WebKitGTK/webkit-2.10/Source/WebCore








Revision 188955
Author carlo...@webkit.org
Date 2015-08-26 01:03:04 -0700 (Wed, 26 Aug 2015)


Log Message
Merge r188902 - Clear cairo-gl surface for initialization
https://bugs.webkit.org/show_bug.cgi?id=148307

Patch by Jinyoung Hur hur@navercorp.com on 2015-08-24
Reviewed by Martin Robinson.

A cairo-gl surface that is created from an uninitialized texture, should be cleared before use.
A texture memory created by calling glTexImage2D with null data parameter, is uninitialized.
And cairo_gl_surface_create_for_texture doesn't clear the provided texture for initialization.
So it seems safe to clear the surface explicitly.

It is hard to verify this behavior change because the texture memory status is undefined. Undefined means
it can be either initialized or not, though mostly initialized in my experiences.

* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::clearSurface):
(WebCore::createCairoGLSurface):

Modified Paths

releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (188954 => 188955)

--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2015-08-26 07:52:01 UTC (rev 188954)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2015-08-26 08:03:04 UTC (rev 188955)
@@ -1,3 +1,22 @@
+2015-08-24  Jinyoung Hur  hur@navercorp.com
+
+Clear cairo-gl surface for initialization
+https://bugs.webkit.org/show_bug.cgi?id=148307
+
+Reviewed by Martin Robinson.
+
+A cairo-gl surface that is created from an uninitialized texture, should be cleared before use.
+A texture memory created by calling glTexImage2D with null data parameter, is uninitialized.
+And cairo_gl_surface_create_for_texture doesn't clear the provided texture for initialization.
+So it seems safe to clear the surface explicitly.
+
+It is hard to verify this behavior change because the texture memory status is undefined. Undefined means
+it can be either initialized or not, though mostly initialized in my experiences.
+
+* platform/graphics/cairo/ImageBufferCairo.cpp:
+(WebCore::clearSurface):
+(WebCore::createCairoGLSurface):
+
 2015-08-25  Carlos Garcia Campos  cgar...@igalia.com
 
 IconDatabase: syncThreadMainLoop() is unlocking m_syncLock twice when thread termination is requested


Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (188954 => 188955)

--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp	2015-08-26 07:52:01 UTC (rev 188954)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp	2015-08-26 08:03:04 UTC (rev 188955)
@@ -68,6 +68,16 @@
 }
 
 #if ENABLE(ACCELERATED_2D_CANVAS)
+void clearSurface(cairo_surface_t* surface)
+{
+if (cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS)
+return;
+
+RefPtrcairo_t cr = adoptRef(cairo_create(surface));
+cairo_set_operator(cr.get(), CAIRO_OPERATOR_CLEAR);
+cairo_paint(cr.get());
+}
+
 PassRefPtrcairo_surface_t createCairoGLSurface(const FloatSize size, uint32_t texture)
 {
 GLContext::sharingContext()-makeContextCurrent();
@@ -91,7 +101,9 @@
 // Thread-awareness is a huge performance hit on non-Intel drivers.
 cairo_gl_device_set_thread_aware(device, FALSE);
 
-return adoptRef(cairo_gl_surface_create_for_texture(device, CAIRO_CONTENT_COLOR_ALPHA, texture, size.width(), size.height()));
+auto surface = adoptRef(cairo_gl_surface_create_for_texture(device, CAIRO_CONTENT_COLOR_ALPHA, texture, size.width(), size.height()));
+clearSurface(surface.get());
+return surface;
 }
 #endif
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188964] trunk/Source/WebInspectorUI

2015-08-26 Thread mattbaker

Title: [188964] trunk/Source/WebInspectorUI








Revision 188964
Author mattba...@apple.com
Date 2015-08-26 03:24:30 -0700 (Wed, 26 Aug 2015)


Log Message
Web Inspector: Rendering Frames legend item checkbox colors are too light
https://bugs.webkit.org/show_bug.cgi?id=148465

Reviewed by Timothy Hatcher.

* UserInterface/Views/ChartDetailsSectionRow.js:
(WebInspector.ChartDetailsSectionRow.prototype._addCheckboxColorFilter):
Gamma primitive should use an exponent attribute instead of value.
Increased gamma exponent to 1.4.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/ChartDetailsSectionRow.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (188963 => 188964)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-08-26 10:22:22 UTC (rev 188963)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-08-26 10:24:30 UTC (rev 188964)
@@ -1,3 +1,15 @@
+2015-08-26  Matt Baker  mattba...@apple.com
+
+Web Inspector: Rendering Frames legend item checkbox colors are too light
+https://bugs.webkit.org/show_bug.cgi?id=148465
+
+Reviewed by Timothy Hatcher.
+
+* UserInterface/Views/ChartDetailsSectionRow.js:
+(WebInspector.ChartDetailsSectionRow.prototype._addCheckboxColorFilter):
+Gamma primitive should use an exponent attribute instead of value.
+Increased gamma exponent to 1.4.
+
 2015-08-26  Nikita Vasilyev  nvasil...@apple.com
 
 Web Inspector: Make DOM node attribute changes highlighting less obnoxious


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ChartDetailsSectionRow.js (188963 => 188964)

--- trunk/Source/WebInspectorUI/UserInterface/Views/ChartDetailsSectionRow.js	2015-08-26 10:22:22 UTC (rev 188963)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ChartDetailsSectionRow.js	2015-08-26 10:24:30 UTC (rev 188964)
@@ -176,12 +176,12 @@
 {
 let gammaPrimitive = createSVGElement(tagName);
 gammaPrimitive.setAttribute(type, gamma);
-gammaPrimitive.setAttribute(value, value);
+gammaPrimitive.setAttribute(exponent, value);
 return gammaPrimitive;
 }
 
 let componentTransferPrimitive = createSVGElement(feComponentTransfer);
-componentTransferPrimitive.append(createGammaPrimitive(feFuncR, 1.2), createGammaPrimitive(feFuncG, 1.2), createGammaPrimitive(feFuncB, 1.2));
+componentTransferPrimitive.append(createGammaPrimitive(feFuncR, 1.4), createGammaPrimitive(feFuncG, 1.4), createGammaPrimitive(feFuncB, 1.4));
 filterElement.append(colorMatrixPrimitive, componentTransferPrimitive);
 
 this._svgFiltersElement.append(filterElement);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188983] trunk/Source

2015-08-26 Thread eric . carlson

Title: [188983] trunk/Source








Revision 188983
Author eric.carl...@apple.com
Date 2015-08-26 13:29:06 -0700 (Wed, 26 Aug 2015)


Log Message
Media Session: make MediaSessionMetadata a class
https://bugs.webkit.org/show_bug.cgi?id=148486

Reviewed by Jer Noble.

Source/WebCore:

No new tests, no observable changes.

* Modules/mediasession/MediaSessionMetadata.h: Make it a class.
* page/ChromeClient.h: struct MediaSessionMetadata - class MediaSessionMetadata.

Source/WebKit2:

* Shared/WebCoreArgumentCoders.h: struct MediaSessionMetadata - class MediaSessionMetadata.
* UIProcess/WebPageProxy.h: Ditto.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediasession/MediaSessionMetadata.h
trunk/Source/WebCore/page/ChromeClient.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (188982 => 188983)

--- trunk/Source/WebCore/ChangeLog	2015-08-26 20:22:43 UTC (rev 188982)
+++ trunk/Source/WebCore/ChangeLog	2015-08-26 20:29:06 UTC (rev 188983)
@@ -1,3 +1,15 @@
+2015-08-26  Eric Carlson  eric.carl...@apple.com
+
+Media Session: make MediaSessionMetadata a class
+https://bugs.webkit.org/show_bug.cgi?id=148486
+
+Reviewed by Jer Noble.
+
+No new tests, no observable changes.
+
+* Modules/mediasession/MediaSessionMetadata.h: Make it a class.
+* page/ChromeClient.h: struct MediaSessionMetadata - class MediaSessionMetadata.
+
 2015-08-26  Per Arne Vollan  pe...@outlook.com
 
 [Curl] Deadlock when downloading.


Modified: trunk/Source/WebCore/Modules/mediasession/MediaSessionMetadata.h (188982 => 188983)

--- trunk/Source/WebCore/Modules/mediasession/MediaSessionMetadata.h	2015-08-26 20:22:43 UTC (rev 188982)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionMetadata.h	2015-08-26 20:29:06 UTC (rev 188983)
@@ -32,7 +32,8 @@
 
 namespace WebCore {
 
-struct MediaSessionMetadata {
+class MediaSessionMetadata final {
+public:
 MediaSessionMetadata() = default;
 
 MediaSessionMetadata(const String title, const String artist, const String album, const URL artworkURL)


Modified: trunk/Source/WebCore/page/ChromeClient.h (188982 => 188983)

--- trunk/Source/WebCore/page/ChromeClient.h	2015-08-26 20:22:43 UTC (rev 188982)
+++ trunk/Source/WebCore/page/ChromeClient.h	2015-08-26 20:29:06 UTC (rev 188983)
@@ -47,7 +47,7 @@
 
 #if ENABLE(MEDIA_SESSION)
 namespace WebCore {
-struct MediaSessionMetadata;
+class MediaSessionMetadata;
 }
 #endif
 


Modified: trunk/Source/WebKit2/ChangeLog (188982 => 188983)

--- trunk/Source/WebKit2/ChangeLog	2015-08-26 20:22:43 UTC (rev 188982)
+++ trunk/Source/WebKit2/ChangeLog	2015-08-26 20:29:06 UTC (rev 188983)
@@ -1,3 +1,13 @@
+2015-08-26  Eric Carlson  eric.carl...@apple.com
+
+Media Session: make MediaSessionMetadata a class
+https://bugs.webkit.org/show_bug.cgi?id=148486
+
+Reviewed by Jer Noble.
+
+* Shared/WebCoreArgumentCoders.h: struct MediaSessionMetadata - class MediaSessionMetadata.
+* UIProcess/WebPageProxy.h: Ditto.
+
 2015-08-26  Zan Dobersek  zdober...@igalia.com
 
 Unreviewed.


Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (188982 => 188983)

--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h	2015-08-26 20:22:43 UTC (rev 188982)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h	2015-08-26 20:29:06 UTC (rev 188983)
@@ -123,7 +123,7 @@
 
 #if ENABLE(MEDIA_SESSION)
 namespace WebCore {
-struct MediaSessionMetadata;
+class MediaSessionMetadata;
 }
 #endif
 


Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (188982 => 188983)

--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h	2015-08-26 20:22:43 UTC (rev 188982)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h	2015-08-26 20:29:06 UTC (rev 188983)
@@ -121,7 +121,7 @@
 
 #if ENABLE(MEDIA_SESSION)
 namespace WebCore {
-struct MediaSessionMetadata;
+class MediaSessionMetadata;
 }
 #endif
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188985] trunk/Source/WTF

2015-08-26 Thread andersca

Title: [188985] trunk/Source/WTF








Revision 188985
Author ander...@apple.com
Date 2015-08-26 13:38:42 -0700 (Wed, 26 Aug 2015)


Log Message
Fix build.

* wtf/WorkQueue.cpp:

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/WorkQueue.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (188984 => 188985)

--- trunk/Source/WTF/ChangeLog	2015-08-26 20:29:17 UTC (rev 188984)
+++ trunk/Source/WTF/ChangeLog	2015-08-26 20:38:42 UTC (rev 188985)
@@ -1,5 +1,11 @@
 2015-08-26  Anders Carlsson  ander...@apple.com
 
+Fix build.
+
+* wtf/WorkQueue.cpp:
+
+2015-08-26  Anders Carlsson  ander...@apple.com
+
 Add and implement WorkQueue::concurrentApply
 https://bugs.webkit.org/show_bug.cgi?id=148488
 


Modified: trunk/Source/WTF/wtf/WorkQueue.cpp (188984 => 188985)

--- trunk/Source/WTF/wtf/WorkQueue.cpp	2015-08-26 20:29:17 UTC (rev 188984)
+++ trunk/Source/WTF/wtf/WorkQueue.cpp	2015-08-26 20:38:42 UTC (rev 188985)
@@ -27,13 +27,13 @@
 #include WorkQueue.h
 
 #include mutex
-#include wtf/BinarySemaphore.h
 #include wtf/MessageQueue.h
 #include wtf/NeverDestroyed.h
 #include wtf/NumberOfCores.h
 #include wtf/Ref.h
 #include wtf/Threading.h
 #include wtf/text/WTFString.h
+#include wtf/threads/BinarySemaphore.h
 
 namespace WTF {
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [188984] trunk/Websites/webkit.org

2015-08-26 Thread bfulgham

Title: [188984] trunk/Websites/webkit.org








Revision 188984
Author bfulg...@apple.com
Date 2015-08-26 13:29:17 -0700 (Wed, 26 Aug 2015)


Log Message
Update Windows tool install instructions.

* building/tools.html:

Modified Paths

trunk/Websites/webkit.org/ChangeLog
trunk/Websites/webkit.org/building/tools.html




Diff

Modified: trunk/Websites/webkit.org/ChangeLog (188983 => 188984)

--- trunk/Websites/webkit.org/ChangeLog	2015-08-26 20:29:06 UTC (rev 188983)
+++ trunk/Websites/webkit.org/ChangeLog	2015-08-26 20:29:17 UTC (rev 188984)
@@ -1,3 +1,9 @@
+2015-08-26  Brent Fulgham  bfulg...@apple.com
+
+Update Windows tool install instructions.
+
+* building/tools.html:
+
 2015-08-24  Saam barati  sbar...@apple.com
 
 Add mp4 version of types-changing video.


Modified: trunk/Websites/webkit.org/building/tools.html (188983 => 188984)

--- trunk/Websites/webkit.org/building/tools.html	2015-08-26 20:29:06 UTC (rev 188983)
+++ trunk/Websites/webkit.org/building/tools.html	2015-08-26 20:29:17 UTC (rev 188984)
@@ -17,7 +17,7 @@
 div class=windows-instructions
 h4Windows/h4
 ol
-lipYou can build with either Visual Studio 2013 or Visual Studio 2013 express. (Newer versions currently unsupported)/p
+lipYou can build with either Visual Studio 2015 or Visual Studio 2015 Community Edition./p
 pUse the default options for the installation./p
 
 lipInstall Cygwin/p
@@ -59,10 +59,12 @@
 pIf you are behind a proxy you need to do the following to allow cygwin svn to get through the proxy (similar steps are available for your Windows svn):
 ulliIn bash (Cygwin) run: codesvn help/code. This will create in your cygwin home directory the file .subversion/servers./li
 liEdit the file mentioned above and follow the instructions in the file to set up your proxy settings./li/ul/p
-lipInstall DirectX SDK/p
-pDownload the a href="" 2010 DirectX SDK/a  This is needed for accelerated compositing./p/li
+lipInstall Perl/p
+pDownload Perl 5.18 (or newer) from a href="" and install it./p/li
 lipInstall Python/p
-pDownload Python 2.7.8 from a href="" When done installing, remember to add the folder of the python executable to your PATH environment variable./p/li
+pDownload Python 2.7.8 from a href="" and install it./p/li
+lipInstall Ruby/p
+pDownload Ruby 2.0.0 from a href="" and install it./p/li
 lipInstall php, we use the following steps (you need this to run http layout tests):/p
 ol
 licd /usr/local/bin/li
@@ -71,9 +73,7 @@
 liChange line 341 of the apt-cyg script to wget -nc $mirror/../$install/li
 liapt-cyg -m ftp://sourceware.org/pub/cygwinports/x86 install php/li
 /ol
-lipOptional: Install the 32-bit version of Debugging Tools for Windows/p
-pDebugging Tools for Windows includes many useful debugging tools such as WinDbg and NTSD. Some of WebKitrsquo;s tests and scripts use these tools. Follow the a target=installtools href="" for installing the 32-bit version of Debugging Tools for Windows/a./p
-lipOptional: Hotfix for 64-bit Windows to disable the user-mode callback filter for exceptions/p
+lipOptional: Hotfix for 64-bit Windows (Windows 7 or earlier) to disable the user-mode callback filter for exceptions/p
 pWithout the a href="" hotfix/a, exceptions may be thrown in callback routines that do not cause a crash but leave the application in an inconsistent state that might cause a crash later. You will need to click on View and request hotfix downloads and fill out the form. A link to download the hotfix and a password will be emailed to you./p
 /ol
 /div






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [189005] trunk/Source/WebCore

2015-08-26 Thread mmaxfield

Title: [189005] trunk/Source/WebCore








Revision 189005
Author mmaxfi...@apple.com
Date 2015-08-26 17:20:14 -0700 (Wed, 26 Aug 2015)


Log Message
[Cocoa] PerformanceTest Layout/RegionsShapes.html is failing
https://bugs.webkit.org/show_bug.cgi?id=148464

Reviewed by Andy Estes.

The test is failing because Core Text emits a warning message when you use CTFontCreateWithName()
and it cannot find the name you provide. However, this is exactly the situation we are creating
(by attempting to auto-activate a font if we could not otherwise find it). The fix is to simply
not use that API function in favor of using CTFontCreateWithFontDescriptor(), which does not emit
a warning message..

No new tests because there is no behavior change.

* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::autoActivateFont):
(WebCore::FontCache::createFontPlatformData):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (189004 => 189005)

--- trunk/Source/WebCore/ChangeLog	2015-08-27 00:04:20 UTC (rev 189004)
+++ trunk/Source/WebCore/ChangeLog	2015-08-27 00:20:14 UTC (rev 189005)
@@ -1,3 +1,22 @@
+2015-08-26  Myles C. Maxfield  mmaxfi...@apple.com
+
+[Cocoa] PerformanceTest Layout/RegionsShapes.html is failing
+https://bugs.webkit.org/show_bug.cgi?id=148464
+
+Reviewed by Andy Estes.
+
+The test is failing because Core Text emits a warning message when you use CTFontCreateWithName()
+and it cannot find the name you provide. However, this is exactly the situation we are creating
+(by attempting to auto-activate a font if we could not otherwise find it). The fix is to simply
+not use that API function in favor of using CTFontCreateWithFontDescriptor(), which does not emit
+a warning message..
+
+No new tests because there is no behavior change.
+
+* platform/graphics/cocoa/FontCacheCoreText.cpp:
+(WebCore::autoActivateFont):
+(WebCore::FontCache::createFontPlatformData):
+
 2015-08-26  Joseph Pecoraro  pecor...@apple.com
 
 Web Inspector: Implement tracking of active stylesheets in the frontend


Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (189004 => 189005)

--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp	2015-08-27 00:04:20 UTC (rev 189004)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp	2015-08-27 00:20:14 UTC (rev 189005)
@@ -462,6 +462,17 @@
 // Only attempt to auto-activate fonts once for performance reasons.
 return knownFamilies.get().add(family).isNewEntry;
 }
+
+static void autoActivateFont(const String name, CGFloat size)
+{
+auto fontName = name.createCFString();
+CFTypeRef keys[] = { kCTFontNameAttribute };
+CFTypeRef values[] = { fontName.get() };
+auto attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), kCFTypeDictionaryKeyCallBacks, kCFTypeDictionaryValueCallBacks));
+auto descriptor = adoptCF(CTFontDescriptorCreateWithAttributes(attributes.get()));
+if (auto newFont = CTFontCreateWithFontDescriptor(descriptor.get(), size, nullptr))
+CFRelease(newFont);
+}
 #endif
 
 std::unique_ptrFontPlatformData FontCache::createFontPlatformData(const FontDescription fontDescription, const AtomicString family)
@@ -478,7 +489,7 @@
 
 // Auto activate the font before looking for it a second time.
 // Ignore the result because we want to use our own algorithm to actually find the font.
-CFRelease(CTFontCreateWithName(family.string().createCFString().get(), size, nullptr));
+autoActivateFont(family.string(), size);
 
 font = fontWithFamily(family, traits, fontDescription.weight(), fontDescription.featureSettings(), fontDescription.textRenderingMode(), size);
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [189008] trunk/Source/WebInspectorUI

2015-08-26 Thread commit-queue

Title: [189008] trunk/Source/WebInspectorUI








Revision 189008
Author commit-qu...@webkit.org
Date 2015-08-26 18:28:06 -0700 (Wed, 26 Aug 2015)


Log Message
Web Inspector: Uncaught exception in CSS Completion - TypeError: undefined is not an object (evaluating 'this._values[middleIndex].startsWith')
https://bugs.webkit.org/show_bug.cgi?id=148508

Patch by Joseph Pecoraro pecor...@apple.com on 2015-08-26
Reviewed by Timothy Hatcher.

* UserInterface/Models/CSSCompletions.js:
(WebInspector.CSSCompletions):
Add a comment explaining that the constructor may be called with
a list of strings or a list of objects from the protocol. Add
a fast path for when this is constructed with a list of strings.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (189007 => 189008)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-08-27 01:10:45 UTC (rev 189007)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-08-27 01:28:06 UTC (rev 189008)
@@ -1,3 +1,16 @@
+2015-08-26  Joseph Pecoraro  pecor...@apple.com
+
+Web Inspector: Uncaught exception in CSS Completion - TypeError: undefined is not an object (evaluating 'this._values[middleIndex].startsWith')
+https://bugs.webkit.org/show_bug.cgi?id=148508
+
+Reviewed by Timothy Hatcher.
+
+* UserInterface/Models/CSSCompletions.js:
+(WebInspector.CSSCompletions):
+Add a comment explaining that the constructor may be called with
+a list of strings or a list of objects from the protocol. Add
+a fast path for when this is constructed with a list of strings.
+
 2015-08-26  Matt Baker  mattba...@apple.com
 
 Web Inspector: Rendering Frames timeline pie chart should use SVG instead of 2D canvas


Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js (189007 => 189008)

--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js	2015-08-27 01:10:45 UTC (rev 189007)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js	2015-08-27 01:28:06 UTC (rev 189008)
@@ -39,24 +39,33 @@
 this._longhands = {};
 this._shorthands = {};
 
-for (var property of properties) {
-var propertyName = property.name;
-this._values.push(propertyName);
+// The `properties` parameter can be either a list of objects with 'name' / 'longhand'
+// properties when initialized from the protocol for CSSCompletions.cssNameCompletions.
+// Or it may just a list of strings when quickly initialized for other completion purposes.
+if (properties.length  typeof properties[0] === string)
+this._values = this._values.concat(properties);
+else {
+for (var property of properties) {
+var propertyName = property.name;
+console.assert(propertyName);
 
-var longhands = property.longhands;
-if (longhands) {
-this._longhands[propertyName] = longhands;
+this._values.push(propertyName);
 
-for (var j = 0; j  longhands.length; ++j) {
-var longhandName = longhands[j];
+var longhands = property.longhands;
+if (longhands) {
+this._longhands[propertyName] = longhands;
 
-var shorthands = this._shorthands[longhandName];
-if (!shorthands) {
-shorthands = [];
-this._shorthands[longhandName] = shorthands;
+for (var j = 0; j  longhands.length; ++j) {
+var longhandName = longhands[j];
+
+var shorthands = this._shorthands[longhandName];
+if (!shorthands) {
+shorthands = [];
+this._shorthands[longhandName] = shorthands;
+}
+
+shorthands.push(propertyName);
 }
-
-shorthands.push(propertyName);
 }
 }
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [189000] trunk/Source/WebCore

2015-08-26 Thread mmaxfield

Title: [189000] trunk/Source/WebCore








Revision 189000
Author mmaxfi...@apple.com
Date 2015-08-26 16:21:47 -0700 (Wed, 26 Aug 2015)


Log Message
Add comment to LocaleToScriptMappingDefault.cpp
rdar://problem/22407296

Unreviewed.

We currently map lang=zh to USCRIPT_SIMPLIFIED_HAN, which is incorrect.
Instead, we should consult with an external source, such as the user's
language preferences.

* platform/text/LocaleToScriptMappingDefault.cpp:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (188999 => 189000)

--- trunk/Source/WebCore/ChangeLog	2015-08-26 22:24:26 UTC (rev 188999)
+++ trunk/Source/WebCore/ChangeLog	2015-08-26 23:21:47 UTC (rev 189000)
@@ -1,3 +1,16 @@
+2015-08-26  Myles C. Maxfield  mmaxfi...@apple.com
+
+Add comment to LocaleToScriptMappingDefault.cpp
+rdar://problem/22407296
+
+Unreviewed.
+
+We currently map lang=zh to USCRIPT_SIMPLIFIED_HAN, which is incorrect.
+Instead, we should consult with an external source, such as the user's
+language preferences.
+
+* platform/text/LocaleToScriptMappingDefault.cpp:
+
 2015-08-26  Chris Dumez  cdu...@apple.com
 
 Distinguish Web IDL callback interfaces from Web IDL callback functions


Modified: trunk/Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp (188999 => 189000)

--- trunk/Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp	2015-08-26 22:24:26 UTC (rev 188999)
+++ trunk/Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp	2015-08-26 23:21:47 UTC (rev 189000)
@@ -376,7 +376,7 @@
 { yap, USCRIPT_LATIN },
 { yo, USCRIPT_LATIN },
 { za, USCRIPT_LATIN },
-{ zh, USCRIPT_SIMPLIFIED_HAN },
+{ zh, USCRIPT_SIMPLIFIED_HAN }, // FIXME: This mapping in incorrect. Instead, we should consult with an external source (such as the user's language preferences).
 { zh_hk, USCRIPT_TRADITIONAL_HAN },
 { zh_tw, USCRIPT_TRADITIONAL_HAN },
 { zu, USCRIPT_LATIN }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [189003] trunk/Tools

2015-08-26 Thread achristensen

Title: [189003] trunk/Tools








Revision 189003
Author achristen...@apple.com
Date 2015-08-26 16:52:22 -0700 (Wed, 26 Aug 2015)


Log Message
Build fix after r188982

* MiniBrowser/win/CMakeLists.txt:
Find .rc files in correct directory.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/win/CMakeLists.txt




Diff

Modified: trunk/Tools/ChangeLog (189002 => 189003)

--- trunk/Tools/ChangeLog	2015-08-26 23:48:49 UTC (rev 189002)
+++ trunk/Tools/ChangeLog	2015-08-26 23:52:22 UTC (rev 189003)
@@ -1,3 +1,10 @@
+2015-08-26  Alex Christensen  achristen...@webkit.org
+
+Build fix after r188982
+
+* MiniBrowser/win/CMakeLists.txt:
+Find .rc files in correct directory.
+
 2015-08-26  Ryuan Choi  ryuan.c...@navercorp.com
 
 [EFL] Bump cairo version to 1.14.2


Modified: trunk/Tools/MiniBrowser/win/CMakeLists.txt (189002 => 189003)

--- trunk/Tools/MiniBrowser/win/CMakeLists.txt	2015-08-26 23:48:49 UTC (rev 189002)
+++ trunk/Tools/MiniBrowser/win/CMakeLists.txt	2015-08-26 23:52:22 UTC (rev 189003)
@@ -21,7 +21,7 @@
 WinMain.cpp
 stdafx.cpp
 
-MiniBrowser.vcxproj/MiniBrowserLib.rc
+../MiniBrowser.vcxproj/MiniBrowserLib.rc
 )
 
 set(MiniBrowser_LIBRARIES
@@ -58,7 +58,7 @@
 set_target_properties(MiniBrowserLib PROPERTIES FOLDER Tools)
 set_target_properties(MiniBrowserLib PROPERTIES OUTPUT_NAME MiniBrowser)
 
-add_executable(MiniBrowser WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp MiniBrowser.vcxproj/MiniBrowser.rc)
+add_executable(MiniBrowser WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp ../MiniBrowser.vcxproj/MiniBrowser.rc)
 target_link_libraries(MiniBrowser shlwapi)
 set_target_properties(MiniBrowser PROPERTIES FOLDER Tools)
 set_target_properties(MiniBrowser PROPERTIES OUTPUT_NAME MiniBrowser)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [189004] trunk/LayoutTests

2015-08-26 Thread aestes

Title: [189004] trunk/LayoutTests








Revision 189004
Author aes...@apple.com
Date 2015-08-26 17:04:20 -0700 (Wed, 26 Aug 2015)


Log Message
REGRESSION (r188987): imported/mozilla/svg/filters/feConvolveMatrix-1.svg fails
https://bugs.webkit.org/show_bug.cgi?id=148497

* TestExpectations: Marked as ImageOnlyFailure.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (189003 => 189004)

--- trunk/LayoutTests/ChangeLog	2015-08-26 23:52:22 UTC (rev 189003)
+++ trunk/LayoutTests/ChangeLog	2015-08-27 00:04:20 UTC (rev 189004)
@@ -1,3 +1,10 @@
+2015-08-26  Andy Estes  aes...@apple.com
+
+REGRESSION (r188987): imported/mozilla/svg/filters/feConvolveMatrix-1.svg fails
+https://bugs.webkit.org/show_bug.cgi?id=148497
+
+* TestExpectations: Marked as ImageOnlyFailure.
+
 2015-08-26  Joseph Pecoraro  pecor...@apple.com
 
 Web Inspector: Implement tracking of active stylesheets in the frontend


Modified: trunk/LayoutTests/TestExpectations (189003 => 189004)

--- trunk/LayoutTests/TestExpectations	2015-08-26 23:52:22 UTC (rev 189003)
+++ trunk/LayoutTests/TestExpectations	2015-08-27 00:04:20 UTC (rev 189004)
@@ -572,3 +572,6 @@
 fast/dom/timer-fire-after-page-pause.html [ Skip ]
 
 webkit.org/b/148026 [ Debug ] animations/restart-after-scroll.html [ Skip ]
+
+# REGRESSION (r188987): imported/mozilla/svg/filters/feConvolveMatrix-1.svg fails
+webkit.org/b/148497 imported/mozilla/svg/filters/feConvolveMatrix-1.svg [ ImageOnlyFailure ]






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [189001] branches/safari-601.1-branch

2015-08-26 Thread aestes

Title: [189001] branches/safari-601.1-branch








Revision 189001
Author aes...@apple.com
Date 2015-08-26 16:36:58 -0700 (Wed, 26 Aug 2015)


Log Message
Merge r188988.

2015-08-26  Andy Estes  aes...@apple.com

Crash when following a Google search link to Twitter with Limit Adult Content enabled
https://bugs.webkit.org/show_bug.cgi?id=147651

Rubber-stamped by Brady Eidson.

Tools:

Taught TestRunner how to decide the navigation policy after a delay.

* WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::decidePolicyForNavigationAction):
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::setShouldDecideNavigationPolicyAfterDelay):
* WebKitTestRunner/InjectedBundle/TestRunner.h:
(WTR::TestRunner::shouldDecideNavigationPolicyAfterDelay):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize):
(WTR::TestController::resetStateToConsistentValues):
(WTR::TestController::decidePolicyForNavigationAction):
* WebKitTestRunner/TestController.h:
(WTR::TestController::setShouldDecideNavigationPolicyAfterDelay):
* WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::didReceiveMessageFromInjectedBundle):

LayoutTests:

Added a layout test.

* http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt: Added.
* http/tests/contentfiltering/load-substitute-data-from-appcache.html: Added.
* http/tests/contentfiltering/resources/appcache.html: Added.
* http/tests/contentfiltering/resources/appcache.manifest: Added.
* platform/mac-wk1/TestExpectations:

Modified Paths

branches/safari-601.1-branch/LayoutTests/ChangeLog
branches/safari-601.1-branch/LayoutTests/platform/mac-wk1/TestExpectations
branches/safari-601.1-branch/Tools/ChangeLog
branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
branches/safari-601.1-branch/Tools/WebKitTestRunner/TestController.cpp
branches/safari-601.1-branch/Tools/WebKitTestRunner/TestController.h
branches/safari-601.1-branch/Tools/WebKitTestRunner/TestInvocation.cpp


Added Paths

branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt
branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache.html
branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/resources/appcache.html
branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/resources/appcache.manifest




Diff

Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (189000 => 189001)

--- branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-26 23:21:47 UTC (rev 189000)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-26 23:36:58 UTC (rev 189001)
@@ -1,3 +1,22 @@
+2015-08-26  Andy Estes  aes...@apple.com
+
+Merge r188988.
+
+2015-08-26  Andy Estes  aes...@apple.com
+
+Crash when following a Google search link to Twitter with Limit Adult Content enabled
+https://bugs.webkit.org/show_bug.cgi?id=147651
+
+Rubber-stamped by Brady Eidson.
+
+Added a layout test.
+
+* http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt: Added.
+* http/tests/contentfiltering/load-substitute-data-from-appcache.html: Added.
+* http/tests/contentfiltering/resources/appcache.html: Added.
+* http/tests/contentfiltering/resources/appcache.manifest: Added.
+* platform/mac-wk1/TestExpectations:
+
 2015-08-21  Matthew Hanson  matthew_han...@apple.com
 
 Merge r188769. rdar://problem/22354983


Added: branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt (0 => 189001)

--- branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt	(rev 0)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt	2015-08-26 23:36:58 UTC (rev 189001)
@@ -0,0 +1,3 @@
+This is a regression test for webkit.org/b/147651. The test passes if it does not crash.
+
+


Added: branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache.html (0 => 189001)

--- branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache.html	(rev 0)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache.html

[webkit-changes] [189002] trunk

2015-08-26 Thread joepeck

Title: [189002] trunk








Revision 189002
Author joep...@webkit.org
Date 2015-08-26 16:48:49 -0700 (Wed, 26 Aug 2015)


Log Message
Web Inspector: Implement tracking of active stylesheets in the frontend
https://bugs.webkit.org/show_bug.cgi?id=105828

Reviewed by Timothy Hatcher.

Source/_javascript_Core:

* inspector/protocol/CSS.json:
Add new events for when a StyleSheet is added or removed.

Source/WebCore:

Tests: inspector/css/stylesheet-events-basic.html
   inspector/css/stylesheet-events-imports.html
   inspector/css/stylesheet-events-inspector-stylesheet.html

* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::documentDetachedImpl):
(WebCore::InspectorInstrumentation::activeStyleSheetsUpdatedImpl):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::documentDetached):
(WebCore::InspectorInstrumentation::activeStyleSheetsUpdated):
New hooks for when a document is detached or a document's style sheets are updated.

* dom/Document.cpp:
(WebCore::Document::prepareForDestruction):
Inform the inspector so the CSSAgent can remove document related data.

* dom/DocumentStyleSheetCollection.h:
* dom/DocumentStyleSheetCollection.cpp:
(WebCore::DocumentStyleSheetCollection::updateActiveStyleSheets):
Inform the inspector so the CSSAgent can push stylesheet related events.

(WebCore::DocumentStyleSheetCollection::activeStyleSheetsForInspector): Added.
CSSStyleSheets for the inspector include non-disabled author stylesheets
even if they are empty.

* inspector/InspectorCSSAgent.h:
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::reset):
(WebCore::InspectorCSSAgent::documentDetached):
Handling for the new list of known document to CSSStyleSheets map.

(WebCore::InspectorCSSAgent::enable):
When the CSS domain is enabled, tell the frontend about known stylesheets.

(WebCore::InspectorCSSAgent::activeStyleSheetsUpdated):
(WebCore::InspectorCSSAgent::setActiveStyleSheetsForDocument):
Diff the old list of known stylesheets to the new list of stylesheets
for an individual document. Then send appropriate added/removed events.

(WebCore::InspectorCSSAgent::collectAllStyleSheets):
(WebCore::InspectorCSSAgent::collectAllDocumentStyleSheets):
(WebCore::InspectorCSSAgent::collectStyleSheets):
Collect stylesheets recursively. A stylesheet may link to other stylesheets
through @import statements.

(WebCore::InspectorCSSAgent::getAllStyleSheets):
Use the new methods, this command should go away as it will no longer be useful.

(WebCore::InspectorCSSAgent::unbindStyleSheet):
(WebCore::InspectorCSSAgent::bindStyleSheet):
Create an InspectorStyleSheet from a CSSStyleSheet and add to the appropriate lists.
Likewise, unbinding will remove from the appropriate lists.

(WebCore::InspectorCSSAgent::viaInspectorStyleSheet):
(WebCore::InspectorCSSAgent::detectOrigin):
When creating the inspector stylesheet, which is a style element,
it will push a StyleSheetAdded event. In the process of binding this
new stylesheet use the m_creatingViaInspectorStyleSheet to add it to
out list of Inspector Stylesheets.

Source/WebInspectorUI:

* UserInterface/Models/CSSStyleSheet.js:
(WebInspector.CSSStyleSheet):
(WebInspector.CSSStyleSheet.prototype.get origin):
(WebInspector.CSSStyleSheet.prototype.updateInfo):
Add a new origin attribute that has been sent from the backend for a while.

* UserInterface/Controllers/CSSStyleManager.js:
(WebInspector.CSSStyleManager.prototype.styleSheetAdded):
(WebInspector.CSSStyleManager.prototype.styleSheetRemoved):
Handle the new events by managing the new CSSStyleSheets.

(WebInspector.CSSStyleManager):
(WebInspector.CSSStyleManager.prototype._mainResourceDidChange):
Reset the legacy fetching flag. Fetching is only needed for legacy backends.

(WebInspector.CSSStyleManager.prototype._fetchInfoForAllStyleSheets):
Include the new origin property in the legacy updateInfo path.

* UserInterface/Protocol/CSSObserver.js:
(WebInspector.CSSObserver.prototype.styleSheetAdded):
(WebInspector.CSSObserver.prototype.styleSheetRemoved):
Forward to the manager.

* UserInterface/Views/CSSStyleDetailsSidebarPanel.js:
(WebInspector.CSSStyleDetailsSidebarPanel):
Refresh the sidebar when stylesheets are added / removed, as that
may affect the style of the select element.

LayoutTests:

* inspector/css/resources/import-level-1.css: Added.
* inspector/css/resources/import-level-2.css: Added.
* inspector/css/resources/stylesheet-events-subframe.html: Added.
* inspector/css/stylesheet-events-basic-expected.txt: Added.
* inspector/css/stylesheet-events-basic.html: Added.
* inspector/css/stylesheet-events-imports-expected.txt: Added.
* inspector/css/stylesheet-events-imports.html: Added.
* inspector/css/stylesheet-events-inspector-stylesheet-expected.txt: Added.
* inspector/css/stylesheet-events-inspector-stylesheet.html: Added.
* inspector/css/stylesheet-events-multiple-documents-expected.txt: Added.
* inspector/css/stylesheet-events-multiple-documents.html: Added.

[webkit-changes] [189006] trunk/Source/WebInspectorUI

2015-08-26 Thread mattbaker

Title: [189006] trunk/Source/WebInspectorUI








Revision 189006
Author mattba...@apple.com
Date 2015-08-26 18:09:44 -0700 (Wed, 26 Aug 2015)


Log Message
Web Inspector: Rendering Frames timeline pie chart should use SVG instead of 2D canvas
https://bugs.webkit.org/show_bug.cgi?id=148457

Reviewed by Timothy Hatcher.

* UserInterface/Views/ChartDetailsSectionRow.css:
(.details-section  .content  .group  .row.chart  .chart-content  svg  path.hidden):
(.details-section  .content  .group  .row.chart  .chart-content  svg  path.chart-segment):
(.details-section  .content  .group  .row.chart  .chart-content  svg  path.empty-chart):
New styles for SVG chart elements.

* UserInterface/Views/ChartDetailsSectionRow.js:
(WebInspector.ChartDetailsSectionRow):
Calculate radii and create SVG chart elements.
(WebInspector.ChartDetailsSectionRow.prototype.clearItems):
Remove chart segment path elements.
(WebInspector.ChartDetailsSectionRow.prototype._needsLayout):
(WebInspector.ChartDetailsSectionRow.prototype._updateLayout.createSegmentPathData):
Helper function that creates path data for a single pie chart segment.
(WebInspector.ChartDetailsSectionRow.prototype._updateLayout):
Creates path elements as needed, and updates path data for for non-zero data points.
(WebInspector.ChartDetailsSectionRow.prototype.set innerLabel): Deleted.
(WebInspector.ChartDetailsSectionRow.prototype.set innerRadius): Deleted.
These properties are now set during construction.
(WebInspector.ChartDetailsSectionRow.prototype.updateLayout): Deleted.
Renamed to _updateLayout.

* UserInterface/Views/TimelineSidebarPanel.js:
Chart size and inner radius passed to chart constructor.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/ChartDetailsSectionRow.css
trunk/Source/WebInspectorUI/UserInterface/Views/ChartDetailsSectionRow.js
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (189005 => 189006)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-08-27 00:20:14 UTC (rev 189005)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-08-27 01:09:44 UTC (rev 189006)
@@ -1,3 +1,35 @@
+2015-08-26  Matt Baker  mattba...@apple.com
+
+Web Inspector: Rendering Frames timeline pie chart should use SVG instead of 2D canvas
+https://bugs.webkit.org/show_bug.cgi?id=148457
+
+Reviewed by Timothy Hatcher.
+
+* UserInterface/Views/ChartDetailsSectionRow.css:
+(.details-section  .content  .group  .row.chart  .chart-content  svg  path.hidden):
+(.details-section  .content  .group  .row.chart  .chart-content  svg  path.chart-segment):
+(.details-section  .content  .group  .row.chart  .chart-content  svg  path.empty-chart):
+New styles for SVG chart elements.
+
+* UserInterface/Views/ChartDetailsSectionRow.js:
+(WebInspector.ChartDetailsSectionRow):
+Calculate radii and create SVG chart elements.
+(WebInspector.ChartDetailsSectionRow.prototype.clearItems):
+Remove chart segment path elements.
+(WebInspector.ChartDetailsSectionRow.prototype._needsLayout):
+(WebInspector.ChartDetailsSectionRow.prototype._updateLayout.createSegmentPathData):
+Helper function that creates path data for a single pie chart segment.
+(WebInspector.ChartDetailsSectionRow.prototype._updateLayout):
+Creates path elements as needed, and updates path data for for non-zero data points.
+(WebInspector.ChartDetailsSectionRow.prototype.set innerLabel): Deleted.
+(WebInspector.ChartDetailsSectionRow.prototype.set innerRadius): Deleted.
+These properties are now set during construction.
+(WebInspector.ChartDetailsSectionRow.prototype.updateLayout): Deleted.
+Renamed to _updateLayout.
+
+* UserInterface/Views/TimelineSidebarPanel.js:
+Chart size and inner radius passed to chart constructor.
+
 2015-08-26  Joseph Pecoraro  pecor...@apple.com
 
 Web Inspector: Implement tracking of active stylesheets in the frontend


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ChartDetailsSectionRow.css (189005 => 189006)

--- trunk/Source/WebInspectorUI/UserInterface/Views/ChartDetailsSectionRow.css	2015-08-27 00:20:14 UTC (rev 189005)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ChartDetailsSectionRow.css	2015-08-27 01:09:44 UTC (rev 189006)
@@ -42,6 +42,20 @@
 padding: 8px 5px 0px 12px;
 }
 
+.details-section  .content  .group  .row.chart  .chart-content  svg  path.hidden {
+display: none;
+}
+.details-section  .content  .group  .row.chart  .chart-content  svg  path.chart-segment {
+stroke-width: 1;
+stroke: rgba(255, 255, 255, 0.7);
+}
+
+.details-section  .content  .group  .row.chart  .chart-content  svg  path.empty-chart {
+fill: rgba(0, 0, 0, 0.02);
+stroke-width: 1;
+stroke: rgba(0, 0, 0, 0.1);
+}
+
 .details-section  .content  .group

[webkit-changes] [188997] branches/safari-601.1.46-branch

2015-08-26 Thread bshafiei

Title: [188997] branches/safari-601.1.46-branch








Revision 188997
Author bshaf...@apple.com
Date 2015-08-26 15:22:29 -0700 (Wed, 26 Aug 2015)


Log Message
Merged r188311.  rdar://problem/22410806

Modified Paths

branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog
branches/safari-601.1.46-branch/Source/_javascript_Core/dfg/DFGOSREntry.cpp
branches/safari-601.1.46-branch/Source/_javascript_Core/ftl/FTLOSREntry.cpp
branches/safari-601.1.46-branch/Source/_javascript_Core/heap/ConservativeRoots.cpp
branches/safari-601.1.46-branch/Source/_javascript_Core/heap/MachineStackMarker.cpp
branches/safari-601.1.46-branch/Source/_javascript_Core/interpreter/Register.h
branches/safari-601.1.46-branch/Source/WTF/wtf/Compiler.h
branches/safari-601.1.46-branch/Tools/ChangeLog
branches/safari-601.1.46-branch/Tools/asan/asan.xcconfig


Removed Paths

branches/safari-601.1.46-branch/Tools/asan/webkit-asan-ignore.txt




Diff

Modified: branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog (188996 => 188997)

--- branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog	2015-08-26 22:20:03 UTC (rev 188996)
+++ branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog	2015-08-26 22:22:29 UTC (rev 188997)
@@ -1,3 +1,33 @@
+2015-08-26  Babak Shafiei  bshaf...@apple.com
+
+Merge r188311.
+
+2015-08-11  Alexey Proskuryakov  a...@apple.com
+
+Make ASan build not depend on asan.xcconfig
+https://bugs.webkit.org/show_bug.cgi?id=147840
+rdar://problem/21093702
+
+Reviewed by Daniel Bates.
+
+* dfg/DFGOSREntry.cpp:
+(JSC::DFG::OSREntryData::dump):
+(JSC::DFG::prepareOSREntry):
+* ftl/FTLOSREntry.cpp:
+(JSC::FTL::prepareOSREntry):
+* heap/ConservativeRoots.cpp:
+(JSC::ConservativeRoots::genericAddPointer):
+(JSC::ConservativeRoots::genericAddSpan):
+* heap/MachineStackMarker.cpp:
+(JSC::MachineThreads::removeThreadIfFound):
+(JSC::MachineThreads::gatherFromCurrentThread):
+(JSC::MachineThreads::Thread::captureStack):
+(JSC::copyMemory):
+* interpreter/Register.h:
+(JSC::Register::operator=):
+(JSC::Register::asanUnsafeJSValue):
+(JSC::Register::jsValue):
+
 2015-08-21  Babak Shafiei  bshaf...@apple.com
 
 Merge r188067.


Modified: branches/safari-601.1.46-branch/Source/_javascript_Core/dfg/DFGOSREntry.cpp (188996 => 188997)

--- branches/safari-601.1.46-branch/Source/_javascript_Core/dfg/DFGOSREntry.cpp	2015-08-26 22:20:03 UTC (rev 188996)
+++ branches/safari-601.1.46-branch/Source/_javascript_Core/dfg/DFGOSREntry.cpp	2015-08-26 22:22:29 UTC (rev 188997)
@@ -90,6 +90,7 @@
 dumpInContext(out, nullptr);
 }
 
+SUPPRESS_ASAN
 void* prepareOSREntry(ExecState* exec, CodeBlock* codeBlock, unsigned bytecodeIndex)
 {
 ASSERT(JITCode::isOptimizingJIT(codeBlock-jitType()));
@@ -202,33 +203,33 @@
 for (size_t local = 0; local  entry-m_expectedValues.numberOfLocals(); ++local) {
 int localOffset = virtualRegisterForLocal(local).offset();
 if (entry-m_localsForcedDouble.get(local)) {
-if (!exec-registers()[localOffset].jsValue().isNumber()) {
+if (!exec-registers()[localOffset].asanUnsafeJSValue().isNumber()) {
 if (Options::verboseOSR()) {
 dataLog(
 OSR failed because variable , localOffset,  is ,
-exec-registers()[localOffset].jsValue(), , expected number.\n);
+exec-registers()[localOffset].asanUnsafeJSValue(), , expected number.\n);
 }
 return 0;
 }
 continue;
 }
 if (entry-m_localsForcedMachineInt.get(local)) {
-if (!exec-registers()[localOffset].jsValue().isMachineInt()) {
+if (!exec-registers()[localOffset].asanUnsafeJSValue().isMachineInt()) {
 if (Options::verboseOSR()) {
 dataLog(
 OSR failed because variable , localOffset,  is ,
-exec-registers()[localOffset].jsValue(), , expected ,
+exec-registers()[localOffset].asanUnsafeJSValue(), , expected ,
 machine int.\n);
 }
 return 0;
 }
 continue;
 }
-if (!entry-m_expectedValues.local(local).validate(exec-registers()[localOffset].jsValue())) {
+if (!entry-m_expectedValues.local(local).validate(exec-registers()[localOffset].asanUnsafeJSValue())) {
 if (Options::verboseOSR()) {
 dataLog(
 OSR failed because variable , localOffset,  is ,
-exec-registers()[localOffset].jsValue(), , expected ,
+

[webkit-changes] [189012] trunk/Source/JavaScriptCore

2015-08-26 Thread saambarati1

Title: [189012] trunk/Source/_javascript_Core








Revision 189012
Author saambara...@gmail.com
Date 2015-08-26 22:54:21 -0700 (Wed, 26 Aug 2015)


Log Message
MarkedBlock::allocateBlock will have the wrong allocation size when (sizeof(MarkedBlock) + bytes) is divisible by WTF::pageSize()
https://bugs.webkit.org/show_bug.cgi?id=148500

Reviewed by Mark Lam.

Consider the following scenario:
- On OS X, WTF::pageSize() is 4*1024 bytes.
- JSEnvironmentRecord::allocationSizeForScopeSize(6621) == 53000
- sizeof(MarkedBlock) == 248
- (248 + 53000) is a multiple of 4*1024.
- (248 + 53000)/(4*1024) == 13

We will allocate a chunk of memory of size 53248 bytes that looks like this:
0248   256   53248   53256
[Marked Block | 8 bytes |  payload ..  ]  8 bytes  |
^  ^
   Our Environment record starts here. ^
   ^
 Our last JSValue in the environment record will go from byte 53248 to 53256. But, we don't own this memory.

We need to ensure that we round up sizeof(MarkedBlock) to an
atomSize boundary. We need to do this because the first atom
inside the MarkedBlock will start at the rounded up multiple
of atomSize past MarkedBlock. If we end up with an allocation
that is perfectly aligned to the page size, then we will be short
8 bytes (in the current implementation where atomSize is 16 bytes,
and MarkedBlock is 248 bytes).

* heap/MarkedAllocator.cpp:
(JSC::MarkedAllocator::allocateBlock):
* tests/stress/heap-allocator-allocates-incorrect-size-for-activation.js: Added.
(use):
(makeFunction):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/heap/MarkedAllocator.cpp


Added Paths

trunk/Source/_javascript_Core/tests/stress/heap-allocator-allocates-incorrect-size-for-activation.js




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (189011 => 189012)

--- trunk/Source/_javascript_Core/ChangeLog	2015-08-27 04:40:50 UTC (rev 189011)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-08-27 05:54:21 UTC (rev 189012)
@@ -1,3 +1,39 @@
+2015-08-26  Saam barati  sbar...@apple.com
+
+MarkedBlock::allocateBlock will have the wrong allocation size when (sizeof(MarkedBlock) + bytes) is divisible by WTF::pageSize()
+https://bugs.webkit.org/show_bug.cgi?id=148500
+
+Reviewed by Mark Lam.
+
+Consider the following scenario:
+- On OS X, WTF::pageSize() is 4*1024 bytes.
+- JSEnvironmentRecord::allocationSizeForScopeSize(6621) == 53000
+- sizeof(MarkedBlock) == 248
+- (248 + 53000) is a multiple of 4*1024.
+- (248 + 53000)/(4*1024) == 13
+
+We will allocate a chunk of memory of size 53248 bytes that looks like this:
+0248   256   53248   53256
+[Marked Block | 8 bytes |  payload ..  ]  8 bytes  |
+^  ^
+   Our Environment record starts here. ^
+   ^
+ Our last JSValue in the environment record will go from byte 53248 to 53256. But, we don't own this memory.
+
+We need to ensure that we round up sizeof(MarkedBlock) to an
+atomSize boundary. We need to do this because the first atom
+inside the MarkedBlock will start at the rounded up multiple
+of atomSize past MarkedBlock. If we end up with an allocation
+that is perfectly aligned to the page size, then we will be short
+8 bytes (in the current implementation where atomSize is 16 bytes,
+and MarkedBlock is 248 bytes).
+
+* heap/MarkedAllocator.cpp:
+(JSC::MarkedAllocator::allocateBlock):
+* tests/stress/heap-allocator-allocates-incorrect-size-for-activation.js: Added.
+(use):
+(makeFunction):
+
 2015-08-26  Mark Lam  mark@apple.com
 
 watchdog m_didFire state erroneously retained.


Modified: trunk/Source/_javascript_Core/heap/MarkedAllocator.cpp (189011 => 189012)

--- trunk/Source/_javascript_Core/heap/MarkedAllocator.cpp	2015-08-27 04:40:50 UTC (rev 189011)
+++ trunk/Source/_javascript_Core/heap/MarkedAllocator.cpp	2015-08-27 05:54:21 UTC (rev 189012)
@@ -175,7 +175,8 @@
 MarkedBlock* MarkedAllocator::allocateBlock(size_t bytes)
 {
 size_t minBlockSize = MarkedBlock::blockSize;
-size_t minAllocationSize = WTF::roundUpToMultipleOf(WTF::pageSize(), sizeof(MarkedBlock) + bytes);
+size_t minAllocationSize = WTF::roundUpToMultipleOfMarkedBlock::atomSize(sizeof(MarkedBlock)) + WTF::roundUpToMultipleOfMarkedBlock::atomSize(bytes);
+minAllocationSize = WTF::roundUpToMultipleOf(WTF::pageSize(),

[webkit-changes] [189010] trunk/Source/WebKit2

2015-08-26 Thread commit-queue

Title: [189010] trunk/Source/WebKit2








Revision 189010
Author commit-qu...@webkit.org
Date 2015-08-26 20:32:12 -0700 (Wed, 26 Aug 2015)


Log Message
[ThreadedCompositor] Use WTF::Condition together with WTF::Lock
https://bugs.webkit.org/show_bug.cgi?id=148493

Patch by Emanuele Aina emanuele.a...@collabora.com on 2015-08-26
Reviewed by Gyuyoung Kim.

* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
Replace ThreadCondition::signal() calls with Condition::notifyOne().
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
Replace ThreadCondition usage with Condition.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (189009 => 189010)

--- trunk/Source/WebKit2/ChangeLog	2015-08-27 02:49:52 UTC (rev 189009)
+++ trunk/Source/WebKit2/ChangeLog	2015-08-27 03:32:12 UTC (rev 189010)
@@ -1,3 +1,15 @@
+2015-08-26  Emanuele Aina  emanuele.a...@collabora.com
+
+[ThreadedCompositor] Use WTF::Condition together with WTF::Lock
+https://bugs.webkit.org/show_bug.cgi?id=148493
+
+Reviewed by Gyuyoung Kim.
+
+* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+Replace ThreadCondition::signal() calls with Condition::notifyOne().
+* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
+Replace ThreadCondition usage with Condition.
+
 2015-08-26  Wenson Hsieh  wenson_hs...@apple.com
 
 Fix crash due to animationDidEnd called on deallocated RemoteLayerTreeHost


Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (189009 => 189010)

--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp	2015-08-27 02:49:52 UTC (rev 189009)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp	2015-08-27 03:32:12 UTC (rev 189010)
@@ -312,7 +312,7 @@
 m_scene = adoptRef(new CoordinatedGraphicsScene(this));
 m_viewportController = std::make_uniqueSimpleViewportController(this);
 
-m_initializeRunLoopCondition.signal();
+m_initializeRunLoopCondition.notifyOne();
 }
 
 m_compositingRunLoop-runLoop().run();
@@ -324,7 +324,7 @@
 LockHolder locker(m_terminateRunLoopConditionMutex);
 m_compositingRunLoop = nullptr;
 m_context = nullptr;
-m_terminateRunLoopCondition.signal();
+m_terminateRunLoopCondition.notifyOne();
 }
 
 detachThread(m_threadIdentifier);


Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h (189009 => 189010)

--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h	2015-08-27 02:49:52 UTC (rev 189009)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h	2015-08-27 03:32:12 UTC (rev 189010)
@@ -33,6 +33,7 @@
 #include WebCore/GLContext.h
 #include WebCore/IntSize.h
 #include WebCore/TransformationMatrix.h
+#include wtf/Condition.h
 #include wtf/FastMalloc.h
 #include wtf/Noncopyable.h
 #include wtf/ThreadSafeRefCounted.h
@@ -110,9 +111,9 @@
 std::unique_ptrCompositingRunLoop m_compositingRunLoop;
 
 ThreadIdentifier m_threadIdentifier;
-ThreadCondition m_initializeRunLoopCondition;
+Condition m_initializeRunLoopCondition;
 Lock m_initializeRunLoopConditionMutex;
-ThreadCondition m_terminateRunLoopCondition;
+Condition m_terminateRunLoopCondition;
 Lock m_terminateRunLoopConditionMutex;
 };
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [189009] trunk

2015-08-26 Thread mark . lam

Title: [189009] trunk








Revision 189009
Author mark@apple.com
Date 2015-08-26 19:49:52 -0700 (Wed, 26 Aug 2015)


Log Message
watchdog m_didFire state erroneously retained.
https://bugs.webkit.org/show_bug.cgi?id=131082

Reviewed by Geoffrey Garen.

Source/_javascript_Core:

The watchdog can fire for 2 reasons:
1. an external controlling entity (i.e. another thread) has scheduled termination
   of the script thread via watchdog::terminateSoon().
2. the allowed CPU time has expired.

For case 1, we're doing away with the m_didFire flag.  Watchdog::terminateSoon() 
will set the timer deadlines and m_timeLimit to 0, and m_timerDidFire to true.
This will get the script thread to check Watchdog::didFire() and terminate
execution.

Note: the watchdog only guarantees that script execution will terminate as soon
as possible due to a time limit of 0.  Once we've exited the VM, the client of the
VM is responsible from keeping a flag to prevent new script execution.

In a race condition, if terminateSoon() is called just after execution has gotten
past the client's reentry check and the client is in the process of re-entering,
the worst that can happen is that we will schedule the watchdog timer to fire
after a period of 0.  This will terminate script execution quickly, and thereafter
the client's check should be able to prevent further entry into the VM.

The correctness (i.e. has no race condition) of this type of termination relies
on the termination state being sticky.  Once the script thread is terminated this
way, the VM will continue to terminate scripts quickly until the client sets the
time limit to a non-zero value (or clears it which sets the time limit to
noTimeLimit).

For case 2, the watchdog does not alter m_timeLimit.  If the CPU deadline has
been reached, the script thread will terminate execution and exit the VM.

If the client of the VM starts new script execution, the watchdog will allow
execution for the specified m_timeLimit.  In this case, since m_timeLimit is not
0, the script gets a fresh allowance of CPU time to execute.  Hence, terminations
due to watchdog time outs are no longer sticky.

* API/JSContextRef.cpp:
(JSContextGroupSetExecutionTimeLimit):
(JSContextGroupClearExecutionTimeLimit):
* API/tests/ExecutionTimeLimitTest.cpp:
- Add test scenarios to verify that the watchdog is automatically reset by the VM
  upon throwing the TerminatedExecutionException.

(testResetAfterTimeout):
(testExecutionTimeLimit):
* _javascript_Core.vcxproj/_javascript_Core.vcxproj:
* _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters:
* _javascript_Core.xcodeproj/project.pbxproj:
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseBlock):
* interpreter/Interpreter.cpp:
(JSC::Interpreter::execute):
(JSC::Interpreter::executeCall):
(JSC::Interpreter::executeConstruct):
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_loop_hint):
(JSC::JIT::emitSlow_op_loop_hint):
* jit/JITOperations.cpp:
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
* runtime/VM.cpp:
(JSC::VM::VM):
(JSC::VM::ensureWatchdog):
* runtime/VM.h:
* runtime/VMInlines.h: Added.
(JSC::VM::shouldTriggerTermination):
* runtime/Watchdog.cpp:
(JSC::Watchdog::Watchdog):
(JSC::Watchdog::setTimeLimit):
(JSC::Watchdog::terminateSoon):
(JSC::Watchdog::didFireSlow):
(JSC::Watchdog::hasTimeLimit):
(JSC::Watchdog::enteredVM):
(JSC::Watchdog::exitedVM):
(JSC::Watchdog::startTimer):
(JSC::Watchdog::stopTimer):
(JSC::Watchdog::hasStartedTimer): Deleted.
(JSC::Watchdog::fire): Deleted.
* runtime/Watchdog.h:
(JSC::Watchdog::didFire):
(JSC::Watchdog::timerDidFireAddress):

Source/WebCore:

No new tests.  The new code is covered by the JSC API tests and an existing test:
fast/workers/worker-terminate-forever.html

* bindings/js/JSEventListener.cpp:
(WebCore::JSEventListener::handleEvent):
* bindings/js/WorkerScriptController.cpp:
(WebCore::WorkerScriptController::WorkerScriptController):
- Always create a watchdog for the Web Worker's VM.  We need this in order to support
  Worker.terminate().
(WebCore::WorkerScriptController::evaluate):
(WebCore::WorkerScriptController::scheduleExecutionTermination):
(WebCore::WorkerScriptController::isTerminatingExecution):
(WebCore::WorkerScriptController::forbidExecution):
(WebCore::WorkerScriptController::isExecutionTerminating): Deleted.
* bindings/js/WorkerScriptController.h:

LayoutTests:

* fast/workers/worker-terminate-forever-expected.txt:
* fast/workers/worker-terminate-forever.html:
- Updated to check if the worker actually did terminate. 

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/workers/worker-terminate-forever-expected.txt
trunk/LayoutTests/fast/workers/worker-terminate-forever.html
trunk/Source/_javascript_Core/API/JSContextRef.cpp
trunk/Source/_javascript_Core/API/tests/ExecutionTimeLimitTest.cpp
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj

[webkit-changes] [189011] trunk/Source/WebInspectorUI

2015-08-26 Thread nvasilyev

Title: [189011] trunk/Source/WebInspectorUI








Revision 189011
Author nvasil...@apple.com
Date 2015-08-26 21:40:50 -0700 (Wed, 26 Aug 2015)


Log Message
Web Inspector: [Regression] [Mavericks]: Undocked Web Inspector toolbar is two different colors and has extra space
https://bugs.webkit.org/show_bug.cgi?id=148510

Make body element transparent and remove extra padding above the toolbar only for OS X Mavericks.

Reviewed by Timothy Hatcher.

* UserInterface/Base/Main.js:
(WebInspector.contentLoaded):
* UserInterface/Views/Main.css:
(body:not(.mavericks)):
(body): Deleted.
* UserInterface/Views/Toolbar.css:
(body:not(.mavericks) .toolbar):
(body.window-inactive:not(.mavericks) .toolbar):
(body.mac-platform:not(.docked, .mavericks) .toolbar):
(.toolbar): Deleted.
(body.window-inactive .toolbar): Deleted.
(body.mac-platform:not(.docked) .toolbar): Deleted.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Base/Main.js
trunk/Source/WebInspectorUI/UserInterface/Views/Main.css
trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (189010 => 189011)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-08-27 03:32:12 UTC (rev 189010)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-08-27 04:40:50 UTC (rev 189011)
@@ -1,3 +1,25 @@
+2015-08-26  Nikita Vasilyev  nvasil...@apple.com
+
+Web Inspector: [Regression] [Mavericks]: Undocked Web Inspector toolbar is two different colors and has extra space
+https://bugs.webkit.org/show_bug.cgi?id=148510
+
+Make body element transparent and remove extra padding above the toolbar only for OS X Mavericks.
+
+Reviewed by Timothy Hatcher.
+
+* UserInterface/Base/Main.js:
+(WebInspector.contentLoaded):
+* UserInterface/Views/Main.css:
+(body:not(.mavericks)):
+(body): Deleted.
+* UserInterface/Views/Toolbar.css:
+(body:not(.mavericks) .toolbar):
+(body.window-inactive:not(.mavericks) .toolbar):
+(body.mac-platform:not(.docked, .mavericks) .toolbar):
+(.toolbar): Deleted.
+(body.window-inactive .toolbar): Deleted.
+(body.mac-platform:not(.docked) .toolbar): Deleted.
+
 2015-08-26  Joseph Pecoraro  pecor...@apple.com
 
 Web Inspector: Uncaught exception in CSS Completion - TypeError: undefined is not an object (evaluating 'this._values[middleIndex].startsWith')


Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (189010 => 189011)

--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js	2015-08-27 03:32:12 UTC (rev 189010)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js	2015-08-27 04:40:50 UTC (rev 189011)
@@ -195,6 +195,8 @@
 document.body.classList.add(nightly-build);
 
 if (WebInspector.Platform.name === mac) {
+document.body.classList.add(WebInspector.Platform.version.name);
+
 if (WebInspector.Platform.version.release = 11)
 document.body.classList.add(latest-mac);
 else


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Main.css (189010 => 189011)

--- trunk/Source/WebInspectorUI/UserInterface/Views/Main.css	2015-08-27 03:32:12 UTC (rev 189010)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Main.css	2015-08-27 04:40:50 UTC (rev 189011)
@@ -34,8 +34,6 @@
 font-family: -apple-system, sans-serif;
 font-size: 11px;
 
-background-color: white;
-
 position: absolute;
 top: 0;
 left: 0;
@@ -57,6 +55,10 @@
 tab-size: 4; /* FIXME: This should be controlled by a setting. rdar://problem/10593948 */
 }
 
+body:not(.mavericks) {
+background-color: white;
+}
+
 body.docked.bottom {
 border-top: 1px solid hsl(0, 0%, 78%);
 }


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css (189010 => 189011)

--- trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css	2015-08-27 03:32:12 UTC (rev 189010)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css	2015-08-27 04:40:50 UTC (rev 189011)
@@ -29,9 +29,6 @@
 white-space: nowrap;
 overflow: hidden;
 
-background-image: linear-gradient(to bottom, hsl(0, 0%, 92%), hsl(0, 0%, 87%));
-box-shadow: inset hsla(0, 0%, 100%, 0.5) 0 1px 1px;
-
 outline: none;
 
 padding-top: 3px;
@@ -39,12 +36,17 @@
 height: 36px;
 }
 
-body.window-inactive .toolbar {
+body:not(.mavericks) .toolbar {
+background-image: linear-gradient(to bottom, hsl(0, 0%, 92%), hsl(0, 0%, 87%));
+box-shadow: inset hsla(0, 0%, 100%, 0.5) 0 1px 1px;
+}
+
+body.window-inactive:not(.mavericks) .toolbar {
 background-image: none;
 background-color: hsl(0, 0%, 96%);
 }
 
-body.mac-platform:not(.docked) .toolbar {
+body.mac-platform:not(.docked, .mavericks) .toolbar {
 padding-top: 21px;
 height: 54px;
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org

59 matches

Mail list logo