[webkit-changes] [151009] trunk
Title: [151009] trunk Revision 151009 Author eus...@chromium.org Date 2013-05-30 22:14:45 -0700 (Thu, 30 May 2013) Log Message selectionStart/selectionEnd return "obsolete" values when requested during "input" event https://bugs.webkit.org/show_bug.cgi?id=110742 Reviewed by Ryosuke Niwa. Source/WebCore: This patch defers firing "webkitEditableContentChanged" until new selection is applied to control. This makes selection during "input" more consistent and reliable. Background: "input" event is fired by "webkitEditableContentChanged" dispatcher. But "input" is scoped event, so under some conditions its dispatching may be deferred. When "input" dispatching is deferred, dispatcher observes updated selectionStart and selectionEnd. Otherwise values repersent state before applying editing command. So, to make selectionStart/End to be more predictable and useful, we need either always dispatch "input" before selection is updated, or always dispatch "input" after selection is updated. As it was mentioned, dispatching could be deferred by scoping. So dispatching before updating selection couldn't be guaranteed. Moreover, it will be hard to calculate updated selection in user code. On the other side - old selection could be easily tracked. So, it looks logically that we should guarantee dispatching "input" after updating selection. There are no execution paths in "webkitEditableContentChanged" dispatched that depends on current selection. So it is safe to fire this event after selection is updated. Test: editing/selection/caret-after-keypress.html * editing/Editor.cpp: Dispatch "input" event after new selection in applied. LayoutTests: Test that cursor is up-to-date during "input" event. * editing/selection/caret-after-keypress-expected.txt: Added. * editing/selection/caret-after-keypress.html: Added. * platform/mac-wk2/TestExpectations: Exclude new test. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/mac-wk2/TestExpectations trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/editing/Editor.cpp Added Paths trunk/LayoutTests/editing/selection/caret-after-keypress-expected.txt trunk/LayoutTests/editing/selection/caret-after-keypress.html Diff Modified: trunk/LayoutTests/ChangeLog (151008 => 151009) --- trunk/LayoutTests/ChangeLog 2013-05-31 04:53:34 UTC (rev 151008) +++ trunk/LayoutTests/ChangeLog 2013-05-31 05:14:45 UTC (rev 151009) @@ -1,3 +1,16 @@ +2013-05-30 Eugene Klyuchnikov + +selectionStart/selectionEnd return "obsolete" values when requested during "input" event +https://bugs.webkit.org/show_bug.cgi?id=110742 + +Reviewed by Ryosuke Niwa. + +Test that cursor is up-to-date during "input" event. + +* editing/selection/caret-after-keypress-expected.txt: Added. +* editing/selection/caret-after-keypress.html: Added. +* platform/mac-wk2/TestExpectations: Exclude new test. + 2013-05-30 Gyuyoung Kim Unreviewed, EFL gardening. Added: trunk/LayoutTests/editing/selection/caret-after-keypress-expected.txt (0 => 151009) --- trunk/LayoutTests/editing/selection/caret-after-keypress-expected.txt (rev 0) +++ trunk/LayoutTests/editing/selection/caret-after-keypress-expected.txt 2013-05-31 05:14:45 UTC (rev 151009) @@ -0,0 +1,37 @@ +This tests that 'input' event listener gets correct caret position after keypress. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +PASS test.value is "" +PASS test.selectionStart is 0 +PASS test.selectionEnd is 0 + +PASS test.value is "a" +PASS test.selectionStart is 1 +PASS test.selectionEnd is 1 + +PASS test.value is "ab" +PASS test.selectionStart is 2 +PASS test.selectionEnd is 2 + +PASS test.value is "abc" +PASS test.selectionStart is 3 +PASS test.selectionEnd is 3 + +PASS test.value is "ab" +PASS test.selectionStart is 2 +PASS test.selectionEnd is 2 + +PASS test.value is "a" +PASS test.selectionStart is 1 +PASS test.selectionEnd is 1 + +PASS test.value is "" +PASS test.selectionStart is 0 +PASS test.selectionEnd is 0 + +PASS successfullyParsed is true + +TEST COMPLETE + Added: trunk/LayoutTests/editing/selection/caret-after-keypress.html (0 => 151009) --- trunk/LayoutTests/editing/selection/caret-after-keypress.html (rev 0) +++ trunk/LayoutTests/editing/selection/caret-after-keypress.html 2013-05-31 05:14:45 UTC (rev 151009) @@ -0,0 +1,30 @@ + + + + +description("This tests that 'input' event listener gets correct caret position after keypress."); + +var test = document.createElement("input"); +document.body.appendChild(test); +test.focus(); + +const backSpace = String.fromCharCode(8); +var input = ["a", "b", "c", backSpace, backSpace, backSpace]; +var output = ["", "a", "ab", "abc", "ab", "a", ""]; + +function step() { +var expectedValue = output.shift(); +shouldBeEqualToString("test.value", expectedValue); +shouldBe("test.selectionStart", "" + expectedValue.
[webkit-changes] [151008] branches/safari-537.43-branch/Source
Title: [151008] branches/safari-537.43-branch/Source Revision 151008 Author lforsch...@apple.com Date 2013-05-30 21:53:34 -0700 (Thu, 30 May 2013) Log Message Versioning. Modified Paths branches/safari-537.43-branch/Source/_javascript_Core/Configurations/Version.xcconfig branches/safari-537.43-branch/Source/WebCore/Configurations/Version.xcconfig branches/safari-537.43-branch/Source/WebKit/mac/Configurations/Version.xcconfig branches/safari-537.43-branch/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: branches/safari-537.43-branch/Source/_javascript_Core/Configurations/Version.xcconfig (151007 => 151008) --- branches/safari-537.43-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2013-05-31 04:51:13 UTC (rev 151007) +++ branches/safari-537.43-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2013-05-31 04:53:34 UTC (rev 151008) @@ -23,7 +23,7 @@ MAJOR_VERSION = 537; MINOR_VERSION = 43; -TINY_VERSION = 5; +TINY_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-537.43-branch/Source/WebCore/Configurations/Version.xcconfig (151007 => 151008) --- branches/safari-537.43-branch/Source/WebCore/Configurations/Version.xcconfig 2013-05-31 04:51:13 UTC (rev 151007) +++ branches/safari-537.43-branch/Source/WebCore/Configurations/Version.xcconfig 2013-05-31 04:53:34 UTC (rev 151008) @@ -23,7 +23,7 @@ MAJOR_VERSION = 537; MINOR_VERSION = 43; -TINY_VERSION = 5; +TINY_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-537.43-branch/Source/WebKit/mac/Configurations/Version.xcconfig (151007 => 151008) --- branches/safari-537.43-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2013-05-31 04:51:13 UTC (rev 151007) +++ branches/safari-537.43-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2013-05-31 04:53:34 UTC (rev 151008) @@ -23,7 +23,7 @@ MAJOR_VERSION = 537; MINOR_VERSION = 43; -TINY_VERSION = 5; +TINY_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-537.43-branch/Source/WebKit2/Configurations/Version.xcconfig (151007 => 151008) --- branches/safari-537.43-branch/Source/WebKit2/Configurations/Version.xcconfig 2013-05-31 04:51:13 UTC (rev 151007) +++ branches/safari-537.43-branch/Source/WebKit2/Configurations/Version.xcconfig 2013-05-31 04:53:34 UTC (rev 151008) @@ -23,7 +23,7 @@ MAJOR_VERSION = 537; MINOR_VERSION = 43; -TINY_VERSION = 5; +TINY_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [151007] tags/Safari-537.43.5/
Title: [151007] tags/Safari-537.43.5/ Revision 151007 Author lforsch...@apple.com Date 2013-05-30 21:51:13 -0700 (Thu, 30 May 2013) Log Message New Tag. Added Paths tags/Safari-537.43.5/ Diff Property changes: tags/Safari-537.43.5 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] [151005] trunk/Tools
Title: [151005] trunk/Tools Revision 151005 Author bfulg...@apple.com Date 2013-05-30 20:59:58 -0700 (Thu, 30 May 2013) Log Message [Windows] Unreviewed build correction. * Scripts/webkitpy/port/win.py: (WinPort.create_debugger_command_file): The directory needs to be a string, not a temporary directory object. Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/port/win.py Diff Modified: trunk/Tools/ChangeLog (151004 => 151005) --- trunk/Tools/ChangeLog 2013-05-31 03:31:18 UTC (rev 151004) +++ trunk/Tools/ChangeLog 2013-05-31 03:59:58 UTC (rev 151005) @@ -1,5 +1,13 @@ 2013-05-30 Brent Fulgham +[Windows] Unreviewed build correction. + +* Scripts/webkitpy/port/win.py: +(WinPort.create_debugger_command_file): The directory needs to be +a string, not a temporary directory object. + +2013-05-30 Brent Fulgham + [Windows] NRWT doesn't save crash logs on Apple's Windows port. https://bugs.webkit.org/show_bug.cgi?id=76935 Modified: trunk/Tools/Scripts/webkitpy/port/win.py (151004 => 151005) --- trunk/Tools/Scripts/webkitpy/port/win.py 2013-05-31 03:31:18 UTC (rev 151004) +++ trunk/Tools/Scripts/webkitpy/port/win.py 2013-05-31 03:59:58 UTC (rev 151005) @@ -146,7 +146,7 @@ return None def create_debugger_command_file(self): -debugger_temp_directory = self._filesystem.mkdtemp() +debugger_temp_directory = str(self._filesystem.mkdtemp()) command_file = self._filesystem.join(debugger_temp_directory, "debugger-commands.txt") self._filesystem.write_text_file(command_file, '.logopen /t "%s\\%s.txt"\n' % (cygpath(self.results_directory()), self.CRASH_LOG_PREFIX)) self._filesystem.write_text_file(command_file, '.srcpath "%s"\n' % cygpath(self._webkit_finder.webkit_base())) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [151004] trunk/Tools
Title: [151004] trunk/Tools Revision 151004 Author bfulg...@apple.com Date 2013-05-30 20:31:18 -0700 (Thu, 30 May 2013) Log Message [Windows] NRWT doesn't save crash logs on Apple's Windows port. https://bugs.webkit.org/show_bug.cgi?id=76935 Reviewed by Ryosuke Niwa. Extend the WinPort class with commands to set and clean up various registry values needed to invoke the correct debugger to get crash files. * Scripts/webkitpy/port/win.py: (WinPort): Added global caches for registry keys and settings (WinPort._ntsd_location): Added (WinPort.create_debugger_command_file): Added (WinPort.read_registry_string): Added (WinPort.write_registry_string): Added (WinPort.setup_crash_log_saving): Added (WinPort.restore_crash_log_saving): Added (WinPort.setup_test_run): Added overload to add registry settings. (WinPort.clean_up_test_run): Added overload to clean up registry settings. Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/port/win.py Diff Modified: trunk/Tools/ChangeLog (151003 => 151004) --- trunk/Tools/ChangeLog 2013-05-31 02:32:03 UTC (rev 151003) +++ trunk/Tools/ChangeLog 2013-05-31 03:31:18 UTC (rev 151004) @@ -1,3 +1,24 @@ +2013-05-30 Brent Fulgham + +[Windows] NRWT doesn't save crash logs on Apple's Windows port. +https://bugs.webkit.org/show_bug.cgi?id=76935 + +Reviewed by Ryosuke Niwa. + +Extend the WinPort class with commands to set and clean up various registry +values needed to invoke the correct debugger to get crash files. + +* Scripts/webkitpy/port/win.py: +(WinPort): Added global caches for registry keys and settings +(WinPort._ntsd_location): Added +(WinPort.create_debugger_command_file): Added +(WinPort.read_registry_string): Added +(WinPort.write_registry_string): Added +(WinPort.setup_crash_log_saving): Added +(WinPort.restore_crash_log_saving): Added +(WinPort.setup_test_run): Added overload to add registry settings. +(WinPort.clean_up_test_run): Added overload to clean up registry settings. + 2013-05-30 Roger Fong Get rid of _javascript_ exports file on AppleWin port. Modified: trunk/Tools/Scripts/webkitpy/port/win.py (151003 => 151004) --- trunk/Tools/Scripts/webkitpy/port/win.py 2013-05-31 02:32:03 UTC (rev 151003) +++ trunk/Tools/Scripts/webkitpy/port/win.py 2013-05-31 03:31:18 UTC (rev 151004) @@ -1,4 +1,5 @@ # Copyright (C) 2010 Google Inc. All rights reserved. +# Copyright (C) 2013 Apple Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -26,6 +27,8 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import atexit +import os import logging import re import sys @@ -46,6 +49,12 @@ ARCHITECTURES = ['x86'] +CRASH_LOG_PREFIX = "CrashLog" + +POST_MORTEM_DEBUGGER_KEY = "/HKLM/SOFTWARE/Microsoft/Windows NT/CurrentVersion/AeDebug/%s" + +previous_debugger_values = {} + def do_text_results_differ(self, expected_text, actual_text): # Sanity was restored in WK2, so we don't need this hack there. if self.get_option('webkit_test_runner'): @@ -122,3 +131,89 @@ def test_search_path(self): test_fallback_names = [path for path in self.baseline_search_path() if not path.startswith(self._webkit_baseline_path('mac'))] return map(self._webkit_baseline_path, test_fallback_names) + +def _ntsd_location(self): +possible_paths = [self._filesystem.join(os.environ['PROGRAMFILES'], "Windows Kits", "8.0", "Debuggers", "x86", "ntsd.exe"), +self._filesystem.join(os.environ['PROGRAMFILES'], "Windows Kits", "8.0", "Debuggers", "x64", "ntsd.exe"), +self._filesystem.join(os.environ['PROGRAMFILES'], "Debugging Tools for Windows (x86)", "ntsd.exe"), +self._filesystem.join(os.environ['ProgramW6432'], "Debugging Tools for Windows (x64)", "ntsd.exe"), +self._filesystem.join(os.environ['SYSTEMROOT'], "system32", "ntsd.exe")] +for path in possible_paths: +expanded_path = self._filesystem.expanduser(path) +if self._filesystem.exists(expanded_path): +_log.debug("Using ntsd located in '%s'" % path) +return expanded_path +return None + +def create_debugger_command_file(self): +debugger_temp_directory = self._filesystem.mkdtemp() +command_file = self._filesystem.join(debugger_temp_directory, "debugger-commands.txt") +self._filesystem.write_text_file(command_file, '.logopen /t "%s\\%s.txt"\n' % (cygpath(self.results_directory()), self.CRASH_LOG_PREFIX)) +self._filesystem.write_text_file(command_file, '.srcpath "%s"\n' % cygpath(self._webkit_finder.webkit_base())) +self._filesystem.write_text_file
[webkit-changes] [151003] trunk/Source/WebCore
Title: [151003] trunk/Source/WebCore Revision 151003 Author commit-qu...@webkit.org Date 2013-05-30 19:32:03 -0700 (Thu, 30 May 2013) Log Message WebKit's Enter Full Screen for elements isn't working https://bugs.webkit.org/show_bug.cgi?id=117001 Patch by Ruth Fong on 2013-05-30 Reviewed by Jer Noble. Fix workflow to allow a video to enter into full screen mode from a kWKContextMenuItemTagEnterVideoFullscreen context menu item by denoting the enterFullscreenForVideo call as a user gesture, so Document::requestFullScreenForElement will execute correctly. No new tests. Covered by media/context-menu-actions.html, which is disabled due to bug #116651. * rendering/HitTestResult.cpp: (WebCore::HitTestResult::enterFullscreenForVideo): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/HitTestResult.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (151002 => 151003) --- trunk/Source/WebCore/ChangeLog 2013-05-31 02:30:06 UTC (rev 151002) +++ trunk/Source/WebCore/ChangeLog 2013-05-31 02:32:03 UTC (rev 151003) @@ -1,3 +1,22 @@ +2013-05-30 Ruth Fong + +WebKit's Enter Full Screen for elements isn't working +https://bugs.webkit.org/show_bug.cgi?id=117001 + +Reviewed by Jer Noble. + +Fix workflow to allow a video to enter into full screen +mode from a kWKContextMenuItemTagEnterVideoFullscreen +context menu item by denoting the enterFullscreenForVideo +call as a user gesture, so Document::requestFullScreenForElement +will execute correctly. + +No new tests. Covered by media/context-menu-actions.html, +which is disabled due to bug #116651. + +* rendering/HitTestResult.cpp: +(WebCore::HitTestResult::enterFullscreenForVideo): + 2013-05-30 Rafael Brandao Fix double hash lookup in RenderTableSection::paintObject loop Modified: trunk/Source/WebCore/rendering/HitTestResult.cpp (151002 => 151003) --- trunk/Source/WebCore/rendering/HitTestResult.cpp 2013-05-31 02:30:06 UTC (rev 151002) +++ trunk/Source/WebCore/rendering/HitTestResult.cpp 2013-05-31 02:32:03 UTC (rev 151003) @@ -41,6 +41,7 @@ #include "RenderImage.h" #include "RenderInline.h" #include "Scrollbar.h" +#include "UserGestureIndicator.h" #if ENABLE(SVG) #include "SVGNames.h" @@ -404,8 +405,10 @@ HTMLMediaElement* mediaElt(mediaElement()); if (mediaElt && mediaElt->hasTagName(HTMLNames::videoTag)) { HTMLVideoElement* videoElt = static_cast(mediaElt); -if (!videoElt->isFullscreen() && mediaElt->supportsFullscreen()) +if (!videoElt->isFullscreen() && mediaElt->supportsFullscreen()) { +UserGestureIndicator indicator(DefinitelyProcessingNewUserGesture); videoElt->enterFullscreen(); +} } #endif } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [151001] trunk/Source/WebKit2
Title: [151001] trunk/Source/WebKit2 Revision 151001 Author timothy_hor...@apple.com Date 2013-05-30 19:05:52 -0700 (Thu, 30 May 2013) Log Message It's easy to hit ASSERT_NOT_REACHED in WKDOMNodeClass https://bugs.webkit.org/show_bug.cgi?id=117051 Reviewed by Anders Carlsson. Re-add the ASSERT_NOT_REACHED, and return [WKDOMNode class] in the case where we don't have a specific subclass. * WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm: (WebKit::WKDOMNodeClass): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (151000 => 151001) --- trunk/Source/WebKit2/ChangeLog 2013-05-31 01:52:47 UTC (rev 151000) +++ trunk/Source/WebKit2/ChangeLog 2013-05-31 02:05:52 UTC (rev 151001) @@ -1,5 +1,18 @@ 2013-05-30 Tim Horton +It's easy to hit ASSERT_NOT_REACHED in WKDOMNodeClass +https://bugs.webkit.org/show_bug.cgi?id=117051 + +Reviewed by Anders Carlsson. + +Re-add the ASSERT_NOT_REACHED, and return [WKDOMNode class] in the case +where we don't have a specific subclass. + +* WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm: +(WebKit::WKDOMNodeClass): + +2013-05-30 Tim Horton + Remove ASSERT_NOT_REACHED from WKDOMNodeClass https://bugs.webkit.org/show_bug.cgi?id=117051 Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm (151000 => 151001) --- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm 2013-05-31 01:52:47 UTC (rev 151000) +++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm 2013-05-31 02:05:52 UTC (rev 151001) @@ -82,8 +82,9 @@ case WebCore::Node::DOCUMENT_FRAGMENT_NODE: case WebCore::Node::NOTATION_NODE: case WebCore::Node::XPATH_NAMESPACE_NODE: -break; +return [WKDOMNode class]; } +ASSERT_NOT_REACHED(); return nil; } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [151000] trunk/LayoutTests
Title: [151000] trunk/LayoutTests Revision 151000 Author barraclo...@apple.com Date 2013-05-30 18:52:47 -0700 (Thu, 30 May 2013) Log Message fast/js/date-DST-time-cusps.html fails after http://trac.webkit.org/changeset/150833 https://bugs.webkit.org/show_bug.cgi?id=116895 Safari incorrectly handles times that shouldn't exist https://bugs.webkit.org/show_bug.cgi?id=11157 Reviewed by Alexey Proskuryakov. Accidental progression, updating results to expect success. * TestExpectations: - Remove expectations of failure. * fast/js/script-tests/date-DST-time-cusps.js: - Prefer the latter option for non-existent time (due to clock rolling forward). Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/TestExpectations trunk/LayoutTests/fast/js/script-tests/date-DST-time-cusps.js Diff Modified: trunk/LayoutTests/ChangeLog (150999 => 151000) --- trunk/LayoutTests/ChangeLog 2013-05-31 01:52:39 UTC (rev 150999) +++ trunk/LayoutTests/ChangeLog 2013-05-31 01:52:47 UTC (rev 151000) @@ -1,3 +1,19 @@ +2013-05-28 Gavin Barraclough + +fast/js/date-DST-time-cusps.html fails after http://trac.webkit.org/changeset/150833 +https://bugs.webkit.org/show_bug.cgi?id=116895 + Safari incorrectly handles times that shouldn't exist +https://bugs.webkit.org/show_bug.cgi?id=11157 + +Reviewed by Alexey Proskuryakov. + +Accidental progression, updating results to expect success. + +* TestExpectations: +- Remove expectations of failure. +* fast/js/script-tests/date-DST-time-cusps.js: +- Prefer the latter option for non-existent time (due to clock rolling forward). + 2013-05-30 Tim Horton fast/dom/location-new-window-no-crash.html times out flakily on mac-wk2 Modified: trunk/LayoutTests/TestExpectations (150999 => 151000) --- trunk/LayoutTests/TestExpectations 2013-05-31 01:52:39 UTC (rev 150999) +++ trunk/LayoutTests/TestExpectations 2013-05-31 01:52:47 UTC (rev 151000) @@ -15,6 +15,3 @@ # media/W3C/video/networkState/networkState_during_progress.html is flaky webkit.org/b/76280 media/W3C/video/networkState/networkState_during_progress.html [ Pass Failure ] - -# fast/js/date-DST-time-cusps.html fails after http://trac.webkit.org/changeset/150833 -webkit.org/b/116895 fast/js/date-DST-time-cusps.html [ Failure ] Modified: trunk/LayoutTests/fast/js/script-tests/date-DST-time-cusps.js (150999 => 151000) --- trunk/LayoutTests/fast/js/script-tests/date-DST-time-cusps.js 2013-05-31 01:52:39 UTC (rev 150999) +++ trunk/LayoutTests/fast/js/script-tests/date-DST-time-cusps.js 2013-05-31 01:52:47 UTC (rev 151000) @@ -3,17 +3,13 @@ ); description( -"For times that shouldn't happen we currently go back an hour, but in reality we would like to go forward an hour. This has been filed as a radar: 4777813" +"For times that happen twice the behavior of all major browsers seems to be to pick the second occurrance, i.e. Standard Time not Daylight Time" ); -description( -"For times that happen twice the behavior of all major browsers seems to be to pick the second occurance, i.e. Standard Time not Daylight Time" -); - var testCases = []; if ((new Date(2009, 9, 1)).toString().match("PDT")) { -testCases.push(["(new Date(1982, 2, 14, 2, 10)).getHours()", "1"]); -testCases.push(["(new Date(1982, 2, 14, 2)).getHours()", "1"]); +testCases.push(["(new Date(1982, 2, 14, 2, 10)).getHours()", "3"]); +testCases.push(["(new Date(1982, 2, 14, 2)).getHours()", "3"]); testCases.push(["(new Date(1982, 11, 7, 1, 10)).getTimezoneOffset()", "480"]); testCases.push(["(new Date(1982, 11, 7, 1)).getTimezoneOffset()", "480"]); } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150999] trunk/Source/WTF
Title: [150999] trunk/Source/WTF Revision 150999 Author roger_f...@apple.com Date 2013-05-30 18:52:39 -0700 (Thu, 30 May 2013) Log Message Another unreviewed speculative build fix for Mac. * wtf/text/WTFString.h: (WTF::String::fromUTF8WithLatin1Fallback): Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/text/WTFString.h Diff Modified: trunk/Source/WTF/ChangeLog (150998 => 150999) --- trunk/Source/WTF/ChangeLog 2013-05-31 01:46:19 UTC (rev 150998) +++ trunk/Source/WTF/ChangeLog 2013-05-31 01:52:39 UTC (rev 150999) @@ -1,5 +1,12 @@ 2013-05-30 Roger Fong +Another unreviewed build fix for Mac. + +* wtf/text/WTFString.h: +(WTF::String::fromUTF8WithLatin1Fallback): + +2013-05-30 Roger Fong + Unreviewed build fix for Mac. * wtf/OSAllocator.h: Modified: trunk/Source/WTF/wtf/text/WTFString.h (150998 => 150999) --- trunk/Source/WTF/wtf/text/WTFString.h 2013-05-31 01:46:19 UTC (rev 150998) +++ trunk/Source/WTF/wtf/text/WTFString.h 2013-05-31 01:52:39 UTC (rev 150999) @@ -459,7 +459,7 @@ // Tries to convert the passed in string to UTF-8, but will fall back to Latin-1 if the string is not valid UTF-8. WTF_EXPORT_STRING_API static String fromUTF8WithLatin1Fallback(const LChar*, size_t); -WTF_EXPORT_STRING_API static String fromUTF8WithLatin1Fallback(const char* s, size_t length) { return fromUTF8WithLatin1Fallback(reinterpret_cast(s), length); }; +static String fromUTF8WithLatin1Fallback(const char* s, size_t length) { return fromUTF8WithLatin1Fallback(reinterpret_cast(s), length); }; // Determines the writing direction using the Unicode Bidi Algorithm rules P2 and P3. WTF::Unicode::Direction defaultWritingDirection(bool* hasStrongDirectionality = 0) const ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150998] trunk/Source/JavaScriptCore
Title: [150998] trunk/Source/_javascript_Core Revision 150998 Author dfar...@apple.com Date 2013-05-30 18:46:19 -0700 (Thu, 30 May 2013) Log Message Fix jscore-test when not using --sdk option with jsDriver.pl https://bugs.webkit.org/show_bug.cgi?id=116339 Reviewed by Joe Pecoraro. * tests/mozilla/jsDriver.pl: (execute_tests): With each test, the shell_command needs to be started from scratch. This fix will clear the shell_command and start over as before with the opt_arch option when not using --sdk with jsDriver.pl. Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/tests/mozilla/jsDriver.pl Diff Modified: trunk/Source/_javascript_Core/ChangeLog (150997 => 150998) --- trunk/Source/_javascript_Core/ChangeLog 2013-05-31 01:07:10 UTC (rev 150997) +++ trunk/Source/_javascript_Core/ChangeLog 2013-05-31 01:46:19 UTC (rev 150998) @@ -1,3 +1,17 @@ +2013-05-30 David Farler + +Fix jscore-test when not using --sdk option with jsDriver.pl +https://bugs.webkit.org/show_bug.cgi?id=116339 + +Reviewed by Joe Pecoraro. + +* tests/mozilla/jsDriver.pl: +(execute_tests): +With each test, the shell_command needs to be started from scratch. + +This fix will clear the shell_command and start over as before with +the opt_arch option when not using --sdk with jsDriver.pl. + 2013-05-30 Roger Fong Get rid of _javascript_ exports file on AppleWin port. Modified: trunk/Source/_javascript_Core/tests/mozilla/jsDriver.pl (150997 => 150998) --- trunk/Source/_javascript_Core/tests/mozilla/jsDriver.pl 2013-05-31 01:07:10 UTC (rev 150997) +++ trunk/Source/_javascript_Core/tests/mozilla/jsDriver.pl 2013-05-31 01:46:19 UTC (rev 150998) @@ -179,11 +179,11 @@ if ($last_suite ne $suite || $last_test_dir ne $test_dir) { if ($opt_sim_sdk) { chomp($shell_command = `xcrun -sdk $opt_sim_sdk -find sim`); -$shell_command .= " --adopt-pid "; +$shell_command .= " --adopt-pid $opt_arch "; +} else { +$shell_command = "$opt_arch "; } -$shell_command .= "$opt_arch "; - $shell_command .= &xp_path($engine_command) . " -s "; # FIXME: ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150997] trunk/Source/WTF
Title: [150997] trunk/Source/WTF Revision 150997 Author roger_f...@apple.com Date 2013-05-30 18:07:10 -0700 (Thu, 30 May 2013) Log Message Unreviewed build fix for Mac. * wtf/OSAllocator.h: * wtf/text/WTFString.h: (WTF::String::fromUTF8): Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/OSAllocator.h trunk/Source/WTF/wtf/text/WTFString.h Diff Modified: trunk/Source/WTF/ChangeLog (150996 => 150997) --- trunk/Source/WTF/ChangeLog 2013-05-31 00:53:31 UTC (rev 150996) +++ trunk/Source/WTF/ChangeLog 2013-05-31 01:07:10 UTC (rev 150997) @@ -1,5 +1,13 @@ 2013-05-30 Roger Fong +Unreviewed build fix for Mac. + +* wtf/OSAllocator.h: +* wtf/text/WTFString.h: +(WTF::String::fromUTF8): + +2013-05-30 Roger Fong + Get rid of _javascript_ exports file on AppleWin port. https://bugs.webkit.org/show_bug.cgi?id=117050. Modified: trunk/Source/WTF/wtf/OSAllocator.h (150996 => 150997) --- trunk/Source/WTF/wtf/OSAllocator.h 2013-05-31 00:53:31 UTC (rev 150996) +++ trunk/Source/WTF/wtf/OSAllocator.h 2013-05-31 01:07:10 UTC (rev 150997) @@ -57,13 +57,13 @@ // decommitAndRelease should be called on a region of VM allocated by a single reservation, // the memory must all currently be in a committed state. WTF_EXPORT_PRIVATE static void* reserveAndCommit(size_t, Usage = UnknownUsage, bool writable = true, bool executable = false, bool includesGuardPages = false); -WTF_EXPORT_PRIVATE static void decommitAndRelease(void* base, size_t size); +static void decommitAndRelease(void* base, size_t size); // These methods are akin to reserveAndCommit/decommitAndRelease, above - however rather than // committing/decommitting the entire region additional parameters allow a subregion to be // specified. WTF_EXPORT_PRIVATE static void* reserveAndCommit(size_t reserveSize, size_t commitSize, Usage = UnknownUsage, bool writable = true, bool executable = false); -WTF_EXPORT_PRIVATE static void decommitAndRelease(void* releaseBase, size_t releaseSize, void* decommitBase, size_t decommitSize); +static void decommitAndRelease(void* releaseBase, size_t releaseSize, void* decommitBase, size_t decommitSize); // Reallocate an existing, committed allocation. // The prior allocation must be fully comitted, and the new size will also be fully committed. Modified: trunk/Source/WTF/wtf/text/WTFString.h (150996 => 150997) --- trunk/Source/WTF/wtf/text/WTFString.h 2013-05-31 00:53:31 UTC (rev 150996) +++ trunk/Source/WTF/wtf/text/WTFString.h 2013-05-31 01:07:10 UTC (rev 150997) @@ -453,8 +453,8 @@ // the input data contains invalid UTF-8 sequences. WTF_EXPORT_STRING_API static String fromUTF8(const LChar*, size_t); WTF_EXPORT_STRING_API static String fromUTF8(const LChar*); -WTF_EXPORT_STRING_API static String fromUTF8(const char* s, size_t length) { return fromUTF8(reinterpret_cast(s), length); }; -WTF_EXPORT_STRING_API static String fromUTF8(const char* s) { return fromUTF8(reinterpret_cast(s)); }; +static String fromUTF8(const char* s, size_t length) { return fromUTF8(reinterpret_cast(s), length); }; +static String fromUTF8(const char* s) { return fromUTF8(reinterpret_cast(s)); }; WTF_EXPORT_STRING_API static String fromUTF8(const CString&); // Tries to convert the passed in string to UTF-8, but will fall back to Latin-1 if the string is not valid UTF-8. ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150996] trunk/Source/WebCore
Title: [150996] trunk/Source/WebCore Revision 150996 Author rafael.l...@openbossa.org Date 2013-05-30 17:53:31 -0700 (Thu, 30 May 2013) Log Message Fix double hash lookup in RenderTableSection::paintObject loop https://bugs.webkit.org/show_bug.cgi?id=117055 Reviewed by Antonio Gomes. * rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::paintObject): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/RenderTableSection.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (150995 => 150996) --- trunk/Source/WebCore/ChangeLog 2013-05-31 00:38:15 UTC (rev 150995) +++ trunk/Source/WebCore/ChangeLog 2013-05-31 00:53:31 UTC (rev 150996) @@ -1,5 +1,15 @@ 2013-05-30 Rafael Brandao +Fix double hash lookup in RenderTableSection::paintObject loop +https://bugs.webkit.org/show_bug.cgi?id=117055 + +Reviewed by Antonio Gomes. + +* rendering/RenderTableSection.cpp: +(WebCore::RenderTableSection::paintObject): + +2013-05-30 Rafael Brandao + Fix double hash lookup in WebSocket::connect loop https://bugs.webkit.org/show_bug.cgi?id=117052 Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (150995 => 150996) --- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2013-05-31 00:38:15 UTC (rev 150995) +++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2013-05-31 00:53:31 UTC (rev 150996) @@ -1173,9 +1173,8 @@ continue; if (current.cells[i]->rowSpan() > 1 || current.cells[i]->colSpan() > 1) { -if (spanningCells.contains(current.cells[i])) +if (!spanningCells.add(current.cells[i]).isNewEntry) continue; -spanningCells.add(current.cells[i]); } cells.append(current.cells[i]); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150994] trunk/Source/JavaScriptCore
Title: [150994] trunk/Source/_javascript_Core Revision 150994 Author dfar...@apple.com Date 2013-05-30 17:16:29 -0700 (Thu, 30 May 2013) Log Message Add --sdk option to jsDriver.pl to run with iOS Simulator https://bugs.webkit.org/show_bug.cgi?id=116339 Reviewed by David Kilzer. * tests/mozilla/jsDriver.pl: (execute_tests): Prefix shell command with the path to the "sim" tool. (parse_args): Add -d / --sdk option. (usage): Help message for -d / --sdk option. Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/tests/mozilla/jsDriver.pl Diff Modified: trunk/Source/_javascript_Core/ChangeLog (150993 => 150994) --- trunk/Source/_javascript_Core/ChangeLog 2013-05-30 23:29:55 UTC (rev 150993) +++ trunk/Source/_javascript_Core/ChangeLog 2013-05-31 00:16:29 UTC (rev 150994) @@ -1,3 +1,18 @@ +2013-05-22 David Farler + +Add --sdk option to jsDriver.pl to run with iOS Simulator +https://bugs.webkit.org/show_bug.cgi?id=116339 + +Reviewed by David Kilzer. + +* tests/mozilla/jsDriver.pl: +(execute_tests): +Prefix shell command with the path to the "sim" tool. +(parse_args): +Add -d / --sdk option. +(usage): +Help message for -d / --sdk option. + 2013-05-30 Julien Brianceau [sh4] Optimize NaN checks in LLINT for floating point comparisons. Modified: trunk/Source/_javascript_Core/tests/mozilla/jsDriver.pl (150993 => 150994) --- trunk/Source/_javascript_Core/tests/mozilla/jsDriver.pl 2013-05-30 23:29:55 UTC (rev 150993) +++ trunk/Source/_javascript_Core/tests/mozilla/jsDriver.pl 2013-05-31 00:16:29 UTC (rev 150994) @@ -65,9 +65,10 @@ my $opt_lxr_url = "./"; # "http://lxr.mozilla.org/mozilla/source/js/tests/"; my $opt_exit_munge = ($os_type ne "MAC") ? 1 : 0; my $opt_arch= ""; +my $opt_sim_sdk = ""; # command line option definition -my $options = "a=s arch>a b=s bugurl>b c=s classpath>c e=s engine>e f=s file>f " . +my $options = "a=s arch>a b=s bugurl>b c=s classpath>c d=s sdk>d e=s engine>e f=s file>f " . "h help>h i j=s javapath>j k confail>k l=s list>l L=s neglist>L " . "o=s opt>o p=s testpath>p s=s shellpath>s t trace>t u=s lxrurl>u " . "x noexitmunge>x"; @@ -148,7 +149,8 @@ sub execute_tests { my (@test_list) = @_; -my ($test, $shell_command, $line, @output, $path); +my ($test, $line, @output, $path); +my $shell_command = ""; my $file_param = " -f "; my ($last_suite, $last_test_dir); @@ -175,7 +177,12 @@ # (only check for their existance if the suite or test_dir has changed # since the last time we looked.) if ($last_suite ne $suite || $last_test_dir ne $test_dir) { -$shell_command = $opt_arch . " "; +if ($opt_sim_sdk) { +chomp($shell_command = `xcrun -sdk $opt_sim_sdk -find sim`); +$shell_command .= " --adopt-pid "; +} + +$shell_command .= "$opt_arch "; $shell_command .= &xp_path($engine_command) . " -s "; @@ -449,6 +456,11 @@ &dd ("opt: adding negative list '$value'."); push (@opt_neg_list_files, $value); +} elsif ($option eq "d") { +$option = 'd'; +&dd ("opt: using $value simulator SDK to run jsc."); +$opt_sim_sdk = $value; + } elsif ($option eq "o") { $opt_engine_params = $value; &dd ("opt: setting engine params to '$opt_engine_params'."); @@ -511,6 +523,7 @@ "(-b|--bugurl) Bugzilla URL.\n" . " (default is $opt_bug_url)\n" . "(-c|--classpath) Classpath (Rhino only.)\n" . + "(-d|--sdk)Use a simulator SDK to run jsc\n" . "(-e|--engine) ... Specify the type of engine(s) to test.\n" . " is one or more of\n" . " (squirrelfish|smopt|smdebug|lcopt|lcdebug|xpcshell|" . ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150993] branches/dfgFourthTier/Source/JavaScriptCore
Title: [150993] branches/dfgFourthTier/Source/_javascript_Core Revision 150993 Author fpi...@apple.com Date 2013-05-30 16:29:55 -0700 (Thu, 30 May 2013) Log Message fourthTier: LLInt shouldn't store an offset call PC during op_call-like calls https://bugs.webkit.org/show_bug.cgi?id=117048 Reviewed by Mark Hahnenberg. This just makes everything consistent in the LLInt: anytime any op calls out, it stores its PC and never the next op's PC. * bytecode/CodeBlock.cpp: (JSC::CodeBlock::dumpBytecode): (JSC::CodeBlock::linkIncomingCall): (JSC::CodeBlock::bytecodeOffset): * bytecode/CodeBlock.h: * bytecode/Opcode.h: (JSC::padOpcodeName): * bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::emitCallVarargs): * llint/LLIntExceptions.cpp: (JSC::LLInt::interpreterThrowInCaller): (JSC::LLInt::returnToThrow): (JSC::LLInt::callToThrow): * llint/LLIntSlowPaths.cpp: (JSC::LLInt::LLINT_SLOW_PATH_DECL): * llint/LowLevelInterpreter.asm: * llint/LowLevelInterpreter.cpp: (JSC::CLoop::execute): * llint/LowLevelInterpreter32_64.asm: * llint/LowLevelInterpreter64.asm: Modified Paths branches/dfgFourthTier/Source/_javascript_Core/ChangeLog branches/dfgFourthTier/Source/_javascript_Core/bytecode/CodeBlock.cpp branches/dfgFourthTier/Source/_javascript_Core/bytecode/CodeBlock.h branches/dfgFourthTier/Source/_javascript_Core/bytecode/Opcode.h branches/dfgFourthTier/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp branches/dfgFourthTier/Source/_javascript_Core/llint/LLIntExceptions.cpp branches/dfgFourthTier/Source/_javascript_Core/llint/LLIntSlowPaths.cpp branches/dfgFourthTier/Source/_javascript_Core/llint/LowLevelInterpreter.asm branches/dfgFourthTier/Source/_javascript_Core/llint/LowLevelInterpreter.cpp branches/dfgFourthTier/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm branches/dfgFourthTier/Source/_javascript_Core/llint/LowLevelInterpreter64.asm Diff Modified: branches/dfgFourthTier/Source/_javascript_Core/ChangeLog (150992 => 150993) --- branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-05-30 23:21:17 UTC (rev 150992) +++ branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-05-30 23:29:55 UTC (rev 150993) @@ -1,3 +1,34 @@ +2013-05-30 Filip Pizlo + +fourthTier: LLInt shouldn't store an offset call PC during op_call-like calls +https://bugs.webkit.org/show_bug.cgi?id=117048 + +Reviewed by Mark Hahnenberg. + +This just makes everything consistent in the LLInt: anytime any op calls out, +it stores its PC and never the next op's PC. + +* bytecode/CodeBlock.cpp: +(JSC::CodeBlock::dumpBytecode): +(JSC::CodeBlock::linkIncomingCall): +(JSC::CodeBlock::bytecodeOffset): +* bytecode/CodeBlock.h: +* bytecode/Opcode.h: +(JSC::padOpcodeName): +* bytecompiler/BytecodeGenerator.cpp: +(JSC::BytecodeGenerator::emitCallVarargs): +* llint/LLIntExceptions.cpp: +(JSC::LLInt::interpreterThrowInCaller): +(JSC::LLInt::returnToThrow): +(JSC::LLInt::callToThrow): +* llint/LLIntSlowPaths.cpp: +(JSC::LLInt::LLINT_SLOW_PATH_DECL): +* llint/LowLevelInterpreter.asm: +* llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): +* llint/LowLevelInterpreter32_64.asm: +* llint/LowLevelInterpreter64.asm: + 2013-05-28 Filip Pizlo fourthTier: FTL should support ArithAbs Modified: branches/dfgFourthTier/Source/_javascript_Core/bytecode/CodeBlock.cpp (150992 => 150993) --- branches/dfgFourthTier/Source/_javascript_Core/bytecode/CodeBlock.cpp 2013-05-30 23:21:17 UTC (rev 150992) +++ branches/dfgFourthTier/Source/_javascript_Core/bytecode/CodeBlock.cpp 2013-05-30 23:29:55 UTC (rev 150993) @@ -1294,6 +1294,7 @@ int thisValue = (++it)->u.operand; int arguments = (++it)->u.operand; int firstFreeRegister = (++it)->u.operand; +++it; out.printf("[%4d] call_varargs\t %s, %s, %s, %d", location, registerName(callee).data(), registerName(thisValue).data(), registerName(arguments).data(), firstFreeRegister); break; } @@ -2601,58 +2602,6 @@ noticeIncomingCall(callerFrame); m_incomingLLIntCalls.push(incoming); } - -Instruction* CodeBlock::adjustPCIfAtCallSite(Instruction* potentialReturnPC) -{ -ASSERT(potentialReturnPC); - -unsigned returnPCOffset = potentialReturnPC - instructions().begin(); -Instruction* adjustedPC; -unsigned opcodeLength; - -// If we are at a callsite, the LLInt stores the PC after the call -// instruction rather than the PC of the call instruction. This requires -// some correcting. If so, we can rely on the fact that the preceding -// instruction must be one of the call instructions, so either it's a -// call_varargs or it's a call, construct, or eval. -// -// If we are not at a call site, then we need to g
[webkit-changes] [150992] trunk/Source/JavaScriptCore
Title: [150992] trunk/Source/_javascript_Core Revision 150992 Author commit-qu...@webkit.org Date 2013-05-30 16:21:17 -0700 (Thu, 30 May 2013) Log Message [sh4] Optimize NaN checks in LLINT for floating point comparisons. https://bugs.webkit.org/show_bug.cgi?id=117049 Patch by Julien Brianceau on 2013-05-30 Reviewed by Oliver Hunt. Use the fcmp/eq opcode in sh4 LLINT to test if a double is NaN. This is more efficient, doesn't require two tmp registers and requires less code than current implementation (which converts double to float, then checks 'E = Emax + 1' and 'f != 0'). * offlineasm/sh4.rb: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/offlineasm/sh4.rb Diff Modified: trunk/Source/_javascript_Core/ChangeLog (150991 => 150992) --- trunk/Source/_javascript_Core/ChangeLog 2013-05-30 23:15:36 UTC (rev 150991) +++ trunk/Source/_javascript_Core/ChangeLog 2013-05-30 23:21:17 UTC (rev 150992) @@ -1,3 +1,17 @@ +2013-05-30 Julien Brianceau + +[sh4] Optimize NaN checks in LLINT for floating point comparisons. +https://bugs.webkit.org/show_bug.cgi?id=117049 + +Reviewed by Oliver Hunt. + +Use the fcmp/eq opcode in sh4 LLINT to test if a double is NaN. +This is more efficient, doesn't require two tmp registers and requires +less code than current implementation (which converts double to float, +then checks 'E = Emax + 1' and 'f != 0'). + +* offlineasm/sh4.rb: + 2013-05-30 Oliver Hunt JSCallbackObject does not correctly initialise the PropertySlot for getOwnPropertyDescriptor Modified: trunk/Source/_javascript_Core/offlineasm/sh4.rb (150991 => 150992) --- trunk/Source/_javascript_Core/offlineasm/sh4.rb 2013-05-30 23:15:36 UTC (rev 150991) +++ trunk/Source/_javascript_Core/offlineasm/sh4.rb 2013-05-30 23:21:17 UTC (rev 150992) @@ -320,21 +320,17 @@ case node.opcode when "bdltun", "bdgtun" # Handle specific floating point unordered opcodes. -tmp1 = Tmp.new(codeOrigin, :gpr) -tmp2 = Tmp.new(codeOrigin, :gpr) -newList << Instruction.new(codeOrigin, "bdnan", [node.operands[0], node.operands[2], tmp1, tmp2]) -newList << Instruction.new(codeOrigin, "bdnan", [node.operands[1], node.operands[2], tmp1, tmp2]) +newList << Instruction.new(codeOrigin, "bdnan", [node.operands[0], node.operands[2]]) +newList << Instruction.new(codeOrigin, "bdnan", [node.operands[1], node.operands[2]]) newList << Instruction.new(codeOrigin, node.opcode[0..-3], node.operands) when "bdnequn", "bdgtequn", "bdltequn" newList << Instruction.new(codeOrigin, node.opcode[0..-3], node.operands) when "bdneq", "bdgteq", "bdlteq" # Handle specific floating point ordered opcodes. -tmp1 = Tmp.new(codeOrigin, :gpr) -tmp2 = Tmp.new(codeOrigin, :gpr) outlabel = LocalLabel.unique("out_#{node.opcode}") outref = LocalLabelReference.new(codeOrigin, outlabel) -newList << Instruction.new(codeOrigin, "bdnan", [node.operands[0], outref, tmp1, tmp2]) -newList << Instruction.new(codeOrigin, "bdnan", [node.operands[1], outref, tmp1, tmp2]) +newList << Instruction.new(codeOrigin, "bdnan", [node.operands[0], outref]) +newList << Instruction.new(codeOrigin, "bdnan", [node.operands[1], outref]) newList << Instruction.new(codeOrigin, node.opcode, node.operands) newList << outlabel else @@ -544,40 +540,9 @@ end def emitSH4BranchIfNaN(operands) -raise "Invalid operands number (#{operands.size})" unless operands.size == 4 -dblop = operands[0] -labelop = operands[1] -scrmask = operands[2] -scrint = operands[3] - -notNaNlabel = LocalLabel.unique("notnan") -notNaNref = LocalLabelReference.new(codeOrigin, notNaNlabel) -constlabel1 = LocalLabel.unique("notnanConst1") -constlabel2 = LocalLabel.unique("notnanConst2") - -# If we don't have "E = Emax + 1", it's not a NaN. -$asm.puts "fcnvds #{dblop.sh4Operand}, fpul" -$asm.puts "sts fpul, #{scrint.sh4Operand}" -$asm.puts "mov.l #{LocalLabelReference.new(codeOrigin, constlabel1).asmLabel}, #{scrmask.sh4Operand}" -$asm.puts "and #{sh4Operands([scrmask, scrint])}" -$asm.puts "cmp/eq #{sh4Operands([scrmask, scrint])}" -$asm.puts "bf #{notNaNref.asmLabel}" - -# If we have "E = Emax + 1" and "f != 0", then it's a NaN. -$asm.puts "sts fpul, #{scrint.sh4Operand}" -$asm.puts "mov.l #{LocalLabelReference.new(codeOrigin, constlabel2).asmLabel}, #{scrmask.sh4Operand}" -$asm.puts "tst #{sh4Operands([scrmask, scrint])}" -$asm.puts "bt #{notNaNref.asmLabel}" -$asm.puts "bra #{labelop.asmLabel}" -$asm.puts "nop" - -$asm.puts ".bali
[webkit-changes] [150991] trunk/Source/WebCore
Title: [150991] trunk/Source/WebCore Revision 150991 Author rafael.l...@openbossa.org Date 2013-05-30 16:15:36 -0700 (Thu, 30 May 2013) Log Message Fix double hash lookup in WebSocket::connect loop https://bugs.webkit.org/show_bug.cgi?id=117052 Reviewed by Anders Carlsson. * Modules/websockets/WebSocket.cpp: (WebCore::WebSocket::connect): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Modules/websockets/WebSocket.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (150990 => 150991) --- trunk/Source/WebCore/ChangeLog 2013-05-30 22:58:12 UTC (rev 150990) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 23:15:36 UTC (rev 150991) @@ -1,3 +1,13 @@ +2013-05-30 Rafael Brandao + +Fix double hash lookup in WebSocket::connect loop +https://bugs.webkit.org/show_bug.cgi?id=117052 + +Reviewed by Anders Carlsson. + +* Modules/websockets/WebSocket.cpp: +(WebCore::WebSocket::connect): + 2013-05-30 Benjamin Poulain Remove some 16bits conversion. Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (150990 => 150991) --- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2013-05-30 22:58:12 UTC (rev 150990) +++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2013-05-30 23:15:36 UTC (rev 150991) @@ -274,13 +274,12 @@ } HashSet visited; for (size_t i = 0; i < protocols.size(); ++i) { -if (visited.contains(protocols[i])) { +if (!visited.add(protocols[i]).isNewEntry) { scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "WebSocket protocols contain duplicates: '" + encodeProtocolString(protocols[i]) + "'"); m_state = CLOSED; ec = SYNTAX_ERR; return; } -visited.add(protocols[i]); } String protocolString; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150990] trunk/Source/JavaScriptCore
Title: [150990] trunk/Source/_javascript_Core Revision 150990 Author oli...@apple.com Date 2013-05-30 15:58:12 -0700 (Thu, 30 May 2013) Log Message JSCallbackObject does not correctly initialise the PropertySlot for getOwnPropertyDescriptor https://bugs.webkit.org/show_bug.cgi?id=117053 Reviewed by Mark Hahnenberg. Set appropriate thisValue on the PropertySlot * API/JSCallbackObjectFunctions.h: (JSCgetOwnPropertyDescriptor): * API/tests/testapi.mm: Modified Paths trunk/Source/_javascript_Core/API/JSCallbackObjectFunctions.h trunk/Source/_javascript_Core/API/tests/testapi.mm trunk/Source/_javascript_Core/ChangeLog Diff Modified: trunk/Source/_javascript_Core/API/JSCallbackObjectFunctions.h (150989 => 150990) --- trunk/Source/_javascript_Core/API/JSCallbackObjectFunctions.h 2013-05-30 22:55:28 UTC (rev 150989) +++ trunk/Source/_javascript_Core/API/JSCallbackObjectFunctions.h 2013-05-30 22:58:12 UTC (rev 150990) @@ -216,7 +216,7 @@ bool JSCallbackObject::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor) { JSCallbackObject* thisObject = jsCast(object); -PropertySlot slot; +PropertySlot slot(thisObject); if (thisObject->methodTable()->getOwnPropertySlot(thisObject, exec, propertyName, slot)) { // Ideally we should return an access descriptor, but returning a value descriptor is better than nothing. JSValue value = slot.getValue(exec, propertyName); Modified: trunk/Source/_javascript_Core/API/tests/testapi.mm (150989 => 150990) --- trunk/Source/_javascript_Core/API/tests/testapi.mm 2013-05-30 22:55:28 UTC (rev 150989) +++ trunk/Source/_javascript_Core/API/tests/testapi.mm 2013-05-30 22:58:12 UTC (rev 150990) @@ -811,6 +811,14 @@ checkResult(@"JSValue correctly protected its internal value", [[o[@"foo"] toString] isEqualToString:@"foo"]); } + +@autoreleasepool { +JSContext *context = [[JSContext alloc] init]; +TestObject *testObject = TestObject.testObject; +context[@"testObject"] = testObject; +[context evaluateScript:@"testObject.__lookupGetter__('variable').call({})"]; +checkResult(@"Make sure we throw an exception when calling getter on incorrect |this|", context.exception); +} } #else Modified: trunk/Source/_javascript_Core/ChangeLog (150989 => 150990) --- trunk/Source/_javascript_Core/ChangeLog 2013-05-30 22:55:28 UTC (rev 150989) +++ trunk/Source/_javascript_Core/ChangeLog 2013-05-30 22:58:12 UTC (rev 150990) @@ -1,3 +1,16 @@ +2013-05-30 Oliver Hunt + +JSCallbackObject does not correctly initialise the PropertySlot for getOwnPropertyDescriptor +https://bugs.webkit.org/show_bug.cgi?id=117053 + +Reviewed by Mark Hahnenberg. + +Set appropriate thisValue on the PropertySlot + +* API/JSCallbackObjectFunctions.h: +(JSCgetOwnPropertyDescriptor): +* API/tests/testapi.mm: + 2013-05-29 Jeffrey Pfau [Mac] Enable cache partitioning and the public suffix list on 10.8 ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150989] trunk/Source/WebKit2
Title: [150989] trunk/Source/WebKit2 Revision 150989 Author timothy_hor...@apple.com Date 2013-05-30 15:55:28 -0700 (Thu, 30 May 2013) Log Message Remove ASSERT_NOT_REACHED from WKDOMNodeClass https://bugs.webkit.org/show_bug.cgi?id=117051 Reviewed by Anders Carlsson. It's easy to fail this assertion in seemingly-legitimate cases. * WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm: (WebKit::WKDOMNodeClass): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (150988 => 150989) --- trunk/Source/WebKit2/ChangeLog 2013-05-30 22:47:36 UTC (rev 150988) +++ trunk/Source/WebKit2/ChangeLog 2013-05-30 22:55:28 UTC (rev 150989) @@ -1,3 +1,15 @@ +2013-05-30 Tim Horton + +Remove ASSERT_NOT_REACHED from WKDOMNodeClass +https://bugs.webkit.org/show_bug.cgi?id=117051 + +Reviewed by Anders Carlsson. + +It's easy to fail this assertion in seemingly-legitimate cases. + +* WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm: +(WebKit::WKDOMNodeClass): + 2013-05-29 Jeffrey Pfau [Mac] Enable cache partitioning and the public suffix list on 10.8 Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm (150988 => 150989) --- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm 2013-05-30 22:47:36 UTC (rev 150988) +++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm 2013-05-30 22:55:28 UTC (rev 150989) @@ -84,7 +84,6 @@ case WebCore::Node::XPATH_NAMESPACE_NODE: break; } -ASSERT_NOT_REACHED(); return nil; } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150987] trunk/LayoutTests
Title: [150987] trunk/LayoutTests Revision 150987 Author timothy_hor...@apple.com Date 2013-05-30 14:31:21 -0700 (Thu, 30 May 2013) Log Message fast/dom/location-new-window-no-crash.html times out flakily on mac-wk2 https://bugs.webkit.org/show_bug.cgi?id=117037 Reviewed by Alexey Proskuryakov. Close the window on a zero-delay timer, working around a bug where WKTR will hang if a window is closed while a load is in progress. Doesn't affect the test in an important way. * fast/dom/script-tests/location-new-window-no-crash.js: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/fast/dom/script-tests/location-new-window-no-crash.js Diff Modified: trunk/LayoutTests/ChangeLog (150986 => 150987) --- trunk/LayoutTests/ChangeLog 2013-05-30 21:18:14 UTC (rev 150986) +++ trunk/LayoutTests/ChangeLog 2013-05-30 21:31:21 UTC (rev 150987) @@ -1,3 +1,17 @@ +2013-05-30 Tim Horton + +fast/dom/location-new-window-no-crash.html times out flakily on mac-wk2 +https://bugs.webkit.org/show_bug.cgi?id=117037 + +Reviewed by Alexey Proskuryakov. + +Close the window on a zero-delay timer, working around a bug where WKTR +will hang if a window is closed while a load is in progress. + +Doesn't affect the test in an important way. + +* fast/dom/script-tests/location-new-window-no-crash.js: + 2013-05-30 Zan Dobersek Update XMLHttpRequest timeout tests to a newer version from W3C Modified: trunk/LayoutTests/fast/dom/script-tests/location-new-window-no-crash.js (150986 => 150987) --- trunk/LayoutTests/fast/dom/script-tests/location-new-window-no-crash.js 2013-05-30 21:18:14 UTC (rev 150986) +++ trunk/LayoutTests/fast/dom/script-tests/location-new-window-no-crash.js 2013-05-30 21:31:21 UTC (rev 150987) @@ -44,16 +44,18 @@ shouldBe("testWindow.location.search", "''"); shouldBe("testWindow.location.hash", "''"); -testWindow.close(); +setTimeout(function () { +testWindow.close(); -if (window.testRunner) { -function doneHandler() -{ -if (testWindow.closed) { -testRunner.notifyDone(); -return; +if (window.testRunner) { +function doneHandler() +{ +if (testWindow.closed) { +testRunner.notifyDone(); +return; +} +setTimeout(doneHandler, 0); } -setTimeout(doneHandler, 0); +doneHandler(); } -doneHandler(); -} +}, 0); \ No newline at end of file ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150986] branches/safari-537.43-branch/Source/WebCore
Title: [150986] branches/safari-537.43-branch/Source/WebCore Revision 150986 Author lforsch...@apple.com Date 2013-05-30 14:18:14 -0700 (Thu, 30 May 2013) Log Message Merged r150977. Modified Paths branches/safari-537.43-branch/Source/WebCore/ChangeLog branches/safari-537.43-branch/Source/WebCore/loader/cache/CachedScript.cpp branches/safari-537.43-branch/Source/WebCore/loader/cache/CachedScript.h branches/safari-537.43-branch/Source/WebCore/platform/RuntimeApplicationChecks.cpp branches/safari-537.43-branch/Source/WebCore/platform/RuntimeApplicationChecks.h Diff Modified: branches/safari-537.43-branch/Source/WebCore/ChangeLog (150985 => 150986) --- branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-30 21:15:46 UTC (rev 150985) +++ branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-30 21:18:14 UTC (rev 150986) @@ -1,5 +1,28 @@ 2013-05-30 Lucas Forschler +Merge r150977 + +2013-05-30 Anders Carlsson + +REGRESSION (r119759): Adobe Flash Player "smaller" installer relies on the incorrect firing of a load event and needs an app-specific hack for compatibility +https://bugs.webkit.org/show_bug.cgi?id=117042 + + +Reviewed by Mark Rowe. + +Ignore HTTP errors for scripts requested from within the installer. Instead of just checking for the +Adobe Flash installer, we use the "com.solidstatenetworks.awkhost" bundle identifier to determine +whether to apply the workaround. This could in theory fix other installers that use the same mechanism. + +* loader/cache/CachedScript.cpp: +(WebCore::CachedScript::shouldIgnoreHTTPStatusCodeErrors): +* loader/cache/CachedScript.h: +* platform/RuntimeApplicationChecks.cpp: +(WebCore::applicationIsSolidStateNetworksDownloader): +* platform/RuntimeApplicationChecks.h: + +2013-05-30 Lucas Forschler + Rollout r150819 2013-05-30 Lucas Forschler Modified: branches/safari-537.43-branch/Source/WebCore/loader/cache/CachedScript.cpp (150985 => 150986) --- branches/safari-537.43-branch/Source/WebCore/loader/cache/CachedScript.cpp 2013-05-30 21:15:46 UTC (rev 150985) +++ branches/safari-537.43-branch/Source/WebCore/loader/cache/CachedScript.cpp 2013-05-30 21:18:14 UTC (rev 150986) @@ -33,6 +33,7 @@ #include "MIMETypeRegistry.h" #include "MemoryCache.h" #include "ResourceBuffer.h" +#include "RuntimeApplicationChecks.h" #include "TextResourceDecoder.h" #include @@ -107,4 +108,18 @@ } #endif +bool CachedScript::shouldIgnoreHTTPStatusCodeErrors() const +{ +// This is a workaround for +// REGRESSION (r119759): Adobe Flash Player "smaller" installer relies on the incorrect firing +// of a load event and needs an app-specific hack for compatibility. +// The installer in question tries to load .js file that doesn't exist, causing the server to +// return a 404 response. Normally, this would trigger an error event to be dispatched, but the +// installer expects a load event instead so we work around it here. +if (applicationIsSolidStateNetworksDownloader()) +return true; + +return CachedResource::shouldIgnoreHTTPStatusCodeErrors(); +} + } // namespace WebCore Modified: branches/safari-537.43-branch/Source/WebCore/loader/cache/CachedScript.h (150985 => 150986) --- branches/safari-537.43-branch/Source/WebCore/loader/cache/CachedScript.h 2013-05-30 21:15:46 UTC (rev 150985) +++ branches/safari-537.43-branch/Source/WebCore/loader/cache/CachedScript.h 2013-05-30 21:18:14 UTC (rev 150986) @@ -54,6 +54,8 @@ virtual PurgePriority purgePriority() const { return PurgeLast; } virtual bool mayTryReplaceEncodedData() const OVERRIDE { return true; } +virtual bool shouldIgnoreHTTPStatusCodeErrors() const OVERRIDE; + String m_script; RefPtr m_decoder; }; Modified: branches/safari-537.43-branch/Source/WebCore/platform/RuntimeApplicationChecks.cpp (150985 => 150986) --- branches/safari-537.43-branch/Source/WebCore/platform/RuntimeApplicationChecks.cpp 2013-05-30 21:15:46 UTC (rev 150985) +++ branches/safari-537.43-branch/Source/WebCore/platform/RuntimeApplicationChecks.cpp 2013-05-30 21:18:14 UTC (rev 150986) @@ -108,4 +108,10 @@ return isVersions; } +bool applicationIsSolidStateNetworksDownloader() +{ +static bool isSolidStateNetworksDownloader = mainBundleIsEqualTo("com.solidstatenetworks.awkhost"); +return isSolidStateNetworksDownloader; +} + } // namespace WebCore Modified: branches/safari-537.43-branch/Source/WebCore/platform/RuntimeApplicationChecks.h (150985 => 150986) --- branches/safari-537.43-branch/Source/WebCore/platform/RuntimeApplicationChecks.h 2013-05-30 21:15:46 UTC (rev 150985) +++ branches/safari-537.43-branch/Source/WebCore/platform/RuntimeApplicationChecks.h 2013-05-30 21:18:14 UTC (rev 150986) @@ -36,6 +36,7 @@ bool applicationIsMi
[webkit-changes] [150985] trunk/Source/WebCore
Title: [150985] trunk/Source/WebCore Revision 150985 Author benja...@webkit.org Date 2013-05-30 14:15:46 -0700 (Thu, 30 May 2013) Log Message Remove some 16bits conversion. https://bugs.webkit.org/show_bug.cgi?id=116935 Patch by Benjamin Poulain on 2013-05-30 Reviewed by Darin Adler. Merge chromium ce35a544d09e6cb907457535340eb0e9984e57b8. https://chromium.googlesource.com/chromium/blink/+/ce35a544d09e6cb907457535340eb0e9984e57b8 * html/parser/InputStreamPreprocessor.h: * platform/FileSystem.cpp: (WebCore::encodeForFileName): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/html/parser/InputStreamPreprocessor.h trunk/Source/WebCore/platform/FileSystem.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (150984 => 150985) --- trunk/Source/WebCore/ChangeLog 2013-05-30 21:11:50 UTC (rev 150984) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 21:15:46 UTC (rev 150985) @@ -1,3 +1,17 @@ +2013-05-30 Benjamin Poulain + +Remove some 16bits conversion. +https://bugs.webkit.org/show_bug.cgi?id=116935 + +Reviewed by Darin Adler. + +Merge chromium ce35a544d09e6cb907457535340eb0e9984e57b8. +https://chromium.googlesource.com/chromium/blink/+/ce35a544d09e6cb907457535340eb0e9984e57b8 + +* html/parser/InputStreamPreprocessor.h: +* platform/FileSystem.cpp: +(WebCore::encodeForFileName): + 2013-05-30 Anders Carlsson REGRESSION (r119759): Adobe Flash Player "smaller" installer relies on the incorrect firing of a load event and needs an app-specific hack for compatibility Modified: trunk/Source/WebCore/html/parser/InputStreamPreprocessor.h (150984 => 150985) --- trunk/Source/WebCore/html/parser/InputStreamPreprocessor.h 2013-05-30 21:11:50 UTC (rev 150984) +++ trunk/Source/WebCore/html/parser/InputStreamPreprocessor.h 2013-05-30 21:15:46 UTC (rev 150985) @@ -33,7 +33,7 @@ namespace WebCore { -const UChar kEndOfFileMarker = 0; +const LChar kEndOfFileMarker = 0; // http://www.whatwg.org/specs/web-apps/current-work/#preprocessing-the-input-stream template Modified: trunk/Source/WebCore/platform/FileSystem.cpp (150984 => 150985) --- trunk/Source/WebCore/platform/FileSystem.cpp 2013-05-30 21:11:50 UTC (rev 150984) +++ trunk/Source/WebCore/platform/FileSystem.cpp 2013-05-30 21:15:46 UTC (rev 150985) @@ -27,6 +27,7 @@ #include "FileSystem.h" #include +#include namespace WebCore { @@ -77,27 +78,21 @@ return c > 127 ? false : needsEscaping[c]; } -String encodeForFileName(const String& inputStr) +String encodeForFileName(const String& inputString) { -unsigned length = inputStr.length(); -Vector buffer(length * 3 + 1); -UChar* p = buffer.data(); - -const UChar* str = inputStr.characters(); -const UChar* strEnd = str + length; - -while (str < strEnd) { -UChar c = *str++; -if (shouldEscapeUChar(c)) { -*p++ = '%'; -placeByteAsHex(c, p); +StringBuilder result; +StringImpl* stringImpl = inputString.impl(); +unsigned length = inputString.length(); +for (unsigned i = 0; i < length; ++i) { +UChar character = (*stringImpl)[i]; +if (shouldEscapeUChar(character)) { +result.append('%'); +appendByteAsHex(character, result); } else -*p++ = c; +result.append(character); } -ASSERT(p - buffer.data() <= static_cast(buffer.size())); - -return String(buffer.data(), p - buffer.data()); +return result.toString(); } #if !PLATFORM(MAC) || PLATFORM(IOS) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150984] branches/safari-537.43-branch/Source
Title: [150984] branches/safari-537.43-branch/Source Revision 150984 Author lforsch...@apple.com Date 2013-05-30 14:11:50 -0700 (Thu, 30 May 2013) Log Message Rollout of r150819. Modified Paths branches/safari-537.43-branch/Source/WebCore/ChangeLog branches/safari-537.43-branch/Source/WebCore/WebCore.exp.in branches/safari-537.43-branch/Source/WebKit2/ChangeLog branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm Diff Modified: branches/safari-537.43-branch/Source/WebCore/ChangeLog (150983 => 150984) --- branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-30 21:08:22 UTC (rev 150983) +++ branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-30 21:11:50 UTC (rev 150984) @@ -1,5 +1,9 @@ 2013-05-30 Lucas Forschler +Rollout r150819 + +2013-05-30 Lucas Forschler + Merge r150950 2013-05-29 Tim Horton Modified: branches/safari-537.43-branch/Source/WebCore/WebCore.exp.in (150983 => 150984) --- branches/safari-537.43-branch/Source/WebCore/WebCore.exp.in 2013-05-30 21:08:22 UTC (rev 150983) +++ branches/safari-537.43-branch/Source/WebCore/WebCore.exp.in 2013-05-30 21:11:50 UTC (rev 150984) @@ -168,7 +168,6 @@ __ZN7WebCore11URLWithDataEP6NSDataP5NSURL __ZN7WebCore11iBeamCursorEv __ZN7WebCore11memoryCacheEv -__ZN7WebCore11startOfLineERKNS_15VisiblePositionE __ZN7WebCore11startOfWordERKNS_15VisiblePositionENS_9EWordSideE __ZN7WebCore11writeToFileEiPKci __ZN7WebCore12ChromeClient23paintCustomOverhangAreaEPNS_15GraphicsContextERKNS_7IntRectES5_S5_ @@ -569,7 +568,6 @@ __ZN7WebCore16enclosingIntRectERKNS_9FloatRectE __ZN7WebCore16isEndOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE __ZN7WebCore16isUserVisibleURLEP8NSString -__ZN7WebCore16nextLinePositionERKNS_15VisiblePositionEiNS_12EditableTypeE __ZN7WebCore16scriptNameToCodeERKN3WTF6StringE __ZN7WebCore16startOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE __ZN7WebCore17CredentialStorage24getFromPersistentStorageERKNS_15ProtectionSpaceE @@ -690,7 +688,6 @@ __ZN7WebCore20UserGestureIndicatorD1Ev __ZN7WebCore20deleteEmptyDirectoryERKN3WTF6StringE __ZN7WebCore20makeRGBA32FromFloatsE -__ZN7WebCore20previousLinePositionERKNS_15VisiblePositionEiNS_12EditableTypeE __ZN7WebCore20protocolIsJavaScriptERKN3WTF6StringE __ZN7WebCore20toUInt32EnforceRangeEPN3JSC9ExecStateENS0_7JSValueE __ZN7WebCore21BackForwardController11itemAtIndexEi @@ -1268,7 +1265,6 @@ __ZN7WebCore9TimerBaseC2Ev __ZN7WebCore9TimerBaseD2Ev __ZN7WebCore9closeFileERi -__ZN7WebCore9endOfLineERKNS_15VisiblePositionE __ZN7WebCore9endOfWordERKNS_15VisiblePositionENS_9EWordSideE __ZN7WebCore9fontCacheEv __ZN7WebCore9makeRangeERKNS_15VisiblePositionES2_ @@ -1456,7 +1452,6 @@ __ZNK7WebCore15VisiblePosition14characterAfterEv __ZNK7WebCore15VisiblePosition14localCaretRectERPNS_12RenderObjectE __ZNK7WebCore15VisiblePosition19absoluteCaretBoundsEv -__ZNK7WebCore15VisiblePosition45lineDirectionPointForBlockDirectionNavigationEv __ZNK7WebCore15VisiblePosition4nextENS_27EditingBoundaryCrossingRuleE __ZNK7WebCore15VisiblePosition8previousENS_27EditingBoundaryCrossingRuleE __ZNK7WebCore16EventListenerMap8containsERKN3WTF12AtomicStringE @@ -1646,7 +1641,6 @@ __ZNK7WebCore8Position24parentAnchoredEquivalentEv __ZNK7WebCore8Position25leadingWhitespacePositionENS_9EAffinityEb __ZNK7WebCore8Position26trailingWhitespacePositionENS_9EAffinityEb -__ZNK7WebCore8Position28offsetForPositionAfterAnchorEv __ZNK7WebCore8Position8upstreamENS_27EditingBoundaryCrossingRuleE __ZNK7WebCore9DOMWindow27pendingUnloadEventListenersEv __ZNK7WebCore9FloatQuad11boundingBoxEv @@ -2079,6 +2073,7 @@ __ZN7WebCore11MemoryCache18pruneLiveResourcesEb __ZN7WebCore11MemoryCache20removeImageFromCacheERKNS_4KURLE __ZN7WebCore11isEndOfLineERKNS_15VisiblePositionE +__ZN7WebCore11startOfLineERKNS_15VisiblePositionE __ZN7WebCore12EventHandler10mouseMovedEP8WebEvent __ZN7WebCore12EventHandler10wheelEventEP8WebEvent __ZN7WebCore12EventHandler15sendScrollEventEv @@ -2127,6 +2122,7 @@ __ZN7WebCore16VisibleSelection27selectionFromContentsOfNodeEPNS_4NodeE __ZN7WebCore16VisibleSelectionC1Ev __ZN7WebCore16jsStringWithCacheSlowCaseEPN3JSC9ExecStateERN3WTF7HashMapIPNS3_10StringImplENS0_4WeakINS0_8JSStringEEENS3_10StringHashENS3_10HashTraitsIS6_EENSB_IS9_S6_ +__ZN7WebCore16nextLinePositionERKNS_15VisiblePositionEiNS_12EditableTypeE __ZN7WebCore16nextWordPositionERKNS_15VisiblePositionE __ZN7WebCore17CredentialStorage16clearCredentialsEv __ZN7WebCore17isStartOfDocumentERKNS_15VisiblePositionE @@ -2141,6 +2137,7 @@ __ZN7WebCore20lastOffsetForEditingEPKNS_4NodeE __ZN7WebCore20networkStateNotifierEv __ZN7WebCore20nextSentencePositionERKNS_15VisiblePositionE +__ZN7WebCore20previousLinePositionERKNS_15VisiblePositionEiNS_12EditableTypeE __ZN7WebCore20previousWordPositionERKNS_15VisiblePositionE __ZN7WebCore21MemoryPressureHandler19clearMemoryPressureEv __ZN7WebCore21MemoryPressur
[webkit-changes] [150983] branches/safari-537.43-branch/Source
Title: [150983] branches/safari-537.43-branch/Source Revision 150983 Author lforsch...@apple.com Date 2013-05-30 14:08:22 -0700 (Thu, 30 May 2013) Log Message Merged r150950. Modified Paths branches/safari-537.43-branch/Source/WebCore/ChangeLog branches/safari-537.43-branch/Source/WebCore/dom/Document.cpp branches/safari-537.43-branch/Source/WebCore/loader/FrameLoader.cpp branches/safari-537.43-branch/Source/WebCore/loader/FrameLoader.h branches/safari-537.43-branch/Source/WebCore/loader/FrameLoaderClient.h branches/safari-537.43-branch/Source/WebKit2/ChangeLog branches/safari-537.43-branch/Source/WebKit2/Shared/WebPreferencesStore.h branches/safari-537.43-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp branches/safari-537.43-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp Diff Modified: branches/safari-537.43-branch/Source/WebCore/ChangeLog (150982 => 150983) --- branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-30 21:03:47 UTC (rev 150982) +++ branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-30 21:08:22 UTC (rev 150983) @@ -1,5 +1,37 @@ 2013-05-30 Lucas Forschler +Merge r150950 + +2013-05-29 Tim Horton + +Expose incrementalRenderingSuppressionTimeout via WK2 +https://bugs.webkit.org/show_bug.cgi?id=117015 + + +Reviewed by Darin Adler. + +* dom/Document.cpp: +(WebCore::Document::setVisualUpdatesAllowed): +Inform the FrameLoader that we're ready to transition the page, if +nothing else already has. This will be forwarded to the FrameLoaderClient, +and WebKit2's implementation will go ahead and un-freeze the layer tree, +so that the incremental rendering suppression watchdog timer actually works. + +(WebCore::Document::setVisualUpdatesAllowedByClient): +Make incremental rendering suppression extension tokens play nice with the +watchdog timer; allow setVisualUpdatesAllowedByClient=true to re-enable updates +if either the page is in the "completed" state or the watchdog has already fired. + +* loader/FrameLoader.cpp: +* loader/FrameLoader.h: +(WebCore::FrameLoader::forcePageTransitionIfNeeded): Added. +Forward to the client. + +* loader/FrameLoaderClient.h: +(WebCore::FrameLoaderClient::forcePageTransitionIfNeeded): Added. + +2013-05-30 Lucas Forschler + Merge r150948 2013-05-29 Simon Fraser Modified: branches/safari-537.43-branch/Source/WebCore/dom/Document.cpp (150982 => 150983) --- branches/safari-537.43-branch/Source/WebCore/dom/Document.cpp 2013-05-30 21:03:47 UTC (rev 150982) +++ branches/safari-537.43-branch/Source/WebCore/dom/Document.cpp 2013-05-30 21:08:22 UTC (rev 150983) @@ -1310,6 +1310,9 @@ if (RenderView* renderView = this->renderView()) renderView->repaintViewAndCompositedLayers(); + +if (Frame* frame = this->frame()) +frame->loader()->forcePageTransitionIfNeeded(); } void Document::visualUpdatesSuppressionTimerFired(Timer*) @@ -1326,7 +1329,10 @@ void Document::setVisualUpdatesAllowedByClient(bool visualUpdatesAllowedByClient) { -if (visualUpdatesAllowedByClient && m_readyState == Complete && !visualUpdatesAllowed()) +// We should only re-enable visual updates if ReadyState is Completed or the watchdog timer has fired, +// both of which we can determine by looking at the timer. + +if (visualUpdatesAllowedByClient && !m_visualUpdatesSuppressionTimer.isActive() && !visualUpdatesAllowed()) setVisualUpdatesAllowed(true); } Modified: branches/safari-537.43-branch/Source/WebCore/loader/FrameLoader.cpp (150982 => 150983) --- branches/safari-537.43-branch/Source/WebCore/loader/FrameLoader.cpp 2013-05-30 21:03:47 UTC (rev 150982) +++ branches/safari-537.43-branch/Source/WebCore/loader/FrameLoader.cpp 2013-05-30 21:08:22 UTC (rev 150983) @@ -3339,6 +3339,11 @@ view->adjustTiledBackingCoverage(); } +void FrameLoader::forcePageTransitionIfNeeded() +{ +m_client->forcePageTransitionIfNeeded(); +} + bool FrameLoaderClient::hasHTMLView() const { return true; Modified: branches/safari-537.43-branch/Source/WebCore/loader/FrameLoader.h (150982 => 150983) --- branches/safari-537.43-branch/Source/WebCore/loader/FrameLoader.h 2013-05-30 21:03:47 UTC (rev 150982) +++ branches/safari-537.43-branch/Source/WebCore/loader/FrameLoader.h 2013-05-30 21:08:22 UTC (rev 150983) @@ -286,6 +286,8 @@ const KURL& previousURL() const { return m_previousURL; } +void forcePageTransitionIfNeeded(); + private: enum For
[webkit-changes] [150982] branches/safari-537.43-branch/Source
Title: [150982] branches/safari-537.43-branch/Source Revision 150982 Author lforsch...@apple.com Date 2013-05-30 14:03:47 -0700 (Thu, 30 May 2013) Log Message Merged r150948. Modified Paths branches/safari-537.43-branch/Source/WebCore/ChangeLog branches/safari-537.43-branch/Source/WebCore/page/ChromeClient.h branches/safari-537.43-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp branches/safari-537.43-branch/Source/WebKit2/ChangeLog branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h Diff Modified: branches/safari-537.43-branch/Source/WebCore/ChangeLog (150981 => 150982) --- branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-30 21:00:47 UTC (rev 150981) +++ branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-30 21:03:47 UTC (rev 150982) @@ -1,5 +1,31 @@ 2013-05-30 Lucas Forschler +Merge r150948 + +2013-05-29 Simon Fraser + +Fix paint-related milestones to not fire when the layer tree is frozen +https://bugs.webkit.org/show_bug.cgi?id=117012 + +Reviewed by Tim Horton. + +In the previous code, it was possible to paint some layer and schedule +the m_paintRelatedMilestonesTimer, but then the layer tree was put into +a frozen state because the page redirected. However, the paint-related +milestones timer would still fire. This caused woes with header/footer +banners. + +Fix by not firing paint-related milestones if the layer tree is frozen, +which we know via a new ChromeClient callback. When unfrozen, we'll +paint again, and fire the timer later. + +* page/ChromeClient.h: +(WebCore::ChromeClient::layerTreeStateIsFrozen): +* rendering/RenderLayerCompositor.cpp: +(WebCore::RenderLayerCompositor::paintRelatedMilestonesTimerFired): + +2013-05-30 Lucas Forschler + Merge r150935 2013-05-28 Oliver Hunt Modified: branches/safari-537.43-branch/Source/WebCore/page/ChromeClient.h (150981 => 150982) --- branches/safari-537.43-branch/Source/WebCore/page/ChromeClient.h 2013-05-30 21:00:47 UTC (rev 150981) +++ branches/safari-537.43-branch/Source/WebCore/page/ChromeClient.h 2013-05-30 21:03:47 UTC (rev 150982) @@ -278,6 +278,9 @@ // Returns a bitfield indicating conditions that can trigger the compositor. virtual CompositingTriggerFlags allowedCompositingTriggers() const { return static_cast(AllTriggers); } + +// Returns true if layer tree updates are disabled. +virtual bool layerTreeStateIsFrozen() const { return false; } #endif #if PLATFORM(WIN) && USE(AVFOUNDATION) Modified: branches/safari-537.43-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (150981 => 150982) --- branches/safari-537.43-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-05-30 21:00:47 UTC (rev 150981) +++ branches/safari-537.43-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-05-30 21:03:47 UTC (rev 150982) @@ -3252,8 +3252,19 @@ void RenderLayerCompositor::paintRelatedMilestonesTimerFired(Timer*) { FrameView* frameView = m_renderView ? m_renderView->frameView() : 0; -if (frameView) -frameView->firePaintRelatedMilestones(); +if (!frameView) +return; + +Frame* frame = frameView->frame(); +Page* page = frame ? frame->page() : 0; +if (!page) +return; + +// If the layer tree is frozen, we'll paint when it's unfrozen and schedule the timer again. +if (page->chrome().client()->layerTreeStateIsFrozen()) +return; + +frameView->firePaintRelatedMilestones(); } } // namespace WebCore Modified: branches/safari-537.43-branch/Source/WebKit2/ChangeLog (150981 => 150982) --- branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-05-30 21:00:47 UTC (rev 150981) +++ branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-05-30 21:03:47 UTC (rev 150982) @@ -1,5 +1,24 @@ 2013-05-30 Lucas Forschler +Merge r150948 + +2013-05-29 Simon Fraser + +Fix paint-related milestones to not fire when the layer tree is frozen +https://bugs.webkit.org/show_bug.cgi?id=117012 + +Reviewed by Tim Horton. + +Implement ChromeClient::layerTreeStateIsFrozen() to return +the frozen state of the drawing area. + +* WebProcess/WebCoreSupport/WebChromeClient.cpp: +(WebKit::WebChromeClient::layerTreeStateIsFrozen): +* WebProcess/WebCoreSupport/WebChromeClient.h: +(WebChromeClient): + +2013-05-30 Lucas Forschler + Merge r150935 2013-05-28 Oliver Hunt Modified: branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (150981 => 150982) --- branches/safari-537.43-branch/
[webkit-changes] [150980] branches/safari-537.43-branch/Source/JavaScriptCore
Title: [150980] branches/safari-537.43-branch/Source/_javascript_Core Revision 150980 Author lforsch...@apple.com Date 2013-05-30 13:55:18 -0700 (Thu, 30 May 2013) Log Message Merged r150831. Modified Paths branches/safari-537.43-branch/Source/_javascript_Core/API/JSValue.mm branches/safari-537.43-branch/Source/_javascript_Core/API/tests/testapi.mm branches/safari-537.43-branch/Source/_javascript_Core/ChangeLog Diff Modified: branches/safari-537.43-branch/Source/_javascript_Core/API/JSValue.mm (150979 => 150980) --- branches/safari-537.43-branch/Source/_javascript_Core/API/JSValue.mm 2013-05-30 20:53:15 UTC (rev 150979) +++ branches/safari-537.43-branch/Source/_javascript_Core/API/JSValue.mm 2013-05-30 20:55:18 UTC (rev 150980) @@ -971,6 +971,7 @@ _context = [context retain]; m_value = value; +JSValueProtect([_context JSGlobalContextRef], m_value); return self; } @@ -1088,6 +1089,7 @@ - (void)dealloc { +JSValueUnprotect([_context JSGlobalContextRef], m_value); [_context release]; _context = nil; [super dealloc]; Modified: branches/safari-537.43-branch/Source/_javascript_Core/API/tests/testapi.mm (150979 => 150980) --- branches/safari-537.43-branch/Source/_javascript_Core/API/tests/testapi.mm 2013-05-30 20:53:15 UTC (rev 150979) +++ branches/safari-537.43-branch/Source/_javascript_Core/API/tests/testapi.mm 2013-05-30 20:55:18 UTC (rev 150980) @@ -802,6 +802,15 @@ [TinyDOMNode clearSharedVirtualMachine]; } + +@autoreleasepool { +JSContext *context = [[JSContext alloc] init]; +JSValue *o = [JSValue valueWithNewObjectInContext:context]; +o[@"foo"] = @"foo"; +JSSynchronousGarbageCollectForDebugging([context JSGlobalContextRef]); + +checkResult(@"JSValue correctly protected its internal value", [[o[@"foo"] toString] isEqualToString:@"foo"]); +} } #else Modified: branches/safari-537.43-branch/Source/_javascript_Core/ChangeLog (150979 => 150980) --- branches/safari-537.43-branch/Source/_javascript_Core/ChangeLog 2013-05-30 20:53:15 UTC (rev 150979) +++ branches/safari-537.43-branch/Source/_javascript_Core/ChangeLog 2013-05-30 20:55:18 UTC (rev 150980) @@ -1,3 +1,22 @@ +2013-05-30 Lucas Forschler + +Merge r150831 + +2013-05-28 Mark Hahnenberg + +r150199 is very wrong +https://bugs.webkit.org/show_bug.cgi?id=116876 + +JSValue needs to protect its internal JSValueRef. + +Reviewed by Darin Adler. + +* API/JSValue.mm: +(-[JSValue initWithValue:inContext:]): +(-[JSValue dealloc]): +* API/tests/testapi.mm: Added a simple test to make sure that we protect the +underlying _javascript_ value across garbage collections. + 2013-05-28 Roger Fong Disable some feature flags. ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150979] branches/safari-537.43-branch/Source/WebKit2
Title: [150979] branches/safari-537.43-branch/Source/WebKit2 Revision 150979 Author lforsch...@apple.com Date 2013-05-30 13:53:15 -0700 (Thu, 30 May 2013) Log Message Merged r150925. Modified Paths branches/safari-537.43-branch/Source/WebKit2/ChangeLog branches/safari-537.43-branch/Source/WebKit2/UIProcess/Storage/StorageManager.cpp Diff Modified: branches/safari-537.43-branch/Source/WebKit2/ChangeLog (150978 => 150979) --- branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-05-30 20:51:44 UTC (rev 150978) +++ branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-05-30 20:53:15 UTC (rev 150979) @@ -1,5 +1,23 @@ 2013-05-30 Lucas Forschler +Merge r150925 + +2013-05-29 Anders Carlsson + +Return earlier if there's no session storage namespace +https://bugs.webkit.org/show_bug.cgi?id=116984 + + +Reviewed by Tim Horton. + +If we can't find a session storage namespace, return before creating an entry in the m_storageAreasByConnection +hash map since then we'll crash trying to remove it later. + +* UIProcess/Storage/StorageManager.cpp: +(WebKit::StorageManager::createSessionStorageMap): + +2013-05-30 Lucas Forschler + Merge r150648 2013-05-24 Anders Carlsson Modified: branches/safari-537.43-branch/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (150978 => 150979) --- branches/safari-537.43-branch/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2013-05-30 20:51:44 UTC (rev 150978) +++ branches/safari-537.43-branch/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2013-05-30 20:53:15 UTC (rev 150979) @@ -461,6 +461,15 @@ void StorageManager::createSessionStorageMap(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData) { +// FIXME: This should be a message check. +ASSERT((HashMap>::isValidKey(storageNamespaceID))); +SessionStorageNamespace* sessionStorageNamespace = m_sessionStorageNamespaces.get(storageNamespaceID); +if (!sessionStorageNamespace) { +// We're getting an incoming message from the web process that's for session storage for a web page +// that has already been closed, just ignore it. +return; +} + std::pair, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID); // FIXME: This should be a message check. @@ -471,14 +480,6 @@ // FIXME: This should be a message check. ASSERT(result.isNewEntry); -ASSERT((HashMap>::isValidKey(storageNamespaceID))); -SessionStorageNamespace* sessionStorageNamespace = m_sessionStorageNamespaces.get(storageNamespaceID); -if (!sessionStorageNamespace) { -// We're getting an incoming message from the web process that's for session storage for a web page -// that has already been closed, just ignore it. -return; -} - // FIXME: This should be a message check. ASSERT(connection == sessionStorageNamespace->allowedConnection()); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150978] branches/safari-537.43-branch/Source/WebKit2
Title: [150978] branches/safari-537.43-branch/Source/WebKit2 Revision 150978 Author lforsch...@apple.com Date 2013-05-30 13:51:44 -0700 (Thu, 30 May 2013) Log Message Merged r150648. Modified Paths branches/safari-537.43-branch/Source/WebKit2/ChangeLog branches/safari-537.43-branch/Source/WebKit2/UIProcess/Storage/StorageManager.cpp Diff Modified: branches/safari-537.43-branch/Source/WebKit2/ChangeLog (150977 => 150978) --- branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-05-30 20:50:03 UTC (rev 150977) +++ branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-05-30 20:51:44 UTC (rev 150978) @@ -1,3 +1,22 @@ +2013-05-30 Lucas Forschler + +Merge r150648 + +2013-05-24 Anders Carlsson + +Intermittent crash when typing in Address Bar +https://bugs.webkit.org/show_bug.cgi?id=116728 + + +Reviewed by Sam Weinig. + +If a web process connection has been removed from the storage manager because we disconnected it +since there were no more active pages associated with the web process, we'll fail to find it here +so just return early instead of crashing. + +* UIProcess/Storage/StorageManager.cpp: +(WebKit::StorageManager::destroyStorageMap): + 2013-05-29 Lucas Forschler Merge r150936 Modified: branches/safari-537.43-branch/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (150977 => 150978) --- branches/safari-537.43-branch/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2013-05-30 20:50:03 UTC (rev 150977) +++ branches/safari-537.43-branch/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2013-05-30 20:51:44 UTC (rev 150978) @@ -496,10 +496,11 @@ ASSERT((HashMap, uint64_t>, RefPtr>::isValidKey(connectionAndStorageMapIDPair))); HashMap, uint64_t>, RefPtr>::iterator it = m_storageAreasByConnection.find(connectionAndStorageMapIDPair); +if (it == m_storageAreasByConnection.end()) { +// The connection has been removed because the last page was closed. +return; +} -// FIXME: This should be a message check. -ASSERT(it != m_storageAreasByConnection.end()); - it->value->removeListener(connection, storageMapID); m_storageAreasByConnection.remove(connectionAndStorageMapIDPair); } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150977] trunk/Source/WebCore
Title: [150977] trunk/Source/WebCore Revision 150977 Author ander...@apple.com Date 2013-05-30 13:50:03 -0700 (Thu, 30 May 2013) Log Message REGRESSION (r119759): Adobe Flash Player "smaller" installer relies on the incorrect firing of a load event and needs an app-specific hack for compatibility https://bugs.webkit.org/show_bug.cgi?id=117042 Reviewed by Mark Rowe. Ignore HTTP errors for scripts requested from within the installer. Instead of just checking for the Adobe Flash installer, we use the "com.solidstatenetworks.awkhost" bundle identifier to determine whether to apply the workaround. This could in theory fix other installers that use the same mechanism. * loader/cache/CachedScript.cpp: (WebCore::CachedScript::shouldIgnoreHTTPStatusCodeErrors): * loader/cache/CachedScript.h: * platform/RuntimeApplicationChecks.cpp: (WebCore::applicationIsSolidStateNetworksDownloader): * platform/RuntimeApplicationChecks.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/cache/CachedScript.cpp trunk/Source/WebCore/loader/cache/CachedScript.h trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp trunk/Source/WebCore/platform/RuntimeApplicationChecks.h Diff Modified: trunk/Source/WebCore/ChangeLog (150976 => 150977) --- trunk/Source/WebCore/ChangeLog 2013-05-30 20:39:15 UTC (rev 150976) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 20:50:03 UTC (rev 150977) @@ -1,3 +1,22 @@ +2013-05-30 Anders Carlsson + +REGRESSION (r119759): Adobe Flash Player "smaller" installer relies on the incorrect firing of a load event and needs an app-specific hack for compatibility +https://bugs.webkit.org/show_bug.cgi?id=117042 + + +Reviewed by Mark Rowe. + +Ignore HTTP errors for scripts requested from within the installer. Instead of just checking for the +Adobe Flash installer, we use the "com.solidstatenetworks.awkhost" bundle identifier to determine +whether to apply the workaround. This could in theory fix other installers that use the same mechanism. + +* loader/cache/CachedScript.cpp: +(WebCore::CachedScript::shouldIgnoreHTTPStatusCodeErrors): +* loader/cache/CachedScript.h: +* platform/RuntimeApplicationChecks.cpp: +(WebCore::applicationIsSolidStateNetworksDownloader): +* platform/RuntimeApplicationChecks.h: + 2013-05-30 Sergio Villar Senin Allow no space between "background-position:" dimensions Modified: trunk/Source/WebCore/loader/cache/CachedScript.cpp (150976 => 150977) --- trunk/Source/WebCore/loader/cache/CachedScript.cpp 2013-05-30 20:39:15 UTC (rev 150976) +++ trunk/Source/WebCore/loader/cache/CachedScript.cpp 2013-05-30 20:50:03 UTC (rev 150977) @@ -33,6 +33,7 @@ #include "MIMETypeRegistry.h" #include "MemoryCache.h" #include "ResourceBuffer.h" +#include "RuntimeApplicationChecks.h" #include "TextResourceDecoder.h" #include @@ -107,4 +108,18 @@ } #endif +bool CachedScript::shouldIgnoreHTTPStatusCodeErrors() const +{ +// This is a workaround for +// REGRESSION (r119759): Adobe Flash Player "smaller" installer relies on the incorrect firing +// of a load event and needs an app-specific hack for compatibility. +// The installer in question tries to load .js file that doesn't exist, causing the server to +// return a 404 response. Normally, this would trigger an error event to be dispatched, but the +// installer expects a load event instead so we work around it here. +if (applicationIsSolidStateNetworksDownloader()) +return true; + +return CachedResource::shouldIgnoreHTTPStatusCodeErrors(); +} + } // namespace WebCore Modified: trunk/Source/WebCore/loader/cache/CachedScript.h (150976 => 150977) --- trunk/Source/WebCore/loader/cache/CachedScript.h 2013-05-30 20:39:15 UTC (rev 150976) +++ trunk/Source/WebCore/loader/cache/CachedScript.h 2013-05-30 20:50:03 UTC (rev 150977) @@ -54,6 +54,8 @@ virtual PurgePriority purgePriority() const { return PurgeLast; } virtual bool mayTryReplaceEncodedData() const OVERRIDE { return true; } +virtual bool shouldIgnoreHTTPStatusCodeErrors() const OVERRIDE; + String m_script; RefPtr m_decoder; }; Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp (150976 => 150977) --- trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp 2013-05-30 20:39:15 UTC (rev 150976) +++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp 2013-05-30 20:50:03 UTC (rev 150977) @@ -108,4 +108,10 @@ return isVersions; } +bool applicationIsSolidStateNetworksDownloader() +{ +static bool isSolidStateNetworksDownloader = mainBundleIsEqualTo("com.solidstatenetworks.awkhost"); +return isSolidStateNetworksDownloader; +} + } // namespace WebCore Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.h (150976 => 150977) --- trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2013-05-3
[webkit-changes] [150976] trunk/Source/WebKit/gtk
Title: [150976] trunk/Source/WebKit/gtk Revision 150976 Author commit-qu...@webkit.org Date 2013-05-30 13:39:15 -0700 (Thu, 30 May 2013) Log Message [GTK] Fix pass_by_value coverity warning in ChromeClientGtk https://bugs.webkit.org/show_bug.cgi?id=117021 Patch by Enrique Ocana Gonzalez on 2013-05-30 Reviewed by Anders Carlsson. Pass dirtyRegion parameter in paintWebView() by reference to avoid object copying. * WebCoreSupport/ChromeClientGtk.cpp: (WebKit::paintWebView): Modified Paths trunk/Source/WebKit/gtk/ChangeLog trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp Diff Modified: trunk/Source/WebKit/gtk/ChangeLog (150975 => 150976) --- trunk/Source/WebKit/gtk/ChangeLog 2013-05-30 19:21:46 UTC (rev 150975) +++ trunk/Source/WebKit/gtk/ChangeLog 2013-05-30 20:39:15 UTC (rev 150976) @@ -1,3 +1,15 @@ +2013-05-30 Enrique Ocana Gonzalez + +[GTK] Fix pass_by_value coverity warning in ChromeClientGtk +https://bugs.webkit.org/show_bug.cgi?id=117021 + +Reviewed by Anders Carlsson. + +Pass dirtyRegion parameter in paintWebView() by reference to avoid object copying. + +* WebCoreSupport/ChromeClientGtk.cpp: +(WebKit::paintWebView): + 2013-05-29 Carlos Garcia Campos Unreviewed. Update NEWS and Versions.m4 for 2.1.1 release. Modified: trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (150975 => 150976) --- trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp 2013-05-30 19:21:46 UTC (rev 150975) +++ trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp 2013-05-30 20:39:15 UTC (rev 150976) @@ -516,7 +516,7 @@ rects.append(clipRect); } -static void paintWebView(WebKitWebView* webView, Frame* frame, Region dirtyRegion) +static void paintWebView(WebKitWebView* webView, Frame* frame, const Region& dirtyRegion) { if (!webView->priv->backingStore) return; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150975] branches/safari-537.43-branch/Source
Title: [150975] branches/safari-537.43-branch/Source Revision 150975 Author lforsch...@apple.com Date 2013-05-30 12:21:46 -0700 (Thu, 30 May 2013) Log Message Versioning. Modified Paths branches/safari-537.43-branch/Source/_javascript_Core/Configurations/Version.xcconfig branches/safari-537.43-branch/Source/WebCore/Configurations/Version.xcconfig branches/safari-537.43-branch/Source/WebKit/mac/Configurations/Version.xcconfig branches/safari-537.43-branch/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: branches/safari-537.43-branch/Source/_javascript_Core/Configurations/Version.xcconfig (150974 => 150975) --- branches/safari-537.43-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2013-05-30 19:18:56 UTC (rev 150974) +++ branches/safari-537.43-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2013-05-30 19:21:46 UTC (rev 150975) @@ -23,7 +23,7 @@ MAJOR_VERSION = 537; MINOR_VERSION = 43; -TINY_VERSION = 4; +TINY_VERSION = 5; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-537.43-branch/Source/WebCore/Configurations/Version.xcconfig (150974 => 150975) --- branches/safari-537.43-branch/Source/WebCore/Configurations/Version.xcconfig 2013-05-30 19:18:56 UTC (rev 150974) +++ branches/safari-537.43-branch/Source/WebCore/Configurations/Version.xcconfig 2013-05-30 19:21:46 UTC (rev 150975) @@ -23,7 +23,7 @@ MAJOR_VERSION = 537; MINOR_VERSION = 43; -TINY_VERSION = 4; +TINY_VERSION = 5; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-537.43-branch/Source/WebKit/mac/Configurations/Version.xcconfig (150974 => 150975) --- branches/safari-537.43-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2013-05-30 19:18:56 UTC (rev 150974) +++ branches/safari-537.43-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2013-05-30 19:21:46 UTC (rev 150975) @@ -23,7 +23,7 @@ MAJOR_VERSION = 537; MINOR_VERSION = 43; -TINY_VERSION = 4; +TINY_VERSION = 5; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-537.43-branch/Source/WebKit2/Configurations/Version.xcconfig (150974 => 150975) --- branches/safari-537.43-branch/Source/WebKit2/Configurations/Version.xcconfig 2013-05-30 19:18:56 UTC (rev 150974) +++ branches/safari-537.43-branch/Source/WebKit2/Configurations/Version.xcconfig 2013-05-30 19:21:46 UTC (rev 150975) @@ -23,7 +23,7 @@ MAJOR_VERSION = 537; MINOR_VERSION = 43; -TINY_VERSION = 4; +TINY_VERSION = 5; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150974] tags/Safari-537.43.4/
Title: [150974] tags/Safari-537.43.4/ Revision 150974 Author lforsch...@apple.com Date 2013-05-30 12:18:56 -0700 (Thu, 30 May 2013) Log Message New Tag. Added Paths tags/Safari-537.43.4/ Diff Property changes: tags/Safari-537.43.4 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] [150972] trunk
Title: [150972] trunk Revision 150972 Author ser...@webkit.org Date 2013-05-30 11:20:32 -0700 (Thu, 30 May 2013) Log Message Allow no space between "background-position:" dimensions https://bugs.webkit.org/show_bug.cgi?id=116870 Reviewed by Darin Adler. >From Blink r149314 by Source/WebCore: Specs allow no spaces between the dimensions of a "background-position:" like "1px+1px", we should support that. Whitespaces are no longer early consumed, dramatically dropping the shift/reduce conflicts to half. The productions unary_term, calc_func_term, calc_func_expr and calc_func_paren_expr no longer consume whitespaces. * css/CSSGrammar.y.in: * css/CSSParser.cpp: (WebCore::CSSParser::realLex): LayoutTests: * fast/backgrounds/background-position-parsing-2-expected.txt: * fast/backgrounds/background-position-parsing-2.html: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/fast/backgrounds/background-position-parsing-2-expected.txt trunk/LayoutTests/fast/backgrounds/background-position-parsing-2.html trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/css/CSSGrammar.y.in trunk/Source/WebCore/css/CSSParser.cpp Diff Modified: trunk/LayoutTests/ChangeLog (150971 => 150972) --- trunk/LayoutTests/ChangeLog 2013-05-30 18:19:00 UTC (rev 150971) +++ trunk/LayoutTests/ChangeLog 2013-05-30 18:20:32 UTC (rev 150972) @@ -1,3 +1,15 @@ +2013-05-30 Sergio Villar Senin + +Allow no space between "background-position:" dimensions +https://bugs.webkit.org/show_bug.cgi?id=116870 + +Reviewed by Darin Adler. + +From Blink r149314 by + +* fast/backgrounds/background-position-parsing-2-expected.txt: +* fast/backgrounds/background-position-parsing-2.html: + 2013-05-30 Zoltan Arvai [Qt] Unreviewed gardening. Modified: trunk/LayoutTests/fast/backgrounds/background-position-parsing-2-expected.txt (150971 => 150972) --- trunk/LayoutTests/fast/backgrounds/background-position-parsing-2-expected.txt 2013-05-30 18:19:00 UTC (rev 150971) +++ trunk/LayoutTests/fast/backgrounds/background-position-parsing-2-expected.txt 2013-05-30 18:20:32 UTC (rev 150972) @@ -81,6 +81,8 @@ PASS computedStyle.backgroundPosition is '50% 50%' PASS style.backgroundPosition is '50% 50%' PASS computedStyle.backgroundPosition is '50% 50%' +PASS style.backgroundPosition is '1px 1px' +PASS computedStyle.backgroundPosition is '1px 1px' background-position with CSS3 comma separator, one or two values PASS style.backgroundPosition is '50% 50%, 100% 50%' PASS computedStyle.backgroundPosition is '50% 50%, 100% 50%' Modified: trunk/LayoutTests/fast/backgrounds/background-position-parsing-2.html (150971 => 150972) --- trunk/LayoutTests/fast/backgrounds/background-position-parsing-2.html 2013-05-30 18:19:00 UTC (rev 150971) +++ trunk/LayoutTests/fast/backgrounds/background-position-parsing-2.html 2013-05-30 18:20:32 UTC (rev 150972) @@ -174,6 +174,10 @@ shouldBe("style.backgroundPosition", "'50% 50%'"); shouldBe("computedStyle.backgroundPosition", "'50% 50%'"); +style.backgroundPosition = "1px+1px"; +shouldBe("style.backgroundPosition", "'1px 1px'"); +shouldBe("computedStyle.backgroundPosition", "'1px 1px'"); + debug("background-position with CSS3 comma separator, one or two values"); style.backgroundImage = "url(resources/diamond.png), url(resources/ring.png)"; style.backgroundRepeat = "no-repeat"; Modified: trunk/Source/WebCore/ChangeLog (150971 => 150972) --- trunk/Source/WebCore/ChangeLog 2013-05-30 18:19:00 UTC (rev 150971) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 18:20:32 UTC (rev 150972) @@ -1,3 +1,25 @@ +2013-05-30 Sergio Villar Senin + +Allow no space between "background-position:" dimensions +https://bugs.webkit.org/show_bug.cgi?id=116870 + +Reviewed by Darin Adler. + +From Blink r149314 by + +Specs allow no spaces between the dimensions of a +"background-position:" like "1px+1px", we should support +that. + +Whitespaces are no longer early consumed, dramatically dropping +the shift/reduce conflicts to half. The productions unary_term, +calc_func_term, calc_func_expr and calc_func_paren_expr no longer +consume whitespaces. + +* css/CSSGrammar.y.in: +* css/CSSParser.cpp: +(WebCore::CSSParser::realLex): + 2013-05-30 Jer Noble HTMLMediaElement will not unthrottle page when playback stops for nreasons other than user-initiated pause. Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (150971 => 150972) --- trunk/Source/WebCore/css/CSSGrammar.y.in 2013-05-30 18:19:00 UTC (rev 150971) +++ trunk/Source/WebCore/css/CSSGrammar.y.in 2013-05-30 18:20:32 UTC (rev 150972) @@ -88,9 +88,9 @@ %} #if ENABLE_SHADOW_DOM -%expect 63 +%expect 33 #else -%expect 62 +%expect 32 #endif %nonassoc LOWEST_PREC @@ -1677,8 +1677,8 @@ ; term: - unary_term { $$ = $1; } - | unary_operator unary_term { $$ = $2; $$.fValue *= $1;
[webkit-changes] [150971] trunk/Source/WebCore
Title: [150971] trunk/Source/WebCore Revision 150971 Author jer.no...@apple.com Date 2013-05-30 11:19:00 -0700 (Thu, 30 May 2013) Log Message HTMLMediaElement will not unthrottle page when playback stops for nreasons other than user-initiated pause. https://bugs.webkit.org/show_bug.cgi?id=117016 Reviewed by Oliver Hunt. Add a new class PageActivityAssertionToken to allow HTMLMediaElement to decouple knowledge of and control over the lifetime of PageThrottler. The new class will have weak references to and from the PageThrottler so that holders of the token will not need to care if the Page or PageThrottler has been destroyed. HTMLMediaElement will create one of these PageActivityAssertionTokens when playback begins and destroy it when playback stops for any reason, or when the element is destroyed. * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::~HTMLMediaElement): (WebCore::HTMLMediaElement::playInternal): (WebCore::HTMLMediaElement::pauseInternal): (WebCore::HTMLMediaElement::playbackProgressTimerFired): (WebCore::HTMLMediaElement::updatePlayState): * html/HTMLMediaElement.h: * page/Page.cpp: (WebCore::createActivityToken): Added simple factory method. * page/Page.h: * page/PageActivityAssertionToken.cpp: (WebCore::PageActivityAssertionToken::PageActivityAssertionToken): Call addActivityToken(); (WebCore::PageActivityAssertionToken::~PageActivityAssertionToken): Call removeActivityToken(); (WebCore::PageActivityAssertionToken::invalidate): Clear m_throttler. * page/PageActivityAssertionToken.h: * page/PageThrottler.cpp: (WebCore::PageThrottler::~PageThrottler): Invalidate all outstanding tokens. (WebCore::PageThrottler::addActivityToken): Bump the activity count. (WebCore::PageThrottler::removeActivityToken): Lower the activity count. * page/PageThrottler.h: Add the new files to the various build systems: * CMakeLists.txt: * GNUmakefile.list.am: * Target.pri: * WebCore.vcproj/WebCore.vcproj: * WebCore.vcxproj/WebCore.vcxproj: * WebCore.vcxproj/WebCore.vcxproj.filters: * WebCore.xcodeproj/project.pbxproj: Modified Paths trunk/Source/WebCore/CMakeLists.txt trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/GNUmakefile.list.am trunk/Source/WebCore/Target.pri trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj trunk/Source/WebCore/html/HTMLMediaElement.cpp trunk/Source/WebCore/html/HTMLMediaElement.h trunk/Source/WebCore/page/Page.cpp trunk/Source/WebCore/page/Page.h trunk/Source/WebCore/page/PageThrottler.cpp trunk/Source/WebCore/page/PageThrottler.h Added Paths trunk/Source/WebCore/page/PageActivityAssertionToken.cpp trunk/Source/WebCore/page/PageActivityAssertionToken.h Diff Modified: trunk/Source/WebCore/CMakeLists.txt (150970 => 150971) --- trunk/Source/WebCore/CMakeLists.txt 2013-05-30 17:52:33 UTC (rev 150970) +++ trunk/Source/WebCore/CMakeLists.txt 2013-05-30 18:19:00 UTC (rev 150971) @@ -1753,6 +1753,7 @@ page/NavigatorBase.cpp page/OriginAccessEntry.cpp page/Page.cpp +page/PageActivityAssertionToken.cpp page/PageConsole.cpp page/PageGroup.cpp page/PageGroupLoadDeferrer.cpp Modified: trunk/Source/WebCore/ChangeLog (150970 => 150971) --- trunk/Source/WebCore/ChangeLog 2013-05-30 17:52:33 UTC (rev 150970) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 18:19:00 UTC (rev 150971) @@ -1,3 +1,49 @@ +2013-05-30 Jer Noble + +HTMLMediaElement will not unthrottle page when playback stops for nreasons other than user-initiated pause. +https://bugs.webkit.org/show_bug.cgi?id=117016 + +Reviewed by Oliver Hunt. + +Add a new class PageActivityAssertionToken to allow HTMLMediaElement to decouple +knowledge of and control over the lifetime of PageThrottler. The new class will +have weak references to and from the PageThrottler so that holders of the token +will not need to care if the Page or PageThrottler has been destroyed. + +HTMLMediaElement will create one of these PageActivityAssertionTokens when playback +begins and destroy it when playback stops for any reason, or when the element is +destroyed. + +* html/HTMLMediaElement.cpp: +(WebCore::HTMLMediaElement::~HTMLMediaElement): +(WebCore::HTMLMediaElement::playInternal): +(WebCore::HTMLMediaElement::pauseInternal): +(WebCore::HTMLMediaElement::playbackProgressTimerFired): +(WebCore::HTMLMediaElement::updatePlayState): +* html/HTMLMediaElement.h: +* page/Page.cpp: +(WebCore::createActivityToken): Added simple factory method. +* page/Page.h: +* page/PageActivityAssertionToken.cpp: +(WebCore::PageActivityAssertionToken::PageActivityAssertionToken): Call addActivityToken(); +(WebCore::PageActivityAssertionToken::~PageActivityAssertionToken): Cal
[webkit-changes] [150970] trunk
Title: [150970] trunk Revision 150970 Author jp...@apple.com Date 2013-05-30 10:52:33 -0700 (Thu, 30 May 2013) Log Message [Mac] Enable cache partitioning and the public suffix list on 10.8 Rubber-stamped by David Kilzer. Source/_javascript_Core: * Configurations/FeatureDefines.xcconfig: Source/WebCore: * Configurations/FeatureDefines.xcconfig: Source/WebKit/mac: * Configurations/FeatureDefines.xcconfig: Source/WebKit2: * Configurations/FeatureDefines.xcconfig: WebKitLibraries: * WebKitSystemInterface.h: * libWebKitSystemInterfaceLion.a: * libWebKitSystemInterfaceMountainLion.a: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig trunk/Source/WebKit/mac/ChangeLog trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig trunk/WebKitLibraries/ChangeLog trunk/WebKitLibraries/WebKitSystemInterface.h trunk/WebKitLibraries/libWebKitSystemInterfaceLion.a trunk/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a Diff Modified: trunk/Source/_javascript_Core/ChangeLog (150969 => 150970) --- trunk/Source/_javascript_Core/ChangeLog 2013-05-30 17:09:07 UTC (rev 150969) +++ trunk/Source/_javascript_Core/ChangeLog 2013-05-30 17:52:33 UTC (rev 150970) @@ -1,3 +1,12 @@ +2013-05-29 Jeffrey Pfau + +[Mac] Enable cache partitioning and the public suffix list on 10.8 + + +Rubber-stamped by David Kilzer. + +* Configurations/FeatureDefines.xcconfig: + 2013-05-28 Brent Fulgham [Windows] Put correct byteCompile symbol in file. Previous version Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (150969 => 150970) --- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2013-05-30 17:09:07 UTC (rev 150969) +++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2013-05-30 17:52:33 UTC (rev 150970) @@ -37,7 +37,7 @@ ENABLE_CACHE_PARTITIONING = $(ENABLE_CACHE_PARTITIONING_$(PLATFORM_NAME)); ENABLE_CACHE_PARTITIONING_macosx = $(ENABLE_CACHE_PARTITIONING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)); ENABLE_CACHE_PARTITIONING_macosx_1070 = ; -ENABLE_CACHE_PARTITIONING_macosx_1080 = ; +ENABLE_CACHE_PARTITIONING_macosx_1080 = ENABLE_CACHE_PARTITIONING; ENABLE_CACHE_PARTITIONING_macosx_1090 = ENABLE_CACHE_PARTITIONING; ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH; ENABLE_CANVAS_PROXY = ; @@ -151,7 +151,7 @@ ENABLE_PUBLIC_SUFFIX_LIST = $(ENABLE_PUBLIC_SUFFIX_LIST_$(PLATFORM_NAME)); ENABLE_PUBLIC_SUFFIX_LIST_macosx = $(ENABLE_PUBLIC_SUFFIX_LIST_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)); ENABLE_PUBLIC_SUFFIX_LIST_macosx_1070 = ; -ENABLE_PUBLIC_SUFFIX_LIST_macosx_1080 = ; +ENABLE_PUBLIC_SUFFIX_LIST_macosx_1080 = ENABLE_PUBLIC_SUFFIX_LIST; ENABLE_PUBLIC_SUFFIX_LIST_macosx_1090 = ENABLE_PUBLIC_SUFFIX_LIST; ENABLE_QUOTA = ; ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME; Modified: trunk/Source/WebCore/ChangeLog (150969 => 150970) --- trunk/Source/WebCore/ChangeLog 2013-05-30 17:09:07 UTC (rev 150969) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 17:52:33 UTC (rev 150970) @@ -1,3 +1,12 @@ +2013-05-29 Jeffrey Pfau + +[Mac] Enable cache partitioning and the public suffix list on 10.8 + + +Rubber-stamped by David Kilzer. + +* Configurations/FeatureDefines.xcconfig: + 2013-05-30 Andreas Kling Fix double hash lookup in DocumentEventQueue::cancelEvent(). Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (150969 => 150970) --- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2013-05-30 17:09:07 UTC (rev 150969) +++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2013-05-30 17:52:33 UTC (rev 150970) @@ -37,7 +37,7 @@ ENABLE_CACHE_PARTITIONING = $(ENABLE_CACHE_PARTITIONING_$(PLATFORM_NAME)); ENABLE_CACHE_PARTITIONING_macosx = $(ENABLE_CACHE_PARTITIONING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)); ENABLE_CACHE_PARTITIONING_macosx_1070 = ; -ENABLE_CACHE_PARTITIONING_macosx_1080 = ; +ENABLE_CACHE_PARTITIONING_macosx_1080 = ENABLE_CACHE_PARTITIONING; ENABLE_CACHE_PARTITIONING_macosx_1090 = ENABLE_CACHE_PARTITIONING; ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH; ENABLE_CANVAS_PROXY = ; @@ -151,7 +151,7 @@ ENABLE_PUBLIC_SUFFIX_LIST = $(ENABLE_PUBLIC_SUFFIX_LIST_$(PLATFORM_NAME)); ENABLE_PUBLIC_SUFFIX_LIST_macosx = $(ENABLE_PUBLIC_SUFFIX_LIST_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)); ENABLE_PUBLIC_SUFFIX_LIST_macosx_1070 = ; -ENABLE_PUBLIC_SUFFIX_LIST_macosx_1080 = ; +ENABLE_PUBLIC_SUFFIX_LIST_macosx_1080 = ENABLE_PUBLIC_SUFFIX_LIST; ENABLE_PUBLIC_SUFFIX_LIST_macosx_1090 = ENABLE_PUBLIC_SUFFIX_LIST; ENABLE_QUOTA = ; ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME; Modified: trunk/Source/WebKit/mac/ChangeLog (150969 => 150970)
[webkit-changes] [150969] trunk/Source/WebCore
Title: [150969] trunk/Source/WebCore Revision 150969 Author akl...@apple.com Date 2013-05-30 10:09:07 -0700 (Thu, 30 May 2013) Log Message Fix double hash lookup in DocumentEventQueue::cancelEvent(). Reviewed by Anders Carlsson. * dom/DocumentEventQueue.cpp: (WebCore::DocumentEventQueue::cancelEvent): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/dom/DocumentEventQueue.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (150968 => 150969) --- trunk/Source/WebCore/ChangeLog 2013-05-30 17:06:52 UTC (rev 150968) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 17:09:07 UTC (rev 150969) @@ -1,5 +1,15 @@ 2013-05-30 Andreas Kling +Fix double hash lookup in DocumentEventQueue::cancelEvent(). + + +Reviewed by Anders Carlsson. + +* dom/DocumentEventQueue.cpp: +(WebCore::DocumentEventQueue::cancelEvent): + +2013-05-30 Andreas Kling + Fix double hash lookup in DocumentLoader::removeSubresourceLoader(). Modified: trunk/Source/WebCore/dom/DocumentEventQueue.cpp (150968 => 150969) --- trunk/Source/WebCore/dom/DocumentEventQueue.cpp 2013-05-30 17:06:52 UTC (rev 150968) +++ trunk/Source/WebCore/dom/DocumentEventQueue.cpp 2013-05-30 17:09:07 UTC (rev 150969) @@ -98,8 +98,10 @@ bool DocumentEventQueue::cancelEvent(Event* event) { -bool found = m_queuedEvents.contains(event); -m_queuedEvents.remove(event); +ListHashSet, 16>::iterator it = m_queuedEvents.find(event); +bool found = it != m_queuedEvents.end(); +if (found) +m_queuedEvents.remove(it); if (m_queuedEvents.isEmpty()) m_pendingEventTimer->stop(); return found; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150967] trunk/Source/WebCore
Title: [150967] trunk/Source/WebCore Revision 150967 Author akl...@apple.com Date 2013-05-30 10:05:33 -0700 (Thu, 30 May 2013) Log Message Fix double hash lookup in DocumentLoader::removeSubresourceLoader(). Reviewed by Anders Carlsson. * loader/DocumentLoader.cpp: (WebCore::DocumentLoader::removeSubresourceLoader): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/DocumentLoader.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (150966 => 150967) --- trunk/Source/WebCore/ChangeLog 2013-05-30 17:03:53 UTC (rev 150966) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 17:05:33 UTC (rev 150967) @@ -1,5 +1,15 @@ 2013-05-30 Andreas Kling +Fix double hash lookup in DocumentLoader::removeSubresourceLoader(). + + +Reviewed by Anders Carlsson. + +* loader/DocumentLoader.cpp: +(WebCore::DocumentLoader::removeSubresourceLoader): + +2013-05-30 Andreas Kling + Fix double hash lookup in RenderView::repaintSelection() loop. Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (150966 => 150967) --- trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-05-30 17:03:53 UTC (rev 150966) +++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-05-30 17:05:33 UTC (rev 150967) @@ -1287,9 +1287,10 @@ void DocumentLoader::removeSubresourceLoader(ResourceLoader* loader) { -if (!m_subresourceLoaders.contains(loader)) +ResourceLoaderSet::iterator it = m_subresourceLoaders.find(loader); +if (it == m_subresourceLoaders.end()) return; -m_subresourceLoaders.remove(loader); +m_subresourceLoaders.remove(it); checkLoadComplete(); if (Frame* frame = m_frame) frame->loader()->checkLoadComplete(); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150968] trunk/Source/WebKit2
Title: [150968] trunk/Source/WebKit2 Revision 150968 Author akl...@apple.com Date 2013-05-30 10:06:52 -0700 (Thu, 30 May 2013) Log Message Fix double hash lookup in WebPage::determinePrimarySnapshottedPlugIn() loop. Reviewed by Anders Carlsson. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::determinePrimarySnapshottedPlugIn): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (150967 => 150968) --- trunk/Source/WebKit2/ChangeLog 2013-05-30 17:05:33 UTC (rev 150967) +++ trunk/Source/WebKit2/ChangeLog 2013-05-30 17:06:52 UTC (rev 150968) @@ -1,3 +1,13 @@ +2013-05-30 Andreas Kling + +Fix double hash lookup in WebPage::determinePrimarySnapshottedPlugIn() loop. + + +Reviewed by Anders Carlsson. + +* WebProcess/WebPage/WebPage.cpp: +(WebKit::WebPage::determinePrimarySnapshottedPlugIn): + 2013-05-29 Tim Horton Expose incrementalRenderingSuppressionTimeout via WK2 Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (150967 => 150968) --- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-05-30 17:05:33 UTC (rev 150967) +++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-05-30 17:06:52 UTC (rev 150968) @@ -4121,9 +4121,8 @@ RenderBox* renderBox = toRenderBox(renderer); -if (seenRenderers.contains(renderer)) +if (!seenRenderers.add(renderer).isNewEntry) continue; -seenRenderers.add(renderer); if (!element->isPluginElement()) continue; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150966] trunk/Source/WebCore
Title: [150966] trunk/Source/WebCore Revision 150966 Author akl...@apple.com Date 2013-05-30 10:03:53 -0700 (Thu, 30 May 2013) Log Message Fix double hash lookup in RenderView::repaintSelection() loop. Reviewed by Anders Carlsson. * rendering/RenderView.cpp: (WebCore::RenderView::repaintSelection): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/RenderView.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (150965 => 150966) --- trunk/Source/WebCore/ChangeLog 2013-05-30 16:44:32 UTC (rev 150965) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 17:03:53 UTC (rev 150966) @@ -1,3 +1,13 @@ +2013-05-30 Andreas Kling + +Fix double hash lookup in RenderView::repaintSelection() loop. + + +Reviewed by Anders Carlsson. + +* rendering/RenderView.cpp: +(WebCore::RenderView::repaintSelection): + 2013-05-30 Peter Gal CURL: Incorrect stripping of query from file URL Modified: trunk/Source/WebCore/rendering/RenderView.cpp (150965 => 150966) --- trunk/Source/WebCore/rendering/RenderView.cpp 2013-05-30 16:44:32 UTC (rev 150965) +++ trunk/Source/WebCore/rendering/RenderView.cpp 2013-05-30 17:03:53 UTC (rev 150966) @@ -662,9 +662,8 @@ // Blocks are responsible for painting line gaps and margin gaps. They must be examined as well. for (RenderBlock* block = o->containingBlock(); block && !block->isRenderView(); block = block->containingBlock()) { -if (processedBlocks.contains(block)) +if (!processedBlocks.add(block).isNewEntry) break; -processedBlocks.add(block); RenderSelectionInfo(block, true).repaint(); } } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150964] trunk/Source/WebCore
Title: [150964] trunk/Source/WebCore Revision 150964 Author commit-qu...@webkit.org Date 2013-05-30 08:12:54 -0700 (Thu, 30 May 2013) Log Message CURL: Incorrect stripping of query from file URL https://bugs.webkit.org/show_bug.cgi?id=104307 Patch by Peter Gal on 2013-05-30 Reviewed by Darin Adler. Clear the query part of the file URL if there is any. * platform/network/curl/ResourceHandleManager.cpp: (WebCore::ResourceHandleManager::initializeHandle): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (150963 => 150964) --- trunk/Source/WebCore/ChangeLog 2013-05-30 14:55:45 UTC (rev 150963) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 15:12:54 UTC (rev 150964) @@ -1,3 +1,15 @@ +2013-05-30 Peter Gal + +CURL: Incorrect stripping of query from file URL +https://bugs.webkit.org/show_bug.cgi?id=104307 + +Reviewed by Darin Adler. + +Clear the query part of the file URL if there is any. + +* platform/network/curl/ResourceHandleManager.cpp: +(WebCore::ResourceHandleManager::initializeHandle): + 2013-05-30 Antti Koivisto Separate generic font family settings to a class Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (150963 => 150964) --- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2013-05-30 14:55:45 UTC (rev 150963) +++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2013-05-30 15:12:54 UTC (rev 150964) @@ -666,12 +666,11 @@ String url = "" if (kurl.isLocalFile()) { -String query = kurl.query(); // Remove any query part sent to a local file. -if (!query.isEmpty()) { -int queryIndex = url.find(query); -if (queryIndex != -1) -url = "" - 1); +if (!kurl.query().isEmpty()) { +// By setting the query to a null string it'll be removed. +kurl.setQuery(String()); +url = "" } // Determine the MIME type based on the path. d->m_response.setMimeType(MIMETypeRegistry::getMIMETypeForPath(url)); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150963] trunk
Title: [150963] trunk Revision 150963 Author commit-qu...@webkit.org Date 2013-05-30 07:55:45 -0700 (Thu, 30 May 2013) Log Message [GTK] Needs to check for harfbuzz-icu https://bugs.webkit.org/show_bug.cgi?id=116978 Patch by Alberto Garcia on 2013-05-30 Reviewed by Xan Lopez. HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we also need to check for it in order to get the necessary flags for the compiler and the linker. We keep this conditional for now since we still want to support earlier versions of HarfBuzz. * Source/autotools/FindDependencies.m4: Modified Paths trunk/ChangeLog trunk/Source/autotools/FindDependencies.m4 Diff Modified: trunk/ChangeLog (150962 => 150963) --- trunk/ChangeLog 2013-05-30 14:26:21 UTC (rev 150962) +++ trunk/ChangeLog 2013-05-30 14:55:45 UTC (rev 150963) @@ -1,3 +1,19 @@ +2013-05-30 Alberto Garcia + +[GTK] Needs to check for harfbuzz-icu +https://bugs.webkit.org/show_bug.cgi?id=116978 + +Reviewed by Xan Lopez. + +HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we +also need to check for it in order to get the necessary flags for +the compiler and the linker. + +We keep this conditional for now since we still want to support +earlier versions of HarfBuzz. + +* Source/autotools/FindDependencies.m4: + 2013-05-29 Kent Tamura Remove leftover files for ENABLE_PAGE_POPUP and ENABLE_CALENDAR_PICKER Modified: trunk/Source/autotools/FindDependencies.m4 (150962 => 150963) --- trunk/Source/autotools/FindDependencies.m4 2013-05-30 14:26:21 UTC (rev 150962) +++ trunk/Source/autotools/FindDependencies.m4 2013-05-30 14:55:45 UTC (rev 150963) @@ -375,6 +375,13 @@ PKG_CHECK_MODULES([FREETYPE], [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version]) fi +# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library. +# Since we support earlier HarfBuzz versions we keep this conditional for now. +if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then +PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version) +FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS" +FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS" +fi AC_SUBST([FREETYPE_CFLAGS]) AC_SUBST([FREETYPE_LIBS]) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150962] trunk/Source/WebCore
Title: [150962] trunk/Source/WebCore Revision 150962 Author an...@apple.com Date 2013-05-30 07:26:21 -0700 (Thu, 30 May 2013) Log Message Separate generic font family settings to a class https://bugs.webkit.org/show_bug.cgi?id=117027 Reviewed by Andreas Kling. The new class is under platform/ and can be accessed by the font code directly without platform violations. * WebCore.xcodeproj/project.pbxproj: * page/Settings.cpp: (WebCore::invalidateAfterGenericFamilyChange): (WebCore::Settings::Settings): (WebCore::Settings::~Settings): (WebCore::Settings::create): (WebCore::Settings::standardFontFamily): (WebCore::Settings::setStandardFontFamily): (WebCore::Settings::fixedFontFamily): (WebCore::Settings::setFixedFontFamily): (WebCore::Settings::serifFontFamily): (WebCore::Settings::setSerifFontFamily): (WebCore::Settings::sansSerifFontFamily): (WebCore::Settings::setSansSerifFontFamily): (WebCore::Settings::cursiveFontFamily): (WebCore::Settings::setCursiveFontFamily): (WebCore::Settings::fantasyFontFamily): (WebCore::Settings::setFantasyFontFamily): (WebCore::Settings::pictographFontFamily): (WebCore::Settings::setPictographFontFamily): * page/Settings.h: * platform/graphics/FontGenericFamilies.cpp: Added. (WebCore::setGenericFontFamilyForScript): (WebCore::genericFontFamilyForScript): (WebCore::FontGenericFamilies::FontGenericFamilies): (WebCore::FontGenericFamilies::standardFontFamily): (WebCore::FontGenericFamilies::fixedFontFamily): (WebCore::FontGenericFamilies::serifFontFamily): (WebCore::FontGenericFamilies::sansSerifFontFamily): (WebCore::FontGenericFamilies::cursiveFontFamily): (WebCore::FontGenericFamilies::fantasyFontFamily): (WebCore::FontGenericFamilies::pictographFontFamily): (WebCore::FontGenericFamilies::setStandardFontFamily): (WebCore::FontGenericFamilies::setFixedFontFamily): (WebCore::FontGenericFamilies::setSerifFontFamily): (WebCore::FontGenericFamilies::setSansSerifFontFamily): (WebCore::FontGenericFamilies::setCursiveFontFamily): (WebCore::FontGenericFamilies::setFantasyFontFamily): (WebCore::FontGenericFamilies::setPictographFontFamily): * platform/graphics/FontGenericFamilies.h: Added. (WebCore::UScriptCodeHashTraits::emptyValue): (WebCore::UScriptCodeHashTraits::constructDeletedValue): (WebCore::UScriptCodeHashTraits::isDeletedValue): (WebCore::FontGenericFamilies::create): Modified Paths trunk/Source/WebCore/CMakeLists.txt trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/GNUmakefile.list.am trunk/Source/WebCore/Target.pri trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj trunk/Source/WebCore/page/Settings.cpp trunk/Source/WebCore/page/Settings.h Added Paths trunk/Source/WebCore/platform/graphics/FontGenericFamilies.cpp trunk/Source/WebCore/platform/graphics/FontGenericFamilies.h Diff Modified: trunk/Source/WebCore/CMakeLists.txt (150961 => 150962) --- trunk/Source/WebCore/CMakeLists.txt 2013-05-30 14:15:28 UTC (rev 150961) +++ trunk/Source/WebCore/CMakeLists.txt 2013-05-30 14:26:21 UTC (rev 150962) @@ -1892,6 +1892,7 @@ platform/graphics/FontCache.cpp platform/graphics/FontData.cpp platform/graphics/FontDescription.cpp +platform/graphics/FontGenericFamilies.cpp platform/graphics/FontGlyphs.cpp platform/graphics/FontFastPath.cpp platform/graphics/FontFeatureSettings.cpp Modified: trunk/Source/WebCore/ChangeLog (150961 => 150962) --- trunk/Source/WebCore/ChangeLog 2013-05-30 14:15:28 UTC (rev 150961) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 14:26:21 UTC (rev 150962) @@ -1,3 +1,57 @@ +2013-05-30 Antti Koivisto + +Separate generic font family settings to a class +https://bugs.webkit.org/show_bug.cgi?id=117027 + +Reviewed by Andreas Kling. + +The new class is under platform/ and can be accessed by the font code directly without platform violations. + +* WebCore.xcodeproj/project.pbxproj: +* page/Settings.cpp: +(WebCore::invalidateAfterGenericFamilyChange): +(WebCore::Settings::Settings): +(WebCore::Settings::~Settings): +(WebCore::Settings::create): +(WebCore::Settings::standardFontFamily): +(WebCore::Settings::setStandardFontFamily): +(WebCore::Settings::fixedFontFamily): +(WebCore::Settings::setFixedFontFamily): +(WebCore::Settings::serifFontFamily): +(WebCore::Settings::setSerifFontFamily): +(WebCore::Settings::sansSerifFontFamily): +(WebCore::Settings::setSansSerifFontFamily): +(WebCore::Settings::cursiveFontFamily): +(WebCore::Settings::setCursiveFontFamily): +(WebCore::Settings::fantasyFontFamily): +(WebCore::Settings::setFantasyFontFamily): +(WebCore::Settings::pictographFontFamily): +(WebCore::Settings::setPictographFontFamily): +* page/Settings.
[webkit-changes] [150957] trunk/Source/WebCore
Title: [150957] trunk/Source/WebCore Revision 150957 Author mk...@chromium.org Date 2013-05-30 05:08:58 -0700 (Thu, 30 May 2013) Log Message Rename 'KURL::elidedString' and inspector's 'String.prototype.trimMiddle' for clarity. https://bugs.webkit.org/show_bug.cgi?id=111700 Reviewed by Darin Adler. Darin suggested that 'KURL::elidedString' is inaccurately named[1], this patch is an attempt to do better. It additionally brings the Inspector's 'String.prototype.trimMiddle' method into line, as the two methods do more or less the same thing. After a bit of discussion with Maciej and Daniel Bates on IRC, I've settled on 'KURL::stringCenterEllipsizedToLength(unsigned)' and 'String.prototype.centerEllipsizedToLength(number)' respectively. No new tests are added, as this patch shouldn't have any visible effect on the web. It's strictly an internal refactoring. * Modules/websockets/WebSocket.cpp: (WebCore::WebSocket::connect): (WebCore::WebSocket::send): * Modules/websockets/WebSocketChannel.cpp: (WebCore::WebSocketChannel::send): (WebCore::WebSocketChannel::fail): * bindings/ScriptControllerBase.cpp: (WebCore::ScriptController::canExecuteScripts): * dom/Document.cpp: (WebCore::Document::processHttpEquiv): * dom/ScriptElement.cpp: (WebCore::ScriptElement::executeScript): * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::canPlayType): (WebCore::HTMLMediaElement::isSafeToLoadURL): * loader/FrameLoader.cpp: (WebCore::FrameLoader::submitForm): (WebCore::FrameLoader::loadFrameRequest): (WebCore::FrameLoader::commitProvisionalLoad): (WebCore::FrameLoader::shouldInterruptLoadForXFrameOptions): (WebCore::FrameLoader::loadProvisionalItemFromCachedPage): (WebCore::createWindow): * loader/MainResourceLoader.cpp: (WebCore::MainResourceLoader::willSendRequest): (WebCore::MainResourceLoader::responseReceived): * loader/MixedContentChecker.cpp: (WebCore::MixedContentChecker::logWarning): * loader/appcache/ApplicationCacheGroup.cpp: (WebCore::ApplicationCacheGroup::didReceiveResponse): (WebCore::ApplicationCacheGroup::didFail): * loader/cache/CachedResourceLoader.cpp: (WebCore::CachedResourceLoader::canRequest): (WebCore::CachedResourceLoader::requestResource): (WebCore::CachedResourceLoader::loadResource): (WebCore::CachedResourceLoader::printAccessDeniedMessage): * page/ContentSecurityPolicy.cpp: (WebCore::CSPDirectiveList::checkSourceAndReportViolation): (WebCore::CSPDirectiveList::allowScriptNonce): (WebCore::CSPDirectiveList::allowPluginType): * platform/KURL.cpp: (WebCore::KURL::stringCenterEllipsizedToLength): * platform/KURL.h: Rename 'KURL::elidedString' to 'KURL::stringCenterEllipsizedToLength', and adjust callsites accordingly. * inspector/front-end/CallStackSidebarPane.js: (WebInspector.CallStackSidebarPane.Placard.prototype._update): * inspector/front-end/ElementsTreeOutline.js: (WebInspector.ElementsTreeElement.prototype._buildAttributeDOM): * inspector/front-end/HeapSnapshotGridNodes.js: (WebInspector.HeapSnapshotGenericObjectNode.prototype.shortenWindowURL): * inspector/front-end/Linkifier.js: (WebInspector.Linkifier.DefaultFormatter.prototype.formatLiveAnchor): * inspector/front-end/ResourceUtils.js: (WebInspector.linkifyURLAsNode): * inspector/front-end/TabbedEditorContainer.js: (WebInspector.TabbedEditorContainer.prototype._titleForFile): * inspector/front-end/utilities.js: Rename 'String.prototype.trimMiddle' to 'String.prototype.centerEllipsizedToLength' and adjust callsites accordingly. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Modules/websockets/WebSocket.cpp trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp trunk/Source/WebCore/bindings/ScriptControllerBase.cpp trunk/Source/WebCore/dom/Document.cpp trunk/Source/WebCore/dom/ScriptElement.cpp trunk/Source/WebCore/html/HTMLMediaElement.cpp trunk/Source/WebCore/inspector/front-end/CallStackSidebarPane.js trunk/Source/WebCore/inspector/front-end/ElementsTreeOutline.js trunk/Source/WebCore/inspector/front-end/HeapSnapshotGridNodes.js trunk/Source/WebCore/inspector/front-end/Linkifier.js trunk/Source/WebCore/inspector/front-end/ResourceUtils.js trunk/Source/WebCore/inspector/front-end/TabbedEditorContainer.js trunk/Source/WebCore/inspector/front-end/utilities.js trunk/Source/WebCore/loader/DocumentLoader.cpp trunk/Source/WebCore/loader/FrameLoader.cpp trunk/Source/WebCore/loader/MixedContentChecker.cpp trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp trunk/Source/WebCore/page/ContentSecurityPolicy.cpp trunk/Source/WebCore/platform/KURL.cpp trunk/Source/WebCore/platform/KURL.h Diff Modified: trunk/Source/WebCore/ChangeLog (150956 => 150957) --- trunk/Source/WebCore/ChangeLog 2013-05-30 10:44:22 UTC (rev 150956) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 12:08:58 UTC (rev 150957) @@ -1,3 +1,82 @@ +2013-05-30 Mike West + +Rename 'KURL::elidedString' and inspector's 'String.prototype.trimMiddle' for c
[webkit-changes] [150954] trunk/Source/WebCore
Title: [150954] trunk/Source/WebCore Revision 150954 Author rn...@webkit.org Date 2013-05-30 03:42:06 -0700 (Thu, 30 May 2013) Log Message Get rid of Position::computedStyle https://bugs.webkit.org/show_bug.cgi?id=117024 Reviewed by Andreas Kling. Removed the function. * dom/Position.cpp: * dom/Position.h: * editing/ApplyStyleCommand.cpp: (WebCore::ApplyStyleCommand::positionToComputeInlineStyleChange): We need a position inside the dummy element since we'll get the containing element's style instead if we had the position before the dummy element. * editing/EditingStyle.cpp: (WebCore::StyleChange::StyleChange): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/dom/Position.cpp trunk/Source/WebCore/dom/Position.h trunk/Source/WebCore/editing/ApplyStyleCommand.cpp trunk/Source/WebCore/editing/EditingStyle.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (150953 => 150954) --- trunk/Source/WebCore/ChangeLog 2013-05-30 08:14:28 UTC (rev 150953) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 10:42:06 UTC (rev 150954) @@ -1,3 +1,21 @@ +2013-05-30 Ryosuke Niwa + +Get rid of Position::computedStyle +https://bugs.webkit.org/show_bug.cgi?id=117024 + +Reviewed by Andreas Kling. + +Removed the function. + +* dom/Position.cpp: +* dom/Position.h: +* editing/ApplyStyleCommand.cpp: +(WebCore::ApplyStyleCommand::positionToComputeInlineStyleChange): We need a position +inside the dummy element since we'll get the containing element's style instead +if we had the position before the dummy element. +* editing/EditingStyle.cpp: +(WebCore::StyleChange::StyleChange): + 2013-05-30 Seokju Kwon Remove obsolete forward declaration from InspectorFrontendHost.h Modified: trunk/Source/WebCore/dom/Position.cpp (150953 => 150954) --- trunk/Source/WebCore/dom/Position.cpp 2013-05-30 08:14:28 UTC (rev 150953) +++ trunk/Source/WebCore/dom/Position.cpp 2013-05-30 10:42:06 UTC (rev 150954) @@ -303,14 +303,6 @@ return toElement(n); } -PassRefPtr Position::computedStyle() const -{ -Element* elem = element(); -if (!elem) -return 0; -return CSSComputedStyleDeclaration::create(elem); -} - Position Position::previous(PositionMoveType moveType) const { Node* n = deprecatedNode(); Modified: trunk/Source/WebCore/dom/Position.h (150953 => 150954) --- trunk/Source/WebCore/dom/Position.h 2013-05-30 08:14:28 UTC (rev 150953) +++ trunk/Source/WebCore/dom/Position.h 2013-05-30 10:42:06 UTC (rev 150954) @@ -144,7 +144,6 @@ bool isOrphan() const { return m_anchorNode && !m_anchorNode->inDocument(); } Element* element() const; -PassRefPtr computedStyle() const; // Move up or down the DOM by one position. // Offsets are computed using render text for nodes that have renderers - but note that even when Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.cpp (150953 => 150954) --- trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2013-05-30 08:14:28 UTC (rev 150953) +++ trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2013-05-30 10:42:06 UTC (rev 150954) @@ -1409,11 +1409,10 @@ Position ApplyStyleCommand::positionToComputeInlineStyleChange(PassRefPtr startNode, RefPtr& dummyElement) { // It's okay to obtain the style at the startNode because we've removed all relevant styles from the current run. -Position positionForStyleComparison; if (!startNode->isElementNode()) { dummyElement = createStyleSpanElement(document()); insertNodeAt(dummyElement, positionBeforeNode(startNode.get())); -return positionBeforeNode(dummyElement.get()); +return firstPositionInOrBeforeNode(dummyElement.get()); } return firstPositionInOrBeforeNode(startNode.get()); Modified: trunk/Source/WebCore/editing/EditingStyle.cpp (150953 => 150954) --- trunk/Source/WebCore/editing/EditingStyle.cpp 2013-05-30 08:14:28 UTC (rev 150953) +++ trunk/Source/WebCore/editing/EditingStyle.cpp 2013-05-30 10:42:06 UTC (rev 150954) @@ -1338,7 +1338,12 @@ if (!style || !style->style() || !document || !document->frame()) return; -RefPtr computedStyle = position.computedStyle(); +Node* node = position.containerNode(); +if (!node) +return; + +RefPtr computedStyle = CSSComputedStyleDeclaration::create(node); + // FIXME: take care of background-color in effect RefPtr mutableStyle = getPropertiesNotIn(style->style(), computedStyle.get()); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150953] trunk/Source/WebCore
Title: [150953] trunk/Source/WebCore Revision 150953 Author commit-qu...@webkit.org Date 2013-05-30 01:14:28 -0700 (Thu, 30 May 2013) Log Message Remove obsolete forward declaration from InspectorFrontendHost.h https://bugs.webkit.org/show_bug.cgi?id=117017 Patch by Seokju Kwon on 2013-05-30 Reviewed by Joseph Pecoraro. Remove obsolete forward declaration and fix style issue as well. No change in behavior, no new tests. * inspector/InspectorFrontendHost.h: (WebCore): (InspectorFrontendHost): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/inspector/InspectorFrontendHost.h Diff Modified: trunk/Source/WebCore/ChangeLog (150952 => 150953) --- trunk/Source/WebCore/ChangeLog 2013-05-30 07:34:57 UTC (rev 150952) +++ trunk/Source/WebCore/ChangeLog 2013-05-30 08:14:28 UTC (rev 150953) @@ -1,3 +1,18 @@ +2013-05-30 Seokju Kwon + +Remove obsolete forward declaration from InspectorFrontendHost.h +https://bugs.webkit.org/show_bug.cgi?id=117017 + +Reviewed by Joseph Pecoraro. + +Remove obsolete forward declaration and fix style issue as well. + +No change in behavior, no new tests. + +* inspector/InspectorFrontendHost.h: +(WebCore): +(InspectorFrontendHost): + 2013-05-29 Tim Horton Expose incrementalRenderingSuppressionTimeout via WK2 Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.h (150952 => 150953) --- trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2013-05-30 07:34:57 UTC (rev 150952) +++ trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2013-05-30 08:14:28 UTC (rev 150953) @@ -42,9 +42,7 @@ class DOMFileSystem; class Event; class FrontendMenuProvider; -class InspectorClient; class InspectorFrontendClient; -class Node; class Page; class InspectorFrontendHost : public RefCounted { @@ -103,7 +101,7 @@ #if ENABLE(CONTEXT_MENUS) friend class FrontendMenuProvider; #endif -InspectorFrontendHost(InspectorFrontendClient* client, Page* frontendPage); +InspectorFrontendHost(InspectorFrontendClient*, Page* frontendPage); InspectorFrontendClient* m_client; Page* m_frontendPage; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150952] trunk/LayoutTests
Title: [150952] trunk/LayoutTests Revision 150952 Author commit-qu...@webkit.org Date 2013-05-30 00:34:57 -0700 (Thu, 30 May 2013) Log Message [GTK] Cleanup TestExpectations https://bugs.webkit.org/show_bug.cgi?id=117005 Unreviewed GTK gardening. Patch by Seokju Kwon on 2013-05-30 * platform/gtk/TestExpectations: Get rid of duplicate entry line. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/gtk/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (150951 => 150952) --- trunk/LayoutTests/ChangeLog 2013-05-30 07:32:33 UTC (rev 150951) +++ trunk/LayoutTests/ChangeLog 2013-05-30 07:34:57 UTC (rev 150952) @@ -1,3 +1,12 @@ +2013-05-30 Seokju Kwon + +[GTK] Cleanup TestExpectations +https://bugs.webkit.org/show_bug.cgi?id=117005 + +Unreviewed GTK gardening. + +* platform/gtk/TestExpectations: Get rid of duplicate entry line. + 2013-05-29 Praveen R Jadhav ProgressEvent should not be cancelable Modified: trunk/LayoutTests/platform/gtk/TestExpectations (150951 => 150952) --- trunk/LayoutTests/platform/gtk/TestExpectations 2013-05-30 07:32:33 UTC (rev 150951) +++ trunk/LayoutTests/platform/gtk/TestExpectations 2013-05-30 07:34:57 UTC (rev 150952) @@ -544,7 +544,6 @@ webkit.org/b/80158 plugins/netscape-plugin-page-cache-works.html [ Failure Pass ] -webkit.org/b/83704 media/event-attributes.html [ Failure Pass ] webkit.org/b/89811 media/media-blocked-by-beforeload.html [ Failure Pass ] webkit.org/b/84856 media/media-controller-playback.html [ Failure Pass ] ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150951] trunk/Tools
Title: [150951] trunk/Tools Revision 150951 Author rn...@webkit.org Date 2013-05-30 00:32:33 -0700 (Thu, 30 May 2013) Log Message Remove requires_http_server as Chromium Android was the only port that needed this https://bugs.webkit.org/show_bug.cgi?id=117018 Reviewed by Benjamin Poulain. Removed the unused code that existed for Chromium Android port. * Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py: (LayoutTestRunner.run_tests): (LayoutTestRunner._handle_finished_test_list): * Scripts/webkitpy/layout_tests/controllers/manager.py: (Manager._run_tests): * Scripts/webkitpy/performance_tests/perftestsrunner.py: (PerfTestsRunner._collect_tests): (PerfTestsRunner.run): * Scripts/webkitpy/port/base.py: (Port.to.start_helper): * Scripts/webkitpy/port/base_unittest.py: (PortTest.test_build_path): Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py trunk/Tools/Scripts/webkitpy/port/base.py trunk/Tools/Scripts/webkitpy/port/base_unittest.py Diff Modified: trunk/Tools/ChangeLog (150950 => 150951) --- trunk/Tools/ChangeLog 2013-05-30 06:24:36 UTC (rev 150950) +++ trunk/Tools/ChangeLog 2013-05-30 07:32:33 UTC (rev 150951) @@ -1,3 +1,25 @@ +2013-05-30 Ryosuke Niwa + +Remove requires_http_server as Chromium Android was the only port that needed this +https://bugs.webkit.org/show_bug.cgi?id=117018 + +Reviewed by Benjamin Poulain. + +Removed the unused code that existed for Chromium Android port. + +* Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py: +(LayoutTestRunner.run_tests): +(LayoutTestRunner._handle_finished_test_list): +* Scripts/webkitpy/layout_tests/controllers/manager.py: +(Manager._run_tests): +* Scripts/webkitpy/performance_tests/perftestsrunner.py: +(PerfTestsRunner._collect_tests): +(PerfTestsRunner.run): +* Scripts/webkitpy/port/base.py: +(Port.to.start_helper): +* Scripts/webkitpy/port/base_unittest.py: +(PortTest.test_build_path): + 2013-05-29 Ruth Fong prepare-Changelog should not be generating namespace-only or class-name-only lines like "(WebCore):" Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py (150950 => 150951) --- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py 2013-05-30 06:24:36 UTC (rev 150950) +++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py 2013-05-30 07:32:33 UTC (rev 150951) @@ -116,7 +116,7 @@ all_shards = locked_shards + unlocked_shards self._remaining_locked_shards = locked_shards -if self._port.requires_http_server() or (locked_shards and self._options.http): +if locked_shards and self._options.http: self.start_servers_with_lock(2 * min(num_workers, len(locked_shards))) num_workers = min(num_workers, len(all_shards)) @@ -239,7 +239,7 @@ index = find(list_name, self._remaining_locked_shards) if index >= 0: self._remaining_locked_shards.pop(index) -if not self._remaining_locked_shards and not self._port.requires_http_server(): +if not self._remaining_locked_shards: self.stop_servers_with_lock() def _handle_finished_test(self, worker_name, result, log_messages=[]): Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (150950 => 150951) --- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2013-05-30 06:24:36 UTC (rev 150950) +++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2013-05-30 07:32:33 UTC (rev 150951) @@ -241,7 +241,7 @@ summarized_results, initial_results, retry_results, enabled_pixel_tests_in_retry) def _run_tests(self, tests_to_run, tests_to_skip, repeat_each, iterations, num_workers, retrying): -needs_http = self._port.requires_http_server() or any(self._is_http_test(test) for test in tests_to_run) +needs_http = any(self._is_http_test(test) for test in tests_to_run) needs_websockets = any(self._is_websocket_test(test) for test in tests_to_run) test_inputs = [] Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py (150950 => 150951) --- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2013-05-30 06:24:36 UTC (rev 150950) +++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2013-05-30 07:32:33 UTC (rev 150951) @@ -165,18 +165,8 @@ return tests -def _start_http_servers(self): -self._port.acquire_http_lock() -self._port.start_http_server(number_of_servers=2) - -def _stop_http_servers(self): -self._port.stop_http_serv