[webkit-changes] [102560] trunk
Title: [102560] trunk
Revision 102560
Author zherc...@webkit.org
Date 2011-12-11 23:44:02 -0800 (Sun, 11 Dec 2011)
Log Message
Add new CSS nth-children parsing tests
https://bugs.webkit.org/show_bug.cgi?id=74178
Source/WebCore:
Reviewed by Darin Adler.
Test: fast/css/parsing-css-nth-child.html
* css/CSSParser.cpp:
(WebCore::isValidNthToken): Add "-n" to the possible identifiers.
LayoutTests:
The test covers several valid and invalid nth-child tokens.
Reviewed by Darin Adler.
* fast/css/parsing-css-nth-child-expected.txt: Added.
* fast/css/parsing-css-nth-child.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSParser.cpp
Added Paths
trunk/LayoutTests/fast/css/parsing-css-nth-child-expected.txt
trunk/LayoutTests/fast/css/parsing-css-nth-child.html
Diff
Modified: trunk/LayoutTests/ChangeLog (102559 => 102560)
--- trunk/LayoutTests/ChangeLog 2011-12-12 07:07:56 UTC (rev 102559)
+++ trunk/LayoutTests/ChangeLog 2011-12-12 07:44:02 UTC (rev 102560)
@@ -1,3 +1,15 @@
+2011-12-11 Zoltan Herczeg
+
+Add new CSS nth-children parsing tests
+https://bugs.webkit.org/show_bug.cgi?id=74178
+
+The test covers several valid and invalid nth-child tokens.
+
+Reviewed by Darin Adler.
+
+* fast/css/parsing-css-nth-child-expected.txt: Added.
+* fast/css/parsing-css-nth-child.html: Added.
+
2011-12-11 Andreas Kling
WK2/NetscapePlugin: Incorrect mouse event coordinates when frameScaleFactor != 1.
Added: trunk/LayoutTests/fast/css/parsing-css-nth-child-expected.txt (0 => 102560)
--- trunk/LayoutTests/fast/css/parsing-css-nth-child-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/parsing-css-nth-child-expected.txt 2011-12-12 07:44:02 UTC (rev 102560)
@@ -0,0 +1,51 @@
+Test parsing of CSS nth-child tokens.
+
+SUCCESS
+
+Rules from the stylesheet:
+
+#a:nth-child(1n+0) { color: green; }
+#b:nth-child(n+0) { color: green; }
+#c:nth-child(n) { color: green; }
+#d:nth-child(-n+0) { color: green; }
+#e:nth-child(-n) { color: green; }
+#f:nth-child(1N+0) { color: green; }
+#g:nth-child(N+0) { color: green; }
+#h:nth-child(N) { color: green; }
+#i:nth-child(-N+0) { color: green; }
+#j:nth-child(-N) { color: green; }
+#l:nth-child(-1N
+ -
+ 123) { color: green; }
+#m:nth-child(N- 123) { color: green; }
+#o:nth-child(23n
+
+ +
+
+123) { color: green; }
+#t:nth-child(+n+3) { color: green; }
+#u:nth-child(+n + 7) { color: green; }
+Expected result:
+
+#a:nth-child(1n+0) { color: green; }
+#b:nth-child(n+0) { color: green; }
+#c:nth-child(n) { color: green; }
+#d:nth-child(-n+0) { color: green; }
+#e:nth-child(-n) { color: green; }
+#f:nth-child(1N+0) { color: green; }
+#g:nth-child(N+0) { color: green; }
+#h:nth-child(N) { color: green; }
+#i:nth-child(-N+0) { color: green; }
+#j:nth-child(-N) { color: green; }
+#l:nth-child(-1N
+ -
+ 123) { color: green; }
+#m:nth-child(N- 123) { color: green; }
+#o:nth-child(23n
+
+ +
+
+123) { color: green; }
+#t:nth-child(+n+3) { color: green; }
+#u:nth-child(+n + 7) { color: green; }
+
Added: trunk/LayoutTests/fast/css/parsing-css-nth-child.html (0 => 102560)
--- trunk/LayoutTests/fast/css/parsing-css-nth-child.html (rev 0)
+++ trunk/LayoutTests/fast/css/parsing-css-nth-child.html 2011-12-12 07:44:02 UTC (rev 102560)
@@ -0,0 +1,100 @@
+
+
+#a:nth-child(1n+0) { color: green; }
+#b:nth-child(n+0) { color: green; }
+#c:nth-child(n){ color: green; }
+#d:nth-child(-n+0) { color: green; }
+#e:nth-child(-n) { color: green; }
+
+#f:nth-child(1N+0) { color: green; }
+#g:nth-child(N+0) { color: green; }
+#h:nth-child(N){ color: green; }
+#i:nth-child(-N+0) { color: green; }
+#j:nth-child(-N) { color: green; }
+
+#k:nth-child(+ 1n) { color: green; }
+#l:nth-child(-1N
+ -
+ 123 ) { color: green; }
+#m:nth-child( N- 123) { color: green; }
+#n:nth-child( n +12 3) { color: green; }
+#o:nth-child( 23n
+
+ +
+
+123 ) { color: green; }
+#p:nth-child( 12 n ) { color: green; }
+#q:nth-child(+12n-0+1) { color: green; }
+#r:nth-child(+12N -- 1) { color: green; }
+#s:nth-child(+12 N ) { color: green; }
+#t:nth-child(+n+3) { color: green; }
+#u:nth-child( +n + 7 ) { color: green; }
+#v:nth-child(+ n + 7) { color: green; }
+
+
+
+
+/** Changes the result text font size. */
+function runTest()
+{
+if (window.layoutTestController)
+layoutTestController.dumpAsText();
+
+var rules = document.styleSheets[0].cssRules;
+var text = "";
+for (var i = 0; i < rules.length; i++) {
+text += rules.item(i).cssText;
+text += "\n";
+}
+
+document.getElementById("result").appendChild(document.createTextNode(text));
+
+if (document.getElementById("result").firstChild.data ="" document.getElementById("expected").firstChild.data)
+document.getElementById("message").firstChild.data = ""
+else
+document.getElementById("message").firstChild.data
[webkit-changes] [102559] trunk/Tools
Title: [102559] trunk/Tools
Revision 102559
Author hara...@chromium.org
Date 2011-12-11 23:07:56 -0800 (Sun, 11 Dec 2011)
Log Message
[Refactoring] Move top-level code to resolve conflicted ChangeLogs into a method
https://bugs.webkit.org/show_bug.cgi?id=74257
Reviewed by Ryosuke Niwa.
We are planning to write unit-tests for prepare-ChangeLog
in a run-leaks_unittest/ manner. This patch is one of the incremental
refactorings to remove all top-level code and global variables from
prepare-ChangeLog.
* Scripts/prepare-ChangeLog: Moved top-level code to get the latest ChangeLogs
into getLatestChangeLogs(), and moved top-level code to resolve conflicted ChangeLogs
into resolveConflictedChangeLogs().
(getLatestChangeLogs):
(resolveConflictedChangeLogs):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/prepare-ChangeLog
Diff
Modified: trunk/Tools/ChangeLog (102558 => 102559)
--- trunk/Tools/ChangeLog 2011-12-12 07:01:29 UTC (rev 102558)
+++ trunk/Tools/ChangeLog 2011-12-12 07:07:56 UTC (rev 102559)
@@ -1,5 +1,23 @@
2011-12-11 Kentaro Hara
+[Refactoring] Move top-level code to resolve conflicted ChangeLogs into a method
+https://bugs.webkit.org/show_bug.cgi?id=74257
+
+Reviewed by Ryosuke Niwa.
+
+We are planning to write unit-tests for prepare-ChangeLog
+in a run-leaks_unittest/ manner. This patch is one of the incremental
+refactorings to remove all top-level code and global variables from
+prepare-ChangeLog.
+
+* Scripts/prepare-ChangeLog: Moved top-level code to get the latest ChangeLogs
+into getLatestChangeLogs(), and moved top-level code to resolve conflicted ChangeLogs
+into resolveConflictedChangeLogs().
+(getLatestChangeLogs):
+(resolveConflictedChangeLogs):
+
+2011-12-11 Kentaro Hara
+
[Refactoring] Move top-level code to generate a new ChangeLog into a method
https://bugs.webkit.org/show_bug.cgi?id=74253
Modified: trunk/Tools/Scripts/prepare-ChangeLog (102558 => 102559)
--- trunk/Tools/Scripts/prepare-ChangeLog 2011-12-12 07:01:29 UTC (rev 102558)
+++ trunk/Tools/Scripts/prepare-ChangeLog 2011-12-12 07:07:56 UTC (rev 102559)
@@ -69,6 +69,8 @@
sub changeLogNameFromArgs($);
sub fetchBugDescriptionFromURL($);
sub findChangeLogs(\%);
+sub getLatestChangeLogs($);
+sub resolveConflictedChangeLogs($);
sub generateNewChangeLogs($$$\%);
sub firstDirectoryOrCwd();
sub diffFromToString();
@@ -205,30 +207,10 @@
my ($filesInChangeLog, $prefixes) = findChangeLogs(%functionLists);
# Get the latest ChangeLog files from svn.
-my @logs = ();
-foreach my $prefix (@$prefixes) {
-push @logs, File::Spec->catfile($prefix || ".", "ChangeLog");
-}
+my $changeLogs = getLatestChangeLogs($prefixes);
-if (@logs && $updateChangeLogs && $isSVN) {
-print STDERR " Running 'svn update' to update ChangeLog files.\n";
-open ERRORS, "-|", $SVN, "update", @logs
-or die "The svn update of ChangeLog files failed: $!.\n";
-my @conflictedChangeLogs;
-while (my $line = ) {
-print STDERR "", $line;
-push @conflictedChangeLogs, $1 if $line =~ m/^C\s+(.+?)[\r\n]*$/;
-}
-close ERRORS;
-
-if (@conflictedChangeLogs) {
-print STDERR " Attempting to merge conflicted ChangeLogs.\n";
-my $resolveChangeLogsPath = File::Spec->catfile(dirname($0), "resolve-ChangeLogs");
-open RESOLVE, "-|", $resolveChangeLogsPath, "--no-warnings", @conflictedChangeLogs
-or die "Could not open resolve-ChangeLogs script: $!.\n";
-print STDERR "$_" while ;
-close RESOLVE;
-}
+if (@$changeLogs && $updateChangeLogs && $isSVN) {
+resolveConflictedChangeLogs($changeLogs);
}
generateNewChangeLogs($prefixes, $filesInChangeLog, $addedRegressionTests, %functionLists);
@@ -247,17 +229,17 @@
}
# Open ChangeLogs.
-if ($openChangeLogs && @logs) {
+if ($openChangeLogs && @$changeLogs) {
print STDERR " Opening the edited ChangeLog files.\n";
my $editor = $ENV{CHANGE_LOG_EDITOR};
if ($editor) {
-system ((split ' ', $editor), @logs);
+system ((split ' ', $editor), @$changeLogs);
} else {
$editor = $ENV{CHANGE_LOG_EDIT_APPLICATION};
if ($editor) {
-system "open", "-a", $editor, @logs;
+system "open", "-a", $editor, @$changeLogs;
} else {
-system "open", "-e", @logs;
+system "open", "-e", @$changeLogs;
}
}
}
@@ -448,6 +430,41 @@
return (\%filesInChangeLog, \@prefixes);
}
+sub getLatestChangeLogs($)
+{
+my ($prefixes) = @_;
+
+my @changeLogs = ();
+foreach my $prefix (@$prefixes) {
+push @changeLogs, File::Spec->catfile($prefix || ".", "ChangeLog");
+}
+return \@changeLogs;
+}
+
+sub resolveConflictedChangeLogs($)
+{
+my ($changeLogs) = @_;
+
+print STDERR " Running 'svn update' to update ChangeLog files.\n";
+open ERRORS, "-|
[webkit-changes] [102558] trunk/Source/WebCore
Title: [102558] trunk/Source/WebCore Revision 102558 Author hara...@chromium.org Date 2011-12-11 23:01:29 -0800 (Sun, 11 Dec 2011) Log Message Use [Supplemental] IDL in WebSocket https://bugs.webkit.org/show_bug.cgi?id=74160 Reviewed by Adam Barth. By using the [Supplemental] IDL, this patch moves declarations of WebSocket attributes from DOMWindow.idl to websocket/DOMWindowWebSocket.idl, which helps make WebSocket a self-contained module. No new tests, no change in behavior. Confirm that http/tests/websocket/* pass. * WebCore.gypi: Added DOMWindowWebSocket.idl. * page/DOMWindow.idl: Added the [Supplemented] IDL to WebSocket-related attributes. This [Supplemented] IDL will be removed after all platforms support the [Supplemental] IDL (See bug 73394 for more details). * websockets/DOMWindowWebSocket.idl: Added. Used the [Supplemental=DOMWindow] IDL. The attributes in this IDL file are treated as if they are described in DOMWindow.idl. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.gypi trunk/Source/WebCore/page/DOMWindow.idl Added Paths trunk/Source/WebCore/websockets/DOMWindowWebSocket.idl Diff Modified: trunk/Source/WebCore/ChangeLog (102557 => 102558) --- trunk/Source/WebCore/ChangeLog 2011-12-12 04:06:57 UTC (rev 102557) +++ trunk/Source/WebCore/ChangeLog 2011-12-12 07:01:29 UTC (rev 102558) @@ -1,3 +1,21 @@ +2011-12-11 Kentaro Hara + +Use [Supplemental] IDL in WebSocket +https://bugs.webkit.org/show_bug.cgi?id=74160 + +Reviewed by Adam Barth. + +By using the [Supplemental] IDL, this patch moves declarations of WebSocket +attributes from DOMWindow.idl to websocket/DOMWindowWebSocket.idl, +which helps make WebSocket a self-contained module. + +No new tests, no change in behavior. +Confirm that http/tests/websocket/* pass. + +* WebCore.gypi: Added DOMWindowWebSocket.idl. +* page/DOMWindow.idl: Added the [Supplemented] IDL to WebSocket-related attributes. This [Supplemented] IDL will be removed after all platforms support the [Supplemental] IDL (See bug 73394 for more details). +* websockets/DOMWindowWebSocket.idl: Added. Used the [Supplemental=DOMWindow] IDL. The attributes in this IDL file are treated as if they are described in DOMWindow.idl. + 2011-12-11 Luke Macpherson Implement webkit-line-grid and webkit-line-grid-snap CSS properties in CSSStyleApplyProperty. Modified: trunk/Source/WebCore/WebCore.gypi (102557 => 102558) --- trunk/Source/WebCore/WebCore.gypi 2011-12-12 04:06:57 UTC (rev 102557) +++ trunk/Source/WebCore/WebCore.gypi 2011-12-12 07:01:29 UTC (rev 102558) @@ -1506,6 +1506,7 @@ 'webaudio/RealtimeAnalyserNode.idl', 'webaudio/WaveShaperNode.idl', 'websockets/CloseEvent.idl', +'websockets/DOMWindowWebSocket.idl', 'websockets/WebSocket.idl', 'workers/AbstractWorker.idl', 'workers/DedicatedWorkerContext.idl', Modified: trunk/Source/WebCore/page/DOMWindow.idl (102557 => 102558) --- trunk/Source/WebCore/page/DOMWindow.idl 2011-12-12 04:06:57 UTC (rev 102557) +++ trunk/Source/WebCore/page/DOMWindow.idl 2011-12-12 07:01:29 UTC (rev 102558) @@ -550,7 +550,7 @@ attribute [Conditional=DEVICE_ORIENTATION, EnabledAtRuntime] DeviceMotionEventConstructor DeviceMotionEvent; attribute [Conditional=DEVICE_ORIENTATION, EnabledAtRuntime] DeviceOrientationEventConstructor DeviceOrientationEvent; attribute [Conditional=TOUCH_EVENTS] TouchEventConstructor TouchEvent; -attribute [Conditional=WEB_SOCKETS] CloseEventConstructor CloseEvent; +attribute [Supplemented, Conditional=WEB_SOCKETS] CloseEventConstructor CloseEvent; attribute StorageEventConstructor StorageEvent; attribute [Supplemented, Conditional=WEB_AUDIO] AudioProcessingEventConstructor AudioProcessingEvent; attribute [Supplemented, Conditional=WEB_AUDIO] OfflineAudioCompletionEventConstructor OfflineAudioCompletionEvent; @@ -606,7 +606,7 @@ #endif #if defined(ENABLE_WEB_SOCKETS) && ENABLE_WEB_SOCKETS -attribute [JSCCustomGetter,EnabledAtRuntime] WebSocketConstructor WebSocket; // Usable with the new operator +attribute [Supplemented, JSCCustomGetter, EnabledAtRuntime] WebSocketConstructor WebSocket; // Usable with the new operator #endif #if defined(ENABLE_VIDEO_TRACK) && ENABLE_VIDEO_TRACK Added: trunk/Source/WebCore/websockets/DOMWindowWebSocket.idl (0 => 102558) --- trunk/Source/WebCore/websockets/DOMWindowWebSocket.idl (rev 0) +++ trunk/Source/WebCore/websockets/DOMWindowWebSocket.idl 2011-12-12 07:01:29 UTC (rev 102558) @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2011 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistribu
[webkit-changes] [102557] trunk/Source/WebCore
Title: [102557] trunk/Source/WebCore Revision 102557 Author macpher...@chromium.org Date 2011-12-11 20:06:57 -0800 (Sun, 11 Dec 2011) Log Message Implement webkit-line-grid and webkit-line-grid-snap CSS properties in CSSStyleApplyProperty. https://bugs.webkit.org/show_bug.cgi?id=74262 Reviewed by Andreas Kling. No new tests / refactoring only. * css/CSSStyleApplyProperty.cpp: (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty): * css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::applyProperty): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp trunk/Source/WebCore/css/CSSStyleSelector.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (102556 => 102557) --- trunk/Source/WebCore/ChangeLog 2011-12-12 03:55:06 UTC (rev 102556) +++ trunk/Source/WebCore/ChangeLog 2011-12-12 04:06:57 UTC (rev 102557) @@ -1,3 +1,17 @@ +2011-12-11 Luke Macpherson + +Implement webkit-line-grid and webkit-line-grid-snap CSS properties in CSSStyleApplyProperty. +https://bugs.webkit.org/show_bug.cgi?id=74262 + +Reviewed by Andreas Kling. + +No new tests / refactoring only. + +* css/CSSStyleApplyProperty.cpp: +(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty): +* css/CSSStyleSelector.cpp: +(WebCore::CSSStyleSelector::applyProperty): + 2011-12-11 Kentaro Hara Use the [Supplemental] IDL for webaudio attributes in Chromium Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (102556 => 102557) --- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2011-12-12 03:55:06 UTC (rev 102556) +++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2011-12-12 04:06:57 UTC (rev 102557) @@ -1639,6 +1639,9 @@ setPropertyHandler(CSSPropertyWebkitHyphenateLimitBefore, ApplyPropertyNumber::createHandler()); setPropertyHandler(CSSPropertyWebkitHyphenateLimitLines, ApplyPropertyNumber::createHandler()); +setPropertyHandler(CSSPropertyWebkitLineGrid, ApplyPropertyString::createHandler()); +setPropertyHandler(CSSPropertyWebkitLineGridSnap, ApplyPropertyDefault::createHandler()); + setPropertyHandler(CSSPropertyWebkitTextCombine, ApplyPropertyDefault::createHandler()); setPropertyHandler(CSSPropertyWebkitTextEmphasisPosition, ApplyPropertyDefault::createHandler()); setPropertyHandler(CSSPropertyWebkitTextEmphasisStyle, ApplyPropertyTextEmphasisStyle::createHandler()); Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (102556 => 102557) --- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-12 03:55:06 UTC (rev 102556) +++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-12 04:06:57 UTC (rev 102557) @@ -3284,16 +3284,6 @@ else if (isInitial) m_style->resetColumnRule(); return; -case CSSPropertyWebkitLineGrid: -HANDLE_INHERIT_AND_INITIAL(lineGrid, LineGrid); -if (primitiveValue->getIdent() == CSSValueNone) -m_style->setLineGrid(nullAtom); -else -m_style->setLineGrid(primitiveValue->getStringValue()); -return; -case CSSPropertyWebkitLineGridSnap: -HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(lineGridSnap, LineGridSnap) -return; case CSSPropertyWebkitRegionBreakBefore: HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE_WITH_VALUE(regionBreakBefore, RegionBreakBefore, PageBreak) return; @@ -3898,6 +3888,8 @@ case CSSPropertyWebkitHyphenateLimitAfter: case CSSPropertyWebkitHyphenateLimitBefore: case CSSPropertyWebkitHyphenateLimitLines: +case CSSPropertyWebkitLineGrid: +case CSSPropertyWebkitLineGridSnap: case CSSPropertyWebkitTextCombine: case CSSPropertyWebkitTextEmphasisPosition: case CSSPropertyWebkitTextEmphasisStyle: ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [102556] trunk/Source/WebCore
Title: [102556] trunk/Source/WebCore
Revision 102556
Author hara...@chromium.org
Date 2011-12-11 19:55:06 -0800 (Sun, 11 Dec 2011)
Log Message
Use the [Supplemental] IDL for webaudio attributes in Chromium
https://bugs.webkit.org/show_bug.cgi?id=73394
Reviewed by Adam Barth.
- Overview: Using the [Supplemental] IDL, this patch moves the attribute
declarations of webaudio from DOMWindow.idl into a new IDL file
webaudio/DOMWindowWebAudio.idl, which helps make webaudio a self-contained
feature (aka a module).
- This patch changes the build flow of WebCore.gyp as follows:
Previous build flow:
foreach $idl (all IDL files) {
generate-bindings.pl depends on $idl;
generate-bindings.pl reads $idl;
generate-bindings.pl generates .h and .cpp files for $idl;
}
New build flow (See the discussions in bug 72138 for more details):
resolve-supplemental.pl depends on all IDL files;
resolve-supplemental.pl reads all IDL files;
resolve-supplemental.pl resolves the dependency of [Supplemental=];
resolve-supplemental.pl outputs supplemental_dependency.tmp;
foreach $idl (all IDL files) {
generate-bindings.pl depends on $idl and supplemental_dependency.tmp;
generate-bindings.pl reads $idl;
generate-bindings.pl reads supplemental_dependency.tmp;
generate-bindings.pl generates .h and .cpp files for $idl, including all attributes in IDL files whilementing $idl;
}
- This patch introduces a temporary IDL, [Supplemented]. The [Supplemented] IDL
will be removed after build scripts for all platforms support the [Supplemental] IDL.
The motivation for the [Supplemented] IDL is as follows:
In order to support the [Supplemental] IDL, we need to
(1) run resolve-supplemental.pl and generate supplemental_dependency.tmp
(2) and run generate-bindings.pl with the supplemental_dependency.tmp.
This build flow requires a change on the following build scripts,
but changing all the build scripts all at once without any regression is too difficult:
- DerivedSources.make
- DerivedSources.pri
- GNUmakefile.am
- PlatformBlackBerry.cmake
- UseJSC.cmake
- UseV8.cmake
- WebCore.vcproj/MigrateScripts
- WebCore.vcproj/WebCore.vcproj
- bindings/gobject/GNUmakefile.am
- WebCore.gyp/WebCore.gyp
Thus, we are planning to change the build scripts one by one, which implies that
we need to allow the temporary state in which some build scripts support [Supplemental] IDL
but others do not. To accomplish this, we introduce a temporary IDL, [Supplemented].
The [Supplemented] IDL on an attribute means that the attribute is marked with [Supplemental]
in another IDL file somewhere, like this:
DOMWindowWebAudio.idl:
interface [
Supplemental=DOMWindow
] DOMWindowWebAudio {
attribute attr1;
attribute attr2;
};
DOMWindow.idl:
interface [
] DOMWindow {
attribute [Supplemented] attr1; // This line will be removed after all build scripts support the [Su IDL
attribute [Supplemented] attr2; // This line will be removed after all build scripts support the [Su IDL.
attribute attr3;
attribute attr4;
};
Assuming these IDL files, this patch implements the following logic in generate-bindings.pl:
- If a given build script supports the [Supplemental] IDL,
generate-bindings.pl ignores all attributes with the [Supplemented] IDL.
- Otherwise, generate-bindings.pl treats all attributes with the [Supplemented] IDL
as normal attributes and instead ignores all attributes with the [Supplemental] IDL
(i.e. generate-bindings.pl generates nothing from the IDL file with the [Supplemental] IDL).
Tests: webaudio/*
* WebCore.gyp/WebCore.gyp: Describes the build flow that I described above.
* WebCore.gyp/scripts/action_derivedsourcesallinone.py:
(main): Reads the IDL file names from the input file (i.e. supplemental_dependency.tmp), which are described at the first column of each line in the input file. If the file name is a "/cygdrive/c/..."-style path, it is converted to a "C:\cygwin\..."-style path by the cygpath command.
* WebCore.gypi: Added DOMWindowWebAudio.idl.
* bindings/scripts/generate-bindings.pl: As a temporary solution, if the platform does not support the [Supplemental] IDL, the perl script ignores the [Supplemental] IDL and instead uses the [Supplemented] IDL. Otherwise, the perl script ignores the [Supplemented] IDL and instead uses the [Supplemental] IDL.
* page/DOMWindow.idl: Added the [Supplemented] IDL to webaudio-related attributes. As I described above, the [Supplemented] IDL will be removed after all platforms support the [Supplemental] IDL.
* webaudio/DOMWindowWebAudio.idl: Added. Describes the [Supplemental=DOMWindow] IDL. The attributes in this IDL file should be treated as if they are written in DOMWi
[webkit-changes] [102555] trunk/Source/WebCore
Title: [102555] trunk/Source/WebCore
Revision 102555
Author kl...@webkit.org
Date 2011-12-11 19:43:10 -0800 (Sun, 11 Dec 2011)
Log Message
Micro-optimize CSSStyleSelector::findSiblingForStyleSharing().
Reviewed by Antti Koivisto.
Move the isStyledElement() check from canShareStyleWithElement() into the
loop in findSiblingForStyleSharing(), and tighten up the argument/return
types to StyledElement* as appropriate.
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::canShareStyleWithElement):
(WebCore::CSSStyleSelector::findSiblingForStyleSharing):
(WebCore::CSSStyleSelector::locateSharedStyle):
* css/CSSStyleSelector.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSStyleSelector.cpp
trunk/Source/WebCore/css/CSSStyleSelector.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (102554 => 102555)
--- trunk/Source/WebCore/ChangeLog 2011-12-12 03:25:22 UTC (rev 102554)
+++ trunk/Source/WebCore/ChangeLog 2011-12-12 03:43:10 UTC (rev 102555)
@@ -1,3 +1,20 @@
+2011-12-11 Andreas Kling
+
+Micro-optimize CSSStyleSelector::findSiblingForStyleSharing().
+
+
+Reviewed by Antti Koivisto.
+
+Move the isStyledElement() check from canShareStyleWithElement() into the
+loop in findSiblingForStyleSharing(), and tighten up the argument/return
+types to StyledElement* as appropriate.
+
+* css/CSSStyleSelector.cpp:
+(WebCore::CSSStyleSelector::canShareStyleWithElement):
+(WebCore::CSSStyleSelector::findSiblingForStyleSharing):
+(WebCore::CSSStyleSelector::locateSharedStyle):
+* css/CSSStyleSelector.h:
+
2011-12-11 Shinya Kawanaka
Asynchronous path synchronous path of SpellChecker should share the code to mark misspellings.
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (102554 => 102555)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-12 03:25:22 UTC (rev 102554)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-12 03:43:10 UTC (rev 102555)
@@ -992,12 +992,8 @@
return true;
}
-bool CSSStyleSelector::canShareStyleWithElement(Node* node) const
+bool CSSStyleSelector::canShareStyleWithElement(StyledElement* element) const
{
-if (!node->isStyledElement())
-return false;
-
-StyledElement* element = static_cast(node);
RenderStyle* style = element->renderStyle();
if (!style)
@@ -1080,17 +1076,17 @@
return true;
}
-inline Node* CSSStyleSelector::findSiblingForStyleSharing(Node* node, unsigned& count) const
+inline StyledElement* CSSStyleSelector::findSiblingForStyleSharing(Node* node, unsigned& count) const
{
for (; node; node = node->previousSibling()) {
-if (!node->isElementNode())
+if (!node->isStyledElement())
continue;
-if (canShareStyleWithElement(node))
+if (canShareStyleWithElement(static_cast(node)))
break;
if (count++ == cStyleSearchThreshold)
return 0;
}
-return node;
+return static_cast(node);
}
static inline bool parentStylePreventsSharing(const RenderStyle* parentStyle)
@@ -1117,17 +1113,17 @@
// Check previous siblings and their cousins.
unsigned count = 0;
unsigned visitedNodeCount = 0;
-Node* shareNode = 0;
+StyledElement* shareElement = 0;
Node* cousinList = m_styledElement->previousSibling();
while (cousinList) {
-shareNode = findSiblingForStyleSharing(cousinList, count);
-if (shareNode)
+shareElement = findSiblingForStyleSharing(cousinList, count);
+if (shareElement)
break;
cousinList = locateCousinList(cousinList->parentElement(), visitedNodeCount);
}
// If we have exhausted all our budget or our cousins.
-if (!shareNode)
+if (!shareElement)
return 0;
// Can't share if sibling rules apply. This is checked at the end as it should rarely fail.
@@ -1139,7 +1135,7 @@
// Tracking child index requires unique style for each node. This may get set by the sibling rule match above.
if (parentStylePreventsSharing(m_parentStyle))
return 0;
-return shareNode->renderStyle();
+return shareElement->renderStyle();
}
void CSSStyleSelector::matchUARules(MatchResult& result)
Modified: trunk/Source/WebCore/css/CSSStyleSelector.h (102554 => 102555)
--- trunk/Source/WebCore/css/CSSStyleSelector.h 2011-12-12 03:25:22 UTC (rev 102554)
+++ trunk/Source/WebCore/css/CSSStyleSelector.h 2011-12-12 03:43:10 UTC (rev 102555)
@@ -134,8 +134,8 @@
RenderStyle* locateSharedStyle();
bool matchesRuleSet(RuleSet*);
Node* locateCousinList(Element* parent, unsigned& visitedNodeCount) const;
-Node* findSiblingForStyleSharing(Node*, unsigned& count) const;
-bool canShareStyleWithElement(Node*) const;
+StyledElement* findSiblingForStyleSharing(Node*, unsigned& count) const;
+bool canShareStyleWithElement(StyledElement*) const;
PassRefPtr sty
[webkit-changes] [102554] trunk/Source/WebKit2
Title: [102554] trunk/Source/WebKit2
Revision 102554
Author commit-qu...@webkit.org
Date 2011-12-11 19:25:22 -0800 (Sun, 11 Dec 2011)
Log Message
[Qt] QQuickWebView missing titleChanged signal tests
https://bugs.webkit.org/show_bug.cgi?id=73923
Patch by Gopal Raghavan on 2011-12-11
Reviewed by Simon Hausmann.
Added tests for QQuickWebView tilteChanged signal.
* UIProcess/API/qt/tests/qmltests/WebView/tst_titleChanged.qml: Added.
* UIProcess/API/qt/tests/qmltests/common/test3.html: Added.
* UIProcess/API/qt/tests/qmltests/qmltests.pro:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro
Added Paths
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_titleChanged.qml
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test3.html
Diff
Modified: trunk/Source/WebKit2/ChangeLog (102553 => 102554)
--- trunk/Source/WebKit2/ChangeLog 2011-12-12 03:12:06 UTC (rev 102553)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-12 03:25:22 UTC (rev 102554)
@@ -1,3 +1,16 @@
+2011-12-11 Gopal Raghavan
+
+[Qt] QQuickWebView missing titleChanged signal tests
+https://bugs.webkit.org/show_bug.cgi?id=73923
+
+Reviewed by Simon Hausmann.
+
+Added tests for QQuickWebView tilteChanged signal.
+
+* UIProcess/API/qt/tests/qmltests/WebView/tst_titleChanged.qml: Added.
+* UIProcess/API/qt/tests/qmltests/common/test3.html: Added.
+* UIProcess/API/qt/tests/qmltests/qmltests.pro:
+
2011-12-11 Anders Carlsson
Crash when trying to garbage collect _javascript_ objects
Added: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_titleChanged.qml (0 => 102554)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_titleChanged.qml (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_titleChanged.qml 2011-12-12 03:25:22 UTC (rev 102554)
@@ -0,0 +1,35 @@
+import QtQuick 2.0
+import QtTest 1.0
+import QtWebKit 3.0
+
+WebView {
+id: webView
+width: 400
+height: 300
+
+SignalSpy {
+id: spy
+target: webView
+signalName: "loadSucceeded"
+}
+
+SignalSpy {
+id: spyTitle
+target: webView
+signalName: "titleChanged"
+}
+
+TestCase {
+name: "WebViewTitleChangedSignal"
+
+function test_titleFirstLoad() {
+compare(spyTitle.count, 0)
+var testUrl = Qt.resolvedUrl("../common/test3.html")
+webView.load(testUrl)
+spyTitle.wait()
+compare(webView.title, "Test page 3")
+spyTitle.wait()
+compare(webView.title, "New Title")
+}
+}
+}
Added: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test3.html (0 => 102554)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test3.html (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test3.html 2011-12-12 03:25:22 UTC (rev 102554)
@@ -0,0 +1,18 @@
+
+
+Test page 3
+
+
+function kickOffTitleChange()
+{
+var t = setTimeout("changeTitle('New Title')",3000);
+}
+function changeTitle(title)
+{
+document.title = title;
+}
+
+
+Hello.
+
+
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro (102553 => 102554)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro 2011-12-12 03:12:06 UTC (rev 102553)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro 2011-12-12 03:25:22 UTC (rev 102554)
@@ -29,4 +29,5 @@
WebView/tst_loadProgress.qml \
WebView/tst_loadProgressSignal.qml \
WebView/tst_preferences.qml \
-WebView/tst_properties.qml
+WebView/tst_properties.qml \
+WebView/tst_titleChanged.qml
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [102553] trunk/Source/WebCore
Title: [102553] trunk/Source/WebCore
Revision 102553
Author commit-qu...@webkit.org
Date 2011-12-11 19:12:06 -0800 (Sun, 11 Dec 2011)
Log Message
Asynchronous path synchronous path of SpellChecker should share the code to mark misspellings.
https://bugs.webkit.org/show_bug.cgi?id=73616
Patch by Shinya Kawanaka on 2011-12-11
Reviewed by Hajime Morita.
Asynchronous spellchecking path should call the same method for the synchronous spellchecking path
to mark misspellings.
No new tests. Covered by existing tests.
* editing/Editor.cpp:
(WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges):
(WebCore::Editor::markAndReplaceFor):
Takes SpellCheckRequest object.
* editing/Editor.h:
* editing/SpellChecker.cpp:
(WebCore::SpellChecker::didCheck):
Calls the same method of synchronous spellchecking path.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/editing/Editor.cpp
trunk/Source/WebCore/editing/Editor.h
trunk/Source/WebCore/editing/SpellChecker.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (102552 => 102553)
--- trunk/Source/WebCore/ChangeLog 2011-12-12 02:24:28 UTC (rev 102552)
+++ trunk/Source/WebCore/ChangeLog 2011-12-12 03:12:06 UTC (rev 102553)
@@ -1,3 +1,24 @@
+2011-12-11 Shinya Kawanaka
+
+Asynchronous path synchronous path of SpellChecker should share the code to mark misspellings.
+https://bugs.webkit.org/show_bug.cgi?id=73616
+
+Reviewed by Hajime Morita.
+
+Asynchronous spellchecking path should call the same method for the synchronous spellchecking path
+to mark misspellings.
+
+No new tests. Covered by existing tests.
+
+* editing/Editor.cpp:
+(WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges):
+(WebCore::Editor::markAndReplaceFor):
+ Takes SpellCheckRequest object.
+* editing/Editor.h:
+* editing/SpellChecker.cpp:
+(WebCore::SpellChecker::didCheck):
+ Calls the same method of synchronous spellchecking path.
+
2011-12-11 Luke Macpherson
Implement CSS display property in CSSStyleApplyProperty.
Modified: trunk/Source/WebCore/editing/Editor.cpp (102552 => 102553)
--- trunk/Source/WebCore/editing/Editor.cpp 2011-12-12 02:24:28 UTC (rev 102552)
+++ trunk/Source/WebCore/editing/Editor.cpp 2011-12-12 03:12:06 UTC (rev 102553)
@@ -2015,25 +2015,31 @@
TextCheckingParagraph paragraphToCheck(rangeToCheck);
if (paragraphToCheck.isRangeEmpty() || paragraphToCheck.isEmpty())
return;
+RefPtr paragraphRange = paragraphToCheck.paragraphRange();
bool asynchronous = m_frame && m_frame->settings() && m_frame->settings()->asynchronousSpellCheckingEnabled() && !shouldShowCorrectionPanel;
+
+// In asynchronous mode, we intentionally check paragraph-wide sentence.
+RefPtr request = SpellCheckRequest::create(resolveTextCheckingTypeMask(textCheckingOptions), asynchronous ? paragraphRange : rangeToCheck, paragraphRange);
+
if (asynchronous) {
-// In asynchronous mode, we intentionally check paragraph-wide sentence.
-RefPtr paragraphRange = paragraphToCheck.paragraphRange();
-m_spellChecker->requestCheckingFor(SpellCheckRequest::create(resolveTextCheckingTypeMask(textCheckingOptions), paragraphRange, paragraphRange));
+m_spellChecker->requestCheckingFor(request);
return;
}
Vector results;
checkTextOfParagraph(textChecker(), paragraphToCheck.textCharacters(), paragraphToCheck.textLength(),
resolveTextCheckingTypeMask(textCheckingOptions), results);
-markAndReplaceFor(textCheckingOptions, results, rangeToCheck, paragraphToCheck.paragraphRange());
+markAndReplaceFor(request, results);
}
-void Editor::markAndReplaceFor(TextCheckingTypeMask textCheckingOptions, const Vector& results, PassRefPtr checkingRange, PassRefPtr paragraphRange)
+void Editor::markAndReplaceFor(PassRefPtr request, const Vector& results)
{
-TextCheckingParagraph paragraph(checkingRange, paragraphRange);
+ASSERT(request);
+TextCheckingTypeMask textCheckingOptions = request->mask();
+TextCheckingParagraph paragraph(request->checkingRange(), request->paragraphRange());
+
bool shouldMarkSpelling = textCheckingOptions & TextCheckingTypeSpelling;
bool shouldMarkGrammar = textCheckingOptions & TextCheckingTypeGrammar;
bool shouldPerformReplacement = textCheckingOptions & TextCheckingTypeReplacement;
Modified: trunk/Source/WebCore/editing/Editor.h (102552 => 102553)
--- trunk/Source/WebCore/editing/Editor.h 2011-12-12 02:24:28 UTC (rev 102552)
+++ trunk/Source/WebCore/editing/Editor.h 2011-12-12 03:12:06 UTC (rev 102553)
@@ -61,6 +61,7 @@
class Pasteboard;
class SimpleFontData;
class SpellChecker;
+class SpellCheckRequest;
class SpellingCorrectionController;
class Text;
class TextCheckerClient;
@@ -223,7 +224,7 @@
void markMisspellings(const VisibleSelection&, RefPtr& firstMisspellingRange);
void markBad
[webkit-changes] [102552] trunk/Source/WebCore
Title: [102552] trunk/Source/WebCore
Revision 102552
Author macpher...@chromium.org
Date 2011-12-11 18:24:28 -0800 (Sun, 11 Dec 2011)
Log Message
Implement CSS display property in CSSStyleApplyProperty.
https://bugs.webkit.org/show_bug.cgi?id=73500
Reviewed by Andreas Kling.
Refactoring only / no functionality changed.
* css/CSSStyleApplyProperty.cpp:
(WebCore::ApplyPropertyDisplay::isValidDisplayValue):
(WebCore::ApplyPropertyDisplay::applyInheritValue):
(WebCore::ApplyPropertyDisplay::applyInitialValue):
(WebCore::ApplyPropertyDisplay::applyValue):
(WebCore::ApplyPropertyDisplay::createHandler):
(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::applyProperty):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp
trunk/Source/WebCore/css/CSSStyleSelector.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (102551 => 102552)
--- trunk/Source/WebCore/ChangeLog 2011-12-12 01:22:49 UTC (rev 102551)
+++ trunk/Source/WebCore/ChangeLog 2011-12-12 02:24:28 UTC (rev 102552)
@@ -1,3 +1,22 @@
+2011-12-11 Luke Macpherson
+
+Implement CSS display property in CSSStyleApplyProperty.
+https://bugs.webkit.org/show_bug.cgi?id=73500
+
+Reviewed by Andreas Kling.
+
+Refactoring only / no functionality changed.
+
+* css/CSSStyleApplyProperty.cpp:
+(WebCore::ApplyPropertyDisplay::isValidDisplayValue):
+(WebCore::ApplyPropertyDisplay::applyInheritValue):
+(WebCore::ApplyPropertyDisplay::applyInitialValue):
+(WebCore::ApplyPropertyDisplay::applyValue):
+(WebCore::ApplyPropertyDisplay::createHandler):
+(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+* css/CSSStyleSelector.cpp:
+(WebCore::CSSStyleSelector::applyProperty):
+
2011-12-11 Geoffrey Garen
Try to fix the Qt build.
Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (102551 => 102552)
--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2011-12-12 01:22:49 UTC (rev 102551)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2011-12-12 02:24:28 UTC (rev 102552)
@@ -1349,6 +1349,49 @@
}
};
+class ApplyPropertyDisplay {
+private:
+static inline bool isValidDisplayValue(CSSStyleSelector* selector, EDisplay displayPropertyValue)
+{
+#if ENABLE(SVG)
+if (selector->element() && selector->element()->isSVGElement() && selector->style()->styleType() == NOPSEUDO)
+return (displayPropertyValue == INLINE || displayPropertyValue == BLOCK || displayPropertyValue == NONE);
+#endif
+return true;
+}
+public:
+static void applyInheritValue(CSSStyleSelector* selector)
+{
+EDisplay display = selector->parentStyle()->display();
+if (!isValidDisplayValue(selector, display))
+return;
+selector->style()->setDisplay(display);
+}
+
+static void applyInitialValue(CSSStyleSelector* selector)
+{
+selector->style()->setDisplay(RenderStyle::initialDisplay());
+}
+
+static void applyValue(CSSStyleSelector* selector, CSSValue* value)
+{
+if (!value->isPrimitiveValue())
+return;
+
+EDisplay display = *static_cast(value);
+
+if (!isValidDisplayValue(selector, display))
+return;
+
+selector->style()->setDisplay(display);
+}
+
+static PropertyHandler createHandler()
+{
+return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue);
+}
+};
+
const CSSStyleApplyProperty& CSSStyleApplyProperty::sharedCSSStyleApplyProperty()
{
DEFINE_STATIC_LOCAL(CSSStyleApplyProperty, cssStyleApplyPropertyInstance, ());
@@ -1373,6 +1416,8 @@
setPropertyHandler(CSSPropertyWebkitBackgroundComposite, ApplyPropertyFillLayer&FillLayer::isCompositeSet, &FillLayer::composite, &FillLayer::setComposite, &FillLayer::clearComposite, &FillLayer::initialFillComposite, &CSSStyleSelector::mapFillComposite>::createHandler());
+setPropertyHandler(CSSPropertyDisplay, ApplyPropertyDisplay::createHandler());
+
setPropertyHandler(CSSPropertyBackgroundImage, ApplyPropertyFillLayer&FillLayer::isImageSet, &FillLayer::image, &FillLayer::setImage, &FillLayer::clearImage, &FillLayer::initialFillImage, &CSSStyleSelector::mapFillImage>::createHandler());
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (102551 => 102552)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-12 01:22:49 UTC (rev 102551)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-12 02:24:28 UTC (rev 102552)
@@ -2504,53 +2504,6 @@
return false;
}
-class SVGDisplayPropertyGuard {
-WTF_MAKE_NONCOPYABLE(SVGDisplayPropertyGuard);
-public:
-SVGDisplayPropertyGuard(Element*, RenderStyle*);
-~SVGDisplayPropertyGuard();
-private:
-#if ENABLE(SVG)
-RenderStyle* m_style;
-EDisplay m_origina
[webkit-changes] [102551] trunk/Source/WebKit2
Title: [102551] trunk/Source/WebKit2
Revision 102551
Author ander...@apple.com
Date 2011-12-11 17:22:49 -0800 (Sun, 11 Dec 2011)
Log Message
Crash when trying to garbage collect _javascript_ objects
https://bugs.webkit.org/show_bug.cgi?id=74259
Reviewed by Sam Weinig.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::garbageCollectJavaScriptObjects):
Use sendToAllProcesses which is more correct and also handles m_process being null.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebContext.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (102550 => 102551)
--- trunk/Source/WebKit2/ChangeLog 2011-12-12 01:22:10 UTC (rev 102550)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-12 01:22:49 UTC (rev 102551)
@@ -1,3 +1,15 @@
+2011-12-11 Anders Carlsson
+
+Crash when trying to garbage collect _javascript_ objects
+https://bugs.webkit.org/show_bug.cgi?id=74259
+
+
+Reviewed by Sam Weinig.
+
+* UIProcess/WebContext.cpp:
+(WebKit::WebContext::garbageCollectJavaScriptObjects):
+Use sendToAllProcesses which is more correct and also handles m_process being null.
+
2011-12-11 Andreas Kling
WK2/NetscapePlugin: Incorrect mouse event coordinates when frameScaleFactor != 1.
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (102550 => 102551)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2011-12-12 01:22:10 UTC (rev 102550)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2011-12-12 01:22:49 UTC (rev 102551)
@@ -896,7 +896,7 @@
void WebContext::garbageCollectJavaScriptObjects()
{
-process()->send(Messages::WebProcess::GarbageCollectJavaScriptObjects(), 0);
+sendToAllProcesses(Messages::WebProcess::GarbageCollectJavaScriptObjects());
}
} // namespace WebKit
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [102550] trunk/Source/JavaScriptCore
Title: [102550] trunk/Source/_javascript_Core Revision 102550 Author wei...@apple.com Date 2011-12-11 17:22:10 -0800 (Sun, 11 Dec 2011) Log Message Fix another signed vs. unsigned warning * runtime/ArgList.h: (JSC::MarkedArgumentBuffer::~MarkedArgumentBuffer): Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/runtime/ArgList.h Diff Modified: trunk/Source/_javascript_Core/ChangeLog (102549 => 102550) --- trunk/Source/_javascript_Core/ChangeLog 2011-12-12 01:05:26 UTC (rev 102549) +++ trunk/Source/_javascript_Core/ChangeLog 2011-12-12 01:22:10 UTC (rev 102550) @@ -1,5 +1,12 @@ 2011-12-11 Sam Weinig +Fix another signed vs. unsigned warning + +* runtime/ArgList.h: +(JSC::MarkedArgumentBuffer::~MarkedArgumentBuffer): + +2011-12-11 Sam Weinig + Fix a signed vs. unsigned warning. * runtime/ArgList.cpp: Modified: trunk/Source/_javascript_Core/runtime/ArgList.h (102549 => 102550) --- trunk/Source/_javascript_Core/runtime/ArgList.h 2011-12-12 01:05:26 UTC (rev 102549) +++ trunk/Source/_javascript_Core/runtime/ArgList.h 2011-12-12 01:22:10 UTC (rev 102550) @@ -58,7 +58,7 @@ if (m_markSet) m_markSet->remove(this); -if (m_capacity != inlineCapacity) +if (m_capacity != static_cast(inlineCapacity)) delete [] &m_buffer[-(m_capacity - 1)]; } ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [102549] trunk/Source/JavaScriptCore
Title: [102549] trunk/Source/_javascript_Core Revision 102549 Author wei...@apple.com Date 2011-12-11 17:05:26 -0800 (Sun, 11 Dec 2011) Log Message Fix a signed vs. unsigned warning. * runtime/ArgList.cpp: (JSC::MarkedArgumentBuffer::slowAppend): Cast inlineCapacity to an int to appease the warning. This is known OK since inlineCapacity is defined to be 8. Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/runtime/ArgList.cpp Diff Modified: trunk/Source/_javascript_Core/ChangeLog (102548 => 102549) --- trunk/Source/_javascript_Core/ChangeLog 2011-12-12 00:50:34 UTC (rev 102548) +++ trunk/Source/_javascript_Core/ChangeLog 2011-12-12 01:05:26 UTC (rev 102549) @@ -1,3 +1,12 @@ +2011-12-11 Sam Weinig + +Fix a signed vs. unsigned warning. + +* runtime/ArgList.cpp: +(JSC::MarkedArgumentBuffer::slowAppend): +Cast inlineCapacity to an int to appease the warning. This is known OK +since inlineCapacity is defined to be 8. + 2011-12-11 Geoffrey Garen Rolled out *another* debugging change I committed accidentally. Modified: trunk/Source/_javascript_Core/runtime/ArgList.cpp (102548 => 102549) --- trunk/Source/_javascript_Core/runtime/ArgList.cpp 2011-12-12 00:50:34 UTC (rev 102548) +++ trunk/Source/_javascript_Core/runtime/ArgList.cpp 2011-12-12 01:05:26 UTC (rev 102549) @@ -57,7 +57,7 @@ for (int i = 0; i < m_capacity; ++i) newBuffer[-i] = m_buffer[-i]; -if (m_capacity != inlineCapacity) +if (m_capacity != static_cast(inlineCapacity)) delete [] &m_buffer[-(m_capacity - 1)]; m_buffer = newBuffer; ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [102548] trunk/Source/WebCore
Title: [102548] trunk/Source/WebCore Revision 102548 Author gga...@apple.com Date 2011-12-11 16:50:34 -0800 (Sun, 11 Dec 2011) Log Message Try to fix the Qt build. Unreviewed. * css/CSSStyleDeclaration.cpp: Maybe an #include will solve our problem? Someday, compiler error messages will not suck. Today is not that day. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/css/CSSStyleDeclaration.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (102547 => 102548) --- trunk/Source/WebCore/ChangeLog 2011-12-12 00:45:40 UTC (rev 102547) +++ trunk/Source/WebCore/ChangeLog 2011-12-12 00:50:34 UTC (rev 102548) @@ -1,3 +1,12 @@ +2011-12-11 Geoffrey Garen + +Try to fix the Qt build. + +Unreviewed. + +* css/CSSStyleDeclaration.cpp: Maybe an #include will solve our problem? +Someday, compiler error messages will not suck. Today is not that day. + 2011-12-11 Luke Macpherson Implement CSS resize property in CSSStyleApplyProperty. Modified: trunk/Source/WebCore/css/CSSStyleDeclaration.cpp (102547 => 102548) --- trunk/Source/WebCore/css/CSSStyleDeclaration.cpp 2011-12-12 00:45:40 UTC (rev 102547) +++ trunk/Source/WebCore/css/CSSStyleDeclaration.cpp 2011-12-12 00:50:34 UTC (rev 102548) @@ -21,6 +21,7 @@ #include "config.h" #include "CSSStyleDeclaration.h" +#include "CSSElementStyleDeclaration.h" #include "CSSMutableStyleDeclaration.h" #include "CSSParser.h" #include "CSSProperty.h" ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [102547] trunk/Source/JavaScriptCore
Title: [102547] trunk/Source/_javascript_Core Revision 102547 Author gga...@apple.com Date 2011-12-11 16:45:40 -0800 (Sun, 11 Dec 2011) Log Message Rolled out *another* debugging change I committed accidentally. Unreviewed. * Configurations/Base.xcconfig: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/Base.xcconfig Diff Modified: trunk/Source/_javascript_Core/ChangeLog (102546 => 102547) --- trunk/Source/_javascript_Core/ChangeLog 2011-12-12 00:40:09 UTC (rev 102546) +++ trunk/Source/_javascript_Core/ChangeLog 2011-12-12 00:45:40 UTC (rev 102547) @@ -1,4 +1,12 @@ 2011-12-11 Geoffrey Garen + +Rolled out *another* debugging change I committed accidentally. + +Unreviewed. + +* Configurations/Base.xcconfig: + +2011-12-11 Geoffrey Garen Rolled out a debug counter I committed accidentally. Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (102546 => 102547) --- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2011-12-12 00:40:09 UTC (rev 102546) +++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2011-12-12 00:45:40 UTC (rev 102547) @@ -24,7 +24,7 @@ #include "CompilerVersion.xcconfig" COMPILER_SPECIFIC_WARNING_CFLAGS = $(COMPILER_SPECIFIC_WARNING_CFLAGS_$(TARGET_GCC_VERSION)); -COMPILER_SPECIFIC_WARNING_CFLAGS_LLVM_COMPILER = ; +COMPILER_SPECIFIC_WARNING_CFLAGS_LLVM_COMPILER = -Wglobal-constructors -Wexit-time-destructors; CLANG_WARN_CXX0X_EXTENSIONS = NO; DEBUG_INFORMATION_FORMAT = dwarf; ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [102546] trunk/Source/JavaScriptCore
Title: [102546] trunk/Source/_javascript_Core
Revision 102546
Author gga...@apple.com
Date 2011-12-11 16:40:09 -0800 (Sun, 11 Dec 2011)
Log Message
Rolled out a debug counter I committed accidentally.
Unreviewed.
* jit/JITStubs.cpp:
(JSC::arityCheckFor):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jit/JITStubs.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (102545 => 102546)
--- trunk/Source/_javascript_Core/ChangeLog 2011-12-12 00:35:51 UTC (rev 102545)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-12-12 00:40:09 UTC (rev 102546)
@@ -1,3 +1,12 @@
+2011-12-11 Geoffrey Garen
+
+Rolled out a debug counter I committed accidentally.
+
+Unreviewed.
+
+* jit/JITStubs.cpp:
+(JSC::arityCheckFor):
+
2011-12-10 Geoffrey Garen
v8 benchmark takes 12-13 million function call slow paths due to extra arguments
Modified: trunk/Source/_javascript_Core/jit/JITStubs.cpp (102545 => 102546)
--- trunk/Source/_javascript_Core/jit/JITStubs.cpp 2011-12-12 00:35:51 UTC (rev 102545)
+++ trunk/Source/_javascript_Core/jit/JITStubs.cpp 2011-12-12 00:40:09 UTC (rev 102546)
@@ -2201,18 +2201,6 @@
return result;
}
-static size_t debugCount[5];
-struct DebugCounter {
-~DebugCounter()
-{
-for (size_t i = 0; i < 5; ++i)
-fprintf(stderr, "DebugCounter[%ld]: %ld\n", i, debugCount[i]);
-}
-void count(int delta) { ++debugCount[std::min(4, delta)]; }
-};
-
-DebugCounter debugCounter;
-
inline CallFrame* arityCheckFor(CallFrame* callFrame, RegisterFile* registerFile, CodeSpecializationKind kind)
{
JSFunction* callee = asFunction(callFrame->callee());
@@ -2226,8 +2214,6 @@
ASSERT(argumentCountIncludingThis < newCodeBlock->m_numParameters);
-debugCounter.count(newCodeBlock->m_numParameters - argumentCountIncludingThis);
-
// Too few arguments -- copy call frame and arguments, then fill in missing arguments with undefined.
size_t delta = newCodeBlock->m_numParameters - argumentCountIncludingThis;
Register* src = ""
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [102544] trunk/Source/WebCore
Title: [102544] trunk/Source/WebCore
Revision 102544
Author macpher...@chromium.org
Date 2011-12-11 16:24:29 -0800 (Sun, 11 Dec 2011)
Log Message
Implement CSS resize property in CSSStyleApplyProperty.
https://bugs.webkit.org/show_bug.cgi?id=74162
Reviewed by Julien Chaffraix.
No new tests / refactoring only.
* css/CSSStyleApplyProperty.cpp:
(WebCore::ApplyPropertyResize::applyValue):
(WebCore::ApplyPropertyResize::createHandler):
(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::applyProperty):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp
trunk/Source/WebCore/css/CSSStyleSelector.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (102543 => 102544)
--- trunk/Source/WebCore/ChangeLog 2011-12-11 23:07:54 UTC (rev 102543)
+++ trunk/Source/WebCore/ChangeLog 2011-12-12 00:24:29 UTC (rev 102544)
@@ -1,3 +1,19 @@
+2011-12-11 Luke Macpherson
+
+Implement CSS resize property in CSSStyleApplyProperty.
+https://bugs.webkit.org/show_bug.cgi?id=74162
+
+Reviewed by Julien Chaffraix.
+
+No new tests / refactoring only.
+
+* css/CSSStyleApplyProperty.cpp:
+(WebCore::ApplyPropertyResize::applyValue):
+(WebCore::ApplyPropertyResize::createHandler):
+(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+* css/CSSStyleSelector.cpp:
+(WebCore::CSSStyleSelector::applyProperty):
+
2011-12-11 Andreas Kling
Move CSSElementStyleDeclaration to its own cpp/h files.
Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (102543 => 102544)
--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2011-12-11 23:07:54 UTC (rev 102543)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2011-12-12 00:24:29 UTC (rev 102544)
@@ -37,6 +37,7 @@
#include "Pair.h"
#include "RenderObject.h"
#include "RenderStyle.h"
+#include "Settings.h"
#include
#include
@@ -1169,6 +1170,36 @@
static PropertyHandler createHandler() { return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
};
+class ApplyPropertyResize {
+public:
+static void applyValue(CSSStyleSelector* selector, CSSValue* value)
+{
+if (!value->isPrimitiveValue())
+return;
+
+CSSPrimitiveValue* primitiveValue = static_cast(value);
+
+EResize r = RESIZE_NONE;
+switch (primitiveValue->getIdent()) {
+case 0:
+return;
+case CSSValueAuto:
+if (Settings* settings = selector->document()->settings())
+r = settings->textAreasAreResizable() ? RESIZE_BOTH : RESIZE_NONE;
+break;
+default:
+r = *primitiveValue;
+}
+selector->style()->setResize(r);
+}
+
+static PropertyHandler createHandler()
+{
+PropertyHandler handler = ApplyPropertyDefaultBase::createHandler();
+return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue);
+}
+};
+
class ApplyPropertyVerticalAlign {
public:
static void applyValue(CSSStyleSelector* selector, CSSValue* value)
@@ -1520,6 +1551,8 @@
setPropertyHandler(CSSPropertyPaddingLeft, ApplyPropertyLength<&RenderStyle::paddingLeft, &RenderStyle::setPaddingLeft, &RenderStyle::initialPadding>::createHandler());
setPropertyHandler(CSSPropertyPadding, ApplyPropertyExpanding::createHandler());
+setPropertyHandler(CSSPropertyResize, ApplyPropertyResize::createHandler());
+
setPropertyHandler(CSSPropertyVerticalAlign, ApplyPropertyVerticalAlign::createHandler());
setPropertyHandler(CSSPropertySize, ApplyPropertyPageSize::createHandler());
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (102543 => 102544)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-11 23:07:54 UTC (rev 102543)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-12 00:24:29 UTC (rev 102544)
@@ -2724,24 +2724,6 @@
case CSSPropertyWebkitMatchNearestMailBlockquoteColor:
HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(matchNearestMailBlockquoteColor, MatchNearestMailBlockquoteColor)
return;
-
-case CSSPropertyResize:
-{
-HANDLE_INHERIT_AND_INITIAL(resize, Resize)
-
-if (!primitiveValue->getIdent())
-return;
-
-EResize r = RESIZE_NONE;
-if (primitiveValue->getIdent() == CSSValueAuto) {
-if (Settings* settings = m_checker.document()->settings())
-r = settings->textAreasAreResizable() ? RESIZE_BOTH : RESIZE_NONE;
-} else
-r = *primitiveValue;
-
-m_style->setResize(r);
-return;
-}
case CSSPropertyFontSize:
{
FontDescription fontDescription = m_style->fontDescription();
@@ -3932,6 +3914,7 @@
case CSSPropertyPaddingBottom:
case CSSPropertyPaddingLeft:
case CSSPropertyPadding:
+case CSSPropertyResize:
[webkit-changes] [102543] trunk/Source/WebCore
Title: [102543] trunk/Source/WebCore Revision 102543 Author kl...@webkit.org Date 2011-12-11 15:07:54 -0800 (Sun, 11 Dec 2011) Log Message Move CSSElementStyleDeclaration to its own cpp/h files. Reviewed by Sam Weinig. CSSElementStyleDeclaration is old enough to move out of CSSMutableStyleDeclaration's attic and into her own apartment. * CMakeLists.txt: * GNUmakefile.list.am: * Target.pri: * WebCore.gypi: * WebCore.vcproj/WebCore.vcproj: * WebCore.xcodeproj/project.pbxproj: * bindings/js/JSDOMBinding.h: * css/CSSElementStyleDeclaration.cpp: Added. (WebCore::CSSElementStyleDeclaration::styleSheet): * css/CSSElementStyleDeclaration.h: Added. (WebCore::CSSElementStyleDeclaration::element): (WebCore::CSSElementStyleDeclaration::setElement): (WebCore::CSSElementStyleDeclaration::CSSElementStyleDeclaration): (WebCore::CSSElementStyleDeclaration::~CSSElementStyleDeclaration): * css/CSSInlineStyleDeclaration.h: * css/CSSMutableStyleDeclaration.cpp: * css/CSSMutableStyleDeclaration.h: * dom/CSSMappedAttributeDeclaration.h: 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.gypi trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj trunk/Source/WebCore/bindings/js/JSDOMBinding.h trunk/Source/WebCore/css/CSSInlineStyleDeclaration.h trunk/Source/WebCore/css/CSSMutableStyleDeclaration.cpp trunk/Source/WebCore/css/CSSMutableStyleDeclaration.h trunk/Source/WebCore/dom/CSSMappedAttributeDeclaration.h Added Paths trunk/Source/WebCore/css/CSSElementStyleDeclaration.cpp trunk/Source/WebCore/css/CSSElementStyleDeclaration.h Diff Modified: trunk/Source/WebCore/CMakeLists.txt (102542 => 102543) --- trunk/Source/WebCore/CMakeLists.txt 2011-12-11 22:20:48 UTC (rev 102542) +++ trunk/Source/WebCore/CMakeLists.txt 2011-12-11 23:07:54 UTC (rev 102543) @@ -430,6 +430,7 @@ css/CSSComputedStyleDeclaration.cpp css/CSSCrossfadeValue.cpp css/CSSCursorImageValue.cpp +css/CSSElementStyleDeclaration.cpp css/CSSFlexValue.cpp css/CSSFontFace.cpp css/CSSFontFaceRule.cpp Modified: trunk/Source/WebCore/ChangeLog (102542 => 102543) --- trunk/Source/WebCore/ChangeLog 2011-12-11 22:20:48 UTC (rev 102542) +++ trunk/Source/WebCore/ChangeLog 2011-12-11 23:07:54 UTC (rev 102543) @@ -1,3 +1,32 @@ +2011-12-11 Andreas Kling + +Move CSSElementStyleDeclaration to its own cpp/h files. + + +Reviewed by Sam Weinig. + +CSSElementStyleDeclaration is old enough to move out of CSSMutableStyleDeclaration's +attic and into her own apartment. + +* CMakeLists.txt: +* GNUmakefile.list.am: +* Target.pri: +* WebCore.gypi: +* WebCore.vcproj/WebCore.vcproj: +* WebCore.xcodeproj/project.pbxproj: +* bindings/js/JSDOMBinding.h: +* css/CSSElementStyleDeclaration.cpp: Added. +(WebCore::CSSElementStyleDeclaration::styleSheet): +* css/CSSElementStyleDeclaration.h: Added. +(WebCore::CSSElementStyleDeclaration::element): +(WebCore::CSSElementStyleDeclaration::setElement): +(WebCore::CSSElementStyleDeclaration::CSSElementStyleDeclaration): +(WebCore::CSSElementStyleDeclaration::~CSSElementStyleDeclaration): +* css/CSSInlineStyleDeclaration.h: +* css/CSSMutableStyleDeclaration.cpp: +* css/CSSMutableStyleDeclaration.h: +* dom/CSSMappedAttributeDeclaration.h: + 2011-12-11 Benjamin Poulain Add KillRingNone.cpp to Mac build system Modified: trunk/Source/WebCore/GNUmakefile.list.am (102542 => 102543) --- trunk/Source/WebCore/GNUmakefile.list.am 2011-12-11 22:20:48 UTC (rev 102542) +++ trunk/Source/WebCore/GNUmakefile.list.am 2011-12-11 23:07:54 UTC (rev 102543) @@ -985,6 +985,8 @@ Source/WebCore/css/CSSCrossfadeValue.h \ Source/WebCore/css/CSSCursorImageValue.cpp \ Source/WebCore/css/CSSCursorImageValue.h \ + Source/WebCore/css/CSSElementStyleDeclaration.cpp \ + Source/WebCore/css/CSSElementStyleDeclaration.h \ Source/WebCore/css/CSSFlexValue.cpp \ Source/WebCore/css/CSSFlexValue.h \ Source/WebCore/css/CSSFontFace.cpp \ Modified: trunk/Source/WebCore/Target.pri (102542 => 102543) --- trunk/Source/WebCore/Target.pri 2011-12-11 22:20:48 UTC (rev 102542) +++ trunk/Source/WebCore/Target.pri 2011-12-11 23:07:54 UTC (rev 102543) @@ -396,6 +396,7 @@ css/CSSComputedStyleDeclaration.cpp \ css/CSSCrossfadeValue.cpp \ css/CSSCursorImageValue.cpp \ +css/CSSElementStyleDeclaration.cpp \ css/CSSFlexValue.cpp \ css/CSSFontFace.cpp \ css/CSSFontFaceRule.cpp \ @@ -1492,6 +1493,7 @@ css/CSSComputedStyleDeclaration.h \ css/CSSCrossfadeValue.h \ css/CSSCursorImageValue.h \ +css/CSSElementStyleDeclaration.h \ css/CSSFlexValue.h \ css/CSSFontFace.h \ css/CSSFontFaceRule.h \ Modified:
[webkit-changes] [102542] trunk/Source/WebCore
Title: [102542] trunk/Source/WebCore
Revision 102542
Author benja...@webkit.org
Date 2011-12-11 14:20:48 -0800 (Sun, 11 Dec 2011)
Log Message
Add KillRingNone.cpp to Mac build system
https://bugs.webkit.org/show_bug.cgi?id=74168
Patch by Benjamin Poulain on 2011-12-11
Reviewed by David Kilzer.
Add KillRingNone.cpp so it can be used on iOS, but
blacklist the file from the build in order to avoid
conflicts with KillRingMac.
* Configurations/WebCore.xcconfig:
* WebCore.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/WebCore.xcconfig
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/WebCore/ChangeLog (102541 => 102542)
--- trunk/Source/WebCore/ChangeLog 2011-12-11 20:44:19 UTC (rev 102541)
+++ trunk/Source/WebCore/ChangeLog 2011-12-11 22:20:48 UTC (rev 102542)
@@ -1,3 +1,17 @@
+2011-12-11 Benjamin Poulain
+
+Add KillRingNone.cpp to Mac build system
+https://bugs.webkit.org/show_bug.cgi?id=74168
+
+Reviewed by David Kilzer.
+
+Add KillRingNone.cpp so it can be used on iOS, but
+blacklist the file from the build in order to avoid
+conflicts with KillRingMac.
+
+* Configurations/WebCore.xcconfig:
+* WebCore.xcodeproj/project.pbxproj:
+
2011-12-11 Peter Rybin
Web Inspector: [protocol] alter some type names generated from Inspector.json
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (102541 => 102542)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2011-12-11 20:44:19 UTC (rev 102541)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2011-12-11 22:20:48 UTC (rev 102542)
@@ -81,9 +81,9 @@
EXCLUDED_SOURCE_FILE_NAMES_SVG_DOM_OBJC_BINDINGS_ENABLE_SVG_DOM_OBJC_BINDINGS = ;
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(REAL_PLATFORM_NAME)) $(EXCLUDED_SOURCE_FILE_NAMES_SVG_DOM_OBJC_BINDINGS);
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png Cursor.cpp CursorMac.mm HTMLConverter.mm MemoryPressureHandlerMac.mm SSLKeyGeneratorMac.cpp SearchPopupMenuMac.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm localizedStrings.js;
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png Cursor.cpp CursorMac.mm HTMLConverter.mm KillRingMac.mm MemoryPressureHandlerMac.mm SSLKeyGeneratorMac.cpp SearchPopupMenuMac.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm localizedStrings.js;
EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
-EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm
+EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm KillRingNone.cpp
SQLITE3_LIBRARY = $(SQLITE3_LIBRARY_$(REAL_PLATFORM_NAME));
SQLITE3_LIBRARY_iphoneos = sqlite3;
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (102541 => 102542)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-12-11 20:44:19 UTC (rev 102541)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-12-11 22:20:48 UTC (rev 102542)
@@ -1037,6 +1037,7 @@
41F584C7104652CB009CAA64 /* JSMessagePortCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F584C6104652CB009CAA64 /* JSMessagePortCustom.h */; };
41FA303E1316C29C00C0BFC5 /* RenderMediaControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41FA303C1316C29C00C0BFC5 /* RenderMediaControls.cpp */; };
41FA303F1316C29C00C0BFC5 /* RenderMediaControls.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FA303D1316C29C00C0BFC5 /* RenderMediaControls.h */; };
+ 4306E4E614955543007F17AC /* KillRingNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4306E4E514955543007F17AC /* KillRingNone.cpp */; };
43142E7A13B1E97700F1C871 /* SVGAnimatedRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43142E7913B1E97700F1C871 /* SVGAnimatedRect.cpp */; };
431A2F9C13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 431A2F9A13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.h */; };
431A2F9D13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 431A2F9B13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.cpp */; };
@@ -8195,6 +8196,7 @@
41F584C6104652CB009CAA64 /* JSMessagePortCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMessagePortCustom.h; sourceTree = ""; };
41FA303C1316C29C00C0BFC5 /* RenderMediaControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMediaControls.cpp; sourceTree = ""; };
41FA303D1316C29C00C0BFC5 /* RenderMediaControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMediaControls.h; sourceTree = ""; };
+ 4306E4E514955543007F17AC /* KillRingNone.cpp */ = {isa = PBXFileReference; fileEncoding =
[webkit-changes] [102541] trunk/Source/WebCore
Title: [102541] trunk/Source/WebCore
Revision 102541
Author loi...@chromium.org
Date 2011-12-11 12:44:19 -0800 (Sun, 11 Dec 2011)
Log Message
Web Inspector: [protocol] alter some type names generated from Inspector.json
https://bugs.webkit.org/show_bug.cgi?id=74247
Patch by Peter Rybin on 2011-12-11
Reviewed by Pavel Feldman.
Manually-filled map added that contains problem type names and its replacement.
* inspector/CodeGeneratorInspector.py:
(fix_type_name.Result):
(fix_type_name.Result.output_comment):
(fix_type_name):
(TypeBindings.create_for_named_type_declaration.write_doc):
(TypeBindings.create_for_named_type_declaration.EnumBinding.generate_type_builder):
(TypeBindings.create_for_named_type_declaration.PlainString.generate_type_builder):
(TypeBindings):
(TypeBindings.create_for_named_type_declaration.ClassBinding.generate_type_builder):
(Generator.process_types):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/CodeGeneratorInspector.py
Diff
Modified: trunk/Source/WebCore/ChangeLog (102540 => 102541)
--- trunk/Source/WebCore/ChangeLog 2011-12-11 19:38:49 UTC (rev 102540)
+++ trunk/Source/WebCore/ChangeLog 2011-12-11 20:44:19 UTC (rev 102541)
@@ -1,3 +1,23 @@
+2011-12-11 Peter Rybin
+
+Web Inspector: [protocol] alter some type names generated from Inspector.json
+https://bugs.webkit.org/show_bug.cgi?id=74247
+
+Reviewed by Pavel Feldman.
+
+Manually-filled map added that contains problem type names and its replacement.
+
+* inspector/CodeGeneratorInspector.py:
+(fix_type_name.Result):
+(fix_type_name.Result.output_comment):
+(fix_type_name):
+(TypeBindings.create_for_named_type_declaration.write_doc):
+(TypeBindings.create_for_named_type_declaration.EnumBinding.generate_type_builder):
+(TypeBindings.create_for_named_type_declaration.PlainString.generate_type_builder):
+(TypeBindings):
+(TypeBindings.create_for_named_type_declaration.ClassBinding.generate_type_builder):
+(Generator.process_types):
+
2011-12-11 Andreas Kling
WK2/NetscapePlugin: Incorrect mouse event coordinates when frameScaleFactor != 1.
Modified: trunk/Source/WebCore/inspector/CodeGeneratorInspector.py (102540 => 102541)
--- trunk/Source/WebCore/inspector/CodeGeneratorInspector.py 2011-12-11 19:38:49 UTC (rev 102540)
+++ trunk/Source/WebCore/inspector/CodeGeneratorInspector.py 2011-12-11 20:44:19 UTC (rev 102541)
@@ -48,6 +48,12 @@
}
+# Manually-filled map of type name replacements.
+TYPE_NAME_FIX_MAP = {
+"RGBA": "Rgba", # RGBA is reported to be conflicting with a define name in Windows CE.
+}
+
+
cmdline_parser = optparse.OptionParser()
cmdline_parser.add_option("--defines")
cmdline_parser.add_option("--output_h_dir")
@@ -439,9 +445,40 @@
INSPECTOR_OBJECT_SETTER_NAMES = frozenset(["setValue", "setBoolean", "setNumber", "setString", "setValue", "setObject", "setArray"])
+def fix_type_name(json_name):
+if json_name in TYPE_NAME_FIX_MAP:
+fixed = TYPE_NAME_FIX_MAP[json_name]
+
+class Result(object):
+class_name = fixed
+
+@staticmethod
+def output_comment(output):
+output.append("// Type originally was named '%s'.\n" % json_name)
+else:
+
+class Result(object):
+class_name = json_name
+
+@staticmethod
+def output_comment(output):
+pass
+
+return Result
+
+
+
class TypeBindings:
@staticmethod
def create_for_named_type_declaration(json_type, context_domain_name):
+fixed_type_name = fix_type_name(json_type["id"])
+
+def write_doc(output):
+if "description" in json_type:
+output.append("/* ")
+output.append(json_type["description"])
+output.append(" */\n")
+
if json_type["type"] == "string":
if "enum" in json_type:
@@ -449,9 +486,11 @@
@staticmethod
def generate_type_builder(output, forward_listener):
enum = json_type["enum"]
-# TODO: doc
+write_doc(output)
+enum_name = fixed_type_name.class_name
+fixed_type_name.output_comment(output)
output.append("namespace ")
-output.append(json_type["id"])
+output.append(enum_name)
output.append(" {\n")
for enum_item in enum:
item_c_name = enum_item.replace('-', '_')
@@ -461,7 +500,7 @@
output.append(enum_item)
output.append("\";\n")
output.append("} // namespace ")
-output.append(json_type["id"])
+output.append(enum_na
[webkit-changes] [102540] trunk
Title: [102540] trunk
Revision 102540
Author kl...@webkit.org
Date 2011-12-11 11:38:49 -0800 (Sun, 11 Dec 2011)
Log Message
WK2/NetscapePlugin: Incorrect mouse event coordinates when frameScaleFactor != 1.
and
Reviewed by Anders Carlsson.
Source/WebCore:
* WebCore.exp.in: Export AffineTransform::scale(double).
Source/WebKit2:
* Shared/WebEvent.h:
* Shared/WebMouseEvent.cpp:
Remove the WebMouseEvent "copy" constructor that applied a scale factor
to the coordinates of an existing event.
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::handleEvent):
Pass the WebMouseEvent through to the plugin unmodified.
(WebKit::PluginView::viewGeometryDidChange):
Plumb a complex translate+scale transform through to the plugin, so coordinate
space transformations in will behave correctly with scale factors other than 1.
LayoutTests:
Add a test verifying that NetscapePlugins receive correctly transformed
mouse events with a page scale factor applied.
* platform/mac-wk2/plugins/mouse-events-scaled-expected.txt: Added.
* platform/mac-wk2/plugins/mouse-events-scaled.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/WebEvent.h
trunk/Source/WebKit2/Shared/WebMouseEvent.cpp
trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp
Added Paths
trunk/LayoutTests/platform/mac-wk2/plugins/mouse-events-scaled-expected.txt
trunk/LayoutTests/platform/mac-wk2/plugins/mouse-events-scaled.html
Diff
Modified: trunk/LayoutTests/ChangeLog (102539 => 102540)
--- trunk/LayoutTests/ChangeLog 2011-12-11 19:33:25 UTC (rev 102539)
+++ trunk/LayoutTests/ChangeLog 2011-12-11 19:38:49 UTC (rev 102540)
@@ -1,3 +1,16 @@
+2011-12-11 Andreas Kling
+
+WK2/NetscapePlugin: Incorrect mouse event coordinates when frameScaleFactor != 1.
+ and
+
+Reviewed by Anders Carlsson.
+
+Add a test verifying that NetscapePlugins receive correctly transformed
+mouse events with a page scale factor applied.
+
+* platform/mac-wk2/plugins/mouse-events-scaled-expected.txt: Added.
+* platform/mac-wk2/plugins/mouse-events-scaled.html: Added.
+
2011-12-11 Dan Bernstein
Test and updated results for REGRESSION (r80438): First word on a line or after collapsed space may not be hyphenated even though it should
Added: trunk/LayoutTests/platform/mac-wk2/plugins/mouse-events-scaled-expected.txt (0 => 102540)
--- trunk/LayoutTests/platform/mac-wk2/plugins/mouse-events-scaled-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/mouse-events-scaled-expected.txt 2011-12-11 19:38:49 UTC (rev 102540)
@@ -0,0 +1,7 @@
+CONSOLE MESSAGE: line 0: PLUGIN: mouseDown at (300, 300)
+CONSOLE MESSAGE: line 0: PLUGIN: mouseUp at (300, 300)
+CONSOLE MESSAGE: line 0: PLUGIN: mouseDown at (200, 200)
+CONSOLE MESSAGE: line 0: PLUGIN: mouseUp at (200, 200)
+CONSOLE MESSAGE: line 0: PLUGIN: mouseDown at (133, 133)
+CONSOLE MESSAGE: line 0: PLUGIN: mouseUp at (133, 133)
+
Added: trunk/LayoutTests/platform/mac-wk2/plugins/mouse-events-scaled.html (0 => 102540)
--- trunk/LayoutTests/platform/mac-wk2/plugins/mouse-events-scaled.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/mouse-events-scaled.html 2011-12-11 19:38:49 UTC (rev 102540)
@@ -0,0 +1,31 @@
+
+
+
+
+
+function fakeClick(x, y) {
+eventSender.mouseMoveTo(300, 300);
+eventSender.mouseDown();
+eventSender.mouseUp();
+}
+
+if (!window.layoutTestController)
+document.write("This test does not work in manual mode.");
+else {
+layoutTestController.dumpAsText();
+
+plg.windowedPlugin = false;
+plg.eventLoggingEnabled = true;
+
+eventSender.scalePageBy(1, 100, 100);
+fakeClick(300, 300);
+eventSender.scalePageBy(2, 100, 100);
+fakeClick(300, 300);
+eventSender.scalePageBy(3, 100, 100);
+fakeClick(300, 300);
+
+plg.eventLoggingEnabled = false;
+}
+
+
+
Modified: trunk/Source/WebCore/ChangeLog (102539 => 102540)
--- trunk/Source/WebCore/ChangeLog 2011-12-11 19:33:25 UTC (rev 102539)
+++ trunk/Source/WebCore/ChangeLog 2011-12-11 19:38:49 UTC (rev 102540)
@@ -1,3 +1,12 @@
+2011-12-11 Andreas Kling
+
+WK2/NetscapePlugin: Incorrect mouse event coordinates when frameScaleFactor != 1.
+ and
+
+Reviewed by Anders Carlsson.
+
+* WebCore.exp.in: Export AffineTransform::scale(double).
+
2011-12-10 Andreas Kling
Remove OS(SYMBIAN) block from Settings constructor.
Modified: trunk/Source/WebCore/WebCore.exp.in (102539 => 102540)
--- trunk/Source/WebCore/WebCore.exp.in 2011-12-11 19:33:25 UTC (rev 102539)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-12-11 19:38:49 UTC (rev 102540)
@@ -407,6 +407,7 @@
__ZN7WebCore14StorageTracker32syncFileSystemAndTrackerDatabaseEv
__ZN7WebCore14endOfParagraphERKNS_15VisiblePosition
[webkit-changes] [102539] trunk/Source/WebCore
Title: [102539] trunk/Source/WebCore Revision 102539 Author kl...@webkit.org Date 2011-12-11 11:33:25 -0800 (Sun, 11 Dec 2011) Log Message Remove OS(SYMBIAN) block from Settings constructor. Reviewed by Benjamin Poulain. Kill the last OS(SYMBIAN) block in WebKit! * page/Settings.cpp: (WebCore::Settings::Settings): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/page/Settings.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (102538 => 102539) --- trunk/Source/WebCore/ChangeLog 2011-12-11 19:06:56 UTC (rev 102538) +++ trunk/Source/WebCore/ChangeLog 2011-12-11 19:33:25 UTC (rev 102539) @@ -1,3 +1,15 @@ +2011-12-10 Andreas Kling + +Remove OS(SYMBIAN) block from Settings constructor. + + +Reviewed by Benjamin Poulain. + +Kill the last OS(SYMBIAN) block in WebKit! + +* page/Settings.cpp: +(WebCore::Settings::Settings): + 2011-12-11 Dan Bernstein REGRESSION (r80438): First word on a line or after collapsed space may not be hyphenated even though it should Modified: trunk/Source/WebCore/page/Settings.cpp (102538 => 102539) --- trunk/Source/WebCore/page/Settings.cpp 2011-12-11 19:06:56 UTC (rev 102538) +++ trunk/Source/WebCore/page/Settings.cpp 2011-12-11 19:33:25 UTC (rev 102539) @@ -222,11 +222,7 @@ #endif , m_mediaPlaybackRequiresUserGesture(false) , m_mediaPlaybackAllowsInline(true) -#if OS(SYMBIAN) -, m_passwordEchoEnabled(true) -#else , m_passwordEchoEnabled(false) -#endif , m_suppressIncrementalRendering(false) , m_backspaceKeyNavigationEnabled(true) , m_visualWordMovementEnabled(false) ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [102538] trunk
Title: [102538] trunk
Revision 102538
Author m...@apple.com
Date 2011-12-11 11:06:56 -0800 (Sun, 11 Dec 2011)
Log Message
Source/WebCore: REGRESSION (r80438): First word on a line or after collapsed space may not be hyphenated even though it should
https://bugs.webkit.org/show_bug.cgi?id=74239
Reviewed by Anders Carlsson.
Tests: fast/text/hyphenate-first-word-after-skipped-space-expected.html
fast/text/hyphenate-first-word-after-skipped-space.html
* rendering/RenderBlockLineLayout.cpp:
(WebCore::tryHyphenating): Replaced the assumption that the character at lastSpace is a space
iff lastSpace is non-zero with a test of whether it is a space, in the sense that it should
not be counted as part of the prefix when comparing it to the value of hyphenate-limit-before.
LayoutTests: Test and updated results for REGRESSION (r80438): First word on a line or after collapsed space may not be hyphenated even though it should
https://bugs.webkit.org/show_bug.cgi?id=74239
Reviewed by Anders Carlsson.
* fast/text/hyphenate-first-word-after-skipped-space-expected.html: Added.
* fast/text/hyphenate-first-word-after-skipped-space.html: Added.
* platform/mac/fast/text/hyphenate-limit-lines-expected.txt:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/mac/fast/text/hyphenate-limit-lines-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp
Added Paths
trunk/LayoutTests/fast/text/hyphenate-first-word-after-skipped-space-expected.html
trunk/LayoutTests/fast/text/hyphenate-first-word-after-skipped-space.html
Diff
Modified: trunk/LayoutTests/ChangeLog (102537 => 102538)
--- trunk/LayoutTests/ChangeLog 2011-12-11 18:04:50 UTC (rev 102537)
+++ trunk/LayoutTests/ChangeLog 2011-12-11 19:06:56 UTC (rev 102538)
@@ -1,3 +1,14 @@
+2011-12-11 Dan Bernstein
+
+Test and updated results for REGRESSION (r80438): First word on a line or after collapsed space may not be hyphenated even though it should
+https://bugs.webkit.org/show_bug.cgi?id=74239
+
+Reviewed by Anders Carlsson.
+
+* fast/text/hyphenate-first-word-after-skipped-space-expected.html: Added.
+* fast/text/hyphenate-first-word-after-skipped-space.html: Added.
+* platform/mac/fast/text/hyphenate-limit-lines-expected.txt:
+
2011-12-09 Robert Hogan
CSS 2.1 failure: numerous counter-increment-* tests fail
Added: trunk/LayoutTests/fast/text/hyphenate-first-word-after-skipped-space-expected.html (0 => 102538)
--- trunk/LayoutTests/fast/text/hyphenate-first-word-after-skipped-space-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/hyphenate-first-word-after-skipped-space-expected.html 2011-12-11 19:06:56 UTC (rev 102538)
@@ -0,0 +1,14 @@
+
+div {
+-webkit-locale: "en_US";
+-webkit-hyphens: auto;
+-webkit-hyphenate-limit-before: 2;
+width: 40px;
+border: solid;
+margin: 8px;
+}
+
+Undone.
+Undone.
+Simply undone.
+I undid it.
Added: trunk/LayoutTests/fast/text/hyphenate-first-word-after-skipped-space.html (0 => 102538)
--- trunk/LayoutTests/fast/text/hyphenate-first-word-after-skipped-space.html (rev 0)
+++ trunk/LayoutTests/fast/text/hyphenate-first-word-after-skipped-space.html 2011-12-11 19:06:56 UTC (rev 102538)
@@ -0,0 +1,16 @@
+
+div {
+-webkit-locale: "en_US";
+-webkit-hyphens: auto;
+-webkit-hyphenate-limit-before: 2;
+width: 40px;
+border: solid;
+margin: 8px;
+}
+
+Undone.
+
+Undone.
+
+Simply undone.
+I undid it.
Modified: trunk/LayoutTests/platform/mac/fast/text/hyphenate-limit-lines-expected.txt (102537 => 102538)
--- trunk/LayoutTests/platform/mac/fast/text/hyphenate-limit-lines-expected.txt 2011-12-11 18:04:50 UTC (rev 102537)
+++ trunk/LayoutTests/platform/mac/fast/text/hyphenate-limit-lines-expected.txt 2011-12-11 19:06:56 UTC (rev 102538)
@@ -78,15 +78,16 @@
text run at (1,125) width 200: "elements, or of"
text run at (1,156) width 200: "pleasures and de" + hyphen string "-"
text run at (1,187) width 200: "sires into"
- text run at (1,218) width 200: "necessary and"
- text run at (1,249) width 155: "unnecessary\x{2014}"
- text run at (1,280) width 200: "these and other"
- text run at (1,311) width 200: "great forms of"
- text run at (1,342) width 200: "thought are all of"
- text run at (1,373) width 66: "them "
- text run at (67,373) width 134: "to be found"
- text run at (1,404) width 200: "in the Republic,"
- text run at (1,435) width 200: "and were probably"
+ text run at (1,218) width 165: "necessary and "
+ text run at (166,218) width 35: "un" + hyphen string "-"
+ text run at (1,249) width 183: "necessary\x{2014}these"
+ text run at (1,280) width 200: "and other great"
+
[webkit-changes] [102537] trunk/Tools
Title: [102537] trunk/Tools
Revision 102537
Author hara...@chromium.org
Date 2011-12-11 10:04:50 -0800 (Sun, 11 Dec 2011)
Log Message
[Refactoring] Move top-level code to generate a new ChangeLog into a method
https://bugs.webkit.org/show_bug.cgi?id=74253
Reviewed by David Kilzer.
The objective is to make prepare-ChangeLog a loadable Perl module for unit testing,
which requires to remove top-level code and global variables. This patch is one of
the incremental refactorings for that.
* Scripts/prepare-ChangeLog: Moved top-level code to generate a new ChangeLog into generateNewChangeLogs().
(generateFunctionLists):
(findChangeLogs):
(generateNewChangeLogs):
(generateFileList): Removed an unnecessary variable $didChangeRegressionTests.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/prepare-ChangeLog
Diff
Modified: trunk/Tools/ChangeLog (102536 => 102537)
--- trunk/Tools/ChangeLog 2011-12-11 06:32:04 UTC (rev 102536)
+++ trunk/Tools/ChangeLog 2011-12-11 18:04:50 UTC (rev 102537)
@@ -1,3 +1,20 @@
+2011-12-11 Kentaro Hara
+
+[Refactoring] Move top-level code to generate a new ChangeLog into a method
+https://bugs.webkit.org/show_bug.cgi?id=74253
+
+Reviewed by David Kilzer.
+
+The objective is to make prepare-ChangeLog a loadable Perl module for unit testing,
+which requires to remove top-level code and global variables. This patch is one of
+the incremental refactorings for that.
+
+* Scripts/prepare-ChangeLog: Moved top-level code to generate a new ChangeLog into generateNewChangeLogs().
+(generateFunctionLists):
+(findChangeLogs):
+(generateNewChangeLogs):
+(generateFileList): Removed an unnecessary variable $didChangeRegressionTests.
+
2011-12-10 Kentaro Hara
[Refactoring] In prepare-ChangeLog, move top-level code to find ChangeLogs into a method
Modified: trunk/Tools/Scripts/prepare-ChangeLog (102536 => 102537)
--- trunk/Tools/Scripts/prepare-ChangeLog 2011-12-11 06:32:04 UTC (rev 102536)
+++ trunk/Tools/Scripts/prepare-ChangeLog 2011-12-11 18:04:50 UTC (rev 102537)
@@ -69,6 +69,7 @@
sub changeLogNameFromArgs($);
sub fetchBugDescriptionFromURL($);
sub findChangeLogs(\%);
+sub generateNewChangeLogs($$$\%);
sub firstDirectoryOrCwd();
sub diffFromToString();
sub diffCommand(@);
@@ -162,16 +163,14 @@
# Find the list of modified files
my @changed_files;
-my %function_lists;
+my %functionLists;
my @conflict_files;
my %supportedTestExtensions = map { $_ => 1 } qw(html shtml svg xml xhtml pl php);
-my @addedRegressionTests = ();
-my $didChangeRegressionTests = 0;
-generateFileList(@changed_files, @conflict_files, %function_lists);
+my $addedRegressionTests = generateFileList(@changed_files, @conflict_files, %functionLists);
-if (!@changed_files && !@conflict_files && !keys %function_lists) {
+if (!@changed_files && !@conflict_files && !keys %functionLists) {
print STDERR " No changes found.\n";
exit 1;
}
@@ -182,7 +181,7 @@
exit 1;
}
-generateFunctionLists(@changed_files, %function_lists);
+generateFunctionLists(@changed_files, %functionLists);
# Get some parameters for the ChangeLog we are about to write.
my $date = changeLogDate($changeLogTimeZone);
@@ -203,7 +202,7 @@
$bugDescription = fetchBugDescriptionFromURL($bugURL);
}
-my ($files_in_change_log, $prefixes) = findChangeLogs(%function_lists);
+my ($filesInChangeLog, $prefixes) = findChangeLogs(%functionLists);
# Get the latest ChangeLog files from svn.
my @logs = ();
@@ -232,66 +231,8 @@
}
}
-# Generate new ChangeLog entries and (optionally) write out new ChangeLog files.
-foreach my $prefix (@$prefixes) {
-my $endl = "\n";
-my @old_change_log;
+generateNewChangeLogs($prefixes, $filesInChangeLog, $addedRegressionTests, %functionLists);
-if ($writeChangeLogs) {
-my $changeLogPath = File::Spec->catfile($prefix || ".", "ChangeLog");
-print STDERR " Editing the ${changeLogPath} file.\n";
-open OLD_CHANGE_LOG, ${changeLogPath} or die "Could not open ${changeLogPath} file: $!.\n";
-# It's less efficient to read the whole thing into memory than it would be
-# to read it while we prepend to it later, but I like doing this part first.
-@old_change_log = ;
-close OLD_CHANGE_LOG;
-# We want to match the ChangeLog's line endings in case it doesn't match
-# the native line endings for this version of perl.
-if ($old_change_log[0] =~ /(\r?\n)$/g) {
-$endl = "$1";
-}
-open CHANGE_LOG, "> ${changeLogPath}" or die "Could not write ${changeLogPath}\n.";
-} else {
-open CHANGE_LOG, ">-" or die "Could not write to STDOUT\n.";
-print substr($prefix, 0, length($prefix) - 1) . ":\n\n" unless (scalar @$prefixes) == 1;
-}
-
-print CHANGE_LOG normalizeLineEndings("$date $name <$emailAddress>\n\n", $endl);
-
-my ($reviewer, $descript
