date:20111207

[webkit-changes] [102224] trunk/LayoutTests

2011-12-07 Thread rniwa

Title: [102224] trunk/LayoutTests








Revision 102224
Author rn...@webkit.org
Date 2011-12-07 00:14:39 -0800 (Wed, 07 Dec 2011)


Log Message
Add back a file accidentally removed in r102210.

* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: Copied from
LayoutTests/platform/gtk/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (102223 => 102224)

--- trunk/LayoutTests/ChangeLog	2011-12-07 06:26:36 UTC (rev 102223)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 08:14:39 UTC (rev 102224)
@@ -1,3 +1,10 @@
+2011-12-07  Ryosuke Niwa  rn...@webkit.org
+
+Add back a file accidentally removed in r102210.
+
+* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: Copied from
+LayoutTests/platform/gtk/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt.
+
 2011-12-06  Kent Tamura  tk...@chromium.org
 
 Correct svn:mime-type of platform/*/fast/forms/*.png.


Copied: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (from rev 102223, trunk/LayoutTests/platform/gtk/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt) (0 => 102224)

--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	(rev 0)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	2011-12-07 08:14:39 UTC (rev 102224)
@@ -0,0 +1,277 @@
+Computed style of an element whose parent's 'display' value is 'none':
+background-attachment: scroll
+background-clip: border-box
+background-color: rgb(0, 128, 0)
+background-image: none
+background-origin: padding-box
+background-position: 0% 0%
+background-repeat: repeat
+background-size: auto
+border-bottom-color: rgb(0, 0, 0)
+border-bottom-left-radius: 0px
+border-bottom-right-radius: 0px
+border-bottom-style: none
+border-bottom-width: 0px
+border-collapse: separate
+border-image-outset: 0px
+border-image-repeat: stretch
+border-image-slice: 100%
+border-image-source: none
+border-image-width: 1
+border-left-color: rgb(0, 0, 0)
+border-left-style: none
+border-left-width: 0px
+border-right-color: rgb(0, 0, 0)
+border-right-style: none
+border-right-width: 0px
+border-top-color: rgb(0, 0, 0)
+border-top-left-radius: 0px
+border-top-right-radius: 0px
+border-top-style: solid
+border-top-width: 16px
+bottom: auto
+box-shadow: none
+box-sizing: content-box
+caption-side: top
+clear: none
+clip: auto
+color: rgb(0, 0, 0)
+cursor: auto
+direction: ltr
+display: block
+empty-cells: show
+float: none
+font-family: Times
+font-size: 16px
+font-style: normal
+font-variant: normal
+font-weight: normal
+height: 100px
+image-rendering: auto
+left: auto
+letter-spacing: normal
+line-height: normal
+list-style-image: none
+list-style-position: outside
+list-style-type: disc
+margin-bottom: 0px
+margin-left: auto
+margin-right: 0px
+margin-top: 0px
+max-height: none
+max-width: none
+min-height: 0px
+min-width: 0px
+opacity: 1
+orphans: 2
+outline-color: rgb(0, 0, 0)
+outline-style: none
+outline-width: 0px
+overflow-x: visible
+overflow-y: visible
+padding-bottom: 0px
+padding-left: 0px
+padding-right: 0px
+padding-top: 0px
+page-break-after: auto
+page-break-before: auto
+page-break-inside: auto
+pointer-events: auto
+position: static
+resize: none
+right: auto
+speak: normal
+table-layout: auto
+text-align: -webkit-auto
+text-decoration: none
+text-indent: 0px
+text-rendering: auto
+text-shadow: none
+text-overflow: clip
+text-transform: none
+top: auto
+unicode-bidi: normal
+vertical-align: baseline
+visibility: visible
+white-space: normal
+widows: 2
+width: 50%
+word-break: normal
+word-spacing: 0px
+word-wrap: normal
+z-index: auto
+zoom: 1
+-webkit-animation-delay: 0s
+-webkit-animation-direction: normal
+-webkit-animation-duration: 0s
+-webkit-animation-fill-mode: none
+-webkit-animation-iteration-count: 1
+-webkit-animation-name: none
+-webkit-animation-play-state: running
+-webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1)
+-webkit-appearance: none
+-webkit-backface-visibility: visible
+-webkit-background-clip: border-box
+-webkit-background-composite: source-over
+-webkit-background-origin: padding-box
+-webkit-background-size: auto
+-webkit-border-fit: border
+

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

2011-12-07 Thread rniwa

Title: [102225] trunk/Source/WebCore








Revision 102225
Author rn...@webkit.org
Date 2011-12-07 01:03:51 -0800 (Wed, 07 Dec 2011)


Log Message
TypingCommand duplicates code to obtain the last typing command
https://bugs.webkit.org/show_bug.cgi?id=73984

Reviewed by Kent Tamura.

Extracted lastTypingCommandIfStillOpenForTyping out of isOpenForMoreTypingCommand
and a bunch of TypingCommand static member functions.

Also made more member functions of TypingCommand private.

* editing/Editor.cpp:
(WebCore::Editor::setComposition):
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::setSelection):
* editing/TypingCommand.cpp:
(WebCore::TypingCommand::deleteSelection):
(WebCore::TypingCommand::deleteKeyPressed):
(WebCore::TypingCommand::forwardDeleteKeyPressed):
(WebCore::TypingCommand::insertText):
(WebCore::TypingCommand::insertLineBreak):
(WebCore::TypingCommand::insertParagraphSeparatorInQuotedContent):
(WebCore::TypingCommand::insertParagraphSeparator):
(WebCore::TypingCommand::lastTypingCommandIfStillOpenForTyping):
(WebCore::TypingCommand::closeTyping):
* editing/TypingCommand.h:
(WebCore::TypingCommand::isOpenForMoreTyping):
(WebCore::TypingCommand::closeTyping):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/editing/Editor.cpp
trunk/Source/WebCore/editing/FrameSelection.cpp
trunk/Source/WebCore/editing/TypingCommand.cpp
trunk/Source/WebCore/editing/TypingCommand.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (102224 => 102225)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 08:14:39 UTC (rev 102224)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 09:03:51 UTC (rev 102225)
@@ -1,3 +1,33 @@
+2011-12-07  Ryosuke Niwa  rn...@webkit.org
+
+TypingCommand duplicates code to obtain the last typing command
+https://bugs.webkit.org/show_bug.cgi?id=73984
+
+Reviewed by Kent Tamura.
+
+Extracted lastTypingCommandIfStillOpenForTyping out of isOpenForMoreTypingCommand
+and a bunch of TypingCommand static member functions.
+
+Also made more member functions of TypingCommand private.
+
+* editing/Editor.cpp:
+(WebCore::Editor::setComposition):
+* editing/FrameSelection.cpp:
+(WebCore::FrameSelection::setSelection):
+* editing/TypingCommand.cpp:
+(WebCore::TypingCommand::deleteSelection):
+(WebCore::TypingCommand::deleteKeyPressed):
+(WebCore::TypingCommand::forwardDeleteKeyPressed):
+(WebCore::TypingCommand::insertText):
+(WebCore::TypingCommand::insertLineBreak):
+(WebCore::TypingCommand::insertParagraphSeparatorInQuotedContent):
+(WebCore::TypingCommand::insertParagraphSeparator):
+(WebCore::TypingCommand::lastTypingCommandIfStillOpenForTyping):
+(WebCore::TypingCommand::closeTyping):
+* editing/TypingCommand.h:
+(WebCore::TypingCommand::isOpenForMoreTyping):
+(WebCore::TypingCommand::closeTyping):
+
 2011-12-06  Mary Wu  mary...@torchmobile.com.cn
 
 upstream BlackBerry porting of KURL/Logging


Modified: trunk/Source/WebCore/editing/Editor.cpp (102224 => 102225)

--- trunk/Source/WebCore/editing/Editor.cpp	2011-12-07 08:14:39 UTC (rev 102224)
+++ trunk/Source/WebCore/editing/Editor.cpp	2011-12-07 09:03:51 UTC (rev 102225)
@@ -1425,7 +1425,7 @@
 
 if (mode == CancelComposition) {
 // An open typing command that disagrees about current selection would cause issues with typing later on.
-TypingCommand::closeTyping(m_lastEditCommand.get());
+TypingCommand::closeTyping(m_frame);
 }
 
 setIgnoreCompositionSelectionChange(false);


Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (102224 => 102225)

--- trunk/Source/WebCore/editing/FrameSelection.cpp	2011-12-07 08:14:39 UTC (rev 102224)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp	2011-12-07 09:03:51 UTC (rev 102225)
@@ -264,7 +264,7 @@
 m_granularity = granularity;
 
 if (closeTyping)
-TypingCommand::closeTyping(m_frame-editor()-lastEditCommand());
+TypingCommand::closeTyping(m_frame);
 
 if (shouldClearTypingStyle)
 clearTypingStyle();


Modified: trunk/Source/WebCore/editing/TypingCommand.cpp (102224 => 102225)

--- trunk/Source/WebCore/editing/TypingCommand.cpp	2011-12-07 08:14:39 UTC (rev 102224)
+++ trunk/Source/WebCore/editing/TypingCommand.cpp	2011-12-07 09:03:51 UTC (rev 102225)
@@ -83,13 +83,11 @@
 
 Frame* frame = document-frame();
 ASSERT(frame);
-
+
 if (!frame-selection()-isRange())
 return;
-
-EditCommand* lastEditCommand = frame-editor()-lastEditCommand();
-if (isOpenForMoreTypingCommand(lastEditCommand)) {
-TypingCommand* lastTypingCommand = static_castTypingCommand*(lastEditCommand);
+
+if (TypingCommand* lastTypingCommand = lastTypingCommandIfStillOpenForTyping(frame)) {
 lastTypingCommand-setShouldPreventSpellChecking(options  PreventSpellChecking);

[webkit-changes] [102227] trunk/LayoutTests

2011-12-07 Thread rniwa

Title: [102227] trunk/LayoutTests








Revision 102227
Author rn...@webkit.org
Date 2011-12-07 01:43:22 -0800 (Wed, 07 Dec 2011)


Log Message
Qt rebaseline after r102149.

* platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: Copied from
LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (102226 => 102227)

--- trunk/LayoutTests/ChangeLog	2011-12-07 09:36:06 UTC (rev 102226)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 09:43:22 UTC (rev 102227)
@@ -1,3 +1,10 @@
+2011-12-07  Ryosuke Niwa  rn...@webkit.org
+
+Qt rebaseline after r102149.
+
+* platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: Copied from
+LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt.
+
 2011-12-07  Kent Tamura  tk...@chromium.org
 
 Move input type=number tests to fast/forms/number/


Copied: trunk/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (from rev 102225, trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt) (0 => 102227)

--- trunk/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	2011-12-07 09:43:22 UTC (rev 102227)
@@ -0,0 +1,277 @@
+Computed style of an element whose parent's 'display' value is 'none':
+background-attachment: scroll
+background-clip: border-box
+background-color: rgb(0, 128, 0)
+background-image: none
+background-origin: padding-box
+background-position: 0% 0%
+background-repeat: repeat
+background-size: auto
+border-bottom-color: rgb(0, 0, 0)
+border-bottom-left-radius: 0px
+border-bottom-right-radius: 0px
+border-bottom-style: none
+border-bottom-width: 0px
+border-collapse: separate
+border-image-outset: 0px
+border-image-repeat: stretch
+border-image-slice: 100%
+border-image-source: none
+border-image-width: 1
+border-left-color: rgb(0, 0, 0)
+border-left-style: none
+border-left-width: 0px
+border-right-color: rgb(0, 0, 0)
+border-right-style: none
+border-right-width: 0px
+border-top-color: rgb(0, 0, 0)
+border-top-left-radius: 0px
+border-top-right-radius: 0px
+border-top-style: solid
+border-top-width: 16px
+bottom: auto
+box-shadow: none
+box-sizing: content-box
+caption-side: top
+clear: none
+clip: auto
+color: rgb(0, 0, 0)
+cursor: auto
+direction: ltr
+display: block
+empty-cells: show
+float: none
+font-family: Times
+font-size: 16px
+font-style: normal
+font-variant: normal
+font-weight: normal
+height: 100px
+image-rendering: auto
+left: auto
+letter-spacing: normal
+line-height: normal
+list-style-image: none
+list-style-position: outside
+list-style-type: disc
+margin-bottom: 0px
+margin-left: auto
+margin-right: 0px
+margin-top: 0px
+max-height: none
+max-width: none
+min-height: 0px
+min-width: 0px
+opacity: 1
+orphans: 2
+outline-color: rgb(0, 0, 0)
+outline-style: none
+outline-width: 0px
+overflow-x: visible
+overflow-y: visible
+padding-bottom: 0px
+padding-left: 0px
+padding-right: 0px
+padding-top: 0px
+page-break-after: auto
+page-break-before: auto
+page-break-inside: auto
+pointer-events: auto
+position: static
+resize: none
+right: auto
+speak: normal
+table-layout: auto
+text-align: -webkit-auto
+text-decoration: none
+text-indent: 0px
+text-rendering: auto
+text-shadow: none
+text-overflow: clip
+text-transform: none
+top: auto
+unicode-bidi: normal
+vertical-align: baseline
+visibility: visible
+white-space: normal
+widows: 2
+width: 50%
+word-break: normal
+word-spacing: 0px
+word-wrap: normal
+z-index: auto
+zoom: 1
+-webkit-animation-delay: 0s
+-webkit-animation-direction: normal
+-webkit-animation-duration: 0s
+-webkit-animation-fill-mode: none
+-webkit-animation-iteration-count: 1
+-webkit-animation-name: none
+-webkit-animation-play-state: running
+-webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1)
+-webkit-appearance: none
+-webkit-backface-visibility: visible
+-webkit-background-clip: border-box
+-webkit-background-composite: source-over
+-webkit-background-origin: padding-box
+-webkit-background-size: auto
+-webkit-border-fit: border
+

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

2011-12-07 Thread commit-queue

Title: [102228] trunk/Source/WebKit2








Revision 102228
Author commit-qu...@webkit.org
Date 2011-12-07 01:56:41 -0800 (Wed, 07 Dec 2011)


Log Message
[Qt][WK2] Enable page cache.
https://bugs.webkit.org/show_bug.cgi?id=73938

Enable WebCore's page cache for Qt port by setting its capacity to 20. This is temporary
and will be replaced by a computed value based on CacheMode. See bug#73918.

Patch by Zalan Bujtas zbuj...@gmail.com on 2011-12-07
Reviewed by Simon Hausmann.

* WebProcess/qt/WebProcessQt.cpp:
(WebKit::WebProcess::platformSetCacheModel):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (102227 => 102228)

--- trunk/Source/WebKit2/ChangeLog	2011-12-07 09:43:22 UTC (rev 102227)
+++ trunk/Source/WebKit2/ChangeLog	2011-12-07 09:56:41 UTC (rev 102228)
@@ -1,3 +1,16 @@
+2011-12-07  Zalan Bujtas  zbuj...@gmail.com
+
+[Qt][WK2] Enable page cache.
+https://bugs.webkit.org/show_bug.cgi?id=73938
+
+Enable WebCore's page cache for Qt port by setting its capacity to 20. This is temporary 
+and will be replaced by a computed value based on CacheMode. See bug#73918.
+
+Reviewed by Simon Hausmann.
+
+* WebProcess/qt/WebProcessQt.cpp:
+(WebKit::WebProcess::platformSetCacheModel):
+
 2011-12-06  Andy Estes  aes...@apple.com
 
 REGRESSION (r101838): Crash in LayerTreeHostCA::initialize() when accelerated drawing is enabled


Modified: trunk/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp (102227 => 102228)

--- trunk/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp	2011-12-07 09:43:22 UTC (rev 102227)
+++ trunk/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp	2011-12-07 09:56:41 UTC (rev 102228)
@@ -35,17 +35,23 @@
 #include QNetworkAccessManager
 #include QNetworkCookieJar
 #include WebCore/CookieJarQt.h
+#include WebCore/PageCache.h
 #include WebCore/RuntimeEnabledFeatures.h
 
 #if defined(Q_OS_MACX)
 #include dispatch/dispatch.h
 #endif
 
+using namespace WebCore;
+
 namespace WebKit {
 
+static const int DefaultPageCacheCapacity = 20;
+
 void WebProcess::platformSetCacheModel(CacheModel)
 {
-// FIXME: Implement.
+// FIXME: see bug 73918
+pageCache()-setCapacity(DefaultPageCacheCapacity);
 }
 
 void WebProcess::platformClearResourceCaches(ResourceCachesToClear)






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

[webkit-changes] [102229] trunk/LayoutTests

2011-12-07 Thread vsevik

Title: [102229] trunk/LayoutTests








Revision 102229
Author vse...@chromium.org
Date 2011-12-07 02:19:01 -0800 (Wed, 07 Dec 2011)


Log Message
Unreviewed chromium test expectations update.

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (102228 => 102229)

--- trunk/LayoutTests/ChangeLog	2011-12-07 09:56:41 UTC (rev 102228)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 10:19:01 UTC (rev 102229)
@@ -1,3 +1,9 @@
+2011-12-07  Vsevolod Vlasov  vse...@chromium.org
+
+Unreviewed chromium test expectations update.
+
+* platform/chromium/test_expectations.txt:
+
 2011-12-07  Ryosuke Niwa  rn...@webkit.org
 
 Qt rebaseline after r102149.


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (102228 => 102229)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-07 09:56:41 UTC (rev 102228)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-07 10:19:01 UTC (rev 102229)
@@ -3824,3 +3824,10 @@
 
 BUGWK73933 DEBUG : svg/W3C-SVG-1.1-SE/struct-dom-11-f.svg = TIMEOUT PASS
 
+BUGWK73991 WIN7 VISTA RELEASE : fast/text/international/complex-character-based-fallback.html = IMAGE+TEXT
+BUGWK73991 WIN7 VISTA RELEASE : fast/text/international/danda-space.html = IMAGE+TEXT
+BUGWK73991 WIN7 VISTA RELEASE : fast/text/international/thai-baht-space.html = IMAGE+TEXT
+BUGWK73991 WIN7 VISTA RELEASE : fast/text/international/chromium-complex-text-non-printable.html = IMAGE
+BUGWK73991 WIN7 VISTA RELEASE : platform/win/fast/text/uniscribe-missing-glyph.html = IMAGE
+BUGWK73991 WIN7 VISTA RELEASE : fast/text/international/bidi-neutral-run.html = TEXT
+BUGWK73991 WIN7 VISTA RELEASE : fast/text/international/thai-line-breaks.html = TEXT






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

[webkit-changes] [102230] trunk/Tools

2011-12-07 Thread vsevik

Title: [102230] trunk/Tools








Revision 102230
Author vse...@chromium.org
Date 2011-12-07 04:31:29 -0800 (Wed, 07 Dec 2011)


Log Message
Unreviewed. Disabled failing tests on chromium.

* TestWebKitAPI/Tests/WTF/StringBuilder.cpp:
(TestWebKitAPI::TEST):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp




Diff

Modified: trunk/Tools/ChangeLog (102229 => 102230)

--- trunk/Tools/ChangeLog	2011-12-07 10:19:01 UTC (rev 102229)
+++ trunk/Tools/ChangeLog	2011-12-07 12:31:29 UTC (rev 102230)
@@ -1,3 +1,10 @@
+2011-12-07  Vsevolod Vlasov  vse...@chromium.org
+
+Unreviewed. Disabled failing tests on chromium.
+
+* TestWebKitAPI/Tests/WTF/StringBuilder.cpp:
+(TestWebKitAPI::TEST):
+
 2011-12-06  Dirk Pranke  dpra...@chromium.org
 
 binaries in webkit.gyp should be split into a new file to break circular dependencies on webkit_support


Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp (102229 => 102230)

--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp	2011-12-07 10:19:01 UTC (rev 102229)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp	2011-12-07 12:31:29 UTC (rev 102230)
@@ -66,7 +66,7 @@
 expectEmpty(builder);
 }
 
-TEST(StringBuilderTest, Append)
+TEST(StringBuilderTest, DISABLED_Append)
 {
 StringBuilder builder;
 builder.append(String(0123456789));
@@ -123,7 +123,7 @@
 ASSERT_EQ(String(0123456789abcdefghijklmnopqrstuvwxyzABC), string1);
 }
 
-TEST(StringBuilderTest, ToStringPreserveCapacity)
+TEST(StringBuilderTest, DISABLED_ToStringPreserveCapacity)
 {
 StringBuilder builder;
 builder.append(0123456789);






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

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

2011-12-07 Thread vsevik

Title: [102233] trunk/Source/WebCore








Revision 102233
Author vse...@chromium.org
Date 2011-12-07 06:00:52 -0800 (Wed, 07 Dec 2011)


Log Message
Web Inspector: Extract default call stack creation and check for front-end from console.
https://bugs.webkit.org/show_bug.cgi?id=73566

Reviewed by Yury Semikhatsky.

* bindings/js/ScriptCallStackFactory.cpp:
(WebCore::createScriptCallStack):
* bindings/js/ScriptCallStackFactory.h:
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateParametersCheck):
* bindings/scripts/CodeGeneratorV8.pm:
(GenerateFunctionCallback):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjPrototypeFunctionCustomArgsAndException):
* bindings/scripts/test/V8/V8TestObj.cpp:
(WebCore::TestObjInternal::customArgsAndExceptionCallback):
* bindings/v8/ScriptCallStackFactory.cpp:
(WebCore::createScriptCallStack):
* bindings/v8/ScriptCallStackFactory.h:
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::hasFrontendForScriptContext):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::hasFrontendForScriptContext):
* inspector/WorkerInspectorController.h:
(WebCore::WorkerInspectorController::hasFrontend):
* page/Console.cpp:
* page/Console.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.cpp
trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.h
trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp
trunk/Source/WebCore/bindings/v8/ScriptCallStackFactory.cpp
trunk/Source/WebCore/bindings/v8/ScriptCallStackFactory.h
trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp
trunk/Source/WebCore/inspector/InspectorInstrumentation.h
trunk/Source/WebCore/inspector/WorkerInspectorController.h
trunk/Source/WebCore/page/Console.cpp
trunk/Source/WebCore/page/Console.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (102232 => 102233)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 12:55:42 UTC (rev 102232)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 14:00:52 UTC (rev 102233)
@@ -1,3 +1,33 @@
+2011-12-01  Vsevolod Vlasov  vse...@chromium.org
+
+Web Inspector: Extract default call stack creation and check for front-end from console.
+https://bugs.webkit.org/show_bug.cgi?id=73566
+
+Reviewed by Yury Semikhatsky.
+
+* bindings/js/ScriptCallStackFactory.cpp:
+(WebCore::createScriptCallStack):
+* bindings/js/ScriptCallStackFactory.h:
+* bindings/scripts/CodeGeneratorJS.pm:
+(GenerateParametersCheck):
+* bindings/scripts/CodeGeneratorV8.pm:
+(GenerateFunctionCallback):
+* bindings/scripts/test/JS/JSTestObj.cpp:
+(WebCore::jsTestObjPrototypeFunctionCustomArgsAndException):
+* bindings/scripts/test/V8/V8TestObj.cpp:
+(WebCore::TestObjInternal::customArgsAndExceptionCallback):
+* bindings/v8/ScriptCallStackFactory.cpp:
+(WebCore::createScriptCallStack):
+* bindings/v8/ScriptCallStackFactory.h:
+* inspector/InspectorInstrumentation.cpp:
+(WebCore::InspectorInstrumentation::hasFrontendForScriptContext):
+* inspector/InspectorInstrumentation.h:
+(WebCore::InspectorInstrumentation::hasFrontendForScriptContext):
+* inspector/WorkerInspectorController.h:
+(WebCore::WorkerInspectorController::hasFrontend):
+* page/Console.cpp:
+* page/Console.h:
+
 2011-12-07  Shinya Kawanaka  shin...@google.com
 
 Internals should have a method to reutrn the max sequence number of spellcheck reqeust.


Modified: trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.cpp (102232 => 102233)

--- trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.cpp	2011-12-07 12:55:42 UTC (rev 102232)
+++ trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.cpp	2011-12-07 14:00:52 UTC (rev 102233)
@@ -31,6 +31,7 @@
 #include config.h
 #include ScriptCallStackFactory.h
 
+#include InspectorInstrumentation.h
 #include JSDOMBinding.h
 #include ScriptArguments.h
 #include ScriptCallFrame.h
@@ -48,6 +49,8 @@
 
 namespace WebCore {
 
+class ScriptExecutionContext;
+
 PassRefPtrScriptCallStack createScriptCallStack(size_t, bool)
 {
 return 0;
@@ -83,6 +86,17 @@
 return ScriptCallStack::create(frames);
 }
 
+PassRefPtrScriptCallStack createScriptCallStack(JSC::ExecState* exec)
+{
+size_t maxStackSize = 1;
+if (InspectorInstrumentation::hasFrontends()) {
+ScriptExecutionContext* scriptExecutionContext = static_castJSDOMGlobalObject*(exec-lexicalGlobalObject())-scriptExecutionContext();
+if (InspectorInstrumentation::hasFrontendForScriptContext(scriptExecutionContext))
+maxStackSize = ScriptCallStack::maxCallStackSizeToCapture;
+}
+return createScriptCallStack(exec, maxStackSize);
+}
+

[webkit-changes] [102235] trunk/Source

2011-12-07 Thread commit-queue

Title: [102235] trunk/Source








Revision 102235
Author commit-qu...@webkit.org
Date 2011-12-07 06:54:13 -0800 (Wed, 07 Dec 2011)


Log Message
Change function name InitializeLoggingChannelsIfNecessary to follow coding style guideline
https://bugs.webkit.org/show_bug.cgi?id=73986

Patch by Mary Wu mary...@torchmobile.com.cn on 2011-12-07
Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

Just function name change, no new tests.

* platform/Logging.h:
* platform/efl/LoggingEfl.cpp:
(WebCore::initializeLoggingChannelsIfNecessary):
* platform/gtk/LoggingGtk.cpp:
(WebCore::initializeLoggingChannelsIfNecessary):
* platform/mac/LoggingMac.mm:
(WebCore::initializeLoggingChannelsIfNecessary):
* platform/qt/LoggingQt.cpp:
(WebCore::initializeLoggingChannelsIfNecessary):
* platform/win/LoggingWin.cpp:
(WebCore::initializeLoggingChannelsIfNecessary):
* platform/wx/LoggingWx.cpp:
(WebCore::initializeLoggingChannelsIfNecessary):

Source/WebKit/efl:

* ewk/ewk_main.cpp:
(_ewk_init_body):

Source/WebKit/gtk:

* webkit/webkitglobals.cpp:
(webkitInit):

Source/WebKit/mac:

* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):

Source/WebKit/qt:

* WebCoreSupport/InitWebCoreQt.cpp:
(WebCore::initializeWebCoreQt):

Source/WebKit/win:

* WebView.cpp:
(WebView::initWithFrame):

Source/WebKit/wx:

* WebView.cpp:
(wxWebView::Create):

Source/WebKit2:

* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/Logging.h
trunk/Source/WebCore/platform/blackberry/LoggingBlackBerry.cpp
trunk/Source/WebCore/platform/efl/LoggingEfl.cpp
trunk/Source/WebCore/platform/gtk/LoggingGtk.cpp
trunk/Source/WebCore/platform/mac/LoggingMac.mm
trunk/Source/WebCore/platform/qt/LoggingQt.cpp
trunk/Source/WebCore/platform/win/LoggingWin.cpp
trunk/Source/WebCore/platform/wx/LoggingWx.cpp
trunk/Source/WebKit/efl/ChangeLog
trunk/Source/WebKit/efl/ewk/ewk_main.cpp
trunk/Source/WebKit/gtk/ChangeLog
trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebView.mm
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebView.cpp
trunk/Source/WebKit/wx/ChangeLog
trunk/Source/WebKit/wx/WebView.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebContext.cpp
trunk/Source/WebKit2/WebProcess/WebProcess.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (102234 => 102235)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 14:51:33 UTC (rev 102234)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 14:54:13 UTC (rev 102235)
@@ -1,3 +1,26 @@
+2011-12-07  Mary Wu  mary...@torchmobile.com.cn
+
+Change function name InitializeLoggingChannelsIfNecessary to follow coding style guideline
+https://bugs.webkit.org/show_bug.cgi?id=73986
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Just function name change, no new tests.
+
+* platform/Logging.h:
+* platform/efl/LoggingEfl.cpp:
+(WebCore::initializeLoggingChannelsIfNecessary):
+* platform/gtk/LoggingGtk.cpp:
+(WebCore::initializeLoggingChannelsIfNecessary):
+* platform/mac/LoggingMac.mm:
+(WebCore::initializeLoggingChannelsIfNecessary):
+* platform/qt/LoggingQt.cpp:
+(WebCore::initializeLoggingChannelsIfNecessary):
+* platform/win/LoggingWin.cpp:
+(WebCore::initializeLoggingChannelsIfNecessary):
+* platform/wx/LoggingWx.cpp:
+(WebCore::initializeLoggingChannelsIfNecessary):
+
 2011-12-07  Mihnea Ovidenie  mih...@adobe.com
 
 [CSSRegions]Add support for background-color in region styling


Modified: trunk/Source/WebCore/platform/Logging.h (102234 => 102235)

--- trunk/Source/WebCore/platform/Logging.h	2011-12-07 14:51:33 UTC (rev 102234)
+++ trunk/Source/WebCore/platform/Logging.h	2011-12-07 14:54:13 UTC (rev 102235)
@@ -60,7 +60,7 @@
 extern WTFLogChannel LogProgress;
 extern WTFLogChannel LogFileAPI;
 
-void InitializeLoggingChannelsIfNecessary();
+void initializeLoggingChannelsIfNecessary();
 WTFLogChannel* getChannelFromName(const String channelName);
 }
 


Modified: trunk/Source/WebCore/platform/blackberry/LoggingBlackBerry.cpp (102234 => 102235)

--- trunk/Source/WebCore/platform/blackberry/LoggingBlackBerry.cpp	2011-12-07 14:51:33 UTC (rev 102234)
+++ trunk/Source/WebCore/platform/blackberry/LoggingBlackBerry.cpp	2011-12-07 14:54:13 UTC (rev 102235)
@@ -29,7 +29,7 @@
 channel.state = WTFLogChannelOff;
 }
 
-void InitializeLoggingChannelsIfNecessary()
+void initializeLoggingChannelsIfNecessary()
 {
 static bool haveInitializedLoggingChannels = false;
 if (haveInitializedLoggingChannels)


Modified: trunk/Source/WebCore/platform/efl/LoggingEfl.cpp (102234 => 102235)

---

[webkit-changes] [102237] trunk

2011-12-07 Thread hausmann

Title: [102237] trunk








Revision 102237
Author hausm...@webkit.org
Date 2011-12-07 07:29:30 -0800 (Wed, 07 Dec 2011)


Log Message
[Qt] V8 build fixes.

Reviewed by Tor Arne Vestbø.

Source/_javascript_Core:

* yarr/yarr.pri: Don't rely on Source/_javascript_Core being in
VPATH. Prefix SOURCES correctly and make sure that runtime/ is
in the include search path when building with v8.

Source/WebCore:

* Target.pri: Don't load(_javascript_core) if we're building with v8.

Tools:

* qmake/mkspecs/features/_javascript_core.prf: Don't add
Source/Thirdparty to the include search path here.
* qmake/mkspecs/features/webcore.prf: Instead it belongs here, because it's
used when building WebCore as well as using it, because header files like
GraphicsContext3D.h include stuff from ThirdParty.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/yarr/yarr.pri
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Target.pri
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/_javascript_core.prf
trunk/Tools/qmake/mkspecs/features/webcore.prf




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (102236 => 102237)

--- trunk/Source/_javascript_Core/ChangeLog	2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-12-07 15:29:30 UTC (rev 102237)
@@ -1,3 +1,13 @@
+2011-11-30  Simon Hausmann  simon.hausm...@nokia.com
+
+[Qt] V8 build fixes.
+
+Reviewed by Tor Arne Vestbø.
+
+* yarr/yarr.pri: Don't rely on Source/_javascript_Core being in
+VPATH. Prefix SOURCES correctly and make sure that runtime/ is
+in the include search path when building with v8.
+
 2011-12-06  Filip Pizlo  fpi...@apple.com
 
 Zapping a block that is Marked leads to dead objects being mistaken for live ones


Modified: trunk/Source/_javascript_Core/yarr/yarr.pri (102236 => 102237)

--- trunk/Source/_javascript_Core/yarr/yarr.pri	2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Source/_javascript_Core/yarr/yarr.pri	2011-12-07 15:29:30 UTC (rev 102237)
@@ -5,7 +5,9 @@
 # ---
 
 SOURCES += \
-yarr/YarrInterpreter.cpp \
-yarr/YarrPattern.cpp \
-yarr/YarrSyntaxChecker.cpp
+$$PWD/YarrInterpreter.cpp \
+$$PWD/YarrPattern.cpp \
+$$PWD/YarrSyntaxChecker.cpp
 
+# For UString.h
+v8: INCLUDEPATH += $$PWD/../runtime


Modified: trunk/Source/WebCore/ChangeLog (102236 => 102237)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 15:29:30 UTC (rev 102237)
@@ -1,3 +1,11 @@
+2011-11-30  Simon Hausmann  simon.hausm...@nokia.com
+
+[Qt] V8 build fixes.
+
+Reviewed by Tor Arne Vestbø.
+
+* Target.pri: Don't load(_javascript_core) if we're building with v8.
+
 2011-12-07  Mary Wu  mary...@torchmobile.com.cn
 
 Change function name InitializeLoggingChannelsIfNecessary to follow coding style guideline


Modified: trunk/Source/WebCore/Target.pri (102236 => 102237)

--- trunk/Source/WebCore/Target.pri	2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Source/WebCore/Target.pri	2011-12-07 15:29:30 UTC (rev 102237)
@@ -9,7 +9,7 @@
 DEFINES += BUILDING_WebCore
 
 load(webcore)
-load(_javascript_core)
+!v8: load(_javascript_core)
 load(wtf)
 
 CONFIG += staticlib


Modified: trunk/Tools/ChangeLog (102236 => 102237)

--- trunk/Tools/ChangeLog	2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Tools/ChangeLog	2011-12-07 15:29:30 UTC (rev 102237)
@@ -1,3 +1,15 @@
+2011-11-30  Simon Hausmann  simon.hausm...@nokia.com
+
+[Qt] V8 build fixes.
+
+Reviewed by Tor Arne Vestbø.
+
+* qmake/mkspecs/features/_javascript_core.prf: Don't add
+Source/Thirdparty to the include search path here.
+* qmake/mkspecs/features/webcore.prf: Instead it belongs here, because it's
+used when building WebCore as well as using it, because header files like
+GraphicsContext3D.h include stuff from ThirdParty.
+
 2011-12-07  Peter Beverloo  pe...@chromium.org
 
 [Chromium] Fix project file generation for the Android bot after r102201


Modified: trunk/Tools/qmake/mkspecs/features/_javascript_core.prf (102236 => 102237)

--- trunk/Tools/qmake/mkspecs/features/_javascript_core.prf	2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Tools/qmake/mkspecs/features/_javascript_core.prf	2011-12-07 15:29:30 UTC (rev 102237)
@@ -20,7 +20,6 @@
 _javascript_CORE_INCLUDEPATH = \
 $$_javascript_CORE_SOURCE_DIR \
 $$_javascript_CORE_SOURCE_DIR/.. \
-$$_javascript_CORE_SOURCE_DIR/../ThirdParty \
 $$_javascript_CORE_SOURCE_DIR/assembler \
 $$_javascript_CORE_SOURCE_DIR/bytecode \
 $$_javascript_CORE_SOURCE_DIR/bytecompiler \


Modified: trunk/Tools/qmake/mkspecs/features/webcore.prf (102236 => 102237)

--- trunk/Tools/qmake/mkspecs/features/webcore.prf	2011-12-07 15:10:24 UTC (rev 102236)
+++ trunk/Tools/qmake/mkspecs/features/webcore.prf	2011-12-07

[webkit-changes] [102238] trunk/Tools

2011-12-07 Thread hausmann

Title: [102238] trunk/Tools








Revision 102238
Author hausm...@webkit.org
Date 2011-12-07 07:29:47 -0800 (Wed, 07 Dec 2011)


Log Message
[Qt] Fix debug shlib build with V8.

Reviewed by Tor Arne Vestbø.

* qmake/mkspecs/features/qtwebkit.prf: Don't like jscore with
v8 builds.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/qtwebkit.prf




Diff

Modified: trunk/Tools/ChangeLog (102237 => 102238)

--- trunk/Tools/ChangeLog	2011-12-07 15:29:30 UTC (rev 102237)
+++ trunk/Tools/ChangeLog	2011-12-07 15:29:47 UTC (rev 102238)
@@ -1,5 +1,14 @@
 2011-11-30  Simon Hausmann  simon.hausm...@nokia.com
 
+[Qt] Fix debug shlib build with V8.
+
+Reviewed by Tor Arne Vestbø.
+
+* qmake/mkspecs/features/qtwebkit.prf: Don't link jscore with
+v8 builds.
+
+2011-11-30  Simon Hausmann  simon.hausm...@nokia.com
+
 [Qt] V8 build fixes.
 
 Reviewed by Tor Arne Vestbø.


Modified: trunk/Tools/qmake/mkspecs/features/qtwebkit.prf (102237 => 102238)

--- trunk/Tools/qmake/mkspecs/features/qtwebkit.prf	2011-12-07 15:29:30 UTC (rev 102237)
+++ trunk/Tools/qmake/mkspecs/features/qtwebkit.prf	2011-12-07 15:29:47 UTC (rev 102238)
@@ -28,7 +28,9 @@
 
 force_static_libs_as_shared {
 !no_webkit2: LIBS += -lwebkit2
-LIBS += -lwebcore -ljscore -lwtf
+LIBS += -lwebcore
+!v8: LIBS += -ljscore
+LIBS += -lwtf
 }
 }
 






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

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

2011-12-07 Thread hausmann

Title: [102239] trunk/Source/WebCore








Revision 102239
Author hausm...@webkit.org
Date 2011-12-07 07:32:58 -0800 (Wed, 07 Dec 2011)


Log Message
[Qt] V8 debug build fixes.

Reviewed by Tor Arne Vestbø.

* Target.pri: Add missing files to the build.
* loader/SubresourceLoader.cpp: Add missing CString.h header file inclusion,
that is implicitly included with Chromium builds.
* loader/cache/CachedResource.cpp: Ditto.
* page/FrameTree.cpp: Ditto.
* platform/graphics/MediaPlayer.cpp: Ditto.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Target.pri
trunk/Source/WebCore/loader/SubresourceLoader.cpp
trunk/Source/WebCore/loader/cache/CachedResource.cpp
trunk/Source/WebCore/page/FrameTree.cpp
trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (102238 => 102239)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 15:29:47 UTC (rev 102238)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 15:32:58 UTC (rev 102239)
@@ -1,5 +1,19 @@
 2011-11-30  Simon Hausmann  simon.hausm...@nokia.com
 
+[Qt] V8 debug build fixes.
+
+Reviewed by Tor Arne Vestbø.
+
+* Target.pri: Add missing files to the build.
+* loader/SubresourceLoader.cpp: Add missing CString.h header file inclusion,
+that is implicitly included with Chromium builds and only needed in ASSERTS
+in debug builds.
+* loader/cache/CachedResource.cpp: Ditto.
+* page/FrameTree.cpp: Ditto.
+* platform/graphics/MediaPlayer.cpp: Ditto.
+
+2011-11-30  Simon Hausmann  simon.hausm...@nokia.com
+
 [Qt] V8 build fixes.
 
 Reviewed by Tor Arne Vestbø.


Modified: trunk/Source/WebCore/Target.pri (102238 => 102239)

--- trunk/Source/WebCore/Target.pri	2011-12-07 15:29:47 UTC (rev 102238)
+++ trunk/Source/WebCore/Target.pri	2011-12-07 15:32:58 UTC (rev 102239)
@@ -98,6 +98,7 @@
 bindings/v8/DOMData.cpp \
 bindings/v8/DOMDataStore.cpp \
 bindings/v8/NPV8Object.cpp \
+bindings/v8/NPObjectWrapper.cpp \
 bindings/v8/OptionsObject.cpp \
 bindings/v8/PageScriptDebugServer.cpp \
 bindings/v8/RetainedDOMInfo.cpp \
@@ -1352,6 +1353,7 @@
 bindings/v8/npruntime_impl.h \
 bindings/v8/npruntime_priv.h \
 bindings/v8/NPV8Object.h \
+bindings/v8/NPObjectWrapper.h \
 bindings/v8/OwnHandle.h \
 bindings/v8/PageScriptDebugServer.h \
 bindings/v8/RetainedDOMInfo.h \


Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (102238 => 102239)

--- trunk/Source/WebCore/loader/SubresourceLoader.cpp	2011-12-07 15:29:47 UTC (rev 102238)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp	2011-12-07 15:32:58 UTC (rev 102239)
@@ -41,6 +41,7 @@
 #include SecurityPolicy.h
 #include wtf/RefCountedLeakCounter.h
 #include wtf/StdLibExtras.h
+#include wtf/text/CString.h
 
 namespace WebCore {
 


Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (102238 => 102239)

--- trunk/Source/WebCore/loader/cache/CachedResource.cpp	2011-12-07 15:29:47 UTC (rev 102238)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp	2011-12-07 15:32:58 UTC (rev 102239)
@@ -45,6 +45,7 @@
 #include wtf/MathExtras.h
 #include wtf/RefCountedLeakCounter.h
 #include wtf/StdLibExtras.h
+#include wtf/text/CString.h
 #include wtf/Vector.h
 
 using namespace WTF;


Modified: trunk/Source/WebCore/page/FrameTree.cpp (102238 => 102239)

--- trunk/Source/WebCore/page/FrameTree.cpp	2011-12-07 15:29:47 UTC (rev 102238)
+++ trunk/Source/WebCore/page/FrameTree.cpp	2011-12-07 15:32:58 UTC (rev 102239)
@@ -29,6 +29,7 @@
 #include stdarg.h
 #include wtf/StringExtras.h
 #include wtf/Vector.h
+#include wtf/text/CString.h
 
 using std::swap;
 


Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (102238 => 102239)

--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp	2011-12-07 15:29:47 UTC (rev 102238)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp	2011-12-07 15:32:58 UTC (rev 102239)
@@ -38,6 +38,7 @@
 #include MediaPlayerPrivate.h
 #include Settings.h
 #include TimeRanges.h
+#include wtf/text/CString.h
 
 #if PLATFORM(QT)
 #include QtGlobal






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

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

2011-12-07 Thread jberlin

Title: [102241] trunk/Source/WebCore








Revision 102241
Author jber...@webkit.org
Date 2011-12-07 08:12:36 -0800 (Wed, 07 Dec 2011)


Log Message
Mac build fix after r102235.

* WebCore.exp.in:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in




Diff

Modified: trunk/Source/WebCore/ChangeLog (102240 => 102241)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 15:38:58 UTC (rev 102240)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 16:12:36 UTC (rev 102241)
@@ -1,3 +1,9 @@
+2011-12-07  Jessie Berlin  jber...@apple.com
+
+Mac build fix after r102235.
+
+* WebCore.exp.in:
+
 2011-11-30  Simon Hausmann  simon.hausm...@nokia.com
 
 [Qt] V8 debug build fixes.


Modified: trunk/Source/WebCore/WebCore.exp.in (102240 => 102241)

--- trunk/Source/WebCore/WebCore.exp.in	2011-12-07 15:38:58 UTC (rev 102240)
+++ trunk/Source/WebCore/WebCore.exp.in	2011-12-07 16:12:36 UTC (rev 102241)
@@ -719,7 +719,7 @@
 __ZN7WebCore35contextMenuItemTagShowSpellingPanelEb
 __ZN7WebCore35contextMenuItemTagShowSubstitutionsEb
 __ZN7WebCore35contextMenuItemTagSubstitutionsMenuEv
-__ZN7WebCore36InitializeLoggingChannelsIfNecessaryEv
+__ZN7WebCore36initializeLoggingChannelsIfNecessaryEv
 __ZN7WebCore37contextMenuItemTagTransformationsMenuEv
 __ZN7WebCore38contextMenuItemTagWritingDirectionMenuEv
 __ZN7WebCore3macERKNS_10CredentialE






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

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

2011-12-07 Thread kling

Title: [102242] trunk/Source/WebCore








Revision 102242
Author kl...@webkit.org
Date 2011-12-07 08:16:34 -0800 (Wed, 07 Dec 2011)


Log Message
ApplyPropertyBorderImage: Remove unneeded template argument for mapNinePieceImage().
http://webkit.org/b/73998

Reviewed by Antti Koivisto.

Have ApplyPropertyBorderImage call mapNinePieceImage() directly now that it's
public (instead of passing it as a template argument.)

* css/CSSStyleApplyProperty.cpp:
(WebCore::ApplyPropertyBorderImage::applyValue):
(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (102241 => 102242)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 16:12:36 UTC (rev 102241)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 16:16:34 UTC (rev 102242)
@@ -1,3 +1,17 @@
+2011-12-07  Andreas Kling  kl...@webkit.org
+
+ApplyPropertyBorderImage: Remove unneeded template argument for mapNinePieceImage().
+http://webkit.org/b/73998
+
+Reviewed by Antti Koivisto.
+
+Have ApplyPropertyBorderImage call mapNinePieceImage() directly now that it's
+public (instead of passing it as a template argument.)
+
+* css/CSSStyleApplyProperty.cpp:
+(WebCore::ApplyPropertyBorderImage::applyValue):
+(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+
 2011-12-07  Jessie Berlin  jber...@apple.com
 
 Mac build fix after r102235.


Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (102241 => 102242)

--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp	2011-12-07 16:12:36 UTC (rev 102241)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp	2011-12-07 16:16:34 UTC (rev 102242)
@@ -611,8 +611,7 @@
 template BorderImageType borderImageType,
   CSSPropertyID property,
   const NinePieceImage (RenderStyle::*getterFunction)() const,
-  void (RenderStyle::*setterFunction)(const NinePieceImage),
-  void (CSSStyleSelector::*mapNinePieceImage)(CSSPropertyID, CSSValue*, NinePieceImage)
+  void (RenderStyle::*setterFunction)(const NinePieceImage)
 class ApplyPropertyBorderImage {
 public:
 static void applyValue(CSSStyleSelector* selector, CSSValue* value)
@@ -620,7 +619,7 @@
 NinePieceImage image;
 if (borderImageType == Mask)
 image.setMaskDefaults();
-(selector-*mapNinePieceImage)(property, value, image);
+selector-mapNinePieceImage(property, value, image);
 (selector-style()-*setterFunction)(image);
 }
 
@@ -1350,9 +1349,9 @@
 setPropertyHandler(CSSPropertyBorderColor, ApplyPropertyExpandingSuppressValue, CSSPropertyBorderTopColor, CSSPropertyBorderRightColor, CSSPropertyBorderBottomColor, CSSPropertyBorderLeftColor::createHandler());
 setPropertyHandler(CSSPropertyBorder, ApplyPropertyExpandingSuppressValue, CSSPropertyBorderStyle, CSSPropertyBorderWidth, CSSPropertyBorderColor::createHandler());
 
-setPropertyHandler(CSSPropertyBorderImage, ApplyPropertyBorderImageImage, CSSPropertyBorderImage, RenderStyle::borderImage, RenderStyle::setBorderImage, CSSStyleSelector::mapNinePieceImage::createHandler());
-setPropertyHandler(CSSPropertyWebkitBorderImage, ApplyPropertyBorderImageImage, CSSPropertyWebkitBorderImage, RenderStyle::borderImage, RenderStyle::setBorderImage, CSSStyleSelector::mapNinePieceImage::createHandler());
-setPropertyHandler(CSSPropertyWebkitMaskBoxImage, ApplyPropertyBorderImageMask, CSSPropertyWebkitMaskBoxImage, RenderStyle::maskBoxImage, RenderStyle::setMaskBoxImage, CSSStyleSelector::mapNinePieceImage::createHandler());
+setPropertyHandler(CSSPropertyBorderImage, ApplyPropertyBorderImageImage, CSSPropertyBorderImage, RenderStyle::borderImage, RenderStyle::setBorderImage::createHandler());
+setPropertyHandler(CSSPropertyWebkitBorderImage, ApplyPropertyBorderImageImage, CSSPropertyWebkitBorderImage, RenderStyle::borderImage, RenderStyle::setBorderImage::createHandler());
+setPropertyHandler(CSSPropertyWebkitMaskBoxImage, ApplyPropertyBorderImageMask, CSSPropertyWebkitMaskBoxImage, RenderStyle::maskBoxImage, RenderStyle::setMaskBoxImage::createHandler());
 
 setPropertyHandler(CSSPropertyBorderImageOutset, ApplyPropertyBorderImageModifierImage, Outset::createHandler());
 setPropertyHandler(CSSPropertyWebkitMaskBoxImageOutset, ApplyPropertyBorderImageModifierMask, Outset::createHandler());






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

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

2011-12-07 Thread kling

Title: [102243] trunk/Source/WebCore








Revision 102243
Author kl...@webkit.org
Date 2011-12-07 08:40:31 -0800 (Wed, 07 Dec 2011)


Log Message
Micro-optimize ScrollView::visibleContentRect().
http://webkit.org/b/74001

Reviewed by Anders Carlsson.

Reorder the scrollbar exclusion code to minimize the number of virtual calls
to ScrollableArea::verticalScrollbar(), ScrollableArea::horizontalScrollbar()
and Scrollbar::isOverlayScrollbar().

* platform/ScrollView.cpp:
(WebCore::ScrollView::visibleContentRect):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/ScrollView.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (102242 => 102243)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 16:16:34 UTC (rev 102242)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 16:40:31 UTC (rev 102243)
@@ -1,5 +1,19 @@
 2011-12-07  Andreas Kling  kl...@webkit.org
 
+Micro-optimize ScrollView::visibleContentRect().
+http://webkit.org/b/74001
+
+Reviewed by Anders Carlsson.
+
+Reorder the scrollbar exclusion code to minimize the number of virtual calls
+to ScrollableArea::verticalScrollbar(), ScrollableArea::horizontalScrollbar()
+and Scrollbar::isOverlayScrollbar().
+
+* platform/ScrollView.cpp:
+(WebCore::ScrollView::visibleContentRect):
+
+2011-12-07  Andreas Kling  kl...@webkit.org
+
 ApplyPropertyBorderImage: Remove unneeded template argument for mapNinePieceImage().
 http://webkit.org/b/73998
 


Modified: trunk/Source/WebCore/platform/ScrollView.cpp (102242 => 102243)

--- trunk/Source/WebCore/platform/ScrollView.cpp	2011-12-07 16:16:34 UTC (rev 102242)
+++ trunk/Source/WebCore/platform/ScrollView.cpp	2011-12-07 16:40:31 UTC (rev 102243)
@@ -231,11 +231,16 @@
 if (!m_fixedVisibleContentRect.isEmpty())
 return m_fixedVisibleContentRect;
 
-int verticalScrollbarWidth = verticalScrollbar()  !verticalScrollbar()-isOverlayScrollbar()
- !includeScrollbars ? verticalScrollbar()-width() : 0;
-int horizontalScrollbarHeight = horizontalScrollbar()  !horizontalScrollbar()-isOverlayScrollbar()
- !includeScrollbars ? horizontalScrollbar()-height() : 0;
+int verticalScrollbarWidth = 0;
+int horizontalScrollbarHeight = 0;
 
+if (!includeScrollbars) {
+if (Scrollbar* verticalBar = verticalScrollbar())
+verticalScrollbarWidth = !verticalBar-isOverlayScrollbar() ? verticalBar-width() : 0;
+if (Scrollbar* horizontalBar = horizontalScrollbar())
+horizontalScrollbarHeight = !horizontalBar-isOverlayScrollbar() ? horizontalBar-height() : 0;
+}
+
 return IntRect(m_scrollOffset.width(),
m_scrollOffset.height(),
max(0, width() - verticalScrollbarWidth), 






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

[webkit-changes] [102244] trunk

2011-12-07 Thread commit-queue

Title: [102244] trunk








Revision 102244
Author commit-qu...@webkit.org
Date 2011-12-07 10:08:25 -0800 (Wed, 07 Dec 2011)


Log Message
Source/WebCore: [CHROMIUM/SKIA] Handle put[Un/Pre]multipliedImageData conversions in Skia rather than ImageBuffer
https://bugs.webkit.org/show_bug.cgi?id=73953

Patch by Brian Salomon bsalo...@google.com on 2011-12-07
Reviewed by Stephen White.

Tested by existing canvas2d layout tests.

* platform/graphics/skia/ImageBufferSkia.cpp:
(WebCore::putImageData):
(WebCore::ImageBuffer::putUnmultipliedImageData):
(WebCore::ImageBuffer::putPremultipliedImageData):

LayoutTests: [CHROMIUM] Make canvas/philip/tests/2d.imageData.put.unchanged.html be expected to fail
on the GPU due to slight difference in alpha-premul computation.

https://bugs.webkit.org/show_bug.cgi?id=73953

Patch by Brian Salomon bsalo...@google.com on 2011-12-07
Reviewed by Stephen White.

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (102243 => 102244)

--- trunk/LayoutTests/ChangeLog	2011-12-07 16:40:31 UTC (rev 102243)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 18:08:25 UTC (rev 102244)
@@ -1,3 +1,14 @@
+2011-12-07  Brian Salomon  bsalo...@google.com
+
+[CHROMIUM] Make canvas/philip/tests/2d.imageData.put.unchanged.html be expected to fail
+on the GPU due to slight difference in alpha-premul computation.
+
+https://bugs.webkit.org/show_bug.cgi?id=73953
+
+Reviewed by Stephen White.
+
+* platform/chromium/test_expectations.txt:
+
 2011-12-07  Balazs Kelemen  kbal...@webkit.org
 
 [Qt][WK2] REGRESSION(102228): lot of test failures after enabled page cache


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (102243 => 102244)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-07 16:40:31 UTC (rev 102243)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-07 18:08:25 UTC (rev 102244)
@@ -2653,6 +2653,12 @@
 // GPU
 //
 
+// This test expects that putImageData followed by getImageData at the same location
+// will return the exact same pixel values. However, the spec allows some fuzziness
+// due to conversion to/from premultiplied-alpha. When we do the conversions on the
+// GPU we may be off by one in r, g, and/or b.
+BUGWK73952 GPU : canvas/philip/tests/2d.imageData.put.unchanged.html = TEXT
+
 // Will need windows and linux baselines
 
 BUGWK47923 : compositing/geometry/limit-layer-bounds-opacity-transition.html = TIMEOUT


Modified: trunk/Source/WebCore/ChangeLog (102243 => 102244)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 16:40:31 UTC (rev 102243)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 18:08:25 UTC (rev 102244)
@@ -1,3 +1,17 @@
+2011-12-07  Brian Salomon  bsalo...@google.com
+
+[CHROMIUM/SKIA] Handle put[Un/Pre]multipliedImageData conversions in Skia rather than ImageBuffer
+https://bugs.webkit.org/show_bug.cgi?id=73953
+
+Reviewed by Stephen White.
+
+Tested by existing canvas2d layout tests.
+
+* platform/graphics/skia/ImageBufferSkia.cpp:
+(WebCore::putImageData):
+(WebCore::ImageBuffer::putUnmultipliedImageData):
+(WebCore::ImageBuffer::putPremultipliedImageData):
+
 2011-12-07  Andreas Kling  kl...@webkit.org
 
 Micro-optimize ScrollView::visibleContentRect().


Modified: trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp (102243 => 102244)

--- trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp	2011-12-07 16:40:31 UTC (rev 102243)
+++ trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp	2011-12-07 18:08:25 UTC (rev 102244)
@@ -292,7 +292,7 @@
 
 template Multiply multiplied
 void putImageData(ByteArray* source, const IntSize sourceSize, const IntRect sourceRect, const IntPoint destPoint,
-  SkDevice* dstDevice, const IntSize size)
+  SkCanvas* canvas, const IntSize size)
 {
 ASSERT(sourceRect.width()  0);
 ASSERT(sourceRect.height()  0);
@@ -321,52 +321,27 @@
 int numRows = endY - destY;
 
 unsigned srcBytesPerRow = 4 * sourceSize.width();
+SkBitmap srcBitmap;
+srcBitmap.setConfig(SkBitmap::kARGB__Config, numColumns, numRows, srcBytesPerRow);
+srcBitmap.setPixels(source-data() + originY * srcBytesPerRow + originX * 4);
 
-SkBitmap deviceBitmap = dstDevice-accessBitmap(true);
+SkCanvas::Config config;
+if (multiplied == Premultiplied)
+config = SkCanvas::kRGBA_Premul_Config;
+else
+config = SkCanvas::kRGBA_Unpremul_Config;
 
-// If the device's bitmap doesn't have pixels we will make a temp and call writePixels on the device.
-bool temporaryBitmap = !!deviceBitmap.getTexture();
-SkBitmap destBitmap;
-
-

[webkit-changes] [102245] trunk/LayoutTests

2011-12-07 Thread kbalazs

Title: [102245] trunk/LayoutTests








Revision 102245
Author kbal...@webkit.org
Date 2011-12-07 10:12:47 -0800 (Wed, 07 Dec 2011)


Log Message
Unreviewed gardening.

Skip 3 more metric related tests with Qt5 until test-font fix.

* platform/qt-5.0/Skipped:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/qt-5.0/Skipped




Diff

Modified: trunk/LayoutTests/ChangeLog (102244 => 102245)

--- trunk/LayoutTests/ChangeLog	2011-12-07 18:08:25 UTC (rev 102244)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 18:12:47 UTC (rev 102245)
@@ -1,3 +1,11 @@
+2011-12-07  Balazs Kelemen  kbal...@webkit.org
+
+Unreviewed gardening.
+
+Skip 3 more metric related tests with Qt5 until test-font fix.
+
+* platform/qt-5.0/Skipped:
+
 2011-12-07  Brian Salomon  bsalo...@google.com
 
 [CHROMIUM] Make canvas/philip/tests/2d.imageData.put.unchanged.html be expected to fail


Modified: trunk/LayoutTests/platform/qt-5.0/Skipped (102244 => 102245)

--- trunk/LayoutTests/platform/qt-5.0/Skipped	2011-12-07 18:08:25 UTC (rev 102244)
+++ trunk/LayoutTests/platform/qt-5.0/Skipped	2011-12-07 18:12:47 UTC (rev 102245)
@@ -6933,6 +6933,10 @@
 tables/mozilla_expected_failures/marvin/backgr_position-table-column.html
 tables/mozilla_expected_failures/marvin/backgr_position-table-row-group.html
 tables/mozilla_expected_failures/marvin/backgr_position-table-row.html
+fast/forms/number/input-appearance-number-rtl.html
+fast/forms/number/input-appearance-spinbutton-disabled-readonly.html
+fast/forms/number/input-appearance-spinbutton-layer.html
+fast/forms/number/spin-in-multi-column.html
 
 # crashing test
 fast/text/regional-indicator-symobls.html






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

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

2011-12-07 Thread mitz

Title: [102247] trunk/Source/WebCore








Revision 102247
Author m...@apple.com
Date 2011-12-07 10:21:04 -0800 (Wed, 07 Dec 2011)


Log Message
Fixed the definition of BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING from r102246.

* platform/mac/ThemeMac.mm: Added parentheses.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/ThemeMac.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (102246 => 102247)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 18:15:02 UTC (rev 102246)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 18:21:04 UTC (rev 102247)
@@ -1,5 +1,11 @@
 2011-12-07  Dan Bernstein  m...@apple.com
 
+Fixed the definition of BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING from r102246.
+
+* platform/mac/ThemeMac.mm: Added parentheses.
+
+2011-12-07  Dan Bernstein  m...@apple.com
+
 rdar://problem/10542095 Focus rings are not drawn around push buttons, radio buttons and checkboxes
 
 Reviewed by Darin Adler.


Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (102246 => 102247)

--- trunk/Source/WebCore/platform/mac/ThemeMac.mm	2011-12-07 18:15:02 UTC (rev 102246)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm	2011-12-07 18:21:04 UTC (rev 102247)
@@ -69,7 +69,7 @@
 
 @end
 
-#define BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LION)
+#define BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING (defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LION))
 
 #if !BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
 






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

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

2011-12-07 Thread commit-queue

Title: [102249] trunk/Source/WebCore








Revision 102249
Author commit-qu...@webkit.org
Date 2011-12-07 10:24:35 -0800 (Wed, 07 Dec 2011)


Log Message
Upstream 5 files into WebCore/platform/blackberry
https://bugs.webkit.org/show_bug.cgi?id=73632

Patch by Mary Wu mary...@torchmobile.com.cn on 2011-12-07
Reviewed by Rob Buis.

Initial upstream, no new tests.

* PlatformBlackBerry.cmake: Remove two empty files from build list.
* platform/blackberry/PopupMenuBlackBerry.cpp: Added.
(WebCore::PopupMenuBlackBerry::PopupMenuBlackBerry):
(WebCore::PopupMenuBlackBerry::~PopupMenuBlackBerry):
(WebCore::PopupMenuBlackBerry::show):
(WebCore::PopupMenuBlackBerry::hide):
(WebCore::PopupMenuBlackBerry::updateFromElement):
(WebCore::PopupMenuBlackBerry::disconnectClient):
* platform/blackberry/PopupMenuBlackBerry.h: Added.
(WebCore::PopupMenuBlackBerry::client):
* platform/blackberry/ScrollbarThemeBlackBerry.cpp: Added.
(WebCore::ScrollbarTheme::nativeTheme):
* platform/blackberry/SearchPopupMenuBlackBerry.cpp: Added.
(WebCore::SearchPopupMenuBlackBerry::SearchPopupMenuBlackBerry):
(WebCore::SearchPopupMenuBlackBerry::popupMenu):
(WebCore::SearchPopupMenuBlackBerry::enabled):
(WebCore::SearchPopupMenuBlackBerry::saveRecentSearches):
(WebCore::SearchPopupMenuBlackBerry::loadRecentSearches):
* platform/blackberry/SearchPopupMenuBlackBerry.h: Added.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/PlatformBlackBerry.cmake


Added Paths

trunk/Source/WebCore/platform/blackberry/PopupMenuBlackBerry.cpp
trunk/Source/WebCore/platform/blackberry/PopupMenuBlackBerry.h
trunk/Source/WebCore/platform/blackberry/ScrollbarThemeBlackBerry.cpp
trunk/Source/WebCore/platform/blackberry/SearchPopupMenuBlackBerry.cpp
trunk/Source/WebCore/platform/blackberry/SearchPopupMenuBlackBerry.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (102248 => 102249)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 18:24:05 UTC (rev 102248)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 18:24:35 UTC (rev 102249)
@@ -1,3 +1,32 @@
+2011-12-07  Mary Wu  mary...@torchmobile.com.cn
+
+Upstream 5 files into WebCore/platform/blackberry
+https://bugs.webkit.org/show_bug.cgi?id=73632
+
+Reviewed by Rob Buis.
+
+Initial upstream, no new tests.
+
+* PlatformBlackBerry.cmake: Remove two empty files from build list.
+* platform/blackberry/PopupMenuBlackBerry.cpp: Added.
+(WebCore::PopupMenuBlackBerry::PopupMenuBlackBerry):
+(WebCore::PopupMenuBlackBerry::~PopupMenuBlackBerry):
+(WebCore::PopupMenuBlackBerry::show):
+(WebCore::PopupMenuBlackBerry::hide):
+(WebCore::PopupMenuBlackBerry::updateFromElement):
+(WebCore::PopupMenuBlackBerry::disconnectClient):
+* platform/blackberry/PopupMenuBlackBerry.h: Added.
+(WebCore::PopupMenuBlackBerry::client):
+* platform/blackberry/ScrollbarThemeBlackBerry.cpp: Added.
+(WebCore::ScrollbarTheme::nativeTheme):
+* platform/blackberry/SearchPopupMenuBlackBerry.cpp: Added.
+(WebCore::SearchPopupMenuBlackBerry::SearchPopupMenuBlackBerry):
+(WebCore::SearchPopupMenuBlackBerry::popupMenu):
+(WebCore::SearchPopupMenuBlackBerry::enabled):
+(WebCore::SearchPopupMenuBlackBerry::saveRecentSearches):
+(WebCore::SearchPopupMenuBlackBerry::loadRecentSearches):
+* platform/blackberry/SearchPopupMenuBlackBerry.h: Added.
+
 2011-12-07  Dan Bernstein  m...@apple.com
 
 Fixed the definition of BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING from r102246.


Modified: trunk/Source/WebCore/PlatformBlackBerry.cmake (102248 => 102249)

--- trunk/Source/WebCore/PlatformBlackBerry.cmake	2011-12-07 18:24:05 UTC (rev 102248)
+++ trunk/Source/WebCore/PlatformBlackBerry.cmake	2011-12-07 18:24:35 UTC (rev 102249)
@@ -154,8 +154,6 @@
 platform/blackberry/PopupMenuBlackBerry.cpp
 platform/blackberry/RenderThemeBlackBerry.cpp
 platform/blackberry/SSLKeyGeneratorBlackBerry.cpp
-platform/blackberry/ScrollViewBlackBerry.cpp
-platform/blackberry/ScrollbarBlackBerry.cpp
 platform/blackberry/ScrollbarThemeBlackBerry.cpp
 platform/blackberry/SearchPopupMenuBlackBerry.cpp
 platform/blackberry/SharedTimerBlackBerry.cpp


Added: trunk/Source/WebCore/platform/blackberry/PopupMenuBlackBerry.cpp (0 => 102249)

--- trunk/Source/WebCore/platform/blackberry/PopupMenuBlackBerry.cpp	(rev 0)
+++ trunk/Source/WebCore/platform/blackberry/PopupMenuBlackBerry.cpp	2011-12-07 18:24:35 UTC (rev 102249)
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2010 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+

[webkit-changes] [102250] trunk/Source

2011-12-07 Thread commit-queue

Title: [102250] trunk/Source








Revision 102250
Author commit-qu...@webkit.org
Date 2011-12-07 10:45:49 -0800 (Wed, 07 Dec 2011)


Log Message
[chromium] Plumb damage from WebExternalTextureLayer and WebPluginContainer to CCDamageTracker
https://bugs.webkit.org/show_bug.cgi?id=73485

Patch by Jonathan Backer bac...@chromium.org on 2011-12-07
Reviewed by Darin Fisher.

Source/WebCore:

* platform/graphics/chromium/PluginLayerChromium.cpp:
(WebCore::PluginLayerChromium::updateCompositorResources):
(WebCore::PluginLayerChromium::invalidateRect):
* platform/graphics/chromium/PluginLayerChromium.h:

Source/WebKit/chromium:

* public/platform/WebExternalTextureLayer.h:
* src/WebExternalTextureLayer.cpp:
(WebKit::WebExternalTextureLayer::invalidateRect):
* src/WebPluginContainerImpl.cpp:
(WebKit::WebPluginContainerImpl::commitBackingTexture):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/chromium/PluginLayerChromium.cpp
trunk/Source/WebCore/platform/graphics/chromium/PluginLayerChromium.h
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/platform/WebExternalTextureLayer.h
trunk/Source/WebKit/chromium/src/WebExternalTextureLayer.cpp
trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (102249 => 102250)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 18:24:35 UTC (rev 102249)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 18:45:49 UTC (rev 102250)
@@ -1,3 +1,15 @@
+2011-12-07  Jonathan Backer  bac...@chromium.org
+
+[chromium] Plumb damage from WebExternalTextureLayer and WebPluginContainer to CCDamageTracker
+https://bugs.webkit.org/show_bug.cgi?id=73485
+
+Reviewed by Darin Fisher.
+
+* platform/graphics/chromium/PluginLayerChromium.cpp:
+(WebCore::PluginLayerChromium::updateCompositorResources):
+(WebCore::PluginLayerChromium::invalidateRect):
+* platform/graphics/chromium/PluginLayerChromium.h:
+
 2011-12-07  Mary Wu  mary...@torchmobile.com.cn
 
 Upstream 5 files into WebCore/platform/blackberry


Modified: trunk/Source/WebCore/platform/graphics/chromium/PluginLayerChromium.cpp (102249 => 102250)

--- trunk/Source/WebCore/platform/graphics/chromium/PluginLayerChromium.cpp	2011-12-07 18:24:35 UTC (rev 102249)
+++ trunk/Source/WebCore/platform/graphics/chromium/PluginLayerChromium.cpp	2011-12-07 18:45:49 UTC (rev 102250)
@@ -52,6 +52,17 @@
 {
 }
 
+void PluginLayerChromium::updateCompositorResources(GraphicsContext3D* rendererContext, CCTextureUpdater)
+{
+if (!m_needsDisplay)
+return;
+
+// PluginLayers are updated externally (outside of the compositor).
+// |m_dirtyRect| covers the region that has changed since the last composite.
+m_updateRect = m_dirtyRect;
+m_dirtyRect = FloatRect();
+}
+
 PassRefPtrCCLayerImpl PluginLayerChromium::createCCLayerImpl()
 {
 return CCPluginLayerImpl::create(m_layerId);
@@ -99,5 +110,11 @@
 pluginLayer-setIOSurfaceProperties(m_ioSurfaceWidth, m_ioSurfaceHeight, m_ioSurfaceId);
 }
 
+void PluginLayerChromium::invalidateRect(const FloatRect dirtyRect)
+{
+setNeedsDisplayRect(dirtyRect);
+m_dirtyRect.unite(dirtyRect);
 }
+
+}
 #endif // USE(ACCELERATED_COMPOSITING)


Modified: trunk/Source/WebCore/platform/graphics/chromium/PluginLayerChromium.h (102249 => 102250)

--- trunk/Source/WebCore/platform/graphics/chromium/PluginLayerChromium.h	2011-12-07 18:24:35 UTC (rev 102249)
+++ trunk/Source/WebCore/platform/graphics/chromium/PluginLayerChromium.h	2011-12-07 18:45:49 UTC (rev 102250)
@@ -38,6 +38,7 @@
 public:
 static PassRefPtrPluginLayerChromium create(CCLayerDelegate* = 0);
 virtual bool drawsContent() const { return true; }
+virtual void updateCompositorResources(GraphicsContext3D*, CCTextureUpdater);
 
 virtual PassRefPtrCCLayerImpl createCCLayerImpl();
 
@@ -55,6 +56,8 @@
 
 virtual void pushPropertiesTo(CCLayerImpl*);
 
+void invalidateRect(const FloatRect dirtyRect);
+
 protected:
 explicit PluginLayerChromium(CCLayerDelegate*);
 
@@ -65,6 +68,7 @@
 int m_ioSurfaceWidth;
 int m_ioSurfaceHeight;
 uint32_t m_ioSurfaceId;
+FloatRect m_dirtyRect;
 };
 
 }


Modified: trunk/Source/WebKit/chromium/ChangeLog (102249 => 102250)

--- trunk/Source/WebKit/chromium/ChangeLog	2011-12-07 18:24:35 UTC (rev 102249)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-12-07 18:45:49 UTC (rev 102250)
@@ -1,3 +1,16 @@
+2011-12-07  Jonathan Backer  bac...@chromium.org
+
+[chromium] Plumb damage from WebExternalTextureLayer and WebPluginContainer to CCDamageTracker
+https://bugs.webkit.org/show_bug.cgi?id=73485
+
+Reviewed by Darin Fisher.
+
+* public/platform/WebExternalTextureLayer.h:
+* src/WebExternalTextureLayer.cpp:
+(WebKit::WebExternalTextureLayer::invalidateRect):
+* src/WebPluginContainerImpl.cpp:
+

[webkit-changes] [102252] trunk

2011-12-07 Thread xji

Title: [102252] trunk








Revision 102252
Author x...@chromium.org
Date 2011-12-07 11:05:50 -0800 (Wed, 07 Dec 2011)


Log Message
Source/WebCore: Turn on move caret by word visually for Windows platform.
https://bugs.webkit.org/show_bug.cgi?id=59652

Reviewed by Ryosuke Niwa.

We already support (arrow key) moving cursor by character in visual order.
This patch implements (ctrl/alt-arrow) moving cursor by word in visual order (in Windows).
It matches Firefox's default behavior.

Without this patch, ctrl(alt for mac)-arrow key or
selection.modify(move, left/right, word) moves cursor by word in logical order. 

IE implements moving cursor by logical order for both arrow key and ctrl-arrow key.
Firefox implements moving cursor by visual order for both operations.
>From Chromium bug report, native speakers would like moving cursor by visual order since it
is more intuitive.

The patch is only enabled for Windows (by EditingBehavior) because current implementation
matches Windows' native behavior.
For exmaple, if the logical text is abc def hij, the cursor positions are
|abc |def |hij| no matter pressing ctrl-left-arrow or ctrl-right-arrow.

Mac and Linux's native behavior is slightly different. In which, when pressing
ctrl-left-arrow, the cursor positions are |abc |def |hij|. When pressing ctrl-right-arrow,
the cursor positions are |abc| def| hij|. We will implement it next.

Test: editing/selection/move-left-right-by-word-mac.html

* editing/EditingBehavior.h:
(WebCore::EditingBehavior::shouldMoveLeftRightByWordInVisualOrder):
* editing/FrameSelection.cpp: Remove experimental enum WebKitVisualWordGranularity.
(WebCore::FrameSelection::modifyExtendingRight):
(WebCore::FrameSelection::modifyExtendingForward):
(WebCore::FrameSelection::modifyMovingRight):
(WebCore::FrameSelection::modifyMovingForward):
(WebCore::FrameSelection::modifyExtendingLeft):
(WebCore::FrameSelection::modifyExtendingBackward):
(WebCore::FrameSelection::modifyMovingLeft):
(WebCore::FrameSelection::modifyMovingBackward):
* editing/TextGranularity.h: Remove experimental enum WebKitVisualWordGranularity.
* editing/VisibleSelection.cpp: Remove experimental enum WebKitVisualWordGranularity.
(WebCore::VisibleSelection::setStartAndEndFromBaseAndExtentRespectingGranularity):
* page/DOMSelection.cpp: Remove experimental experimental flag -webkit-visual-word.
(WebCore::DOMSelection::modify):

LayoutTests: Turn on move caret by word visually for windows platform.
https://bugs.webkit.org/show_bug.cgi?id=59652

Reviewed by Ryosuke Niwa.

* editing/selection/caret-mode-paragraph-keys-navigation.html:
* editing/selection/move-by-word-visually-crash-test-1.html:
* editing/selection/move-by-word-visually-crash-test-2.html:
* editing/selection/move-by-word-visually-crash-test-3.html:
* editing/selection/move-by-word-visually-crash-test-4.html:
* editing/selection/move-by-word-visually-crash-test-textarea.html:
* editing/selection/move-by-word-visually-inline-block-positioned-element.html:
* editing/selection/move-by-word-visually-multi-line.html:
* editing/selection/move-by-word-visually-multi-space.html:
* editing/selection/move-by-word-visually-null-box.html:
* editing/selection/move-by-word-visually-single-space-inline-element.html:
* editing/selection/move-by-word-visually-single-space-one-element.html:
* editing/selection/move-by-word-visually-textarea.html:
* editing/selection/move-left-right-by-word-mac-expected.txt: Added.
* editing/selection/move-left-right-by-word-mac.html: Added.
* editing/selection/resources/move-by-word-visually.js:
(moveByWord):
(moveByWordOnEveryChar):

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/editing/selection/caret-mode-paragraph-keys-navigation.html
trunk/LayoutTests/editing/selection/move-by-word-visually-crash-test-1.html
trunk/LayoutTests/editing/selection/move-by-word-visually-crash-test-2.html
trunk/LayoutTests/editing/selection/move-by-word-visually-crash-test-3.html
trunk/LayoutTests/editing/selection/move-by-word-visually-crash-test-4.html
trunk/LayoutTests/editing/selection/move-by-word-visually-crash-test-textarea.html
trunk/LayoutTests/editing/selection/move-by-word-visually-inline-block-positioned-element.html
trunk/LayoutTests/editing/selection/move-by-word-visually-multi-line.html
trunk/LayoutTests/editing/selection/move-by-word-visually-multi-space.html
trunk/LayoutTests/editing/selection/move-by-word-visually-null-box.html
trunk/LayoutTests/editing/selection/move-by-word-visually-single-space-inline-element.html
trunk/LayoutTests/editing/selection/move-by-word-visually-single-space-one-element.html
trunk/LayoutTests/editing/selection/move-by-word-visually-textarea.html
trunk/LayoutTests/editing/selection/resources/move-by-word-visually.js
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/editing/EditingBehavior.h
trunk/Source/WebCore/editing/FrameSelection.cpp
trunk/Source/WebCore/editing/TextGranularity.h
trunk/Source/WebCore/editing/VisibleSelection.cpp

[webkit-changes] [102253] branches/safari-534.53-branch/Source

2011-12-07 Thread lforschler

Title: [102253] branches/safari-534.53-branch/Source








Revision 102253
Author lforsch...@apple.com
Date 2011-12-07 11:06:27 -0800 (Wed, 07 Dec 2011)


Log Message
Merged r98406.

Modified Paths

branches/safari-534.53-branch/Source/WebCore/ChangeLog
branches/safari-534.53-branch/Source/WebCore/WebCore.exp.in
branches/safari-534.53-branch/Source/WebCore/platform/graphics/GraphicsContext.cpp
branches/safari-534.53-branch/Source/WebCore/platform/graphics/GraphicsContext.h
branches/safari-534.53-branch/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
branches/safari-534.53-branch/Source/WebCore/platform/graphics/cg/ImageCG.cpp
branches/safari-534.53-branch/Source/WebKit2/ChangeLog
branches/safari-534.53-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp




Diff

Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (102252 => 102253)

--- branches/safari-534.53-branch/Source/WebCore/ChangeLog	2011-12-07 19:05:50 UTC (rev 102252)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog	2011-12-07 19:06:27 UTC (rev 102253)
@@ -1,5 +1,33 @@
 2011-12-06  Lucas Forschler  lforsch...@apple.com
 
+Merge 98406
+
+2011-10-25  Beth Dakin  bda...@apple.com
+
+https://bugs.webkit.org/show_bug.cgi?id=70852
+Setting up a HiDPI base-level GraphicsContext should be more straightforward for 
+WebKit2
+
+Reviewed by Dan Bernstein.
+
+This patch removes the old cg-only GraphicsContext::setBaseCTM() api, and adds 
+platform-independent GraphicsContext::applyDeviceScaleFactor().
+* WebCore.exp.in:
+* platform/graphics/GraphicsContext.cpp:
+(WebCore::GraphicsContext::platformApplyDeviceScaleFactor):
+(WebCore::GraphicsContext::applyDeviceScaleFactor):
+* platform/graphics/GraphicsContext.h:
+* platform/graphics/cg/GraphicsContextCG.cpp:
+(WebCore::GraphicsContext::platformApplyDeviceScaleFactor):
+
+Since this patch removes GraphicsContext::setBaseCTM(), this code has been 
+reverted to do what it used to do before that was added; it just calls into 
+WebCoreSystemInterface directly.
+* platform/graphics/cg/ImageCG.cpp:
+(WebCore::Image::drawPattern):
+
+2011-12-06  Lucas Forschler  lforsch...@apple.com
+
 Merge 98403
 
 2011-10-25  Anders Carlsson  ander...@apple.com


Modified: branches/safari-534.53-branch/Source/WebCore/WebCore.exp.in (102252 => 102253)

--- branches/safari-534.53-branch/Source/WebCore/WebCore.exp.in	2011-12-07 19:05:50 UTC (rev 102252)
+++ branches/safari-534.53-branch/Source/WebCore/WebCore.exp.in	2011-12-07 19:06:27 UTC (rev 102253)
@@ -419,6 +419,7 @@
 __ZN7WebCore15GraphicsContext20setShouldSmoothFontsEb
 __ZN7WebCore15GraphicsContext20endTransparencyLayerEv
 __ZN7WebCore15GraphicsContext21setCompositeOperationENS_17CompositeOperatorE
+__ZN7WebCore15GraphicsContext22applyDeviceScaleFactorEf
 __ZN7WebCore15GraphicsContext22beginTransparencyLayerEf
 __ZN7WebCore15GraphicsContext28setImageInterpolationQualityENS_20InterpolationQualityE
 __ZN7WebCore15GraphicsContext4clipERKNS_4PathE
@@ -1174,7 +1175,6 @@
 __ZNK7WebCore14SecurityOrigin18databaseIdentifierEv
 __ZNK7WebCore14SecurityOrigin5equalEPKS0_
 __ZNK7WebCore15FocusController18focusedOrMainFrameEv
-__ZN7WebCore15GraphicsContext10setBaseCTMERKNS_15AffineTransformE 
 __ZNK7WebCore15GraphicsContext15platformContextEv
 __ZNK7WebCore15GraphicsContext16paintingDisabledEv
 __ZNK7WebCore15GraphicsContext20updatingControlTintsEv


Modified: branches/safari-534.53-branch/Source/WebCore/platform/graphics/GraphicsContext.cpp (102252 => 102253)

--- branches/safari-534.53-branch/Source/WebCore/platform/graphics/GraphicsContext.cpp	2011-12-07 19:05:50 UTC (rev 102252)
+++ branches/safari-534.53-branch/Source/WebCore/platform/graphics/GraphicsContext.cpp	2011-12-07 19:06:27 UTC (rev 102253)
@@ -740,4 +740,16 @@
 }
 }
 
+#if !USE(CG)
+void GraphicsContext::platformApplyDeviceScaleFactor()
+{
 }
+#endif
+
+void GraphicsContext::applyDeviceScaleFactor(float deviceScaleFactor)
+{
+scale(FloatSize(deviceScaleFactor, deviceScaleFactor));
+platformApplyDeviceScaleFactor();
+}
+
+}


Modified: branches/safari-534.53-branch/Source/WebCore/platform/graphics/GraphicsContext.h (102252 => 102253)

--- branches/safari-534.53-branch/Source/WebCore/platform/graphics/GraphicsContext.h	2011-12-07 19:05:50 UTC (rev 102252)
+++ branches/safari-534.53-branch/Source/WebCore/platform/graphics/GraphicsContext.h	2011-12-07 19:06:27 UTC (rev 102253)
@@ -276,7 +276,6 @@
 
 void setIsAcceleratedContext(bool);
 bool isAcceleratedContext() const;
-void setBaseCTM(const AffineTransform);
 #endif
 
 void save();
@@ -417,6 +416,11 @@
 void setCTM(const AffineTransform);
 AffineTransform getCTM() const;

[webkit-changes] [102254] branches/safari-534.53-branch

2011-12-07 Thread lforschler

Title: [102254] branches/safari-534.53-branch








Revision 102254
Author lforsch...@apple.com
Date 2011-12-07 11:19:31 -0800 (Wed, 07 Dec 2011)


Log Message
Merged r98413.

Modified Paths

branches/safari-534.53-branch/LayoutTests/ChangeLog
branches/safari-534.53-branch/LayoutTests/platform/mac-wk2/plugins/contents-scale-factor.html
branches/safari-534.53-branch/Source/WebKit2/ChangeLog
branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp
branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h
branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Plugin.h
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.h
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginView.h
branches/safari-534.53-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
branches/safari-534.53-branch/Tools/ChangeLog




Diff

Modified: branches/safari-534.53-branch/LayoutTests/ChangeLog (102253 => 102254)

--- branches/safari-534.53-branch/LayoutTests/ChangeLog	2011-12-07 19:06:27 UTC (rev 102253)
+++ branches/safari-534.53-branch/LayoutTests/ChangeLog	2011-12-07 19:19:31 UTC (rev 102254)
@@ -1,5 +1,20 @@
 2011-12-06  Lucas Forschler  lforsch...@apple.com
 
+Merge 98413
+
+2011-10-25  Anders Carlsson  ander...@apple.com
+
+Plug-ins have no way to find out when the device scale factor changes
+https://bugs.webkit.org/show_bug.cgi?id=67226
+
+Reviewed by Sam Weinig.
+
+Update test to check that the scale factor is updated correctly.
+
+* platform/mac-wk2/plugins/contents-scale-factor.html:
+
+2011-12-06  Lucas Forschler  lforsch...@apple.com
+
 Merge 98403
 
 2011-10-25  Anders Carlsson  ander...@apple.com


Modified: branches/safari-534.53-branch/LayoutTests/platform/mac-wk2/plugins/contents-scale-factor.html (102253 => 102254)

--- branches/safari-534.53-branch/LayoutTests/platform/mac-wk2/plugins/contents-scale-factor.html	2011-12-07 19:06:27 UTC (rev 102253)
+++ branches/safari-534.53-branch/LayoutTests/platform/mac-wk2/plugins/contents-scale-factor.html	2011-12-07 19:19:31 UTC (rev 102254)
@@ -28,14 +28,18 @@
 document.body.appendChild(plugin1);
 
 shouldBe(plugin1.contentsScaleFactor, 1.0);
+shouldBe(plugin1.cachedContentsScaleFactor, 1.0);
 
 // Now change the backing scale factor.
 layoutTestController.setBackingScaleFactor(2, function() {
+shouldBe(plugin1.contentsScaleFactor, 2.0);
+shouldBe(plugin1.cachedContentsScaleFactor, 2.0);
 
 plugin2 = createTestPlugin('contents-scale-factor');
 document.body.appendChild(plugin2);
 
 shouldBe(plugin2.contentsScaleFactor, 2.0);
+shouldBe(plugin2.cachedContentsScaleFactor, 2.0);
 
 layoutTestController.notifyDone();
 });


Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102253 => 102254)

--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 19:06:27 UTC (rev 102253)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 19:19:31 UTC (rev 102254)
@@ -1,5 +1,54 @@
 2011-12-06  Lucas Forschler  lforsch...@apple.com
 
+Merge 98413
+
+2011-10-25  Anders Carlsson  ander...@apple.com
+
+Plug-ins have no way to find out when the device scale factor changes
+https://bugs.webkit.org/show_bug.cgi?id=67226
+
+Reviewed by Sam Weinig.
+
+* PluginProcess/PluginControllerProxy.cpp:
+(WebKit::PluginControllerProxy::geometryDidChange):
+* PluginProcess/PluginControllerProxy.h:
+This now takes the contentsScaleFactor and calls contentsScaleFactorChanged on its plug-in
+if the scale factor changes.
+
+* PluginProcess/PluginControllerProxy.messages.in:
+GeometryDidChange now takes a contents scale factor parameter.
+
+* WebProcess/Plugins/Netscape/NetscapePlugin.h:
+* WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+(WebKit::NetscapePlugin::contentsScaleFactorChanged):
+Implement contentsScaleFactorChanged and call NPP_SetValue with the new scale factor.
+
+* WebProcess/Plugins/PDF/BuiltInPDFView.cpp:
+(WebKit::BuiltInPDFView::contentsScaleFactorChanged):
+*

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

2011-12-07 Thread wangxianzhu

Title: [102255] trunk/Source/WebCore








Revision 102255
Author wangxian...@chromium.org
Date 2011-12-07 11:21:45 -0800 (Wed, 07 Dec 2011)


Log Message
In FontCacheAndroid.cpp should keep the pointer valid returned from CString::data()
https://bugs.webkit.org/show_bug.cgi?id=73849

The changed code has been covered by many existing layout tests.

Reviewed by Adam Barth.

* platform/graphics/chromium/FontCacheAndroid.cpp:
(WebCore::FontCache::createFontPlatformData):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/chromium/FontCacheAndroid.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (102254 => 102255)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 19:19:31 UTC (rev 102254)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 19:21:45 UTC (rev 102255)
@@ -1,3 +1,15 @@
+2011-12-07  Xianzhu Wang  wangxian...@chromium.org
+
+In FontCacheAndroid.cpp should keep the pointer valid returned from CString::data()
+https://bugs.webkit.org/show_bug.cgi?id=73849
+
+The changed code has been covered by many existing layout tests.
+
+Reviewed by Adam Barth.
+
+* platform/graphics/chromium/FontCacheAndroid.cpp:
+(WebCore::FontCache::createFontPlatformData):
+
 2011-12-07  Xiaomei Ji  x...@chromium.org
 
 Turn on move caret by word visually for Windows platform.


Modified: trunk/Source/WebCore/platform/graphics/chromium/FontCacheAndroid.cpp (102254 => 102255)

--- trunk/Source/WebCore/platform/graphics/chromium/FontCacheAndroid.cpp	2011-12-07 19:19:31 UTC (rev 102254)
+++ trunk/Source/WebCore/platform/graphics/chromium/FontCacheAndroid.cpp	2011-12-07 19:21:45 UTC (rev 102255)
@@ -147,13 +147,16 @@
 FontPlatformData* FontCache::createFontPlatformData(const FontDescription fontDescription, const AtomicString family)
 {
 const char* name = 0;
+CString nameString; // Keeps name valid within scope of this function in case that name is from a family.
 
 // If a fallback font is being created (e.g. -webkit-monospace), convert
 // it in to the fallback name (e.g. monospace).
 if (!family.length() || family.startsWith(-webkit-))
 name = getFallbackFontName(fontDescription);
-else
-name = family.string().utf8().data();
+else {
+nameString = family.string().utf8();
+name = nameString.data();
+}
 
 int style = SkTypeface::kNormal;
 if (fontDescription.weight() = FontWeightBold)






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

[webkit-changes] [102256] branches/safari-534.53-branch/Source/WebKit2

2011-12-07 Thread lforschler

Title: [102256] branches/safari-534.53-branch/Source/WebKit2








Revision 102256
Author lforsch...@apple.com
Date 2011-12-07 11:29:44 -0800 (Wed, 07 Dec 2011)


Log Message
Merged r98416.

Modified Paths

branches/safari-534.53-branch/Source/WebKit2/ChangeLog
branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp




Diff

Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102255 => 102256)

--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 19:21:45 UTC (rev 102255)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 19:29:44 UTC (rev 102256)
@@ -1,3 +1,29 @@
+2011-12-07  Lucas Forschler  lforsch...@apple.com
+
+Merge 98416
+
+2011-10-25  Anders Carlsson  ander...@apple.com
+
+CG plug-ins are always given a context with a scale factor of 1, even when the device scale factor is something else
+https://bugs.webkit.org/show_bug.cgi?id=67227
+rdar://problem/10048319
+
+Reviewed by Sam Weinig.
+
+* PluginProcess/PluginControllerProxy.cpp:
+(WebKit::PluginControllerProxy::paint):
+Apply the scale factor when painting.
+
+* WebProcess/Plugins/PluginProxy.cpp:
+(WebKit::PluginProxy::paint):
+Apply the scale factor when painting.
+
+(WebKit::PluginProxy::geometryDidChange):
+Make sure to apply the contents scale factor to the backing store size.
+
+(WebKit::PluginProxy::update):
+Apply the scale factor (when painting).
+
 2011-12-06  Lucas Forschler  lforsch...@apple.com
 
 Merge 98413


Modified: branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (102255 => 102256)

--- branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp	2011-12-07 19:21:45 UTC (rev 102255)
+++ branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp	2011-12-07 19:29:44 UTC (rev 102256)
@@ -163,6 +163,10 @@
 // Create a graphics context.
 OwnPtrGraphicsContext graphicsContext = m_backingStore-createGraphicsContext();
 
+// FIXME: We should really call applyDeviceScaleFactor instead of scale, but that ends up calling into WKSI
+// which we currently don't have initiated in the plug-in process.
+graphicsContext-scale(FloatSize(m_contentsScaleFactor, m_contentsScaleFactor));
+
 graphicsContext-translate(-m_frameRect.x(), -m_frameRect.y());
 
 if (m_plugin-isTransparent())


Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (102255 => 102256)

--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp	2011-12-07 19:21:45 UTC (rev 102255)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp	2011-12-07 19:29:44 UTC (rev 102256)
@@ -143,14 +143,17 @@
 if (!needsBackingStore() || !m_backingStore)
 return;
 
+float contentsScaleFactor = controller()-contentsScaleFactor();
+
 if (!m_pluginBackingStoreContainsValidData) {
 m_connection-connection()-sendSync(Messages::PluginControllerProxy::PaintEntirePlugin(), Messages::PluginControllerProxy::PaintEntirePlugin::Reply(), m_pluginInstanceID);
 
 // Blit the plug-in backing store into our own backing store.
 OwnPtrWebCore::GraphicsContext graphicsContext = m_backingStore-createGraphicsContext();
+graphicsContext-applyDeviceScaleFactor(contentsScaleFactor);
 graphicsContext-setCompositeOperation(CompositeCopy);
 
-m_pluginBackingStore-paint(*graphicsContext, IntPoint(), IntRect(0, 0, m_frameRect.width(), m_frameRect.height()));
+m_pluginBackingStore-paint(*graphicsContext, contentsScaleFactor, IntPoint(), IntRect(0, 0, m_frameRect.width(), m_frameRect.height()));
 
 m_pluginBackingStoreContainsValidData = true;
 }
@@ -158,7 +161,7 @@
 IntRect dirtyRectInPluginCoordinates = dirtyRect;
 dirtyRectInPluginCoordinates.move(-m_frameRect.x(), -m_frameRect.y());
 
-m_backingStore-paint(*graphicsContext, dirtyRect.location(), dirtyRectInPluginCoordinates);
+m_backingStore-paint(*graphicsContext, contentsScaleFactor, dirtyRect.location(), dirtyRectInPluginCoordinates);
 
 if (m_waitingForPaintInResponseToUpdate) {
 m_waitingForPaintInResponseToUpdate = false;
@@ -196,12 +199,15 @@
 }
 
 bool didUpdateBackingStore = false;
+IntSize backingStoreSize = m_frameRect.size();
+backingStoreSize.scale(contentsScaleFactor);
+
 if (!m_backingStore) {
-m_backingStore = ShareableBitmap::create(m_frameRect.size(), ShareableBitmap::SupportsAlpha);
+m_backingStore = ShareableBitmap::create(backingStoreSize, ShareableBitmap::SupportsAlpha);
 didUpdateBackingStore = true;
-} else if (m_frameRect.size() !=

[webkit-changes] [102257] branches/safari-534.53-branch/Source/WebKit2

2011-12-07 Thread lforschler

Title: [102257] branches/safari-534.53-branch/Source/WebKit2








Revision 102257
Author lforsch...@apple.com
Date 2011-12-07 11:31:43 -0800 (Wed, 07 Dec 2011)


Log Message
Merged r98435.

Modified Paths

branches/safari-534.53-branch/Source/WebKit2/ChangeLog
branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp




Diff

Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102256 => 102257)

--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 19:29:44 UTC (rev 102256)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 19:31:43 UTC (rev 102257)
@@ -1,5 +1,17 @@
 2011-12-07  Lucas Forschler  lforsch...@apple.com
 
+Merge 98435
+
+2011-10-25  Ryosuke Niwa  rn...@webkit.org
+
+GTK build fix attempt after r98413 and r98416.
+
+* PluginProcess/PluginControllerProxy.cpp:
+(WebKit::PluginControllerProxy::paint):
+(WebKit::PluginControllerProxy::geometryDidChange):
+
+2011-12-07  Lucas Forschler  lforsch...@apple.com
+
 Merge 98416
 
 2011-10-25  Anders Carlsson  ander...@apple.com


Modified: branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (102256 => 102257)

--- branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp	2011-12-07 19:29:44 UTC (rev 102256)
+++ branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp	2011-12-07 19:31:43 UTC (rev 102257)
@@ -163,9 +163,11 @@
 // Create a graphics context.
 OwnPtrGraphicsContext graphicsContext = m_backingStore-createGraphicsContext();
 
+#if PLATFORM(MAC)
 // FIXME: We should really call applyDeviceScaleFactor instead of scale, but that ends up calling into WKSI
 // which we currently don't have initiated in the plug-in process.
 graphicsContext-scale(FloatSize(m_contentsScaleFactor, m_contentsScaleFactor));
+#endif
 
 graphicsContext-translate(-m_frameRect.x(), -m_frameRect.y());
 
@@ -447,10 +449,14 @@
 
 ASSERT(m_plugin);
 
+#if PLATFORM(MAC)
 if (contentsScaleFactor != m_contentsScaleFactor) {
 m_contentsScaleFactor = contentsScaleFactor;
 m_plugin-contentsScaleFactorChanged(m_contentsScaleFactor);
 }
+#else
+UNUSED_PARAM(contentsScaleFactor)
+#endif
 
 platformGeometryDidChange();
 






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

[webkit-changes] [102258] branches/safari-534.53-branch/Source/WebKit2

2011-12-07 Thread lforschler

Title: [102258] branches/safari-534.53-branch/Source/WebKit2








Revision 102258
Author lforsch...@apple.com
Date 2011-12-07 11:32:55 -0800 (Wed, 07 Dec 2011)


Log Message
Merged r98437.

Modified Paths

branches/safari-534.53-branch/Source/WebKit2/ChangeLog
branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp




Diff

Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102257 => 102258)

--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 19:31:43 UTC (rev 102257)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 19:32:55 UTC (rev 102258)
@@ -1,5 +1,16 @@
 2011-12-07  Lucas Forschler  lforsch...@apple.com
 
+Merge 98437
+
+2011-10-25  Ryosuke Niwa  rn...@webkit.org
+
+C/C++ needs ; after each statement.
+
+* PluginProcess/PluginControllerProxy.cpp:
+(WebKit::PluginControllerProxy::geometryDidChange):
+
+2011-12-07  Lucas Forschler  lforsch...@apple.com
+
 Merge 98435
 
 2011-10-25  Ryosuke Niwa  rn...@webkit.org


Modified: branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (102257 => 102258)

--- branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp	2011-12-07 19:31:43 UTC (rev 102257)
+++ branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp	2011-12-07 19:32:55 UTC (rev 102258)
@@ -455,7 +455,7 @@
 m_plugin-contentsScaleFactorChanged(m_contentsScaleFactor);
 }
 #else
-UNUSED_PARAM(contentsScaleFactor)
+UNUSED_PARAM(contentsScaleFactor);
 #endif
 
 platformGeometryDidChange();






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

[webkit-changes] [102259] branches/safari-534.53-branch/Source/WebKit2

2011-12-07 Thread lforschler

Title: [102259] branches/safari-534.53-branch/Source/WebKit2








Revision 102259
Author lforsch...@apple.com
Date 2011-12-07 11:34:09 -0800 (Wed, 07 Dec 2011)


Log Message
Merged r98438.

Modified Paths

branches/safari-534.53-branch/Source/WebKit2/ChangeLog
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp




Diff

Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102258 => 102259)

--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 19:32:55 UTC (rev 102258)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 19:34:09 UTC (rev 102259)
@@ -1,5 +1,18 @@
 2011-12-07  Lucas Forschler  lforsch...@apple.com
 
+Merge 98438
+
+2011-10-26  Ryosuke Niwa  rn...@webkit.org
+
+Another GTK build fix attempt after r98413 and r98416.
+
+* WebProcess/Plugins/PluginProxy.cpp:
+(WebKit::PluginProxy::paint):
+(WebKit::PluginProxy::geometryDidChange):
+(WebKit::PluginProxy::update):
+
+2011-12-07  Lucas Forschler  lforsch...@apple.com
+
 Merge 98437
 
 2011-10-25  Ryosuke Niwa  rn...@webkit.org


Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (102258 => 102259)

--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp	2011-12-07 19:32:55 UTC (rev 102258)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp	2011-12-07 19:34:09 UTC (rev 102259)
@@ -143,7 +143,11 @@
 if (!needsBackingStore() || !m_backingStore)
 return;
 
+#if PLATFORM(MAC)
 float contentsScaleFactor = controller()-contentsScaleFactor();
+#else
+float contentsScaleFactor = 0;
+#endif
 
 if (!m_pluginBackingStoreContainsValidData) {
 m_connection-connection()-sendSync(Messages::PluginControllerProxy::PaintEntirePlugin(), Messages::PluginControllerProxy::PaintEntirePlugin::Reply(), m_pluginInstanceID);
@@ -190,7 +194,11 @@
 {
 ASSERT(m_isStarted);
 
+#if PLATFORM(MAC)
 float contentsScaleFactor = controller()-contentsScaleFactor();
+#else
+float contentsScaleFactor = 0;
+#endif
 
 if (m_frameRect.isEmpty() || !needsBackingStore()) {
 ShareableBitmap::Handle pluginBackingStoreHandle;
@@ -541,7 +549,11 @@
 paintedRectPluginCoordinates.move(-m_frameRect.x(), -m_frameRect.y());
 
 if (m_backingStore) {
+#if PLATFORM(MAC)
 float contentsScaleFactor = controller()-contentsScaleFactor();
+#else
+float contentsScaleFactor = 0;
+#endif
 
 // Blit the plug-in backing store into our own backing store.
 OwnPtrGraphicsContext graphicsContext = m_backingStore-createGraphicsContext();






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

[webkit-changes] [102260] trunk/LayoutTests

2011-12-07 Thread commit-queue

Title: [102260] trunk/LayoutTests








Revision 102260
Author commit-qu...@webkit.org
Date 2011-12-07 11:45:58 -0800 (Wed, 07 Dec 2011)


Log Message
IndexedDB objectStoreNames not updated after aborted transaction
https://bugs.webkit.org/show_bug.cgi?id=58655

Already functional but there wasn't a test with these specifics.

Patch by Joshua Bell jsb...@chromium.org on 2011-12-07
Reviewed by Tony Chang.

* storage/indexeddb/mozilla/versionchange-abort-expected.txt: Added.
* storage/indexeddb/mozilla/versionchange-abort.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/storage/indexeddb/mozilla/versionchange-abort-expected.txt
trunk/LayoutTests/storage/indexeddb/mozilla/versionchange-abort.html




Diff

Modified: trunk/LayoutTests/ChangeLog (102259 => 102260)

--- trunk/LayoutTests/ChangeLog	2011-12-07 19:34:09 UTC (rev 102259)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 19:45:58 UTC (rev 102260)
@@ -1,3 +1,15 @@
+2011-12-07  Joshua Bell  jsb...@chromium.org
+
+IndexedDB objectStoreNames not updated after aborted transaction
+https://bugs.webkit.org/show_bug.cgi?id=58655
+
+Already functional but there wasn't a test with these specifics.
+
+Reviewed by Tony Chang.
+
+* storage/indexeddb/mozilla/versionchange-abort-expected.txt: Added.
+* storage/indexeddb/mozilla/versionchange-abort.html: Added.
+
 2011-12-07  Xiaomei Ji  x...@chromium.org
 
 Turn on move caret by word visually for windows platform.


Added: trunk/LayoutTests/storage/indexeddb/mozilla/versionchange-abort-expected.txt (0 => 102260)

--- trunk/LayoutTests/storage/indexeddb/mozilla/versionchange-abort-expected.txt	(rev 0)
+++ trunk/LayoutTests/storage/indexeddb/mozilla/versionchange-abort-expected.txt	2011-12-07 19:45:58 UTC (rev 102260)
@@ -0,0 +1,23 @@
+Test IndexedDB's aborting setVersion
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB;
+PASS indexedDB == null is false
+indexedDB.open(name, description)
+db = event.target.result
+initialVersion = db.version;
+request = db.setVersion('2')
+Deleted all object stores.
+objectStore = db.createObjectStore('foo');
+PASS db.objectStoreNames.length is 1
+index = objectStore.createIndex('bar', 'baz');
+PASS objectStore.indexNames.length is 1
+event.target.transaction.abort();
+PASS db.version is initialVersion
+PASS db.objectStoreNames.length is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Added: trunk/LayoutTests/storage/indexeddb/mozilla/versionchange-abort.html (0 => 102260)

--- trunk/LayoutTests/storage/indexeddb/mozilla/versionchange-abort.html	(rev 0)
+++ trunk/LayoutTests/storage/indexeddb/mozilla/versionchange-abort.html	2011-12-07 19:45:58 UTC (rev 102260)
@@ -0,0 +1,72 @@
+!DOCTYPE html
+!--
+  original test: http://mxr.mozilla.org/mozilla2.0/source/dom/indexedDB/test/test_setVersion_abort.html
+  license of original test:
+ Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/ 
+--
+html
+head
+script src=""
+script src=""
+script src=""
+/head
+body
+p id=description/p
+div id=console/div
+script
+
+description(Test IndexedDB's aborting setVersion);
+if (window.layoutTestController)
+layoutTestController.waitUntilDone();
+
+function test()
+{
+indexedDB = evalAndLog(indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB;);
+shouldBeFalse(indexedDB == null);
+
+name = window.location.pathname;
+description = My Test Database;
+request = evalAndLog(indexedDB.open(name, description));
+request._onsuccess_ = openSuccess;
+request._onerror_ = unexpectedErrorCallback;
+}
+
+function openSuccess()
+{
+db = evalAndLog(db = event.target.result);
+initialVersion = evalAndLog(initialVersion = db.version;);
+request = evalAndLog(request = db.setVersion('2'));
+request._onsuccess_ = cleanDatabase;
+request._onerror_ = unexpectedErrorCallback;
+}
+
+function cleanDatabase()
+{
+deleteAllObjectStores(db);
+
+objectStore = evalAndLog(objectStore = db.createObjectStore('foo'););
+shouldBe(db.objectStoreNames.length, 1);
+
+index = evalAndLog(index = objectStore.createIndex('bar', 'baz'););
+shouldBe(objectStore.indexNames.length, 1);
+
+event.target.transaction._oncomplete_ = unexpectedSuccessCallback;
+event.target.transaction._onabort_ = postAbort;
+evalAndLog(event.target.transaction.abort(););
+}
+
+function postAbort()
+{
+shouldBe(db.version, initialVersion);
+shouldBe(db.objectStoreNames.length, 0);
+
+done();
+}
+
+test();
+
+/script
+/body
+/html
+






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

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

2011-12-07 Thread fpizlo

Title: [102261] trunk/Source/_javascript_Core








Revision 102261
Author fpi...@apple.com
Date 2011-12-07 11:52:01 -0800 (Wed, 07 Dec 2011)


Log Message
Non-Mac devices should benefit from a larger heap
https://bugs.webkit.org/show_bug.cgi?id=74015

Reviewed by Geoff Garen.

Removed the ENABLE(LARGE_HEAP) option from Platform.h, since it was only used in
Heap.cpp, and got in the way of having more granular, per-platform control over
what the heap size should be. Bumped the heap size to 8MB on iOS (was 512KB).

* heap/Heap.cpp:
(JSC::GCTimer::heapSizeForHint):
* wtf/Platform.h:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/heap/Heap.cpp
trunk/Source/_javascript_Core/wtf/Platform.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (102260 => 102261)

--- trunk/Source/_javascript_Core/ChangeLog	2011-12-07 19:45:58 UTC (rev 102260)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-12-07 19:52:01 UTC (rev 102261)
@@ -1,3 +1,18 @@
+2011-12-07  Filip Pizlo  fpi...@apple.com
+
+Non-Mac devices should benefit from a larger heap
+https://bugs.webkit.org/show_bug.cgi?id=74015
+
+Reviewed by Geoff Garen.
+
+Removed the ENABLE(LARGE_HEAP) option from Platform.h, since it was only used in
+Heap.cpp, and got in the way of having more granular, per-platform control over
+what the heap size should be. Bumped the heap size to 8MB on iOS (was 512KB).
+
+* heap/Heap.cpp:
+(JSC::GCTimer::heapSizeForHint):
+* wtf/Platform.h:
+
 2011-11-30  Simon Hausmann  simon.hausm...@nokia.com
 
 [Qt] V8 build fixes.


Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (102260 => 102261)

--- trunk/Source/_javascript_Core/heap/Heap.cpp	2011-12-07 19:45:58 UTC (rev 102260)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp	2011-12-07 19:52:01 UTC (rev 102261)
@@ -42,7 +42,13 @@
 
 namespace { 
 
+#if CPU(X86) || CPU(X86_64)
 static const size_t largeHeapSize = 16 * 1024 * 1024;
+#elif PLATFORM(IOS)
+static const size_t largeHeapSize = 8 * 1024 * 1024;
+#else
+static const size_t largeHeapSize = 512 * 1024;
+#endif
 static const size_t smallHeapSize = 512 * 1024;
 
 #if ENABLE(GC_LOGGING)
@@ -141,15 +147,10 @@
 
 static size_t heapSizeForHint(HeapSize heapSize)
 {
-#if ENABLE(LARGE_HEAP)
 if (heapSize == LargeHeap)
 return largeHeapSize;
 ASSERT(heapSize == SmallHeap);
 return smallHeapSize;
-#else
-ASSERT_UNUSED(heapSize, heapSize == LargeHeap || heapSize == SmallHeap);
-return smallHeapSize;
-#endif
 }
 
 static inline bool isValidSharedInstanceThreadState()


Modified: trunk/Source/_javascript_Core/wtf/Platform.h (102260 => 102261)

--- trunk/Source/_javascript_Core/wtf/Platform.h	2011-12-07 19:45:58 UTC (rev 102260)
+++ trunk/Source/_javascript_Core/wtf/Platform.h	2011-12-07 19:52:01 UTC (rev 102261)
@@ -1015,14 +1015,6 @@
 #endif
 #endif
 
-#ifndef ENABLE_LARGE_HEAP
-#if CPU(X86) || CPU(X86_64)
-#define ENABLE_LARGE_HEAP 1
-#else
-#define ENABLE_LARGE_HEAP 0
-#endif
-#endif
-
 #if !defined(ENABLE_PAN_SCROLLING)  OS(WINDOWS)
 #define ENABLE_PAN_SCROLLING 1
 #endif






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

[webkit-changes] [102262] trunk

2011-12-07 Thread ap

Title: [102262] trunk








Revision 102262
Author a...@apple.com
Date 2011-12-07 11:53:37 -0800 (Wed, 07 Dec 2011)


Log Message
Handling of !important in inline style sets is broken
https://bugs.webkit.org/show_bug.cgi?id=73941

Reviewed by Dave Hyatt.

This behavior was introduced in bug 8223 to match IE and Firefox. But it doesn't appear that we're matching
any browser today, and CSSOM spec agrees with them.

* WebCore.exp.in: Don't export CSSStyleDeclaration::setProperty(), no one is using it.

* bindings/js/JSCSSStyleDeclarationCustom.cpp: (WebCore::JSCSSStyleDeclaration::putDelegate): Use regular
setProperty(), not the incorrect version that's being removed. Properties set via IDL attributes are never
important.

* bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp: (WebCore::V8CSSStyleDeclaration::namedPropertySetter):
Made the same fix for v8. Why did v8 bindings authors copy/paste the code?!

* css/CSSStyleDeclaration.cpp:
* css/CSSStyleDeclaration.h:
Removed a version of setProperty() that attempted to parse the value and extract !important from it.

* html/ImageDocument.cpp:
(WebCore::ImageDocument::resizeImageToFit):
(WebCore::ImageDocument::restoreImageSize):
(WebCore::ImageDocument::windowSizeChanged):
* page/DragController.cpp:
(WebCore::DragController::concludeEditDrag):
We never needed to use this version of setProperty() here, it was just unnecessarily slower.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/dom/css-inline-style-important.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp
trunk/Source/WebCore/bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp
trunk/Source/WebCore/css/CSSStyleDeclaration.cpp
trunk/Source/WebCore/css/CSSStyleDeclaration.h
trunk/Source/WebCore/html/ImageDocument.cpp
trunk/Source/WebCore/page/DragController.cpp


Added Paths

trunk/LayoutTests/fast/dom/css-inline-style-important-expected.txt


Removed Paths

trunk/LayoutTests/platform/chromium-linux/fast/dom/css-inline-style-important-expected.png
trunk/LayoutTests/platform/chromium-mac/fast/dom/css-inline-style-important-expected.png
trunk/LayoutTests/platform/chromium-mac-leopard/fast/dom/css-inline-style-important-expected.png
trunk/LayoutTests/platform/chromium-win/fast/dom/css-inline-style-important-expected.png
trunk/LayoutTests/platform/chromium-win/fast/dom/css-inline-style-important-expected.txt
trunk/LayoutTests/platform/efl/fast/dom/css-inline-style-important-expected.png
trunk/LayoutTests/platform/efl/fast/dom/css-inline-style-important-expected.txt
trunk/LayoutTests/platform/gtk/fast/dom/css-inline-style-important-expected.png
trunk/LayoutTests/platform/gtk/fast/dom/css-inline-style-important-expected.txt
trunk/LayoutTests/platform/mac/fast/dom/css-inline-style-important-expected.png
trunk/LayoutTests/platform/mac/fast/dom/css-inline-style-important-expected.txt
trunk/LayoutTests/platform/mac-leopard/fast/dom/css-inline-style-important-expected.png
trunk/LayoutTests/platform/qt/fast/dom/css-inline-style-important-expected.png
trunk/LayoutTests/platform/qt/fast/dom/css-inline-style-important-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (102261 => 102262)

--- trunk/LayoutTests/ChangeLog	2011-12-07 19:52:01 UTC (rev 102261)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 19:53:37 UTC (rev 102262)
@@ -1,3 +1,29 @@
+2011-12-07  Alexey Proskuryakov  a...@apple.com
+
+Handling of !important in inline style sets is broken
+https://bugs.webkit.org/show_bug.cgi?id=73941
+
+Reviewed by Dave Hyatt.
+
+Converted the test to text only, and reversed expectations.
+
+* fast/dom/css-inline-style-important-expected.txt: Added.
+* fast/dom/css-inline-style-important.html:
+* platform/chromium-linux/fast/dom/css-inline-style-important-expected.png: Removed.
+* platform/chromium-mac-leopard/fast/dom/css-inline-style-important-expected.png: Removed.
+* platform/chromium-mac/fast/dom/css-inline-style-important-expected.png: Removed.
+* platform/chromium-win/fast/dom/css-inline-style-important-expected.png: Removed.
+* platform/chromium-win/fast/dom/css-inline-style-important-expected.txt: Removed.
+* platform/efl/fast/dom/css-inline-style-important-expected.png: Removed.
+* platform/efl/fast/dom/css-inline-style-important-expected.txt: Removed.
+* platform/gtk/fast/dom/css-inline-style-important-expected.png: Removed.
+* platform/gtk/fast/dom/css-inline-style-important-expected.txt: Removed.
+* platform/mac-leopard/fast/dom/css-inline-style-important-expected.png: Removed.
+* platform/mac/fast/dom/css-inline-style-important-expected.png: Removed.
+*

[webkit-changes] [102263] trunk

2011-12-07 Thread commit-queue

Title: [102263] trunk








Revision 102263
Author commit-qu...@webkit.org
Date 2011-12-07 12:01:27 -0800 (Wed, 07 Dec 2011)


Log Message
Crash from multicol spans with layers
https://bugs.webkit.org/show_bug.cgi?id=68030

Patch by Ken Buchanan ke...@chromium.org on 2011-12-07
Reviewed by David Hyatt.

Source/WebCore:

The layer tree diverges from the render tree when a span is being split
between columns. This patch causes the layer tree to be updated when necessary.

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::splitFlow)
(WebCore::RenderBlock::splitBlocks)

LayoutTests:

New test for fix to crash on bug 68030.

* fast/multicol/span/removal-of-multicol-span-crash-expected.txt: Added
* fast/multicol/span/removal-of-multicol-span-crash.html: Added

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBlock.cpp


Added Paths

trunk/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash-expected.txt
trunk/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash.html


Property Changed

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog




Diff

Modified: trunk/LayoutTests/ChangeLog (102262 => 102263)

--- trunk/LayoutTests/ChangeLog	2011-12-07 19:53:37 UTC (rev 102262)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 20:01:27 UTC (rev 102263)
@@ -1,3 +1,15 @@
+2011-12-07  Ken Buchanan ke...@chromium.org
+
+Crash from multicol spans with layers
+https://bugs.webkit.org/show_bug.cgi?id=68030
+
+Reviewed by David Hyatt.
+
+New test for fix to crash on bug 68030.
+
+* fast/multicol/span/removal-of-multicol-span-crash-expected.txt: Added
+* fast/multicol/span/removal-of-multicol-span-crash.html: Added
+
 2011-12-07  Alexey Proskuryakov  a...@apple.com
 
 Handling of !important in inline style sets is broken
Property changes on: trunk/LayoutTests/ChangeLog
___


Added: svn:executable

Added: trunk/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash-expected.txt (0 => 102263)

--- trunk/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash-expected.txt	(rev 0)
+++ trunk/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash-expected.txt	2011-12-07 20:01:27 UTC (rev 102263)
@@ -0,0 +1 @@
+PASS, if no exception or crash
Property changes on: trunk/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash-expected.txt
___


Added: svn:executable

Added: trunk/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash.html (0 => 102263)

--- trunk/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash.html	(rev 0)
+++ trunk/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash.html	2011-12-07 20:01:27 UTC (rev 102263)
@@ -0,0 +1,24 @@
+style
+body { -webkit-column-width: 0; }
+#container { position: relative; }
+.hardware:last-of-type { -webkit-column-span: all; }
+/style
+
+script
+function clear() {
+document.documentElement.removeChild(document.body);
+document.documentElement.innerHTML='PASS, if no exception or crash';
+if (window.layoutTestController) {
+layoutTestController.notifyDone();
+}
+}
+setTimeout(clear();, 0);
+if (window.layoutTestController) {
+layoutTestController.waitUntilDone();
+layoutTestController.dumpAsText();
+}
+/script
+body
+div id=container
+div class=hardware box
+/body
Property changes on: trunk/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash.html
___


Added: svn:executable

Modified: trunk/Source/WebCore/ChangeLog (102262 => 102263)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 19:53:37 UTC (rev 102262)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 20:01:27 UTC (rev 102263)
@@ -1,3 +1,17 @@
+2011-12-07  Ken Buchanan ke...@chromium.org
+
+Crash from multicol spans with layers
+https://bugs.webkit.org/show_bug.cgi?id=68030
+
+Reviewed by David Hyatt.
+
+The layer tree diverges from the render tree when a span is being split
+between columns. This patch causes the layer tree to be updated when necessary.
+
+* rendering/RenderBlock.cpp:
+(WebCore::RenderBlock::splitFlow)
+(WebCore::RenderBlock::splitBlocks)
+
 2011-12-07  Alexey Proskuryakov  a...@apple.com
 
 Handling of !important in inline style sets is broken
Property changes on: trunk/Source/WebCore/ChangeLog
___


Added: svn:executable

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (102262 => 102263)

--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2011-12-07 19:53:37 UTC (rev 102262)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2011-12-07 20:01:27 UTC (rev 102263)

[webkit-changes] [102264] trunk

2011-12-07 Thread adamk

Title: [102264] trunk








Revision 102264
Author ad...@chromium.org
Date 2011-12-07 12:03:50 -0800 (Wed, 07 Dec 2011)


Log Message
Layout Test inspector/debugger/dom-breakpoints.html fails on chromium linux debug with ENABLE(MUTATION_OBSERVERS)
https://bugs.webkit.org/show_bug.cgi?id=73919

Reviewed by Ojan Vafai.

Source/WebCore:

Use StyleAttributeMutationScope to manage DOM breakpoints for style property changes.

Instead of calling InspectorInstrumentation::didInvalidateStyleAttr()
directly in setNeedsStyleRecalc, set a bool in the current
StyleAttributeMutationScope, and delay the call until the scope's
counter runs down to zero. This keeps the inspector JS from re-entering
CSSMutableStyleDeclaration until all StyleAttributeMutationScope work is done.

Also fix a small bug in StyleAttributeMutationScope, where
s_shouldDeliver wasn't getting reset properly to false.

* css/CSSMutableStyleDeclaration.cpp:
(WebCore::CSSMutableStyleDeclaration::setNeedsStyleRecalc):

LayoutTests:

Added test that no-op style mutations don't create MutationRecords.

* fast/mutation/observe-attributes-expected.txt:
* fast/mutation/observe-attributes.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/mutation/observe-attributes-expected.txt
trunk/LayoutTests/fast/mutation/observe-attributes.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSMutableStyleDeclaration.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (102263 => 102264)

--- trunk/LayoutTests/ChangeLog	2011-12-07 20:01:27 UTC (rev 102263)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 20:03:50 UTC (rev 102264)
@@ -1,3 +1,15 @@
+2011-12-07  Adam Klein  ad...@chromium.org
+
+Layout Test inspector/debugger/dom-breakpoints.html fails on chromium linux debug with ENABLE(MUTATION_OBSERVERS)
+https://bugs.webkit.org/show_bug.cgi?id=73919
+
+Reviewed by Ojan Vafai.
+
+Added test that no-op style mutations don't create MutationRecords.
+
+* fast/mutation/observe-attributes-expected.txt:
+* fast/mutation/observe-attributes.html:
+
 2011-12-07  Ken Buchanan ke...@chromium.org
 
 Crash from multicol spans with layers


Modified: trunk/LayoutTests/fast/mutation/observe-attributes-expected.txt (102263 => 102264)

--- trunk/LayoutTests/fast/mutation/observe-attributes-expected.txt	2011-12-07 20:01:27 UTC (rev 102263)
+++ trunk/LayoutTests/fast/mutation/observe-attributes-expected.txt	2011-12-07 20:03:50 UTC (rev 102264)
@@ -186,6 +186,9 @@
 ...mutation record created.
 PASS mutations is null
 
+Testing that a no-op style property mutation does not create Mutation Records.
+PASS mutations is null
+
 PASS successfullyParsed is true
 
 TEST COMPLETE


Modified: trunk/LayoutTests/fast/mutation/observe-attributes.html (102263 => 102264)

--- trunk/LayoutTests/fast/mutation/observe-attributes.html	2011-12-07 20:01:27 UTC (rev 102263)
+++ trunk/LayoutTests/fast/mutation/observe-attributes.html	2011-12-07 20:03:50 UTC (rev 102264)
@@ -652,7 +652,7 @@
 }
 
 function testStyleAttributePropertyAccess() {
-var svgDoc, div, path;
+var div, path;
 var observer;
 
 function start() {
@@ -704,7 +704,7 @@
 }
 
 function testStyleAttributePropertyAccessOldValue() {
-var svgDoc, div, path;
+var div, path;
 var observer;
 
 function start() {
@@ -755,6 +755,37 @@
 start();
 }
 
+function testStyleAttributePropertyAccessIgnoreNoop() {
+var div, path;
+var observer;
+
+function start() {
+debug('Testing that a no-op style property mutation does not create Mutation Records.');
+
+mutations = null;
+observer = new WebKitMutationObserver(function(m) {
+mutations = m;
+});
+
+div = document.createElement('div');
+div.setAttribute('style', 'color: yellow; width: 100px; ');
+observer.observe(div, { attributes: true });
+div.style.removeProperty('height');
+
+setTimeout(finish, 0);
+}
+
+function finish() {
+shouldBe('mutations', 'null');
+
+observer.disconnect();
+debug('');
+runNextTest();
+}
+
+start();
+}
+
 var tests = [
 testBasic,
 testWrongType,
@@ -772,7 +803,8 @@
 testAttributeFilterNonHTMLElement,
 testAttributeFilterNonHTMLDocument,
 testStyleAttributePropertyAccess,
-testStyleAttributePropertyAccessOldValue
+testStyleAttributePropertyAccessOldValue,
+testStyleAttributePropertyAccessIgnoreNoop
 ];
 var testIndex = 0;
 


Modified: trunk/Source/WebCore/ChangeLog (102263 => 102264)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 20:01:27 UTC (rev 102263)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 20:03:50 UTC (rev 102264)
@@ -1,3 +1,24 @@
+2011-12-07  Adam Klein  ad...@chromium.org
+
+Layout Test inspector/debugger/dom-breakpoints.html fails on chromium linux debug with ENABLE(MUTATION_OBSERVERS)
+https://bugs.webkit.org/show_bug.cgi?id=73919
+
+Reviewed by Ojan Vafai.

[webkit-changes] [102265] trunk

2011-12-07 Thread commit-queue

Title: [102265] trunk








Revision 102265
Author commit-qu...@webkit.org
Date 2011-12-07 12:08:00 -0800 (Wed, 07 Dec 2011)


Log Message
Unreviewed, rolling out r102244.
http://trac.webkit.org/changeset/102244
https://bugs.webkit.org/show_bug.cgi?id=74016

caused debug test timeouts (Requested by simonjam on #webkit).

Patch by Sheriff Bot webkit.review@gmail.com on 2011-12-07

Source/WebCore:

* platform/graphics/skia/ImageBufferSkia.cpp:
(WebCore::putImageData):
(WebCore::ImageBuffer::putUnmultipliedImageData):
(WebCore::ImageBuffer::putPremultipliedImageData):

LayoutTests:

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (102264 => 102265)

--- trunk/LayoutTests/ChangeLog	2011-12-07 20:03:50 UTC (rev 102264)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 20:08:00 UTC (rev 102265)
@@ -1,3 +1,13 @@
+2011-12-07  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r102244.
+http://trac.webkit.org/changeset/102244
+https://bugs.webkit.org/show_bug.cgi?id=74016
+
+caused debug test timeouts (Requested by simonjam on #webkit).
+
+* platform/chromium/test_expectations.txt:
+
 2011-12-07  Adam Klein  ad...@chromium.org
 
 Layout Test inspector/debugger/dom-breakpoints.html fails on chromium linux debug with ENABLE(MUTATION_OBSERVERS)


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (102264 => 102265)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-07 20:03:50 UTC (rev 102264)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-07 20:08:00 UTC (rev 102265)
@@ -2653,12 +2653,6 @@
 // GPU
 //
 
-// This test expects that putImageData followed by getImageData at the same location
-// will return the exact same pixel values. However, the spec allows some fuzziness
-// due to conversion to/from premultiplied-alpha. When we do the conversions on the
-// GPU we may be off by one in r, g, and/or b.
-BUGWK73952 GPU : canvas/philip/tests/2d.imageData.put.unchanged.html = TEXT
-
 // Will need windows and linux baselines
 
 BUGWK47923 : compositing/geometry/limit-layer-bounds-opacity-transition.html = TIMEOUT


Modified: trunk/Source/WebCore/ChangeLog (102264 => 102265)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 20:03:50 UTC (rev 102264)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 20:08:00 UTC (rev 102265)
@@ -1,3 +1,16 @@
+2011-12-07  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r102244.
+http://trac.webkit.org/changeset/102244
+https://bugs.webkit.org/show_bug.cgi?id=74016
+
+caused debug test timeouts (Requested by simonjam on #webkit).
+
+* platform/graphics/skia/ImageBufferSkia.cpp:
+(WebCore::putImageData):
+(WebCore::ImageBuffer::putUnmultipliedImageData):
+(WebCore::ImageBuffer::putPremultipliedImageData):
+
 2011-12-07  Adam Klein  ad...@chromium.org
 
 Layout Test inspector/debugger/dom-breakpoints.html fails on chromium linux debug with ENABLE(MUTATION_OBSERVERS)


Modified: trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp (102264 => 102265)

--- trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp	2011-12-07 20:03:50 UTC (rev 102264)
+++ trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp	2011-12-07 20:08:00 UTC (rev 102265)
@@ -292,7 +292,7 @@
 
 template Multiply multiplied
 void putImageData(ByteArray* source, const IntSize sourceSize, const IntRect sourceRect, const IntPoint destPoint,
-  SkCanvas* canvas, const IntSize size)
+  SkDevice* dstDevice, const IntSize size)
 {
 ASSERT(sourceRect.width()  0);
 ASSERT(sourceRect.height()  0);
@@ -321,27 +321,52 @@
 int numRows = endY - destY;
 
 unsigned srcBytesPerRow = 4 * sourceSize.width();
-SkBitmap srcBitmap;
-srcBitmap.setConfig(SkBitmap::kARGB__Config, numColumns, numRows, srcBytesPerRow);
-srcBitmap.setPixels(source-data() + originY * srcBytesPerRow + originX * 4);
 
-SkCanvas::Config config;
-if (multiplied == Premultiplied)
-config = SkCanvas::kRGBA_Premul_Config;
-else
-config = SkCanvas::kRGBA_Unpremul_Config;
+SkBitmap deviceBitmap = dstDevice-accessBitmap(true);
 
-canvas-writePixels(srcBitmap, destX, destY, config);
+// If the device's bitmap doesn't have pixels we will make a temp and call writePixels on the device.
+bool temporaryBitmap = !!deviceBitmap.getTexture();
+SkBitmap destBitmap;
+
+if (temporaryBitmap) {
+destBitmap.setConfig(SkBitmap::kARGB__Config, numColumns, numRows, srcBytesPerRow);
+if (!destBitmap.allocPixels())
+CRASH();
+} else
+

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

2011-12-07 Thread kling

Title: [102266] trunk/Source/WebCore








Revision 102266
Author kl...@webkit.org
Date 2011-12-07 12:59:35 -0800 (Wed, 07 Dec 2011)


Log Message
RenderLayer::updateZOrderLists(): Inline early-return condition.
http://webkit.org/b/74013

Reviewed by Anders Carlsson.

updateZOrderLists() was hot (1.2%) when scrolling around on youtube.com,
and 85% of the calls were taking the early return path.

Inlined the two checks for the early return and renamed the function
to updateZOrderListsSlowCase(). Also reversed their order to avoid the
virtual call (RenderObject::isRenderView()) if possible.

* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updateZOrderListsSlowCase):
* rendering/RenderLayer.h:
(WebCore::RenderLayer::updateZOrderLists):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderLayer.cpp
trunk/Source/WebCore/rendering/RenderLayer.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (102265 => 102266)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 20:08:00 UTC (rev 102265)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 20:59:35 UTC (rev 102266)
@@ -1,3 +1,22 @@
+2011-12-07  Andreas Kling  kl...@webkit.org
+
+RenderLayer::updateZOrderLists(): Inline early-return condition.
+http://webkit.org/b/74013
+
+Reviewed by Anders Carlsson.
+
+updateZOrderLists() was hot (1.2%) when scrolling around on youtube.com,
+and 85% of the calls were taking the early return path.
+
+Inlined the two checks for the early return and renamed the function
+to updateZOrderListsSlowCase(). Also reversed their order to avoid the
+virtual call (RenderObject::isRenderView()) if possible.
+
+* rendering/RenderLayer.cpp:
+(WebCore::RenderLayer::updateZOrderListsSlowCase):
+* rendering/RenderLayer.h:
+(WebCore::RenderLayer::updateZOrderLists):
+
 2011-12-07  Sheriff Bot  webkit.review@gmail.com
 
 Unreviewed, rolling out r102244.


Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (102265 => 102266)

--- trunk/Source/WebCore/rendering/RenderLayer.cpp	2011-12-07 20:08:00 UTC (rev 102265)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp	2011-12-07 20:59:35 UTC (rev 102266)
@@ -4092,11 +4092,8 @@
 #endif
 }
 
-void RenderLayer::updateZOrderLists()
+void RenderLayer::updateZOrderListsSlowCase()
 {
-if (!isStackingContext() || !m_zOrderListsDirty)
-return;
-
 #if USE(ACCELERATED_COMPOSITING)
 bool includeHiddenLayers = compositor()-inCompositingMode();
 #else


Modified: trunk/Source/WebCore/rendering/RenderLayer.h (102265 => 102266)

--- trunk/Source/WebCore/rendering/RenderLayer.h	2011-12-07 20:08:00 UTC (rev 102265)
+++ trunk/Source/WebCore/rendering/RenderLayer.h	2011-12-07 20:59:35 UTC (rev 102266)
@@ -544,6 +544,8 @@
 void setContainsDirtyOverlayScrollbars(bool dirtyScrollbars) { m_containsDirtyOverlayScrollbars = dirtyScrollbars; }
 
 private:
+void updateZOrderListsSlowCase();
+
 void computeRepaintRects(IntPoint* offsetFromRoot = 0);
 void clearRepaintRects();
 
@@ -844,6 +846,13 @@
 Page* m_scrollableAreaPage; // Page on which this is registered as a scrollable area.
 };
 
+inline void RenderLayer::updateZOrderLists()
+{
+if (!m_zOrderListsDirty || !isStackingContext())
+return;
+updateZOrderListsSlowCase();
+}
+
 } // namespace WebCore
 
 #ifndef NDEBUG






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

[webkit-changes] [102267] trunk/Source

2011-12-07 Thread adamk

Title: [102267] trunk/Source








Revision 102267
Author ad...@chromium.org
Date 2011-12-07 13:01:59 -0800 (Wed, 07 Dec 2011)


Log Message
Use HashMapNode*, OwnPtr... in ChildListMutationScope
https://bugs.webkit.org/show_bug.cgi?id=73964

Reviewed by Ryosuke Niwa.

Source/_javascript_Core:

* wtf/HashTraits.h: Add passOut(std::nullptr_t) to allow callers to use HashMap::take on an entry whose value is null.

Source/WebCore:

No new tests, refactoring only.

* dom/ChildListMutationScope.cpp:
(WebCore::ChildListMutationAccumulator::MutationAccumulationRouter::childAdded):
(WebCore::ChildListMutationAccumulator::MutationAccumulationRouter::willRemoveChild):
(WebCore::ChildListMutationAccumulator::MutationAccumulationRouter::incrementScopingLevel):
(WebCore::ChildListMutationAccumulator::MutationAccumulationRouter::decrementScopingLevel):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/wtf/HashTraits.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/ChildListMutationScope.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (102266 => 102267)

--- trunk/Source/_javascript_Core/ChangeLog	2011-12-07 20:59:35 UTC (rev 102266)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-12-07 21:01:59 UTC (rev 102267)
@@ -1,3 +1,12 @@
+2011-12-07  Adam Klein  ad...@chromium.org
+
+Use HashMapNode*, OwnPtr... in ChildListMutationScope
+https://bugs.webkit.org/show_bug.cgi?id=73964
+
+Reviewed by Ryosuke Niwa.
+
+* wtf/HashTraits.h: Add passOut(std::nullptr_t) to allow callers to use HashMap::take on an entry whose value is null.
+
 2011-12-07  Filip Pizlo  fpi...@apple.com
 
 Non-Mac devices should benefit from a larger heap


Modified: trunk/Source/_javascript_Core/wtf/HashTraits.h (102266 => 102267)

--- trunk/Source/_javascript_Core/wtf/HashTraits.h	2011-12-07 20:59:35 UTC (rev 102266)
+++ trunk/Source/_javascript_Core/wtf/HashTraits.h	2011-12-07 21:01:59 UTC (rev 102267)
@@ -117,6 +117,7 @@
 
 typedef PassOwnPtrP PassOutType;
 static PassOwnPtrP passOut(OwnPtrP value) { return value.release(); }
+static PassOwnPtrP passOut(std::nullptr_t) { return nullptr; }
 
 typedef typename OwnPtrP::PtrType PeekType;
 static PeekType peek(const OwnPtrP value) { return value.get(); }


Modified: trunk/Source/WebCore/ChangeLog (102266 => 102267)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 20:59:35 UTC (rev 102266)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 21:01:59 UTC (rev 102267)
@@ -1,3 +1,18 @@
+2011-12-07  Adam Klein  ad...@chromium.org
+
+Use HashMapNode*, OwnPtr... in ChildListMutationScope
+https://bugs.webkit.org/show_bug.cgi?id=73964
+
+Reviewed by Ryosuke Niwa.
+
+No new tests, refactoring only.
+
+* dom/ChildListMutationScope.cpp:
+(WebCore::ChildListMutationAccumulator::MutationAccumulationRouter::childAdded):
+(WebCore::ChildListMutationAccumulator::MutationAccumulationRouter::willRemoveChild):
+(WebCore::ChildListMutationAccumulator::MutationAccumulationRouter::incrementScopingLevel):
+(WebCore::ChildListMutationAccumulator::MutationAccumulationRouter::decrementScopingLevel):
+
 2011-12-07  Andreas Kling  kl...@webkit.org
 
 RenderLayer::updateZOrderLists(): Inline early-return condition.


Modified: trunk/Source/WebCore/dom/ChildListMutationScope.cpp (102266 => 102267)

--- trunk/Source/WebCore/dom/ChildListMutationScope.cpp	2011-12-07 20:59:35 UTC (rev 102266)
+++ trunk/Source/WebCore/dom/ChildListMutationScope.cpp	2011-12-07 21:01:59 UTC (rev 102267)
@@ -40,7 +40,7 @@
 #include Node.h
 #include StaticNodeList.h
 #include wtf/HashMap.h
-#include wtf/RefCounted.h
+#include wtf/OwnPtr.h
 
 namespace WebCore {
 
@@ -50,7 +50,7 @@
 // and precede any additions. If this is violated (i.e. because of code changes elsewhere
 // in WebCore) it will likely result in both (a) ASSERTions failing, and (b) mutation records
 // being enqueued for delivery before the outer-most scope closes.
-class ChildListMutationAccumulator : public RefCountedChildListMutationAccumulator {
+class ChildListMutationAccumulator {
 WTF_MAKE_NONCOPYABLE(ChildListMutationAccumulator);
 public:
 ChildListMutationAccumulator(PassRefPtrNode, PassOwnPtrMutationObserverInterestGroup observers);
@@ -95,7 +95,7 @@
 
 typedef HashMapNode*, unsigned ScopingLevelMap;
 ScopingLevelMap m_scopingLevels;
-HashMapNode*, RefPtrChildListMutationAccumulator  m_accumulations;
+HashMapNode*, OwnPtrChildListMutationAccumulator  m_accumulations;
 
 static MutationAccumulationRouter* s_instance;
 };
@@ -216,7 +216,7 @@
 
 void MutationAccumulationRouter::childAdded(Node* target, Node* child)
 {
-HashMapNode*, RefPtrChildListMutationAccumulator ::iterator iter = m_accumulations.find(target);
+HashMapNode*, OwnPtrChildListMutationAccumulator ::iterator iter = m_accumulations.find(target);
 ASSERT(iter !=

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

2011-12-07 Thread kling

Title: [102268] trunk/Source/WebCore








Revision 102268
Author kl...@webkit.org
Date 2011-12-07 13:10:02 -0800 (Wed, 07 Dec 2011)


Log Message
RenderObject::style(): Inline early-return condition.
http://webkit.org/b/74019

Reviewed by Anders Carlsson.

style() was very hot (6.1%) when scrolling around on youtube.com,
and 100% of the calls were taking the early return path.

Inlined the !isRenderFlowThread() check and renamed the function to
styleSlowCase().

* rendering/RenderObject.cpp:
(WebCore::RenderObject::styleSlowCase):
* rendering/RenderObject.h:
(WebCore::RenderObject::style):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/rendering/RenderObject.cpp
trunk/Source/WebCore/rendering/RenderObject.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (102267 => 102268)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 21:01:59 UTC (rev 102267)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 21:10:02 UTC (rev 102268)
@@ -1,3 +1,21 @@
+2011-12-07  Andreas Kling  kl...@webkit.org
+
+RenderObject::style(): Inline early-return condition.
+http://webkit.org/b/74019
+
+Reviewed by Anders Carlsson.
+
+style() was very hot (6.1%) when scrolling around on youtube.com,
+and 100% of the calls were taking the early return path.
+
+Inlined the !isRenderFlowThread() check and renamed the function to
+styleSlowCase().
+
+* rendering/RenderObject.cpp:
+(WebCore::RenderObject::styleSlowCase):
+* rendering/RenderObject.h:
+(WebCore::RenderObject::style):
+
 2011-12-07  Adam Klein  ad...@chromium.org
 
 Use HashMapNode*, OwnPtr... in ChildListMutationScope


Modified: trunk/Source/WebCore/WebCore.exp.in (102267 => 102268)

--- trunk/Source/WebCore/WebCore.exp.in	2011-12-07 21:01:59 UTC (rev 102267)
+++ trunk/Source/WebCore/WebCore.exp.in	2011-12-07 21:10:02 UTC (rev 102268)
@@ -1179,7 +1179,7 @@
 __ZNK7WebCore12RenderObject14enclosingLayerEv
 __ZNK7WebCore12RenderObject15localToAbsoluteERKNS_10FloatPointEbb
 __ZNK7WebCore12RenderObject7childAtEj
-__ZNK7WebCore12RenderObject5styleEv
+__ZNK7WebCore12RenderObject13styleSlowCaseEv
 __ZNK7WebCore12RenderWidget14windowClipRectEv
 __ZNK7WebCore12SharedBuffer11getSomeDataERPKcj
 __ZNK7WebCore12SharedBuffer4dataEv


Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (102267 => 102268)

--- trunk/Source/WebCore/rendering/RenderObject.cpp	2011-12-07 21:01:59 UTC (rev 102267)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp	2011-12-07 21:10:02 UTC (rev 102268)
@@ -1723,10 +1723,11 @@
 return diff;
 }
 
-RenderStyle* RenderObject::style() const
+RenderStyle* RenderObject::styleSlowCase() const
 {
-if (!inRenderFlowThread()
-|| !canHaveRegionStyle()
+ASSERT(inRenderFlowThread());
+
+if (!canHaveRegionStyle()
 || !((view()  view()-currentRenderRegion()  view()-currentRenderRegion()-hasCustomRegionStyle(
 return m_style.get();
 


Modified: trunk/Source/WebCore/rendering/RenderObject.h (102267 => 102268)

--- trunk/Source/WebCore/rendering/RenderObject.h	2011-12-07 21:01:59 UTC (rev 102267)
+++ trunk/Source/WebCore/rendering/RenderObject.h	2011-12-07 21:10:02 UTC (rev 102268)
@@ -866,6 +866,7 @@
 virtual LayoutRect outlineBoundsForRepaint(RenderBoxModelObject* /*repaintContainer*/, LayoutPoint* /*cachedOffsetToRepaintContainer*/ = 0) const { return LayoutRect(); }
 
 private:
+RenderStyle* styleSlowCase() const;
 RenderStyle* firstLineStyleSlowCase() const;
 StyleDifference adjustStyleDifference(StyleDifference, unsigned contextSensitiveProperties) const;
 
@@ -1032,6 +1033,13 @@
 return style()-preserveNewline();
 }
 
+inline RenderStyle* RenderObject::style() const
+{
+if (!inRenderFlowThread())
+return m_style.get();
+return styleSlowCase();
+}
+
 inline void makeMatrixRenderable(TransformationMatrix matrix, bool has3DRendering)
 {
 #if !ENABLE(3D_RENDERING)






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

[webkit-changes] [102269] trunk/LayoutTests

2011-12-07 Thread commit-queue

Title: [102269] trunk/LayoutTests








Revision 102269
Author commit-qu...@webkit.org
Date 2011-12-07 13:18:30 -0800 (Wed, 07 Dec 2011)


Log Message
IndexedDB deleteIndex should throw NOT_ALLOWED_ERR if called outside a VERSION_CHANGE transaction callback
https://bugs.webkit.org/show_bug.cgi?id=62370

Already behaves correctly, just adding tests.

Patch by Joshua Bell jsb...@chromium.org on 2011-12-07
Reviewed by Tony Chang.

* storage/indexeddb/deleteIndex-expected.txt: Added.
* storage/indexeddb/deleteIndex.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/storage/indexeddb/deleteIndex-expected.txt
trunk/LayoutTests/storage/indexeddb/deleteIndex.html




Diff

Modified: trunk/LayoutTests/ChangeLog (102268 => 102269)

--- trunk/LayoutTests/ChangeLog	2011-12-07 21:10:02 UTC (rev 102268)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 21:18:30 UTC (rev 102269)
@@ -1,3 +1,15 @@
+2011-12-07  Joshua Bell  jsb...@chromium.org
+
+IndexedDB deleteIndex should throw NOT_ALLOWED_ERR if called outside a VERSION_CHANGE transaction callback
+https://bugs.webkit.org/show_bug.cgi?id=62370
+
+Already behaves correctly, just adding tests.
+
+Reviewed by Tony Chang.
+
+* storage/indexeddb/deleteIndex-expected.txt: Added.
+* storage/indexeddb/deleteIndex.html: Added.
+
 2011-12-07  Sheriff Bot  webkit.review@gmail.com
 
 Unreviewed, rolling out r102244.


Added: trunk/LayoutTests/storage/indexeddb/deleteIndex-expected.txt (0 => 102269)

--- trunk/LayoutTests/storage/indexeddb/deleteIndex-expected.txt	(rev 0)
+++ trunk/LayoutTests/storage/indexeddb/deleteIndex-expected.txt	2011-12-07 21:18:30 UTC (rev 102269)
@@ -0,0 +1,36 @@
+Test IndexedDB deleteIndex method
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB;
+PASS indexedDB == null is false
+IDBDatabaseException = window.IDBDatabaseException || window.webkitIDBDatabaseException;
+PASS IDBDatabaseException == null is false
+indexedDB.open('deleteIndex')
+db = event.target.result
+request = db.setVersion('1')
+transaction = event.target.result;
+Deleted all object stores.
+objectStore = db.createObjectStore('foo');
+Expecting exception from objectStore.deleteIndex('first')
+PASS Exception was thrown.
+PASS code is IDBDatabaseException.NOT_FOUND_ERR
+PASS objectStore.deleteIndex() threw exception TypeError: Not enough arguments.
+index = objectStore.createIndex('first', 'first');
+Expecting exception from objectStore.deleteIndex('FIRST')
+PASS Exception was thrown.
+PASS code is IDBDatabaseException.NOT_FOUND_ERR
+index = objectStore.createIndex('second', 'second');
+returnValue = objectStore.deleteIndex('first');
+PASS returnValue is undefined
+Expecting exception from db.createObjectStore('bar');
+PASS Exception was thrown.
+PASS code is IDBDatabaseException.NOT_ALLOWED_ERR
+Expecting exception from objectStore.deleteIndex('second')
+PASS Exception was thrown.
+PASS code is IDBDatabaseException.NOT_ALLOWED_ERR
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Added: trunk/LayoutTests/storage/indexeddb/deleteIndex.html (0 => 102269)

--- trunk/LayoutTests/storage/indexeddb/deleteIndex.html	(rev 0)
+++ trunk/LayoutTests/storage/indexeddb/deleteIndex.html	2011-12-07 21:18:30 UTC (rev 102269)
@@ -0,0 +1,67 @@
+!DOCTYPE html
+html
+head
+script src=""
+script src=""
+script src=""
+/head
+body
+p id=description/p
+div id=console/div
+script
+
+description(Test IndexedDB deleteIndex method);
+if (window.layoutTestController)
+layoutTestController.waitUntilDone();
+
+function test()
+{
+indexedDB = evalAndLog(indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB;);
+shouldBeFalse(indexedDB == null);
+IDBDatabaseException = evalAndLog(IDBDatabaseException = window.IDBDatabaseException || window.webkitIDBDatabaseException;);
+shouldBeFalse(IDBDatabaseException == null);
+
+request = evalAndLog(indexedDB.open('deleteIndex'));
+request._onsuccess_ = openSuccess;
+request._onerror_ = unexpectedErrorCallback;
+}
+
+function openSuccess()
+{
+db = evalAndLog(db = event.target.result);
+
+request = evalAndLog(request = db.setVersion('1'));
+request._onsuccess_ = twiddleIndexes;
+request._onerror_ = unexpectedErrorCallback;
+}
+
+function twiddleIndexes()
+{
+transaction = evalAndLog(transaction = event.target.result;);
+transaction._onerror_ = unexpectedErrorCallback;
+transaction._onabort_ = unexpectedAbortCallback;
+transaction._oncomplete_ = postTwiddling;
+deleteAllObjectStores(db);
+
+objectStore = evalAndLog(objectStore = db.createObjectStore('foo'););
+evalAndExpectException(objectStore.deleteIndex('first'), IDBDatabaseException.NOT_FOUND_ERR);
+shouldThrow(objectStore.deleteIndex()); // TypeError: not enough

[webkit-changes] [102270] branches/safari-534.53-branch/Source/WebKit2

2011-12-07 Thread lforschler

Title: [102270] branches/safari-534.53-branch/Source/WebKit2








Revision 102270
Author lforsch...@apple.com
Date 2011-12-07 13:43:11 -0800 (Wed, 07 Dec 2011)


Log Message
Merged r98646.

Modified Paths

branches/safari-534.53-branch/Source/WebKit2/ChangeLog
branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Plugin.h
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.h
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp




Diff

Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102269 => 102270)

--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 21:43:11 UTC (rev 102270)
@@ -1,5 +1,33 @@
 2011-12-07  Lucas Forschler  lforsch...@apple.com
 
+Merge 98646
+
+2011-10-27  Anders Carlsson  ander...@apple.com
+
+Rename Plugin::geometryDidChange to Plugin::deprecatedGeometryDidChange
+https://bugs.webkit.org/show_bug.cgi?id=71065
+
+Reviewed by Simon Fraser.
+
+In preparation for adding a version of geometryDidChange that doesn't take window coordinates.
+
+* PluginProcess/PluginControllerProxy.cpp:
+(WebKit::PluginControllerProxy::geometryDidChange):
+* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+(WebKit::NetscapePlugin::deprecatedGeometryDidChange):
+* WebProcess/Plugins/Netscape/NetscapePlugin.h:
+* WebProcess/Plugins/PDF/BuiltInPDFView.cpp:
+(WebKit::BuiltInPDFView::deprecatedGeometryDidChange):
+* WebProcess/Plugins/PDF/BuiltInPDFView.h:
+* WebProcess/Plugins/Plugin.h:
+* WebProcess/Plugins/PluginProxy.cpp:
+(WebKit::PluginProxy::deprecatedGeometryDidChange):
+* WebProcess/Plugins/PluginProxy.h:
+* WebProcess/Plugins/PluginView.cpp:
+(WebKit::PluginView::viewGeometryDidChange):
+
+2011-12-07  Lucas Forschler  lforsch...@apple.com
+
 Merge 98438
 
 2011-10-26  Ryosuke Niwa  rn...@webkit.org


Modified: branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (102269 => 102270)

--- branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp	2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp	2011-12-07 21:43:11 UTC (rev 102270)
@@ -465,7 +465,7 @@
 m_backingStore = ShareableBitmap::create(backingStoreHandle);
 }
 
-m_plugin-geometryDidChange(frameRect, clipRect);
+m_plugin-deprecatedGeometryDidChange(frameRect, clipRect);
 }
 
 void PluginControllerProxy::didEvaluateJavaScript(uint64_t requestID, const String result)


Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (102269 => 102270)

--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp	2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp	2011-12-07 21:43:11 UTC (rev 102270)
@@ -559,7 +559,7 @@
 return m_isTransparent;
 }
 
-void NetscapePlugin::geometryDidChange(const IntRect frameRect, const IntRect clipRect)
+void NetscapePlugin::deprecatedGeometryDidChange(const IntRect frameRect, const IntRect clipRect)
 {
 ASSERT(m_isStarted);
 


Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (102269 => 102270)

--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h	2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h	2011-12-07 21:43:11 UTC (rev 102270)
@@ -155,7 +155,7 @@
 virtual PlatformLayer* pluginLayer();
 #endif
 virtual bool isTransparent();
-virtual void geometryDidChange(const WebCore::IntRect frameRect, const WebCore::IntRect clipRect);
+virtual void deprecatedGeometryDidChange(const WebCore::IntRect frameRect, const WebCore::IntRect clipRect);
 virtual void visibilityDidChange();
 virtual void frameDidFinishLoading(uint64_t requestID);
 virtual void frameDidFail(uint64_t requestID, bool wasCancelled);


Modified:

[webkit-changes] [102271] branches/safari-534.53-branch/Source

2011-12-07 Thread lforschler

Title: [102271] branches/safari-534.53-branch/Source








Revision 102271
Author lforsch...@apple.com
Date 2011-12-07 14:36:52 -0800 (Wed, 07 Dec 2011)


Log Message
Merge 97514. needed for 98664.

Modified Paths

branches/safari-534.53-branch/Source/WebCore/ChangeLog
branches/safari-534.53-branch/Source/WebCore/WebCore.exp.in
branches/safari-534.53-branch/Source/WebCore/platform/ScrollView.cpp
branches/safari-534.53-branch/Source/WebCore/platform/ScrollView.h
branches/safari-534.53-branch/Source/WebCore/platform/Widget.cpp
branches/safari-534.53-branch/Source/WebCore/platform/Widget.h
branches/safari-534.53-branch/Source/WebKit2/ChangeLog
branches/safari-534.53-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp




Diff

Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (102270 => 102271)

--- branches/safari-534.53-branch/Source/WebCore/ChangeLog	2011-12-07 21:43:11 UTC (rev 102270)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog	2011-12-07 22:36:52 UTC (rev 102271)
@@ -1,3 +1,33 @@
+2011-12-07  Lucas Forschler  lforsch...@apple.com
+
+Merge 97514
+
+2011-10-14  Jeff Miller  je...@apple.com
+
+InjectedBundleHitTestResult::imageRect() should return rect in WKView coordinates
+https://bugs.webkit.org/show_bug.cgi?id=69963
+
+Add infrastructure to convert from any frame view's coordinate system to the
+root view's coordinate system.
+
+Reviewed by Simon Fraser.
+
+No new tests (yet), this is covered by https://bugs.webkit.org/show_bug.cgi?id=70136.
+
+* WebCore.exp.in: Exported WebCore::ScrollView::contentsToRootView(), used by InjectedBundleHitTestResult.cpp.
+
+* platform/ScrollView.cpp:
+(WebCore::ScrollView::rootViewToContents): Added (both point and rect versions).
+(WebCore::ScrollView::contentsToRootView): Ditto.
+
+* platform/ScrollView.h: Added member functions to convert to/from root view coordinates.
+
+* platform/Widget.cpp:
+(WebCore::Widget::convertFromRootView): Added (both point and rect versions).
+(WebCore::Widget::convertToRootView): Ditto.
+
+* platform/Widget.h: Added member functions to convert to/from root view coordinates.
+
 2011-12-06  Lucas Forschler  lforsch...@apple.com
 
 Merge 98406


Modified: branches/safari-534.53-branch/Source/WebCore/WebCore.exp.in (102270 => 102271)

--- branches/safari-534.53-branch/Source/WebCore/WebCore.exp.in	2011-12-07 21:43:11 UTC (rev 102270)
+++ branches/safari-534.53-branch/Source/WebCore/WebCore.exp.in	2011-12-07 22:36:52 UTC (rev 102271)
@@ -1077,6 +1077,7 @@
 __ZNK7WebCore10ScrollView16contentsToWindowERKNS_8IntPointE
 __ZNK7WebCore10ScrollView16windowToContentsERKNS_8IntPointE
 __ZNK7WebCore10ScrollView18visibleContentRectEb
+__ZNK7WebCore10ScrollView18contentsToRootViewERKNS_7IntRectE
 __ZNK7WebCore11CachedImage5imageEv
 __ZNK7WebCore11FrameLoader10isCompleteEv
 __ZNK7WebCore11FrameLoader12blockedErrorERKNS_15ResourceRequestE


Modified: branches/safari-534.53-branch/Source/WebCore/platform/ScrollView.cpp (102270 => 102271)

--- branches/safari-534.53-branch/Source/WebCore/platform/ScrollView.cpp	2011-12-07 21:43:11 UTC (rev 102270)
+++ branches/safari-534.53-branch/Source/WebCore/platform/ScrollView.cpp	2011-12-07 22:36:52 UTC (rev 102271)
@@ -675,6 +675,32 @@
 hostWindow()-invalidateContentsForSlowScroll(updateRect, false);
 }
 
+IntPoint ScrollView::rootViewToContents(const IntPoint rootViewPoint) const
+{
+IntPoint viewPoint = convertFromRootView(rootViewPoint);
+return viewPoint + scrollOffset();
+}
+
+IntPoint ScrollView::contentsToRootView(const IntPoint contentsPoint) const
+{
+IntPoint viewPoint = contentsPoint - scrollOffset();
+return convertToRootView(viewPoint);  
+}
+
+IntRect ScrollView::rootViewToContents(const IntRect rootViewRect) const
+{
+IntRect viewRect = convertFromRootView(rootViewRect);
+viewRect.move(scrollOffset());
+return viewRect;
+}
+
+IntRect ScrollView::contentsToRootView(const IntRect contentsRect) const
+{
+IntRect viewRect = contentsRect;
+viewRect.move(-scrollOffset());
+return convertToRootView(viewRect);
+}
+
 IntPoint ScrollView::windowToContents(const IntPoint windowPoint) const
 {
 IntPoint viewPoint = convertFromContainingWindow(windowPoint);


Modified: branches/safari-534.53-branch/Source/WebCore/platform/ScrollView.h (102270 => 102271)

--- branches/safari-534.53-branch/Source/WebCore/platform/ScrollView.h	2011-12-07 21:43:11 UTC (rev 102270)
+++ branches/safari-534.53-branch/Source/WebCore/platform/ScrollView.h	2011-12-07 22:36:52 UTC (rev 102271)
@@ -196,6 +196,11 @@
 void setScrollbarsSuppressed(bool suppressed, bool repaintOnUnsuppress = false);
 bool scrollbarsSuppressed() const { return m_scrollbarsSuppressed; }
 
+IntPoint rootViewToContents(const IntPoint) const;
+IntPoint

[webkit-changes] [102272] trunk/LayoutTests

2011-12-07 Thread simonjam

Title: [102272] trunk/LayoutTests








Revision 102272
Author simon...@chromium.org
Date 2011-12-07 14:37:06 -0800 (Wed, 07 Dec 2011)


Log Message
[Chromium] Unreviewed, clean out passing tests from test_expectations.txt

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (102271 => 102272)

--- trunk/LayoutTests/ChangeLog	2011-12-07 22:36:52 UTC (rev 102271)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 22:37:06 UTC (rev 102272)
@@ -1,3 +1,9 @@
+2011-12-07  James Simonsen  simon...@chromium.org
+
+[Chromium] Unreviewed, clean out passing tests from test_expectations.txt
+
+* platform/chromium/test_expectations.txt:
+
 2011-12-07  Joshua Bell  jsb...@chromium.org
 
 IndexedDB deleteIndex should throw NOT_ALLOWED_ERR if called outside a VERSION_CHANGE transaction callback


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (102271 => 102272)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-07 22:36:52 UTC (rev 102271)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-07 22:37:06 UTC (rev 102272)
@@ -692,10 +692,6 @@
 
 BUGWK63509 : editing/style/smoosh-styles-003.html = PASS IMAGE
 
-// New tests in r101575
-BUGWK73510 : editing/deleting/delete-and-cleanup.html = TEXT
-BUGWK73510 : editing/pasteboard/paste-without-nesting.html = TEXT
-
 // -
 // Plugin tests
 // -
@@ -1063,7 +1059,7 @@
 BUGWK70748 CPU : fast/borders/mixed-border-styles-radius2.html = IMAGE
 BUGWK70748 CPU : fast/borders/mixed-border-styles-radius.html = IMAGE
 BUGWK70748 CPU : fast/box-shadow/basic-shadows.html = IMAGE
-BUGWK70748 CPU : fast/box-shadow/border-radius-big.html = IMAGE
+BUGWK70748 WIN CPU : fast/box-shadow/border-radius-big.html = IMAGE
 BUGWK70748 CPU : fast/box-shadow/inset-box-shadows.html = IMAGE
 BUGWK70748 CPU : fast/box-shadow/inset.html = IMAGE
 BUGWK70748 CPU : fast/box-shadow/inset-with-extraordinary-radii-and-border.html = IMAGE
@@ -1110,15 +1106,15 @@
 // the image change should be very slight (only in low-bits of color components)
 //
 BUGCR105305 CPU : fast/backgrounds/size/contain-and-cover-zoomed.html = IMAGE
-BUGCR105305 CPU : fast/canvas/canvas-text-alignment.html = IMAGE
+BUGCR105305 LINUX SNOWLEOPARD CPU : fast/canvas/canvas-text-alignment.html = IMAGE
 BUGCR105305 CPU GPU : media/audio-repaint.html = IMAGE
-BUGCR105305 CPU : svg/W3C-SVG-1.1/pservers-grad-11-b.svg = IMAGE
+BUGCR105305 LINUX SNOWLEOPARD CPU : svg/W3C-SVG-1.1/pservers-grad-11-b.svg = IMAGE
 BUGCR105305 CPU : svg/css/composite-shadow-text.svg = IMAGE
 BUGCR105305 CPU : svg/css/text-gradient-shadow.svg = IMAGE
 BUGCR105305 CPU : svg/custom/gradient-stroke-width.svg = IMAGE
 BUGCR105305 CPU : svg/custom/nested-pattern-boundingBoxModeContent.svg = IMAGE
 BUGCR105305 CPU : svg/custom/pattern-with-transformation.svg = IMAGE
-BUGCR105305 CPU : svg/text/text-gradient-positioning.svg = IMAGE
+BUGCR105305 LINUX SNOWLEOPARD CPU : svg/text/text-gradient-positioning.svg = IMAGE
 BUGCR105305 : svg/text/selection-background-color.xhtml = PASS CRASH IMAGE
 BUGCR105305 : svg/text/selection-styles.xhtml = PASS CRASH IMAGE
 BUGCR105305 MAC : fast/borders/border-image-rotate-transform.html = IMAGE
@@ -1488,9 +1484,9 @@
 BUGCR104128 CPU : fast/canvas/shadow-offset-7.html = IMAGE
 BUGCR104128 CPU : fast/repaint/box-shadow-h.html = IMAGE
 BUGCR104128 CPU : fast/repaint/box-shadow-v.html = IMAGE
-BUGCR104128 CPU : fast/repaint/text-shadow-horizontal.html = IMAGE
-BUGCR104128 CPU : fast/repaint/text-shadow.html = IMAGE
-BUGCR104128 CPU : fast/text/shadow-no-blur.html = IMAGE
+BUGCR104128 LINUX SNOWLEOPARD CPU : fast/repaint/text-shadow-horizontal.html = IMAGE
+BUGCR104128 LINUX SNOWLEOPARD CPU : fast/repaint/text-shadow.html = IMAGE
+BUGCR104128 LINUX SNOWLEOPARD CPU : fast/text/shadow-no-blur.html = IMAGE
 BUGCR104128 WIN LINUX SNOWLEOPARD CPU : fast/text/shadow-translucent-fill.html = IMAGE
 BUGCR104128 CPU : fast/text/stroking-decorations.html = IMAGE
 BUGCR104128 WIN LINUX SNOWLEOPARD CPU : fast/text/stroking.html = IMAGE
@@ -1500,8 +1496,8 @@
 BUGCR104128 CPU : transitions/svg-text-shadow-transition.html = IMAGE
 
 // rebaseline after skia rev. 2735 lands (improved luminance computation)
-BUGCR105271 CPU : fast/css/shadow-multiple.html = IMAGE
-BUGCR105271 CPU : fast/multicol/shadow-breaking.html = IMAGE
+BUGCR105271 WIN CPU : fast/css/shadow-multiple.html = IMAGE
+BUGCR105271 WIN CPU : fast/multicol/shadow-breaking.html = IMAGE
 
 // Linux pixeltest failure: alpha=0.5 red (1,0,0) atop yellow (1,1,0) is
 // coming out with with a slightly-less-than-100% red channel. This test fails
@@ -2271,7 +2267,7 @@
 
 // Seems to have been crashing intermittently for as long as we have test history.
 BUGCR62741 WIN LINUX

[webkit-changes] [102274] branches/safari-534.53-branch/Source/WebKit2

2011-12-07 Thread lforschler

Title: [102274] branches/safari-534.53-branch/Source/WebKit2








Revision 102274
Author lforsch...@apple.com
Date 2011-12-07 14:45:15 -0800 (Wed, 07 Dec 2011)


Log Message
Merged r98873.

Modified Paths

branches/safari-534.53-branch/Source/WebKit2/ChangeLog
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.h
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp




Diff

Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102273 => 102274)

--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 22:43:50 UTC (rev 102273)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 22:45:15 UTC (rev 102274)
@@ -1,5 +1,40 @@
 2011-12-07  Lucas Forschler  lforsch...@apple.com
 
+Merge 98873
+
+2011-10-27  Anders Carlsson  ander...@apple.com
+
+Rename a couple of NetscapePlugin and PluginProxy member variables
+https://bugs.webkit.org/show_bug.cgi?id=71086
+
+Reviewed by Sam Weinig.
+
+* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+(WebKit::NetscapePlugin::invalidate):
+(WebKit::NetscapePlugin::callSetWindow):
+(WebKit::NetscapePlugin::snapshot):
+(WebKit::NetscapePlugin::deprecatedGeometryDidChange):
+* WebProcess/Plugins/Netscape/NetscapePlugin.h:
+* WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+(WebKit::NetscapePlugin::platformPaint):
+(WebKit::NetscapePlugin::platformHandleMouseEvent):
+(WebKit::NetscapePlugin::platformHandleWheelEvent):
+(WebKit::NetscapePlugin::platformHandleMouseEnterEvent):
+(WebKit::NetscapePlugin::platformHandleMouseLeaveEvent):
+* WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp:
+(WebKit::NetscapePlugin::scheduleWindowedGeometryUpdate):
+(WebKit::NetscapePlugin::platformPaint):
+* WebProcess/Plugins/PluginProxy.cpp:
+(WebKit::PluginProxy::paint):
+(WebKit::PluginProxy::geometryDidChange):
+(WebKit::PluginProxy::deprecatedGeometryDidChange):
+(WebKit::PluginProxy::update):
+* WebProcess/Plugins/PluginProxy.h:
+* WebProcess/Plugins/PluginView.cpp:
+(WebKit::PluginView::viewGeometryDidChange):
+
+2011-12-07  Lucas Forschler  lforsch...@apple.com
+
 Merge 98664
 
 2011-10-27  Anders Carlsson  ander...@apple.com


Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (102273 => 102274)

--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp	2011-12-07 22:43:50 UTC (rev 102273)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp	2011-12-07 22:45:15 UTC (rev 102274)
@@ -112,7 +112,7 @@
 IntRect rect;
 
 if (!invalidRect)
-rect = IntRect(0, 0, m_frameRect.width(), m_frameRect.height());
+rect = IntRect(0, 0, m_frameRectInWindowCoordinates.width(), m_frameRectInWindowCoordinates.height());
 else
 rect = IntRect(invalidRect-left, invalidRect-top,
invalidRect-right - invalidRect-left, invalidRect-bottom - invalidRect-top);
@@ -387,15 +387,15 @@
 m_npWindow.x = 0;
 m_npWindow.y = 0;
 #else
-m_npWindow.x = m_frameRect.x();
-m_npWindow.y = m_frameRect.y();
+m_npWindow.x = m_frameRectInWindowCoordinates.x();
+m_npWindow.y = m_frameRectInWindowCoordinates.y();
 #endif
-m_npWindow.width = m_frameRect.width();
-m_npWindow.height = m_frameRect.height();
-m_npWindow.clipRect.top = m_clipRect.y();
-m_npWindow.clipRect.left = m_clipRect.x();
-m_npWindow.clipRect.bottom = m_clipRect.maxY();
-m_npWindow.clipRect.right = m_clipRect.maxX();
+m_npWindow.width = m_frameRectInWindowCoordinates.width();
+m_npWindow.height = m_frameRectInWindowCoordinates.height();
+m_npWindow.clipRect.top = m_clipRectInWindowCoordinates.y();
+m_npWindow.clipRect.left = m_clipRectInWindowCoordinates.x();
+m_npWindow.clipRect.bottom = m_clipRectInWindowCoordinates.maxY();
+m_npWindow.clipRect.right = m_clipRectInWindowCoordinates.maxX();
 
 NPP_SetWindow(m_npWindow);
 }
@@ -539,17 +539,17 @@
 
 PassRefPtrShareableBitmap NetscapePlugin::snapshot()
 {
-if (!supportsSnapshotting() || m_frameRect.isEmpty())
+if (!supportsSnapshotting() ||

[webkit-changes] [102275] trunk

2011-12-07 Thread adamk

Title: [102275] trunk








Revision 102275
Author ad...@chromium.org
Date 2011-12-07 14:46:24 -0800 (Wed, 07 Dec 2011)


Log Message
[MutationObservers] Enable in Chromium trunk
https://bugs.webkit.org/show_bug.cgi?id=73851

Reviewed by Ojan Vafai.

Source/WebKit/chromium:

Re-landing after fixing Chromium unit test crashes in r102171
and inspector debugger crash in r102264.

* features.gypi:

LayoutTests:

* platform/chromium/test_expectations.txt: Stop skipping fast/mutation tests.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/features.gypi




Diff

Modified: trunk/LayoutTests/ChangeLog (102274 => 102275)

--- trunk/LayoutTests/ChangeLog	2011-12-07 22:45:15 UTC (rev 102274)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 22:46:24 UTC (rev 102275)
@@ -1,3 +1,12 @@
+2011-12-07  Adam Klein  ad...@chromium.org
+
+[MutationObservers] Enable in Chromium trunk
+https://bugs.webkit.org/show_bug.cgi?id=73851
+
+Reviewed by Ojan Vafai.
+
+* platform/chromium/test_expectations.txt: Stop skipping fast/mutation tests.
+
 2011-12-07  James Simonsen  simon...@chromium.org
 
 [Chromium] Unreviewed, clean out passing tests from test_expectations.txt


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (102274 => 102275)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-07 22:45:15 UTC (rev 102274)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-07 22:46:24 UTC (rev 102275)
@@ -3192,9 +3192,6 @@
 // CSS Filters support not yet enabled
 BUGWK68469 SKIP : css3/filters = PASS
 
-// MutationObservers not yet enabled.
-BUGWK68729 SKIP : fast/mutation = PASS
-
 // style scoped not yet enabled.
 BUGWK49142 SKIP : fast/css/style-scoped = PASS
 


Modified: trunk/Source/WebKit/chromium/ChangeLog (102274 => 102275)

--- trunk/Source/WebKit/chromium/ChangeLog	2011-12-07 22:45:15 UTC (rev 102274)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-12-07 22:46:24 UTC (rev 102275)
@@ -1,3 +1,15 @@
+2011-12-07  Adam Klein  ad...@chromium.org
+
+[MutationObservers] Enable in Chromium trunk
+https://bugs.webkit.org/show_bug.cgi?id=73851
+
+Reviewed by Ojan Vafai.
+
+Re-landing after fixing Chromium unit test crashes in r102171
+and inspector debugger crash in r102264.
+
+* features.gypi:
+
 2011-12-07  Jonathan Backer  bac...@chromium.org
 
 [chromium] Plumb damage from WebExternalTextureLayer and WebPluginContainer to CCDamageTracker


Modified: trunk/Source/WebKit/chromium/features.gypi (102274 => 102275)

--- trunk/Source/WebKit/chromium/features.gypi	2011-12-07 22:45:15 UTC (rev 102274)
+++ trunk/Source/WebKit/chromium/features.gypi	2011-12-07 22:46:24 UTC (rev 102275)
@@ -115,7 +115,7 @@
   'enable_touch_events%': 1,
   'use_skia%': 0,
   'enable_touch_icon_loading%' : 0,
-  'enable_mutation_observers%': 0,
+  'enable_mutation_observers%': 1,
 },
 'use_accelerated_compositing%': '(use_accelerated_compositing)',
 'enable_skia_text%': '(enable_skia_text)',






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

[webkit-changes] [102276] branches/safari-534.53-branch/Source

2011-12-07 Thread lforschler

Title: [102276] branches/safari-534.53-branch/Source








Revision 102276
Author lforsch...@apple.com
Date 2011-12-07 14:47:29 -0800 (Wed, 07 Dec 2011)


Log Message
Merged r98892.

Modified Paths

branches/safari-534.53-branch/Source/WebCore/ChangeLog
branches/safari-534.53-branch/Source/WebCore/WebCore.exp.in
branches/safari-534.53-branch/Source/WebKit2/ChangeLog
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp




Diff

Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (102275 => 102276)

--- branches/safari-534.53-branch/Source/WebCore/ChangeLog	2011-12-07 22:46:24 UTC (rev 102275)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog	2011-12-07 22:47:29 UTC (rev 102276)
@@ -1,5 +1,20 @@
 2011-12-07  Lucas Forschler  lforsch...@apple.com
 
+Merge 98892
+
+2011-10-31  Anders Carlsson  ander...@apple.com
+
+More work on making plug-ins work better with transforms
+https://bugs.webkit.org/show_bug.cgi?id=71241
+
+Reviewed by Darin Adler.
+
+Export symbols used by WebKit2.
+
+* WebCore.exp.in:
+
+2011-12-07  Lucas Forschler  lforsch...@apple.com
+
 Merge 98664
 
 2011-10-27  Anders Carlsson  ander...@apple.com


Modified: branches/safari-534.53-branch/Source/WebCore/WebCore.exp.in (102275 => 102276)

--- branches/safari-534.53-branch/Source/WebCore/WebCore.exp.in	2011-12-07 22:46:24 UTC (rev 102275)
+++ branches/safari-534.53-branch/Source/WebCore/WebCore.exp.in	2011-12-07 22:47:29 UTC (rev 102276)
@@ -394,6 +394,7 @@
 __ZN7WebCore14SecurityOrigin6createERKNS_4KURLEi
 __ZN7WebCore14endOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE
 __ZN7WebCore15AffineTransformC1Edd
+__ZN7WebCore15AffineTransformC1Ev
 __ZN7WebCore15ArchiveResource6createEN3WTF10PassRefPtrINS_12SharedBufferEEERKNS_4KURLERKNS1_6StringESA_SA_RKNS_16ResourceResponseE
 __ZN7WebCore15DOMWrapperWorld13clearWrappersEv
 __ZN7WebCore15DOMWrapperWorldD1Ev
@@ -1177,6 +1178,7 @@
 __ZNK7WebCore14SecurityOrigin10canDisplayERKNS_4KURLE
 __ZNK7WebCore14SecurityOrigin18databaseIdentifierEv
 __ZNK7WebCore14SecurityOrigin5equalEPKS0_
+__ZNK7WebCore15AffineTransform8mapPointERKNS_8IntPointE
 __ZNK7WebCore15FocusController18focusedOrMainFrameEv
 __ZNK7WebCore15GraphicsContext15platformContextEv
 __ZNK7WebCore15GraphicsContext16paintingDisabledEv


Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102275 => 102276)

--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 22:46:24 UTC (rev 102275)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 22:47:29 UTC (rev 102276)
@@ -1,5 +1,29 @@
 2011-12-07  Lucas Forschler  lforsch...@apple.com
 
+Merge 98892
+
+2011-10-31  Anders Carlsson  ander...@apple.com
+
+More work on making plug-ins work better with transforms
+https://bugs.webkit.org/show_bug.cgi?id=71241
+
+Reviewed by Darin Adler.
+
+* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+(WebKit::NetscapePlugin::geometryDidChange):
+Implement NetscapePlugin::geometryDidChange and store the plug-in size,
+the clip rect and the root view transform. Use the transform to compute the window
+relative frame and clip rects.
+
+* WebProcess/Plugins/Netscape/NetscapePlugin.h:
+Add new member variables.
+
+* WebProcess/Plugins/PluginView.cpp:
+(WebKit::PluginView::viewGeometryDidChange):
+Always call the new Plugin::geometryDidChange.
+
+2011-12-07  Lucas Forschler  lforsch...@apple.com
+
 Merge 98873
 
 2011-10-27  Anders Carlsson  ander...@apple.com


Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (102275 => 102276)

--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp	2011-12-07 22:46:24 UTC (rev 102275)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp	2011-12-07 22:47:29 UTC (rev 102276)
@@ -577,8 +577,25 @@
 
 void NetscapePlugin::geometryDidChange(const IntSize pluginSize, const IntRect clipRect, const AffineTransform pluginToRootViewTransform)
 {
-// FIXME: This isn't called yet.
-ASSERT_NOT_REACHED();
+ASSERT(m_isStarted);
+
+if (pluginSize == m_pluginSize  m_clipRect == clipRect  m_pluginToRootViewTransform == pluginToRootViewTransform) {
+// Nothing to do.
+return;
+}
+
+m_pluginSize = pluginSize;
+m_clipRect = clipRect;
+m_pluginToRootViewTransform = pluginToRootViewTransform;
+
+IntPoint frameRectLocationInWindowCoordinates = m_pluginToRootViewTransform.mapPoint(IntPoint());
+m_frameRectInWindowCoordinates =

[webkit-changes] [102277] branches/safari-534.53-branch/Source/WebKit2

2011-12-07 Thread lforschler

Title: [102277] branches/safari-534.53-branch/Source/WebKit2








Revision 102277
Author lforsch...@apple.com
Date 2011-12-07 14:48:49 -0800 (Wed, 07 Dec 2011)


Log Message
Merged r99090.

Modified Paths

branches/safari-534.53-branch/Source/WebKit2/ChangeLog
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp




Diff

Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102276 => 102277)

--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 22:47:29 UTC (rev 102276)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-07 22:48:49 UTC (rev 102277)
@@ -1,5 +1,26 @@
 2011-12-07  Lucas Forschler  lforsch...@apple.com
 
+Merge 99090
+
+2011-11-02  Anders Carlsson  ander...@apple.com
+
+Plug-in snapshots are blurry in HiDPI
+https://bugs.webkit.org/show_bug.cgi?id=71387
+rdar://problem/10385393
+
+Reviewed by Adam Roben.
+
+* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+(WebKit::NetscapePlugin::snapshot):
+Create the backing store in the right size and apply the contents scale factor
+to the newly created graphics context.
+
+* WebProcess/Plugins/PluginView.cpp:
+(WebKit::PluginView::paint):
+Pass the scale factor to ShareableBitmap::paint.
+
+2011-12-07  Lucas Forschler  lforsch...@apple.com
+
 Merge 98892
 
 2011-10-31  Anders Carlsson  ander...@apple.com


Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (102276 => 102277)

--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp	2011-12-07 22:47:29 UTC (rev 102276)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp	2011-12-07 22:48:49 UTC (rev 102277)
@@ -543,12 +543,20 @@
 return 0;
 
 ASSERT(m_isStarted);
-
-RefPtrShareableBitmap bitmap = ShareableBitmap::createShareable(m_frameRectInWindowCoordinates.size(), ShareableBitmap::SupportsAlpha);
+
+IntSize backingStoreSize = m_pluginSize;
+backingStoreSize.scale(contentsScaleFactor());
+
+RefPtrShareableBitmap bitmap = ShareableBitmap::createShareable(backingStoreSize, ShareableBitmap::SupportsAlpha);
 OwnPtrGraphicsContext context = bitmap-createGraphicsContext();
 
+#if PLATFORM(MAC)
+// FIXME: We should really call applyDeviceScaleFactor instead of scale, but that ends up calling into WKSI
+// which we currently don't have initiated in the plug-in process.
+context-scale(FloatSize(contentsScaleFactor(), contentsScaleFactor()));
+#endif
+
 context-translate(-m_frameRectInWindowCoordinates.x(), -m_frameRectInWindowCoordinates.y());
-
 platformPaint(context.get(), m_frameRectInWindowCoordinates, true);
 
 return bitmap.release();


Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (102276 => 102277)

--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp	2011-12-07 22:47:29 UTC (rev 102276)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp	2011-12-07 22:48:49 UTC (rev 102277)
@@ -586,7 +586,7 @@
 return; 
  
 if (m_snapshot) {
-m_snapshot-paint(*context, frameRect().location(), m_snapshot-bounds());
+m_snapshot-paint(*context, contentsScaleFactor(), frameRect().location(), m_snapshot-bounds());
 return;
 }
 






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

[webkit-changes] [102278] trunk

2011-12-07 Thread commit-queue

Title: [102278] trunk








Revision 102278
Author commit-qu...@webkit.org
Date 2011-12-07 15:41:21 -0800 (Wed, 07 Dec 2011)


Log Message
Defer ScriptExecutionContext::Task's in Document when page loading is deferred.
Schedule them with timer when page loading is resumed. The tasks will be performed
in the original order. This fixes the problem that database callbacks could be missed
when page loading was deferred.
https://bugs.webkit.org/show_bug.cgi?id=49401

Patch by Yong Li y...@rim.com on 2011-12-07
Reviewed by Darin Adler.

Manual test added: ManualTests/database-callback-deferred.html.

* dom/Document.cpp:
(WebCore::Document::Document):
(WebCore::Document::didReceiveTask):
(WebCore::Document::postTask):
(WebCore::Document::pendingTasksTimerFired):
(WebCore::Document::suspendScheduledTasks):
(WebCore::Document::resumeScheduledTasks):
* dom/Document.h:
* page/PageGroupLoadDeferrer.cpp:
(WebCore::PageGroupLoadDeferrer::PageGroupLoadDeferrer):
(WebCore::PageGroupLoadDeferrer::~PageGroupLoadDeferrer):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Document.cpp
trunk/Source/WebCore/dom/Document.h
trunk/Source/WebCore/page/PageGroupLoadDeferrer.cpp


Added Paths

trunk/ManualTests/database-callback-deferred.html




Diff

Added: trunk/ManualTests/database-callback-deferred.html (0 => 102278)

--- trunk/ManualTests/database-callback-deferred.html	(rev 0)
+++ trunk/ManualTests/database-callback-deferred.html	2011-12-07 23:41:21 UTC (rev 102278)
@@ -0,0 +1,17 @@
+html
+script
+function test() {
+function transactionCallback()
+{
+document.getElementById(result).innerHTML = Callback was called. Test passed;
+}
+var db = openDatabase(DatabaseCallbackDeferred, 1.0, , 1);
+db.transaction(function(tx) { tx.executeSql(CREATE TABLE IF NOT EXISTS CallbackDeferredTest (randomData), []); }, transactionCallback, transactionCallback);
+
+alert(Wait for a few seconds and close it);
+}
+/script
+body _onload_=test()
+p id=resultWait.../p
+/body
+/html


Modified: trunk/Source/WebCore/ChangeLog (102277 => 102278)

--- trunk/Source/WebCore/ChangeLog	2011-12-07 22:48:49 UTC (rev 102277)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 23:41:21 UTC (rev 102278)
@@ -1,3 +1,28 @@
+2011-12-07  Yong Li  y...@rim.com
+
+Defer ScriptExecutionContext::Task's in Document when page loading is deferred.
+Schedule them with timer when page loading is resumed. The tasks will be performed
+in the original order. This fixes the problem that database callbacks could be missed
+when page loading was deferred.
+https://bugs.webkit.org/show_bug.cgi?id=49401
+ 
+
+Reviewed by Darin Adler.
+
+Manual test added: ManualTests/database-callback-deferred.html. 
+
+* dom/Document.cpp:
+(WebCore::Document::Document):
+(WebCore::Document::didReceiveTask):
+(WebCore::Document::postTask):
+(WebCore::Document::pendingTasksTimerFired):
+(WebCore::Document::suspendScheduledTasks):
+(WebCore::Document::resumeScheduledTasks):
+* dom/Document.h:
+* page/PageGroupLoadDeferrer.cpp:
+(WebCore::PageGroupLoadDeferrer::PageGroupLoadDeferrer):
+(WebCore::PageGroupLoadDeferrer::~PageGroupLoadDeferrer):
+
 2011-12-07  Andreas Kling  kl...@webkit.org
 
 RenderObject::style(): Inline early-return condition.


Modified: trunk/Source/WebCore/dom/Document.cpp (102277 => 102278)

--- trunk/Source/WebCore/dom/Document.cpp	2011-12-07 22:48:49 UTC (rev 102277)
+++ trunk/Source/WebCore/dom/Document.cpp	2011-12-07 23:41:21 UTC (rev 102278)
@@ -7,6 +7,7 @@
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -429,6 +430,7 @@
 , m_writeRecursionIsTooDeep(false)
 , m_writeRecursionDepth(0)
 , m_wheelEventHandlerCount(0)
+, m_pendingTasksTimer(this, Document::pendingTasksTimerFired)
 {
 m_document = this;
 
@@ -4704,24 +4706,61 @@
 OwnPtrScriptExecutionContext::Task task;
 };
 
-static void performTask(void* ctx)
+void Document::didReceiveTask(void* untypedContext)
 {
 ASSERT(isMainThread());
 
-PerformTaskContext* context = reinterpret_castPerformTaskContext*(ctx);
+OwnPtrPerformTaskContext context = adoptPtr(static_castPerformTaskContext*(untypedContext));
 ASSERT(context);
 
-if (Document* document = context-documentReference-document())
-context-task-performTask(document);
+Document* document = context-documentReference-document();
+if (!document)
+return;
 
-delete context;
+Page* page =

[webkit-changes] [102279] trunk/LayoutTests

2011-12-07 Thread simonjam

Title: [102279] trunk/LayoutTests








Revision 102279
Author simon...@chromium.org
Date 2011-12-07 15:43:03 -0800 (Wed, 07 Dec 2011)


Log Message
[Chromium] Unreviewed, skip a test that may be causing Win DRT to hang.

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (102278 => 102279)

--- trunk/LayoutTests/ChangeLog	2011-12-07 23:41:21 UTC (rev 102278)
+++ trunk/LayoutTests/ChangeLog	2011-12-07 23:43:03 UTC (rev 102279)
@@ -1,3 +1,9 @@
+2011-12-07  James Simonsen  simon...@chromium.org
+
+[Chromium] Unreviewed, skip a test that may be causing Win DRT to hang.
+
+* platform/chromium/test_expectations.txt:
+
 2011-12-07  Adam Klein  ad...@chromium.org
 
 [MutationObservers] Enable in Chromium trunk


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (102278 => 102279)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-07 23:41:21 UTC (rev 102278)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-07 23:43:03 UTC (rev 102279)
@@ -2601,7 +2601,7 @@
 BUGCR69300 LINUX : svg/batik/text/textOnPath.svg = PASS IMAGE
 
 // New test added in r75720
-BUGCR69571 : plugins/destroy-on-setwindow.html = CRASH TEXT
+BUGCR69571 SKIP : plugins/destroy-on-setwindow.html = CRASH TEXT
 
 // Failing after r75768, times out after r89503
 BUGCR69639 BUGWK63227 : http/tests/loading/cross-origin-XHR-willLoadRequest.html = TIMEOUT TEXT






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

[webkit-changes] [102280] trunk/Tools

2011-12-07 Thread dpranke

Title: [102280] trunk/Tools








Revision 102280
Author dpra...@chromium.org
Date 2011-12-07 16:12:46 -0800 (Wed, 07 Dec 2011)


Log Message
fix build-webkit --chromium after breakage in r102201
https://bugs.webkit.org/show_bug.cgi?id=74031

Reviewed by Tony Chang.

r102201 introduced a change to the chromium build that splits
the executables out of WebKit.gyp into other gyp files, and adds
a new All.gyp that builds everything. However, I forgot to
update the build script to use All.gyp.

* Scripts/webkitdirs.pm:
(buildChromium):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitdirs.pm




Diff

Modified: trunk/Tools/ChangeLog (102279 => 102280)

--- trunk/Tools/ChangeLog	2011-12-07 23:43:03 UTC (rev 102279)
+++ trunk/Tools/ChangeLog	2011-12-08 00:12:46 UTC (rev 102280)
@@ -1,3 +1,18 @@
+2011-12-07  Dirk Pranke  dpra...@chromium.org
+
+fix build-webkit --chromium after breakage in r102201
+https://bugs.webkit.org/show_bug.cgi?id=74031
+
+Reviewed by Tony Chang.
+
+r102201 introduced a change to the chromium build that splits
+the executables out of WebKit.gyp into other gyp files, and adds
+a new All.gyp that builds everything. However, I forgot to
+update the build script to use All.gyp.
+
+* Scripts/webkitdirs.pm:
+(buildChromium):
+
 2011-12-07  Tom Zakrajsek  t...@codeaurora.org
 
 Moved myself to the committers list.


Modified: trunk/Tools/Scripts/webkitdirs.pm (102279 => 102280)

--- trunk/Tools/Scripts/webkitdirs.pm	2011-12-07 23:43:03 UTC (rev 102279)
+++ trunk/Tools/Scripts/webkitdirs.pm	2011-12-08 00:12:46 UTC (rev 102280)
@@ -2081,10 +2081,10 @@
 my $result = 1;
 if (isDarwin()  !isChromiumAndroid()  !isChromiumMacMake()) {
 # Mac build - builds the root xcode project.
-$result = buildXCodeProject(Source/WebKit/chromium/WebKit, $clean, -configuration, configuration(), @options);
+$result = buildXCodeProject(Source/WebKit/chromium/All, $clean, -configuration, configuration(), @options);
 } elsif (isCygwin() || isWindows()) {
 # Windows build - builds the root visual studio solution.
-$result = buildChromiumVisualStudioProject(Source/WebKit/chromium/WebKit.sln, $clean);
+$result = buildChromiumVisualStudioProject(Source/WebKit/chromium/All.sln, $clean);
 } elsif (isLinux() || isChromiumAndroid() || isChromiumMacMake) {
 # Linux build - build using make.
 $result = buildChromiumMakefile(all, $clean, @options);






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

[webkit-changes] [102282] trunk/Source

2011-12-07 Thread commit-queue

Title: [102282] trunk/Source








Revision 102282
Author commit-qu...@webkit.org
Date 2011-12-07 16:28:55 -0800 (Wed, 07 Dec 2011)


Log Message
Unreviewed, rolling out r102267.
http://trac.webkit.org/changeset/102267
https://bugs.webkit.org/show_bug.cgi?id=74032

Breaks build on Chromium Mac Debug (Requested by aklein on
#webkit).

Patch by Sheriff Bot webkit.review@gmail.com on 2011-12-07

Source/_javascript_Core:

* wtf/HashTraits.h:

Source/WebCore:

* dom/ChildListMutationScope.cpp:
(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::childAdded):
(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::willRemoveChild):
(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::incrementScopingLevel):
(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::decrementScopingLevel):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/wtf/HashTraits.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/ChildListMutationScope.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (102281 => 102282)

--- trunk/Source/_javascript_Core/ChangeLog	2011-12-08 00:25:17 UTC (rev 102281)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-12-08 00:28:55 UTC (rev 102282)
@@ -1,3 +1,14 @@
+2011-12-07  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r102267.
+http://trac.webkit.org/changeset/102267
+https://bugs.webkit.org/show_bug.cgi?id=74032
+
+Breaks build on Chromium Mac Debug (Requested by aklein on
+#webkit).
+
+* wtf/HashTraits.h:
+
 2011-12-07  Adam Klein  ad...@chromium.org
 
 Use HashMapNode*, OwnPtr... in ChildListMutationScope


Modified: trunk/Source/_javascript_Core/wtf/HashTraits.h (102281 => 102282)

--- trunk/Source/_javascript_Core/wtf/HashTraits.h	2011-12-08 00:25:17 UTC (rev 102281)
+++ trunk/Source/_javascript_Core/wtf/HashTraits.h	2011-12-08 00:28:55 UTC (rev 102282)
@@ -117,7 +117,6 @@
 
 typedef PassOwnPtrP PassOutType;
 static PassOwnPtrP passOut(OwnPtrP value) { return value.release(); }
-static PassOwnPtrP passOut(std::nullptr_t) { return nullptr; }
 
 typedef typename OwnPtrP::PtrType PeekType;
 static PeekType peek(const OwnPtrP value) { return value.get(); }


Modified: trunk/Source/WebCore/ChangeLog (102281 => 102282)

--- trunk/Source/WebCore/ChangeLog	2011-12-08 00:25:17 UTC (rev 102281)
+++ trunk/Source/WebCore/ChangeLog	2011-12-08 00:28:55 UTC (rev 102282)
@@ -1,3 +1,18 @@
+2011-12-07  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r102267.
+http://trac.webkit.org/changeset/102267
+https://bugs.webkit.org/show_bug.cgi?id=74032
+
+Breaks build on Chromium Mac Debug (Requested by aklein on
+#webkit).
+
+* dom/ChildListMutationScope.cpp:
+(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::childAdded):
+(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::willRemoveChild):
+(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::incrementScopingLevel):
+(WebCore::MutationAccumulationRouter::MutationAccumulationRouter::decrementScopingLevel):
+
 2011-12-07  Kentaro Hara  hara...@chromium.org
 
 REGRESSION (r95249): Right side can be truncated when printing


Modified: trunk/Source/WebCore/dom/ChildListMutationScope.cpp (102281 => 102282)

--- trunk/Source/WebCore/dom/ChildListMutationScope.cpp	2011-12-08 00:25:17 UTC (rev 102281)
+++ trunk/Source/WebCore/dom/ChildListMutationScope.cpp	2011-12-08 00:28:55 UTC (rev 102282)
@@ -40,7 +40,7 @@
 #include Node.h
 #include StaticNodeList.h
 #include wtf/HashMap.h
-#include wtf/OwnPtr.h
+#include wtf/RefCounted.h
 
 namespace WebCore {
 
@@ -50,7 +50,7 @@
 // and precede any additions. If this is violated (i.e. because of code changes elsewhere
 // in WebCore) it will likely result in both (a) ASSERTions failing, and (b) mutation records
 // being enqueued for delivery before the outer-most scope closes.
-class ChildListMutationAccumulator {
+class ChildListMutationAccumulator : public RefCountedChildListMutationAccumulator {
 WTF_MAKE_NONCOPYABLE(ChildListMutationAccumulator);
 public:
 ChildListMutationAccumulator(PassRefPtrNode, PassOwnPtrMutationObserverInterestGroup observers);
@@ -95,7 +95,7 @@
 
 typedef HashMapNode*, unsigned ScopingLevelMap;
 ScopingLevelMap m_scopingLevels;
-HashMapNode*, OwnPtrChildListMutationAccumulator  m_accumulations;
+HashMapNode*, RefPtrChildListMutationAccumulator  m_accumulations;
 
 static MutationAccumulationRouter* s_instance;
 };
@@ -216,7 +216,7 @@
 
 void MutationAccumulationRouter::childAdded(Node* target, Node* child)
 {
-HashMapNode*, OwnPtrChildListMutationAccumulator ::iterator iter = m_accumulations.find(target);
+HashMapNode*, RefPtrChildListMutationAccumulator ::iterator iter = m_accumulations.find(target);

[webkit-changes] [102284] branches/safari-534.53-branch/Source

2011-12-07 Thread lforschler

Title: [102284] branches/safari-534.53-branch/Source








Revision 102284
Author lforsch...@apple.com
Date 2011-12-07 16:35:12 -0800 (Wed, 07 Dec 2011)


Log Message
Merge 99493

Modified Paths

branches/safari-534.53-branch/Source/WebCore/ChangeLog
branches/safari-534.53-branch/Source/WebCore/WebCore.exp.in
branches/safari-534.53-branch/Source/WebCore/page/EventHandler.cpp
branches/safari-534.53-branch/Source/WebCore/platform/ScrollAnimator.h
branches/safari-534.53-branch/Source/WebCore/platform/Scrollbar.cpp
branches/safari-534.53-branch/Source/WebCore/platform/Scrollbar.h
branches/safari-534.53-branch/Source/WebCore/platform/mac/NSScrollerImpDetails.h
branches/safari-534.53-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.h
branches/safari-534.53-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
branches/safari-534.53-branch/Source/WebCore/platform/win/PopupMenuWin.cpp
branches/safari-534.53-branch/Source/WebKit/chromium/ChangeLog
branches/safari-534.53-branch/Source/WebKit/chromium/src/WebScrollbarImpl.cpp
branches/safari-534.53-branch/Source/WebKit/win/ChangeLog
branches/safari-534.53-branch/Source/WebKit/win/WebScrollBar.cpp
branches/safari-534.53-branch/Source/WebKit2/ChangeLog
branches/safari-534.53-branch/Source/WebKit2/UIProcess/win/WebPopupMenuProxyWin.cpp
branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp




Diff

Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (102283 => 102284)

--- branches/safari-534.53-branch/Source/WebCore/ChangeLog	2011-12-08 00:32:51 UTC (rev 102283)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog	2011-12-08 00:35:12 UTC (rev 102284)
@@ -1,5 +1,87 @@
 2011-12-07  Lucas Forschler  lforsch...@apple.com
 
+Merge 99493
+
+2011-11-07  Beth Dakin  bda...@apple.com
+
+https://bugs.webkit.org/show_bug.cgi?id=71490
+Support uiStateTransitionProgress for scrollbars
+-and corresponding-
+rdar://problem/9849612
+
+Reviewed by Sam Weinig.
+
+Step 1 of supporting uiStateTransitionProgress is knowing when the mouse has 
+entered or exited a scrollbar. These changes to Scrollbar pass that information 
+on to the ScrollAnimator. Also, Scrollbar::mouseUp() now takes a 
+PlatformMouseEvent as a parameter. This is necessary because m_hoveredNode is not 
+always up to date on a mouseUp, so mouseUp must hitTest the scrollbar to see if 
+the mouse has exited the scrollbar.
+* platform/Scrollbar.cpp:
+(WebCore::Scrollbar::mouseMoved):
+(WebCore::Scrollbar::mouseExited):
+(WebCore::Scrollbar::mouseUp):
+* platform/Scrollbar.h:
+
+These changes are required now that Scrollbar::mouseUp() takes a parameter.
+* WebCore.exp.in:
+* page/EventHandler.cpp:
+(WebCore::EventHandler::handleMouseDoubleClickEvent):
+(WebCore::EventHandler::handleMouseReleaseEvent):
+* platform/chromium/PopupListBox.cpp:
+(WebCore::PopupListBox::handleMouseReleaseEvent):
+* platform/win/PopupMenuWin.cpp:
+(WebCore::PopupMenuWin::wndProc):
+
+ScrollAnimator passes the information on to AppKit.
+* platform/ScrollAnimator.h:
+(WebCore::ScrollAnimator::mouseEnteredScrollbar):
+(WebCore::ScrollAnimator::mouseExitedScrollbar):
+* platform/mac/ScrollAnimatorMac.h:
+(WebCore::ScrollAnimatorMac::mouseEnteredScrollbar):
+(WebCore::ScrollAnimatorMac::mouseExitedScrollbar):
+
+There are several new pieces of AppKit api we must call into.
+* platform/mac/NSScrollerImpDetails.h:
+
+This is a temporary function that is needed for the time being since there is new 
+AppKit api required for this to work.
+* platform/mac/ScrollAnimatorMac.mm:
+(supportsUIStateTransitionProgress):
+
+I refactored WebScrollbarPartAnimation so that it can handle the 
+uiStateTransitionProgress animation as well as the alpha animations it already 
+handled. This mostly involved re-naming things and making use of a new enum called 
+FeatureToAnimate which keeps track of what the instance of 
+WebScrollbarPartAnimation is animating.
+(-[WebScrollbarPartAnimation initWithScrollbarPainter:animate:scrollAnimator:animateFrom:animateTo:duration:]):
+(-[WebScrollbarPartAnimation setScrollbarPainter:]):
+(-[WebScrollbarPartAnimation setStartValue:]):
+(-[WebScrollbarPartAnimation setEndValue:]):
+(-[WebScrollbarPartAnimation setCurrentProgress:]):
+
+WebScrollbarPainterDelegate has two new animations, 
+_verticalUIStateTransitionAnimation, and _horizontalUIStateTransitionAnimation. It 
+

[webkit-changes] [102285] branches/safari-534.53-branch/Source

2011-12-07 Thread lforschler

Title: [102285] branches/safari-534.53-branch/Source








Revision 102285
Author lforsch...@apple.com
Date 2011-12-07 16:45:14 -0800 (Wed, 07 Dec 2011)


Log Message
Merged r99617.

Modified Paths

branches/safari-534.53-branch/Source/WebKit/mac/ChangeLog
branches/safari-534.53-branch/Source/WebKit/mac/WebView/WebView.mm
branches/safari-534.53-branch/Source/WebKit2/ChangeLog
branches/safari-534.53-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm




Diff

Modified: branches/safari-534.53-branch/Source/WebKit/mac/ChangeLog (102284 => 102285)

--- branches/safari-534.53-branch/Source/WebKit/mac/ChangeLog	2011-12-08 00:35:12 UTC (rev 102284)
+++ branches/safari-534.53-branch/Source/WebKit/mac/ChangeLog	2011-12-08 00:45:14 UTC (rev 102285)
@@ -1,3 +1,25 @@
+2011-12-07  Lucas Forschler  lforsch...@apple.com
+
+Merge 99617
+
+2011-11-08  Beth Dakin  bda...@apple.com
+
+https://bugs.webkit.org/show_bug.cgi?id=71856
+WebKit should use new NSWindowDidChangeBackingPropertiesNotification instead of 
+old NSWindowDidChangeResolutionNotification
+-and corresponding-
+rdar://problem/10317253
+
+Reviewed by Tim Hatcher.
+
+* WebView/WebView.mm:
+(-[WebView addWindowObserversForWindow:]):
+(-[WebView removeWindowObservers]):
+
+We have to check that the backing scale factor actually changed since this 
+notification can also be used to signify other changes. 
+(-[WebView _windowDidChangeBackingProperties:]):
+
 2011-12-06  Lucas Forschler  lforsch...@apple.com
 
 Merge 97886


Modified: branches/safari-534.53-branch/Source/WebKit/mac/WebView/WebView.mm (102284 => 102285)

--- branches/safari-534.53-branch/Source/WebKit/mac/WebView/WebView.mm	2011-12-08 00:35:12 UTC (rev 102284)
+++ branches/safari-534.53-branch/Source/WebKit/mac/WebView/WebView.mm	2011-12-08 00:45:14 UTC (rev 102285)
@@ -3339,8 +3339,9 @@
 return _private-shouldCloseWithWindow;
 }
 
-// FIXME: Use an AppKit constant for this once one is available.
-static NSString * const windowDidChangeResolutionNotification = @NSWindowDidChangeResolutionNotification;
+// FIXME: Use AppKit constants for these when they are available.
+static NSString * const windowDidChangeBackingPropertiesNotification = @NSWindowDidChangeBackingPropertiesNotification;
+static NSString * const backingPropertyOldScaleFactorKey = @NSBackingPropertyOldScaleFactorKey; 
 
 - (void)addWindowObserversForWindow:(NSWindow *)window
 {
@@ -3353,8 +3354,10 @@
 name:WKWindowWillOrderOnScreenNotification() object:window];
 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowWillOrderOffScreen:) 
 name:WKWindowWillOrderOffScreenNotification() object:window];
-[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidChangeResolution:) 
-name:windowDidChangeResolutionNotification object:window];
+[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidChangeBackingProperties:)
+name:windowDidChangeBackingPropertiesNotification object:window];
+[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidChangeScreen:)
+name:NSWindowDidChangeScreenNotification object:window];
 }
 }
 
@@ -3371,7 +3374,7 @@
 [[NSNotificationCenter defaultCenter] removeObserver:self 
 name:WKWindowWillOrderOffScreenNotification() object:window];
 [[NSNotificationCenter defaultCenter] removeObserver:self
-name:windowDidChangeResolutionNotification object:window];
+name:windowDidChangeBackingPropertiesNotification object:window];
 }
 }
 
@@ -3463,9 +3466,14 @@
 [self close];
 }
 
-- (void)_windowDidChangeResolution:(NSNotification *)notification 
+- (void)_windowDidChangeBackingProperties:(NSNotification *)notification
 {
-_private-page-setDeviceScaleFactor([self _deviceScaleFactor]); 
+CGFloat oldBackingScaleFactor = [[notification.userInfo objectForKey:backingPropertyOldScaleFactorKey] doubleValue]; 
+CGFloat newBackingScaleFactor = [self _deviceScaleFactor];
+if (oldBackingScaleFactor == newBackingScaleFactor) 
+return; 
+
+_private-page-setDeviceScaleFactor(newBackingScaleFactor);
 }
 
 - (void)setPreferences:(WebPreferences *)prefs


Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102284 => 102285)

--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-08 00:35:12 UTC (rev 102284)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog	2011-12-08 00:45:14 UTC (rev 102285)
@@ -1,5 +1,27 @@
 2011-12-07  Lucas Forschler  lforsch...@apple.com
 
+Merge 99617
+
+2011-11-08  Beth Dakin  bda...@apple.com
+
+https://bugs.webkit.org/show_bug.cgi?id=71856
+WebKit should use new

[webkit-changes] [102287] branches/chromium/963/codereview.settings

2011-12-07 Thread kerz

Title: [102287] branches/chromium/963/codereview.settings








Revision 102287
Author k...@chromium.org
Date 2011-12-07 16:52:53 -0800 (Wed, 07 Dec 2011)


Log Message
add codereview settings file

Added Paths

branches/chromium/963/codereview.settings




Diff

Added: branches/chromium/963/codereview.settings (0 => 102287)

--- branches/chromium/963/codereview.settings	(rev 0)
+++ branches/chromium/963/codereview.settings	2011-12-08 00:52:53 UTC (rev 102287)
@@ -0,0 +1,10 @@
+# This file is used by gcl to get repository specific information.
+CODE_REVIEW_SERVER: codereview.chromium.org
+CC_LIST: chromium-revi...@chromium.org
+VIEW_VC: http://src.chromium.org/viewvc/chrome?view=revrevision=
+STATUS: http://chromium-status.appspot.com/status
+TRY_ON_UPLOAD: True
+TRYSERVER_SVN_URL: svn://svn.chromium.org/chrome-try/try
+GITCL_PREUPLOAD: http://src.chromium.org/viewvc/trunk/tools/depot_tools/git-cl-upload-hook?revision=HEADroot=chrome
+GITCL_PREDCOMMIT: http://src.chromium.org/viewvc/trunk/tools/depot_tools/git-cl-upload-hook?revision=HEADroot=chrome
+LINT_IGNORE_REGEX: webkit/api/.*






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

[webkit-changes] [102288] branches/safari-534.53-branch/Source/WebCore

2011-12-07 Thread lforschler

Title: [102288] branches/safari-534.53-branch/Source/WebCore








Revision 102288
Author lforsch...@apple.com
Date 2011-12-07 17:19:47 -0800 (Wed, 07 Dec 2011)


Log Message
Fix a compiler error about implicit conversion from 64 to 32bit int.

Reviewed by Beth Dakin.

* platform/mac/ScrollAnimatorMac.mm:
(-[ScrollbarPainterDelegate scrollerImp:animateUIStateTransitionWithDuration:]):

Modified Paths

branches/safari-534.53-branch/Source/WebCore/ChangeLog
branches/safari-534.53-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm




Diff

Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (102287 => 102288)

--- branches/safari-534.53-branch/Source/WebCore/ChangeLog	2011-12-08 00:52:53 UTC (rev 102287)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog	2011-12-08 01:19:47 UTC (rev 102288)
@@ -1,5 +1,14 @@
 2011-12-07  Lucas Forschler  lforsch...@apple.com
 
+Fix a compiler error about implicit conversion from 64 to 32bit int.
+
+Reviewed by Beth Dakin.
+
+* platform/mac/ScrollAnimatorMac.mm:
+(-[ScrollbarPainterDelegate scrollerImp:animateUIStateTransitionWithDuration:]):
+
+2011-12-07  Lucas Forschler  lforsch...@apple.com
+
 Merge 99493
 
 2011-11-07  Beth Dakin  bda...@apple.com


Modified: branches/safari-534.53-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (102287 => 102288)

--- branches/safari-534.53-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2011-12-08 00:52:53 UTC (rev 102287)
+++ branches/safari-534.53-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2011-12-08 01:19:47 UTC (rev 102288)
@@ -513,14 +513,14 @@
 animate:UIStateTransition
 scrollAnimator:_animator
 animateFrom:[scrollerPainter uiStateTransitionProgress]
-animateTo:1.0 
+animateTo:1.0f 
 duration:duration]);
 [scrollbarPartAnimation.get() setAnimationBlockingMode:NSAnimationNonblocking];
 } else {
 // If we don't need to initialize the animation, just reset the values in case they have changed.
 [scrollbarPartAnimation.get() setScrollbarPainter:scrollerPainter];
 [scrollbarPartAnimation.get() setStartValue:[scrollerPainter uiStateTransitionProgress]];
-[scrollbarPartAnimation.get() setEndValue:1.0];
+[scrollbarPartAnimation.get() setEndValue:1.0f];
 [scrollbarPartAnimation.get() setDuration:duration];
 }
 [scrollbarPartAnimation.get() startAnimation];






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

[webkit-changes] [102290] trunk

2011-12-07 Thread commit-queue

Title: [102290] trunk








Revision 102290
Author commit-qu...@webkit.org
Date 2011-12-07 17:44:52 -0800 (Wed, 07 Dec 2011)


Log Message
li value=0 behaves like li (the same for negative numbers)
https://bugs.webkit.org/show_bug.cgi?id=73911

Patch by Florin Malita fmal...@google.com on 2011-12-07
Reviewed by Alexey Proskuryakov.

Source/WebCore:

Allow LI values = 0 and consolidate the value processing logic.

* html/HTMLLIElement.cpp:
(WebCore::HTMLLIElement::parseMappedAttribute):
Delegated value parsing to parseValue().

(WebCore::HTMLLIElement::attach):
Ditto. Explicit value null testing is no longer necessary,
as parseValue's toInt() performs an equivalent check.

(WebCore::HTMLLIElement::parseValue):
Consolidated value parsing logic.

* html/HTMLLIElement.h:

LayoutTests:

Added tests for values = 0.

* fast/lists/li-values-expected.txt:
* fast/lists/li-values.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/lists/li-values-expected.txt
trunk/LayoutTests/fast/lists/li-values.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/HTMLLIElement.cpp
trunk/Source/WebCore/html/HTMLLIElement.h




Diff

Modified: trunk/LayoutTests/ChangeLog (102289 => 102290)

--- trunk/LayoutTests/ChangeLog	2011-12-08 01:33:29 UTC (rev 102289)
+++ trunk/LayoutTests/ChangeLog	2011-12-08 01:44:52 UTC (rev 102290)
@@ -1,3 +1,15 @@
+2011-12-07  Florin Malita  fmal...@google.com
+
+li value=0 behaves like li (the same for negative numbers)
+https://bugs.webkit.org/show_bug.cgi?id=73911
+
+Reviewed by Alexey Proskuryakov.
+
+Added tests for values = 0.
+
+* fast/lists/li-values-expected.txt:
+* fast/lists/li-values.html:
+
 2011-12-07  Kentaro Hara  hara...@chromium.org
 
 REGRESSION (r95249): Right side can be truncated when printing


Modified: trunk/LayoutTests/fast/lists/li-values-expected.txt (102289 => 102290)

--- trunk/LayoutTests/fast/lists/li-values-expected.txt	2011-12-08 01:33:29 UTC (rev 102289)
+++ trunk/LayoutTests/fast/lists/li-values-expected.txt	2011-12-08 01:44:52 UTC (rev 102290)
@@ -1,4 +1,22 @@
 1 The list marker should show 1 because this item had a value of 4 but it was removed.
-2 The list marker should show 2 even though this item has a value of 0.
-3 The list marker should show 3 even though this item has a value of -1.
+-1 The list marker should show -1 (negative values are allowed).
+0 The list marker should show 0.
+1 The list marker should show 1 (invalid values are ignored).
+-5 The list marker should show -5 (updated programmatically).
+-1 The list marker should fall back to decimal -1 (hebrew: 1-infinite).
+0 The list marker should fall back to decimal 0 (simple-upper-roman: 1-4999).
+0 The list marker should fall back to decimal 0 (simple-lower-roman: 1-4999).
+0 The list marker should fall back to decimal 0 (upper-roman: 1-4999).
+0 The list marker should fall back to decimal 0 (lower-roman: 1-4999).
+0 The list marker should fall back to decimal 0 (lower-armenian: 1-).
+0 The list marker should fall back to decimal 0 (upper-armenian: 1-).
+0 The list marker should fall back to decimal 0 (armenian: 1-).
+0 The list marker should fall back to decimal 0 (georgian: 1-1).
+0 The list marker should fall back to decimal 0 (ancient-tamil: 1-).
+-1 The list marker should fall back to cjk-decimal -1 (japanese-informal: 0-).
+-1 The list marker should fall back to cjk-decimal -1 (japanese-formal: 0-).
+-1 The list marker should fall back to decimal -1 (korean-hangul-formal: 0-).
+-1 The list marker should fall back to decimal -1 (korean-hanja-informal: 0-).
+-1 The list marker should fall back to decimal -1 (korean-hanja-formal: 0-).
+0 The list marker should fall back to decimal 0 (greek: 1-999).
 


Modified: trunk/LayoutTests/fast/lists/li-values.html (102289 => 102290)

--- trunk/LayoutTests/fast/lists/li-values.html	2011-12-08 01:33:29 UTC (rev 102289)
+++ trunk/LayoutTests/fast/lists/li-values.html	2011-12-08 01:44:52 UTC (rev 102290)
@@ -4,6 +4,7 @@
 function finishTest()
 {
 document.getElementById(removeMyValue).removeAttribute(value);
+document.getElementById(changeMyValue).setAttribute(value, -5);
 filterListsWithReplacement(document.querySelectorAll(ol));
 if (window.layoutTestController)
 layoutTestController.notifyDone();
@@ -23,7 +24,29 @@
 body _onload_=init()
 ol
 li value=4 id=removeMyValueThe list marker should show 1 because this item had a value of 4 but it was removed./li
-li value=0The list marker should show 2 even though this item has a value of 0./li
-li value=-1The list marker should show 3 even though this item has a value of -1./li
+li value=-1The list marker should show -1 (negative values are allowed)./li
+liThe list marker should show 0./li
+li value=invalidThe list marker should show 1 (invalid values are ignored)./li
+li value=2 id=changeMyValueThe list marker should show -5 (updated

[webkit-changes] [102291] trunk/Tools

2011-12-07 Thread eric

Title: [102291] trunk/Tools








Revision 102291
Author e...@webkit.org
Date 2011-12-07 17:50:51 -0800 (Wed, 07 Dec 2011)


Log Message
Use free memory to determine if we have space for DRT instances instead of total memory
https://bugs.webkit.org/show_bug.cgi?id=74021

Reviewed by Adam Barth.

This will hopefully make the Mac buildbots behave better.

I also reduced the expected memory needed per DRT now that
we're properly accounting for the system memory in our calculations.

* Scripts/webkitpy/common/system/platforminfo.py:
(PlatformInfo.total_bytes_memory):
(PlatformInfo._compute_free_bytes_from_vm_stat_output):
* Scripts/webkitpy/common/system/platforminfo_mock.py:
(MockPlatformInfo.total_bytes_memory):
* Scripts/webkitpy/layout_tests/port/base.py:
(Port.default_child_processes):
* Scripts/webkitpy/layout_tests/port/base_unittest.py:
(PortTest.test_default_child_processes):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py
trunk/Tools/Scripts/webkitpy/common/system/platforminfo_mock.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (102290 => 102291)

--- trunk/Tools/ChangeLog	2011-12-08 01:44:52 UTC (rev 102290)
+++ trunk/Tools/ChangeLog	2011-12-08 01:50:51 UTC (rev 102291)
@@ -1,3 +1,25 @@
+2011-12-07  Eric Seidel  e...@webkit.org
+
+Use free memory to determine if we have space for DRT instances instead of total memory
+https://bugs.webkit.org/show_bug.cgi?id=74021
+
+Reviewed by Adam Barth.
+
+This will hopefully make the Mac buildbots behave better.
+
+I also reduced the expected memory needed per DRT now that
+we're properly accounting for the system memory in our calculations.
+
+* Scripts/webkitpy/common/system/platforminfo.py:
+(PlatformInfo.total_bytes_memory):
+(PlatformInfo._compute_free_bytes_from_vm_stat_output):
+* Scripts/webkitpy/common/system/platforminfo_mock.py:
+(MockPlatformInfo.total_bytes_memory):
+* Scripts/webkitpy/layout_tests/port/base.py:
+(Port.default_child_processes):
+* Scripts/webkitpy/layout_tests/port/base_unittest.py:
+(PortTest.test_default_child_processes):
+
 2011-12-07  Dirk Pranke  dpra...@chromium.org
 
 fix build-webkit --chromium after breakage in r102201


Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (102290 => 102291)

--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py	2011-12-08 01:44:52 UTC (rev 102290)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py	2011-12-08 01:50:51 UTC (rev 102291)
@@ -27,6 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import platform
+import re
 
 
 # We use this instead of calls to platform directly to allow mocking.
@@ -49,3 +50,19 @@
 if system_name == Darwin:
 return int(self._executive.run_command([sysctl, -n, hw.memsize]))
 return None
+
+def _compute_free_bytes_from_vm_stat_output(self, vm_stat_output):
+page_size_match = re.search(rpage size of (\d+) bytes, vm_stat_output)
+free_pages_match = re.search(rPages free:\s+(\d+)., vm_stat_output)
+if not page_size_match or not free_pages_match:
+return None
+free_page_count = int(free_pages_match.group(1))
+page_size = int(page_size_match.group(1))
+return free_page_count * page_size
+
+def free_bytes_memory(self):
+system_name = platform.system()
+if system_name == Darwin:
+vm_stat_output = self._executive.run_command([vm_stat])
+return self._compute_free_bytes_from_vm_stat_output(vm_stat_output)
+return None


Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo_mock.py (102290 => 102291)

--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo_mock.py	2011-12-08 01:44:52 UTC (rev 102290)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo_mock.py	2011-12-08 01:50:51 UTC (rev 102291)
@@ -33,3 +33,6 @@
 
 def total_bytes_memory(self):
 return 2 * 1024 * 1024 * 1024  # 2GB is a reasonable amount of ram to mock.
+
+def free_bytes_memory(self):
+return 1 * 1024 * 1024 * 1024  # 1GB is a reasonable amount of ram to mock as free.


Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (102290 => 102291)

--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py	2011-12-08 01:44:52 UTC (rev 102290)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py	2011-12-08 01:50:51 UTC (rev 102291)
@@ -166,10 +166,10 @@
 Return the number of DumpRenderTree instances to use for this port.
 cpu_count = self._executive.cpu_count()
 # Make sure we have enough ram to support that many instances:
-total_memory = self.host.platform.total_bytes_memory()
-if total_memory:
-

[webkit-changes] [102292] trunk/Source/WebKit/chromium

2011-12-07 Thread commit-queue

Title: [102292] trunk/Source/WebKit/chromium








Revision 102292
Author commit-qu...@webkit.org
Date 2011-12-07 17:53:42 -0800 (Wed, 07 Dec 2011)


Log Message
[chromium] Preserve original pageScale limits in WebViewImpl
https://bugs.webkit.org/show_bug.cgi?id=72983

Patch by Alexandre Elias ael...@google.com on 2011-12-07
Reviewed by Darin Fisher.

Preserve the originally viewport-tag specified page scale limits, and
compute the final ones in a new private method
computePageScaleFactorLimits().  This is then called when contents
size change (which can affect the minimum).

Also clean up several minor bugs, namely clamping issues (reorder
clampNegativeToZero to avoid negative scroll offsets, and force max to
be greater than min), and incorrect behavior in the presence of
solid scrollbars.

* src/ChromeClientImpl.cpp:
(WebKit::ChromeClientImpl::contentsSizeChanged):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::WebViewImpl):
(WebKit::WebViewImpl::clampPageScaleFactorToLimits):
(WebKit::WebViewImpl::clampOffsetAtScale):
(WebKit::WebViewImpl::setPageScaleFactorPreservingScrollOffset):
(WebKit::WebViewImpl::setPageScaleFactor):
(WebKit::WebViewImpl::setPageScaleFactorLimits):
(WebKit::WebViewImpl::computePageScaleFactorLimits):
(WebKit::WebViewImpl::didChangeContentsSize):
* src/WebViewImpl.h:

Modified Paths

trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp
trunk/Source/WebKit/chromium/src/WebViewImpl.cpp
trunk/Source/WebKit/chromium/src/WebViewImpl.h




Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (102291 => 102292)

--- trunk/Source/WebKit/chromium/ChangeLog	2011-12-08 01:50:51 UTC (rev 102291)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-12-08 01:53:42 UTC (rev 102292)
@@ -1,3 +1,33 @@
+2011-12-07  Alexandre Elias  ael...@google.com
+
+[chromium] Preserve original pageScale limits in WebViewImpl
+https://bugs.webkit.org/show_bug.cgi?id=72983
+
+Reviewed by Darin Fisher.
+
+Preserve the originally viewport-tag specified page scale limits, and
+compute the final ones in a new private method
+computePageScaleFactorLimits().  This is then called when contents
+size change (which can affect the minimum).
+
+Also clean up several minor bugs, namely clamping issues (reorder
+clampNegativeToZero to avoid negative scroll offsets, and force max to
+be greater than min), and incorrect behavior in the presence of
+solid scrollbars.
+
+* src/ChromeClientImpl.cpp:
+(WebKit::ChromeClientImpl::contentsSizeChanged):
+* src/WebViewImpl.cpp:
+(WebKit::WebViewImpl::WebViewImpl):
+(WebKit::WebViewImpl::clampPageScaleFactorToLimits):
+(WebKit::WebViewImpl::clampOffsetAtScale):
+(WebKit::WebViewImpl::setPageScaleFactorPreservingScrollOffset):
+(WebKit::WebViewImpl::setPageScaleFactor):
+(WebKit::WebViewImpl::setPageScaleFactorLimits):
+(WebKit::WebViewImpl::computePageScaleFactorLimits):
+(WebKit::WebViewImpl::didChangeContentsSize):
+* src/WebViewImpl.h:
+
 2011-12-07  Chris Sharp  csh...@chromium.org
 
 Exposing boundsInScreenSpace in WebElement.


Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp (102291 => 102292)

--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp	2011-12-08 01:50:51 UTC (rev 102291)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp	2011-12-08 01:53:42 UTC (rev 102292)
@@ -550,6 +550,8 @@
 
 void ChromeClientImpl::contentsSizeChanged(Frame* frame, const IntSize size) const
 {
+m_webView-didChangeContentsSize();
+
 WebFrameImpl* webframe = WebFrameImpl::fromFrame(frame);
 if (webframe-client())
 webframe-client()-didChangeContentsSize(webframe, size);


Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (102291 => 102292)

--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp	2011-12-08 01:50:51 UTC (rev 102291)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp	2011-12-08 01:53:42 UTC (rev 102292)
@@ -343,6 +343,8 @@
 , m_zoomLevel(0)
 , m_minimumZoomLevel(zoomFactorToZoomLevel(minTextSizeMultiplier))
 , m_maximumZoomLevel(zoomFactorToZoomLevel(maxTextSizeMultiplier))
+, m_pageDefinedMinimumPageScaleFactor(-1)
+, m_pageDefinedMaximumPageScaleFactor(-1)
 , m_minimumPageScaleFactor(minPageScaleFactor)
 , m_maximumPageScaleFactor(maxPageScaleFactor)
 , m_contextMenuAllowed(false)
@@ -1953,7 +1955,7 @@
 return page()-pageScaleFactor();
 }
 
-float WebViewImpl::computePageScaleFactorWithinLimits(float scaleFactor)
+float WebViewImpl::clampPageScaleFactorToLimits(float scaleFactor)
 {
 return min(max(scaleFactor, m_minimumPageScaleFactor), m_maximumPageScaleFactor);
 }
@@ -1970,15 +1972,15 @@
 
 // Enforce the maximum and minimum scroll positions at the new scale.
 IntPoint clampedOffset = offset;
+clampedOffset =

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

2011-12-07 Thread commit-queue

Title: [102294] trunk/Source/WebCore








Revision 102294
Author commit-qu...@webkit.org
Date 2011-12-07 18:02:13 -0800 (Wed, 07 Dec 2011)


Log Message
[chromium] Clearing root surface should happen after damage tracking
https://bugs.webkit.org/show_bug.cgi?id=73958

Patch by Shawn Singh shawnsi...@chromium.org on 2011-12-07
Reviewed by James Robinson.

No new semantics, covered by existing layout tests.

* platform/graphics/chromium/LayerRendererChromium.cpp:
(WebCore::LayerRendererChromium::clearSurfaceForDebug):
(WebCore::LayerRendererChromium::drawLayersOntoRenderSurfaces):
(WebCore::LayerRendererChromium::drawLayersInternal):
* platform/graphics/chromium/LayerRendererChromium.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (102293 => 102294)

--- trunk/Source/WebCore/ChangeLog	2011-12-08 02:01:56 UTC (rev 102293)
+++ trunk/Source/WebCore/ChangeLog	2011-12-08 02:02:13 UTC (rev 102294)
@@ -1,3 +1,18 @@
+2011-12-07  Shawn Singh  shawnsi...@chromium.org
+
+[chromium] Clearing root surface should happen after damage tracking
+https://bugs.webkit.org/show_bug.cgi?id=73958
+
+Reviewed by James Robinson.
+
+No new semantics, covered by existing layout tests.
+
+* platform/graphics/chromium/LayerRendererChromium.cpp:
+(WebCore::LayerRendererChromium::clearSurfaceForDebug):
+(WebCore::LayerRendererChromium::drawLayersOntoRenderSurfaces):
+(WebCore::LayerRendererChromium::drawLayersInternal):
+* platform/graphics/chromium/LayerRendererChromium.h:
+
 2011-12-07  Florin Malita  fmal...@google.com
 
 li value=0 behaves like li (the same for negative numbers)


Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (102293 => 102294)

--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp	2011-12-08 02:01:56 UTC (rev 102293)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp	2011-12-08 02:02:13 UTC (rev 102294)
@@ -365,6 +365,28 @@
 }
 }
 
+void LayerRendererChromium::clearSurfaceForDebug(CCLayerImpl* renderSurfaceLayer, CCLayerImpl* rootDrawLayer, const FloatRect surfaceDamageRect)
+{
+// Non-root layers should clear their entire contents to transparent. The root layer
+// is cleared to blue to easily see regions that were not drawn on the screen. If we
+// are using partial swap / scissor optimization, then the surface should only
+// clear the damaged region, so that we don't accidentally clear un-changed portions
+// of the screen.
+
+if (renderSurfaceLayer != rootDrawLayer)
+GLC(m_context.get(), m_context-clearColor(0, 0, 0, 0));
+else
+GLC(m_context.get(), m_context-clearColor(0, 0, 1, 1));
+
+if (m_capabilities.usingPartialSwap)
+setScissorToRect(enclosingIntRect(surfaceDamageRect));
+else
+GLC(m_context.get(), m_context-disable(GraphicsContext3D::SCISSOR_TEST));
+
+m_context-clear(GraphicsContext3D::COLOR_BUFFER_BIT);
+GLC(m_context.get(), m_context-enable(GraphicsContext3D::SCISSOR_TEST));
+}
+
 void LayerRendererChromium::drawLayersOntoRenderSurfaces(CCLayerImpl* rootDrawLayer, const CCLayerList renderSurfaceLayerList)
 {
 TRACE_EVENT(LayerRendererChromium::drawLayersOntoRenderSurfaces, this, 0);
@@ -399,12 +421,8 @@
 }
 }
 
-if (renderSurfaceLayer != rootDrawLayer) {
-if (m_capabilities.usingPartialSwap)
-setScissorToRect(enclosingIntRect(surfaceDamageRect));
-GLC(m_context.get(), m_context-clearColor(0, 0, 0, 0));
-GLC(m_context.get(), m_context-clear(GraphicsContext3D::COLOR_BUFFER_BIT));
-}
+// FIXME: eventually we should place this under a debug flag.
+clearSurfaceForDebug(renderSurfaceLayer, rootDrawLayer, surfaceDamageRect);
 
 const CCLayerList layerList = renderSurface-layerList();
 for (unsigned layerIndex = 0; layerIndex  layerList.size(); ++layerIndex)
@@ -461,16 +479,7 @@
 
 GLC(m_context.get(), m_context-disable(GraphicsContext3D::DEPTH_TEST));
 GLC(m_context.get(), m_context-disable(GraphicsContext3D::CULL_FACE));
-
-useRenderSurface(m_defaultRenderSurface);
-
-// Clear to blue to make it easier to spot unrendered regions.
-if (m_capabilities.usingPartialSwap)
-setScissorToRect(enclosingIntRect(m_rootDamageRect));
-m_context-clearColor(0, 0, 1, 1);
-m_context-colorMask(true, true, true, true);
-m_context-clear(GraphicsContext3D::COLOR_BUFFER_BIT);
-
+GLC(m_context.get(), m_context-colorMask(true, true, true, true));
 GLC(m_context.get(), m_context-enable(GraphicsContext3D::BLEND));
 GLC(m_context.get(),

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

2011-12-07 Thread fpizlo

Title: [102295] trunk/Source/_javascript_Core








Revision 102295
Author fpi...@apple.com
Date 2011-12-07 18:09:14 -0800 (Wed, 07 Dec 2011)


Log Message
Compare and Swap should be enabled on ARMv7
https://bugs.webkit.org/show_bug.cgi?id=74023

Reviewed by Geoff Garen.

Implemented weakCompareAndSwap in terms of LDREX/STREX and enabled PARALLEL_GC.
It gives the expected speed-up on multi-core ARMv7 devices.

* wtf/Atomics.h:
(WTF::weakCompareAndSwap):
* wtf/Platform.h:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/wtf/Atomics.h
trunk/Source/_javascript_Core/wtf/Platform.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (102294 => 102295)

--- trunk/Source/_javascript_Core/ChangeLog	2011-12-08 02:02:13 UTC (rev 102294)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-12-08 02:09:14 UTC (rev 102295)
@@ -1,5 +1,19 @@
 2011-12-07  Filip Pizlo  fpi...@apple.com
 
+Compare and Swap should be enabled on ARMv7
+https://bugs.webkit.org/show_bug.cgi?id=74023
+
+Reviewed by Geoff Garen.
+
+Implemented weakCompareAndSwap in terms of LDREX/STREX and enabled PARALLEL_GC.
+It gives the expected speed-up on multi-core ARMv7 devices.
+
+* wtf/Atomics.h:
+(WTF::weakCompareAndSwap):
+* wtf/Platform.h:
+
+2011-12-07  Filip Pizlo  fpi...@apple.com
+
 DFG CSE is overzealous with GetByVal
 https://bugs.webkit.org/show_bug.cgi?id=74042
 


Modified: trunk/Source/_javascript_Core/wtf/Atomics.h (102294 => 102295)

--- trunk/Source/_javascript_Core/wtf/Atomics.h	2011-12-08 02:02:13 UTC (rev 102294)
+++ trunk/Source/_javascript_Core/wtf/Atomics.h	2011-12-08 02:09:14 UTC (rev 102295)
@@ -60,6 +60,7 @@
 #define Atomics_h
 
 #include Platform.h
+#include StdLibExtras.h
 #include UnusedParam.h
 
 #if OS(WINDOWS)
@@ -119,10 +120,9 @@
 
 inline bool weakCompareAndSwap(unsigned* location, unsigned expected, unsigned newValue)
 {
-// FIXME: Implement COMPARE_AND_SWAP on other architectures and compilers. Currently
-// it only works on X86 or X86_64 with a GCC-style compiler.
 #if ENABLE(COMPARE_AND_SWAP)
 bool result;
+#if CPU(X86) || CPU(X86_64)
 asm volatile(
 lock; cmpxchgl %3, %2\n\t
 sete %1
@@ -130,6 +130,22 @@
 : r(newValue)
 : memory
 );
+#elif CPU(ARM_THUMB2)
+unsigned tmp;
+asm volatile(
+movw %1, #1\n\t
+ldrex %2, %0\n\t
+cmp %3, %2\n\t
+bne.n 0f\n\t
+strex %1, %4, %0\n\t
+0:
+: +m(*location), =r(result), =r(tmp)
+: r(expected), r(newValue)
+: memory);
+result = !result;
+#else
+#error Bad architecture for compare and swap.
+#endif
 return result;
 #else
 UNUSED_PARAM(location);
@@ -142,22 +158,20 @@
 
 inline bool weakCompareAndSwap(void*volatile* location, void* expected, void* newValue)
 {
-// FIXME: Implement COMPARE_AND_SWAP on other architectures and compilers. Currently
-// it only works on X86 or X86_64 with a GCC-style compiler.
 #if ENABLE(COMPARE_AND_SWAP)
+#if CPU(X86_64)
 bool result;
 asm volatile(
-#if CPU(X86_64)
 lock; cmpxchgq %3, %2\n\t
-#else
-lock; cmpxchgl %3, %2\n\t
-#endif
 sete %1
 : +a(expected), =q(result), +m(*location)
 : r(newValue)
 : memory
 );
 return result;
+#else
+return weakCompareAndSwap(bitwise_castunsigned*(location), bitwise_castunsigned(expected), bitwise_castunsigned(newValue));
+#endif
 #else // ENABLE(COMPARE_AND_SWAP)
 UNUSED_PARAM(location);
 UNUSED_PARAM(expected);


Modified: trunk/Source/_javascript_Core/wtf/Platform.h (102294 => 102295)

--- trunk/Source/_javascript_Core/wtf/Platform.h	2011-12-08 02:02:13 UTC (rev 102294)
+++ trunk/Source/_javascript_Core/wtf/Platform.h	2011-12-08 02:09:14 UTC (rev 102295)
@@ -1105,11 +1105,11 @@
 #define WTF_USE_UNIX_DOMAIN_SOCKETS 1
 #endif
 
-#if !defined(ENABLE_COMPARE_AND_SWAP)  COMPILER(GCC)  (CPU(X86) || CPU(X86_64))
+#if !defined(ENABLE_COMPARE_AND_SWAP)  COMPILER(GCC)  (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2))
 #define ENABLE_COMPARE_AND_SWAP 1
 #endif
 
-#if !defined(ENABLE_PARALLEL_GC)  PLATFORM(MAC)  ENABLE(COMPARE_AND_SWAP)
+#if !defined(ENABLE_PARALLEL_GC)  (PLATFORM(MAC) || PLATFORM(IOS))  ENABLE(COMPARE_AND_SWAP)
 #define ENABLE_PARALLEL_GC 1
 #endif
 






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

[webkit-changes] [102296] trunk/Tools

2011-12-07 Thread morrita

Title: [102296] trunk/Tools








Revision 102296
Author morr...@google.com
Date 2011-12-07 18:09:22 -0800 (Wed, 07 Dec 2011)


Log Message
[filter-build-webkit] should not emit reset color when --no-color is given
https://bugs.webkit.org/show_bug.cgi?id=73992

Reviewed by Daniel Bates.

Stop printing control sequences when --no-color is given.
After this change, the filter runs nicely even on environments
like Emacs compilation-mode which cannot understand the control sequence.

* Scripts/filter-build-webkit:
(printLine):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/filter-build-webkit




Diff

Modified: trunk/Tools/ChangeLog (102295 => 102296)

--- trunk/Tools/ChangeLog	2011-12-08 02:09:14 UTC (rev 102295)
+++ trunk/Tools/ChangeLog	2011-12-08 02:09:22 UTC (rev 102296)
@@ -1,3 +1,17 @@
+2011-12-07  MORITA Hajime  morr...@google.com
+
+[filter-build-webkit] should not emit reset color when --no-color is given
+https://bugs.webkit.org/show_bug.cgi?id=73992
+
+Reviewed by Daniel Bates.
+
+Stop printing control sequences when --no-color is given.
+After this change, the filter runs nicely even on environments
+like Emacs compilation-mode which cannot understand the control sequence.
+
+* Scripts/filter-build-webkit:
+(printLine):
+
 2011-12-07  Eric Seidel  e...@webkit.org
 
 Use free memory to determine if we have space for DRT instances instead of total memory


Modified: trunk/Tools/Scripts/filter-build-webkit (102295 => 102296)

--- trunk/Tools/Scripts/filter-build-webkit	2011-12-08 02:09:14 UTC (rev 102295)
+++ trunk/Tools/Scripts/filter-build-webkit	2011-12-08 02:09:22 UTC (rev 102296)
@@ -178,13 +178,15 @@
 elsif ($style == STYLE_ALERT)   { print OUTPUT_HANDLE p class=\alert\$line/p; }
 else{ print OUTPUT_HANDLE p$line/p; }
 } else {
-my $colors = reset;
 if ($useColor) {
+my $colors = reset;
 if ($style == STYLE_HEADER)  { $colors = blue; }
 if ($style == STYLE_SUCCESS) { $colors = green; }
 if ($style == STYLE_ALERT)   { $colors = red; }
+print OUTPUT_HANDLE possiblyColored($colors, $line);
+} else {
+print OUTPUT_HANDLE $line;
 }
-print OUTPUT_HANDLE possiblyColored($colors, $line);
 }
 print OUTPUT_HANDLE \n;
 }






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

[webkit-changes] [102298] trunk

2011-12-07 Thread msaboff

Title: [102298] trunk








Revision 102298
Author msab...@apple.com
Date 2011-12-07 18:19:59 -0800 (Wed, 07 Dec 2011)


Log Message
StringBuilderTest.Append and StringBuilderTest.ToStringPreserveCapacity are failing.
https://bugs.webkit.org/show_bug.cgi?id=73995

Source/_javascript_Core: 

Reviewed by Geoffrey Garen.

Problem was that a call to characters on an StringImpl associated
with a StringBuilder that is being appended to gets stale.
Added a new m_valid16BitShadowlen that keeps the length of
the 16 bit shadow that has been upconverted or will be up converted
with the first getCharacters().  When StringBuilder::characters or
::reifyString is called, further characters are upconverted if
we have a shadow16bit copy and the m_valid16BitShadowlen is updated.

* _javascript_Core.exp:
* wtf/text/StringBuilder.cpp:
(WTF::StringBuilder::reifyString):
* wtf/text/StringBuilder.h:
(WTF::StringBuilder::StringBuilder):
(WTF::StringBuilder::characters):
(WTF::StringBuilder::clear): Cleaned up as part of the change.
* wtf/text/StringImpl.cpp:
(WTF::StringImpl::getData16SlowCase):
(WTF::StringImpl::upconvertCharacters):
* wtf/text/StringImpl.h:

Tools: 

Reenabled failing tests that the code part of the patch fixes.

Reviewed by Geoffrey Garen.

* TestWebKitAPI/Tests/WTF/StringBuilder.cpp:
(TestWebKitAPI::TEST):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.exp
trunk/Source/_javascript_Core/wtf/text/StringBuilder.cpp
trunk/Source/_javascript_Core/wtf/text/StringBuilder.h
trunk/Source/_javascript_Core/wtf/text/StringImpl.cpp
trunk/Source/_javascript_Core/wtf/text/StringImpl.h
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (102297 => 102298)

--- trunk/Source/_javascript_Core/ChangeLog	2011-12-08 02:11:09 UTC (rev 102297)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-12-08 02:19:59 UTC (rev 102298)
@@ -1,3 +1,30 @@
+2011-12-07  Michael Saboff  msab...@apple.com
+
+StringBuilderTest.Append and StringBuilderTest.ToStringPreserveCapacity are failing.
+https://bugs.webkit.org/show_bug.cgi?id=73995
+
+Reviewed by Geoffrey Garen.
+
+Problem was that a call to characters on an StringImpl associated
+with a StringBuilder that is being appended to gets stale.
+Added a new m_valid16BitShadowlen that keeps the length of
+the 16 bit shadow that has been upconverted or will be up converted
+with the first getCharacters().  When StringBuilder::characters or
+::reifyString is called, further characters are upconverted if
+we have a shadow16bit copy and the m_valid16BitShadowlen is updated.
+
+* _javascript_Core.exp:
+* wtf/text/StringBuilder.cpp:
+(WTF::StringBuilder::reifyString):
+* wtf/text/StringBuilder.h:
+(WTF::StringBuilder::StringBuilder):
+(WTF::StringBuilder::characters):
+(WTF::StringBuilder::clear): Cleaned up as part of the change.
+* wtf/text/StringImpl.cpp:
+(WTF::StringImpl::getData16SlowCase):
+(WTF::StringImpl::upconvertCharacters):
+* wtf/text/StringImpl.h:
+
 2011-12-07  Filip Pizlo  fpi...@apple.com
 
 Compare and Swap should be enabled on ARMv7


Modified: trunk/Source/_javascript_Core/_javascript_Core.exp (102297 => 102298)

--- trunk/Source/_javascript_Core/_javascript_Core.exp	2011-12-08 02:11:09 UTC (rev 102297)
+++ trunk/Source/_javascript_Core/_javascript_Core.exp	2011-12-08 02:19:59 UTC (rev 102298)
@@ -583,6 +583,7 @@
 __ZNK3JSC9HashTable11createTableEPNS_12JSGlobalDataE
 __ZNK3JSC9HashTable11deleteTableEv
 __ZNK3WTF10StringImpl17getData16SlowCaseEv
+__ZNK3WTF10StringImpl19upconvertCharactersEjj
 __ZNK3WTF12AtomicString5lowerEv
 __ZNK3WTF13DecimalNumber15toStringDecimalEPtj
 __ZNK3WTF13DecimalNumber19toStringExponentialEPtj


Modified: trunk/Source/_javascript_Core/wtf/text/StringBuilder.cpp (102297 => 102298)

--- trunk/Source/_javascript_Core/wtf/text/StringBuilder.cpp	2011-12-08 02:11:09 UTC (rev 102297)
+++ trunk/Source/_javascript_Core/wtf/text/StringBuilder.cpp	2011-12-08 02:19:59 UTC (rev 102298)
@@ -51,6 +51,11 @@
 m_string = (m_length == m_buffer-length())
 ? m_buffer.get()
 : StringImpl::create(m_buffer, 0, m_length);
+
+if (m_buffer-has16BitShadow()  m_valid16BitShadowLength  m_length)
+m_buffer-upconvertCharacters(m_valid16BitShadowLength, m_length);
+
+m_valid16BitShadowLength = m_length;
 }
 
 void StringBuilder::resize(unsigned newSize)


Modified: trunk/Source/_javascript_Core/wtf/text/StringBuilder.h (102297 => 102298)

--- trunk/Source/_javascript_Core/wtf/text/StringBuilder.h	2011-12-08 02:11:09 UTC (rev 102297)
+++ trunk/Source/_javascript_Core/wtf/text/StringBuilder.h	2011-12-08 02:19:59 UTC (rev 102298)
@@ -36,6 +36,7 @@
 StringBuilder()
 : m_length(0)
 , m_is8Bit(true)
+,

[webkit-changes] [102299] trunk/LayoutTests

2011-12-07 Thread tkent

Title: [102299] trunk/LayoutTests








Revision 102299
Author tk...@chromium.org
Date 2011-12-07 18:27:22 -0800 (Wed, 07 Dec 2011)


Log Message
[Qt] Follow up of r102226.
https://bugs.webkit.org/show_bug.cgi?id=73987

* platform/qt-5.0/Skipped: Renamed three number tests.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/qt-5.0/Skipped




Diff

Modified: trunk/LayoutTests/ChangeLog (102298 => 102299)

--- trunk/LayoutTests/ChangeLog	2011-12-08 02:19:59 UTC (rev 102298)
+++ trunk/LayoutTests/ChangeLog	2011-12-08 02:27:22 UTC (rev 102299)
@@ -1,3 +1,10 @@
+2011-12-07  Kent Tamura  tk...@chromium.org
+
+[Qt] Follow up of r102226.
+https://bugs.webkit.org/show_bug.cgi?id=73987
+
+* platform/qt-5.0/Skipped: Renamed three number tests.
+
 2011-12-07  Filip Pizlo  fpi...@apple.com
 
 DFG CSE is overzealous with GetByVal


Modified: trunk/LayoutTests/platform/qt-5.0/Skipped (102298 => 102299)

--- trunk/LayoutTests/platform/qt-5.0/Skipped	2011-12-08 02:19:59 UTC (rev 102298)
+++ trunk/LayoutTests/platform/qt-5.0/Skipped	2011-12-08 02:27:22 UTC (rev 102299)
@@ -2756,8 +2756,6 @@
 fast/forms/input-appearance-preventDefault.html
 fast/forms/input-appearance-readonly.html
 fast/forms/input-appearance-selection.html
-fast/forms/input-appearance-spinbutton-disabled-readonly.html
-fast/forms/input-appearance-spinbutton-layer.html
 fast/forms/input-appearance-spinbutton-visibility.html
 fast/forms/input-appearance-visibility.html
 fast/forms/input-baseline.html
@@ -2806,6 +2804,8 @@
 fast/forms/menulist-no-renderer-onmousedown.html
 fast/forms/menulist-style-color.html
 fast/forms/minWidthPercent.html
+fast/forms/number/input-appearance-spinbutton-disabled-readonly.html
+fast/forms/number/input-appearance-spinbutton-layer.html
 fast/forms/onselect-textfield.html
 fast/forms/option-index.html
 fast/forms/option-script.html
@@ -6320,12 +6320,12 @@
 fast/forms/focus-selection-textarea.html
 fast/forms/formmove3.html
 fast/forms/input-align.html
-fast/forms/input-appearance-number-rtl.html
 fast/forms/input-button-sizes.html
 fast/forms/input-text-word-wrap.html
 fast/forms/isindex-placeholder.html
 fast/forms/menulist-option-wrap.html
 fast/forms/menulist-separator-painting.html
+fast/forms/number/input-appearance-number-rtl.html
 fast/forms/search-styled.html
 fast/forms/select-baseline.html
 fast/forms/selectlist-minsize.html






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

[webkit-changes] [102301] trunk/Source

2011-12-07 Thread fsamuel

Title: [102301] trunk/Source








Revision 102301
Author fsam...@chromium.org
Date 2011-12-07 19:03:47 -0800 (Wed, 07 Dec 2011)


Log Message
[Chromium] Plumb DPI info into PlatformScreen
https://bugs.webkit.org/show_bug.cgi?id=70556

Source/WebCore:

Reviewed by Darin Fisher.

Make DPI information accessible from WebKit through
PlatformScreen. This is useful when making scaling
computations on various devices (e.g. Viewport meta tag).

This patch adds DPI plumbing on Chromium Win/Mac/Linux
platforms.

* page/Screen.cpp:
(WebCore::Screen::horizontalDPI):
(WebCore::Screen::verticalDPI):
* page/Screen.h:
* platform/PlatformScreen.h:
* platform/chromium/PlatformScreenChromium.cpp:
(WebCore::screenHorizontalDPI):
(WebCore::screenVerticalDPI):
* platform/chromium/PlatformSupport.h:
* platform/efl/PlatformScreenEfl.cpp:
(WebCore::screenHorizontalDPI):
(WebCore::screenVerticalDPI):
* platform/gtk/PlatformScreenGtk.cpp:
(WebCore::screenHorizontalDPI):
(WebCore::screenVerticalDPI):
* platform/mac/PlatformScreenMac.mm:
(WebCore::screenHorizontalDPI):
(WebCore::screenVerticalDPI):
* platform/qt/PlatformScreenQt.cpp:
(WebCore::screenHorizontalDPI):
(WebCore::screenVerticalDPI):
* platform/win/PlatformScreenWin.cpp:
(WebCore::screenHorizontalDPI):
(WebCore::screenVerticalDPI):

Source/WebKit/chromium:

Reviewed by Darin Fisher.

Make DPI information accessible from WebKit through
PlatformScreen. This is useful when making scaling
computations on various devices (e.g. Viewport meta tag).

This patch adds DPI plumbing on Chromium Win/Mac/Linux
platforms.

* public/WebScreenInfo.h:
(WebKit::WebScreenInfo::WebScreenInfo):
* src/PlatformSupport.cpp:
(WebCore::PlatformSupport::screenHorizontalDPI):
(WebCore::PlatformSupport::screenVerticalDPI):
* src/mac/WebScreenInfoFactory.mm:
(WebKit::WebScreenInfoFactory::screenInfo):
* src/win/WebScreenInfoFactory.cpp:
(WebKit::WebScreenInfoFactory::screenInfo):
* src/x11/WebScreenInfoFactory.cpp:
(WebKit::WebScreenInfoFactory::screenInfo):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/Screen.cpp
trunk/Source/WebCore/page/Screen.h
trunk/Source/WebCore/platform/PlatformScreen.h
trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp
trunk/Source/WebCore/platform/chromium/PlatformSupport.h
trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp
trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp
trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm
trunk/Source/WebCore/platform/qt/PlatformScreenQt.cpp
trunk/Source/WebCore/platform/win/PlatformScreenWin.cpp
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/WebScreenInfo.h
trunk/Source/WebKit/chromium/src/PlatformSupport.cpp
trunk/Source/WebKit/chromium/src/mac/WebScreenInfoFactory.mm
trunk/Source/WebKit/chromium/src/win/WebScreenInfoFactory.cpp
trunk/Source/WebKit/chromium/src/x11/WebScreenInfoFactory.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (102300 => 102301)

--- trunk/Source/WebCore/ChangeLog	2011-12-08 02:45:00 UTC (rev 102300)
+++ trunk/Source/WebCore/ChangeLog	2011-12-08 03:03:47 UTC (rev 102301)
@@ -1,3 +1,42 @@
+2011-12-07  Fady Samuel  fsam...@chromium.org
+
+[Chromium] Plumb DPI info into PlatformScreen
+https://bugs.webkit.org/show_bug.cgi?id=70556
+
+Reviewed by Darin Fisher.
+
+Make DPI information accessible from WebKit through
+PlatformScreen. This is useful when making scaling 
+computations on various devices (e.g. Viewport meta tag).
+
+This patch adds DPI plumbing on Chromium Win/Mac/Linux
+platforms.
+
+* page/Screen.cpp:
+(WebCore::Screen::horizontalDPI):
+(WebCore::Screen::verticalDPI):
+* page/Screen.h:
+* platform/PlatformScreen.h:
+* platform/chromium/PlatformScreenChromium.cpp:
+(WebCore::screenHorizontalDPI):
+(WebCore::screenVerticalDPI):
+* platform/chromium/PlatformSupport.h:
+* platform/efl/PlatformScreenEfl.cpp:
+(WebCore::screenHorizontalDPI):
+(WebCore::screenVerticalDPI):
+* platform/gtk/PlatformScreenGtk.cpp:
+(WebCore::screenHorizontalDPI):
+(WebCore::screenVerticalDPI):
+* platform/mac/PlatformScreenMac.mm:
+(WebCore::screenHorizontalDPI):
+(WebCore::screenVerticalDPI):
+* platform/qt/PlatformScreenQt.cpp:
+(WebCore::screenHorizontalDPI):
+(WebCore::screenVerticalDPI):
+* platform/win/PlatformScreenWin.cpp:
+(WebCore::screenHorizontalDPI):
+(WebCore::screenVerticalDPI):
+
 2011-12-07  Aaron Colwell  acolw...@chromium.org
 
 Revert mixed content handling for video fix and follow-up test expectations  Skipped changes.


Modified: trunk/Source/WebCore/page/Screen.cpp (102300 => 102301)

--- trunk/Source/WebCore/page/Screen.cpp	2011-12-08 02:45:00 UTC (rev 102300)
+++ trunk/Source/WebCore/page/Screen.cpp	2011-12-08 03:03:47 UTC (rev 102301)
@@ -53,6 +53,20 @@

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

2011-12-07 Thread fpizlo

Title: [102302] trunk/Source/_javascript_Core








Revision 102302
Author fpi...@apple.com
Date 2011-12-07 19:11:13 -0800 (Wed, 07 Dec 2011)


Log Message
DFG CSE should know that CheckFunction is pure
https://bugs.webkit.org/show_bug.cgi?id=74044

Reviewed by Oliver Hunt.

Possible slight win on V8, no regressions.

* dfg/DFGPropagator.cpp:
(JSC::DFG::Propagator::checkFunctionElimination):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGPropagator.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (102301 => 102302)

--- trunk/Source/_javascript_Core/ChangeLog	2011-12-08 03:03:47 UTC (rev 102301)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-12-08 03:11:13 UTC (rev 102302)
@@ -1,3 +1,15 @@
+2011-12-07  Filip Pizlo  fpi...@apple.com
+
+DFG CSE should know that CheckFunction is pure
+https://bugs.webkit.org/show_bug.cgi?id=74044
+
+Reviewed by Oliver Hunt.
+
+Possible slight win on V8, no regressions.
+
+* dfg/DFGPropagator.cpp:
+(JSC::DFG::Propagator::checkFunctionElimination):
+
 2011-12-07  Michael Saboff  msab...@apple.com
 
 StringBuilderTest.Append and StringBuilderTest.ToStringPreserveCapacity are failing.


Modified: trunk/Source/_javascript_Core/dfg/DFGPropagator.cpp (102301 => 102302)

--- trunk/Source/_javascript_Core/dfg/DFGPropagator.cpp	2011-12-08 03:03:47 UTC (rev 102301)
+++ trunk/Source/_javascript_Core/dfg/DFGPropagator.cpp	2011-12-08 03:11:13 UTC (rev 102302)
@@ -1085,19 +1085,10 @@
 bool checkFunctionElimination(JSFunction* function, NodeIndex child1)
 {
 NodeIndex start = startIndexForChildren(child1);
-for (NodeIndex index = m_compileIndex; index--  start;) {
+for (NodeIndex index = endIndexForPureCSE(); index--  start;) {
 Node node = m_graph[index];
-switch (node.op) {
-case CheckFunction:
-if (node.child1() == child1  node.function() == function)
-return true;
-break;
-
-default:
-if (clobbersWorld(index))
-return false;
-break;
-}
+if (node.op == CheckFunction  node.child1() == child1  node.function() == function)
+return true;
 }
 return false;
 }






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

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

2011-12-07 Thread leo . yang

Title: [102303] trunk/Source/WebCore








Revision 102303
Author leo.y...@torchmobile.com.cn
Date 2011-12-07 19:38:23 -0800 (Wed, 07 Dec 2011)


Log Message
Upstream the BlackBerry porting of network Resource
https://bugs.webkit.org/show_bug.cgi?id=73388

Reviewed by Rob Buis.

Other main contributors:
Joe Mason jma...@rim.com
Yong Li  y...@rim.com
Gary Simmons  gsimm...@rim.com
Genevieve Mak g...@rim.com
Chris Guan chris.g...@torchmobile.com.cn
Mike Lattanzio mlattan...@rim.com

Initial upstream, can't be built yet, no new tests.

* platform/network/blackberry/ResourceError.h: Added.
* platform/network/blackberry/ResourceErrorBlackBerry.cpp: Added.
* platform/network/blackberry/ResourceHandleBlackBerry.cpp: Added.
* platform/network/blackberry/ResourceRequest.h: Added.
* platform/network/blackberry/ResourceRequestBlackBerry.cpp: Added.
* platform/network/blackberry/ResourceResponse.h: Added.
* platform/network/blackberry/ResourceResponseBlackBerry.cpp: Added.

Modified Paths

trunk/Source/WebCore/ChangeLog


Added Paths

trunk/Source/WebCore/platform/network/blackberry/ResourceError.h
trunk/Source/WebCore/platform/network/blackberry/ResourceErrorBlackBerry.cpp
trunk/Source/WebCore/platform/network/blackberry/ResourceHandleBlackBerry.cpp
trunk/Source/WebCore/platform/network/blackberry/ResourceRequest.h
trunk/Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp
trunk/Source/WebCore/platform/network/blackberry/ResourceResponse.h
trunk/Source/WebCore/platform/network/blackberry/ResourceResponseBlackBerry.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (102302 => 102303)

--- trunk/Source/WebCore/ChangeLog	2011-12-08 03:11:13 UTC (rev 102302)
+++ trunk/Source/WebCore/ChangeLog	2011-12-08 03:38:23 UTC (rev 102303)
@@ -1,3 +1,28 @@
+2011-12-07  Leo Yang  leo.y...@torchmobile.com.cn
+
+Upstream the BlackBerry porting of network Resource
+https://bugs.webkit.org/show_bug.cgi?id=73388
+
+Reviewed by Rob Buis.
+
+Other main contributors:
+Joe Mason jma...@rim.com
+Yong Li  y...@rim.com
+Gary Simmons  gsimm...@rim.com
+Genevieve Mak g...@rim.com
+Chris Guan chris.g...@torchmobile.com.cn
+Mike Lattanzio mlattan...@rim.com
+
+Initial upstream, can't be built yet, no new tests.
+
+* platform/network/blackberry/ResourceError.h: Added.
+* platform/network/blackberry/ResourceErrorBlackBerry.cpp: Added.
+* platform/network/blackberry/ResourceHandleBlackBerry.cpp: Added.
+* platform/network/blackberry/ResourceRequest.h: Added.
+* platform/network/blackberry/ResourceRequestBlackBerry.cpp: Added.
+* platform/network/blackberry/ResourceResponse.h: Added.
+* platform/network/blackberry/ResourceResponseBlackBerry.cpp: Added.
+
 2011-12-07  Fady Samuel  fsam...@chromium.org
 
 [Chromium] Plumb DPI info into PlatformScreen


Added: trunk/Source/WebCore/platform/network/blackberry/ResourceError.h (0 => 102303)

--- trunk/Source/WebCore/platform/network/blackberry/ResourceError.h	(rev 0)
+++ trunk/Source/WebCore/platform/network/blackberry/ResourceError.h	2011-12-08 03:38:23 UTC (rev 102303)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef ResourceError_h
+#define ResourceError_h
+
+#include ResourceErrorBase.h
+
+namespace WebCore {
+
+class ResourceError : public ResourceErrorBase {
+public:
+static const char* const httpErrorDomain;
+static const char* const platformErrorDomain;
+
+ResourceError()
+{
+}
+
+ResourceError(const String domain, int errorCode, const String failingURL, const String localizedDescription)
+: ResourceErrorBase(domain, errorCode, failingURL, localizedDescription)
+{
+}
+};
+
+} // namespace WebCore
+
+#endif // ResourceError_h


Added: trunk/Source/WebCore/platform/network/blackberry/ResourceErrorBlackBerry.cpp (0 => 102303)

--- trunk/Source/WebCore/platform/network/blackberry/ResourceErrorBlackBerry.cpp	(rev 0)
+++ trunk/Source/WebCore/platform/network/blackberry/ResourceErrorBlackBerry.cpp	2011-12-08 03:38:23 UTC (rev 102303)
@@ -0,0

[webkit-changes] [102305] trunk

2011-12-07 Thread commit-queue

Title: [102305] trunk








Revision 102305
Author commit-qu...@webkit.org
Date 2011-12-07 19:55:33 -0800 (Wed, 07 Dec 2011)


Log Message
[FileSystem API] requestFileSystem successCallback is required
https://bugs.webkit.org/show_bug.cgi?id=69637

Patch by Mark Pilgrim pilg...@chromium.org on 2011-12-07
Reviewed by Darin Adler.

Source/WebCore:

* page/DOMWindow.idl: remove [Optional] flag from successCallback parameter

LayoutTests:

* fast/filesystem/filesystem-no-callback-null-ptr-crash.html: fix now-broken logic testing for unrelated bug
* fast/filesystem/not-enough-arguments-expected.txt:
* fast/filesystem/not-enough-arguments.html: add checks for webkitRequestFileSystem with not enough parameters

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/filesystem/filesystem-no-callback-null-ptr-crash.html
trunk/LayoutTests/fast/filesystem/not-enough-arguments-expected.txt
trunk/LayoutTests/fast/filesystem/not-enough-arguments.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/DOMWindow.idl




Diff

Modified: trunk/LayoutTests/ChangeLog (102304 => 102305)

--- trunk/LayoutTests/ChangeLog	2011-12-08 03:43:46 UTC (rev 102304)
+++ trunk/LayoutTests/ChangeLog	2011-12-08 03:55:33 UTC (rev 102305)
@@ -1,3 +1,14 @@
+2011-12-07  Mark Pilgrim  pilg...@chromium.org
+
+[FileSystem API] requestFileSystem successCallback is required
+https://bugs.webkit.org/show_bug.cgi?id=69637
+
+Reviewed by Darin Adler.
+
+* fast/filesystem/filesystem-no-callback-null-ptr-crash.html: fix now-broken logic testing for unrelated bug
+* fast/filesystem/not-enough-arguments-expected.txt: 
+* fast/filesystem/not-enough-arguments.html: add checks for webkitRequestFileSystem with not enough parameters
+
 2011-12-07  James Simonsen  simon...@chromium.org
 
 [Chromium] Unreviewed, rebaseline width-overflow.html and fix test_expectations.txt


Modified: trunk/LayoutTests/fast/filesystem/filesystem-no-callback-null-ptr-crash.html (102304 => 102305)

--- trunk/LayoutTests/fast/filesystem/filesystem-no-callback-null-ptr-crash.html	2011-12-08 03:43:46 UTC (rev 102304)
+++ trunk/LayoutTests/fast/filesystem/filesystem-no-callback-null-ptr-crash.html	2011-12-08 03:55:33 UTC (rev 102305)
@@ -7,9 +7,13 @@
   if (window.layoutTestController)
   layoutTestController.dumpAsText();
   if (window.webkitRequestFileSystem) {
-  // These two calls should not cause a NULL pointer crash:
-  webkitRequestFileSystem(TEMPORARY, 100);
+  // These two calls should throw an exception but should NOT cause a NULL pointer crash:
   webkitResolveLocalFileSystemURL('');
-  document.getElementById('log').innerHTML = PASS;
+  try {
+  webkitRequestFileSystem(TEMPORARY, 100);
+  }
+  catch(e) {
+  document.getElementById('log').innerHTML = PASS;
+  }
   }
 /script


Modified: trunk/LayoutTests/fast/filesystem/not-enough-arguments-expected.txt (102304 => 102305)

--- trunk/LayoutTests/fast/filesystem/not-enough-arguments-expected.txt	2011-12-08 03:43:46 UTC (rev 102304)
+++ trunk/LayoutTests/fast/filesystem/not-enough-arguments-expected.txt	2011-12-08 03:55:33 UTC (rev 102305)
@@ -4,6 +4,9 @@
 
 
 PASS webkitResolveLocalFileSystemURL() threw exception TypeError: Not enough arguments.
+PASS webkitRequestFileSystem() threw exception TypeError: Not enough arguments.
+PASS webkitRequestFileSystem(PERSISTENT) threw exception TypeError: Not enough arguments.
+PASS webkitRequestFileSystem(PERSISTENT, 100) threw exception TypeError: Not enough arguments.
 Successfully obtained Persistent FileSystem:file__0:Temporary
 PASS fileSystem.root.removeRecursively() threw exception TypeError: Not enough arguments.
 PASS fileSystem.root.moveTo() threw exception TypeError: Not enough arguments.


Modified: trunk/LayoutTests/fast/filesystem/not-enough-arguments.html (102304 => 102305)

--- trunk/LayoutTests/fast/filesystem/not-enough-arguments.html	2011-12-08 03:43:46 UTC (rev 102304)
+++ trunk/LayoutTests/fast/filesystem/not-enough-arguments.html	2011-12-08 03:55:33 UTC (rev 102305)
@@ -48,6 +48,9 @@
 
 if (window.webkitRequestFileSystem) {
 shouldThrow(webkitResolveLocalFileSystemURL());
+shouldThrow(webkitRequestFileSystem());
+shouldThrow(webkitRequestFileSystem(PERSISTENT));
+shouldThrow(webkitRequestFileSystem(PERSISTENT, 100));
 webkitRequestFileSystem(window.TEMPORARY, 100, successCallback, errorCallback);
 window.jsTestIsAsync = true;
 } else


Modified: trunk/Source/WebCore/ChangeLog (102304 => 102305)

--- trunk/Source/WebCore/ChangeLog	2011-12-08 03:43:46 UTC (rev 102304)
+++ trunk/Source/WebCore/ChangeLog	2011-12-08 03:55:33 UTC (rev 102305)
@@ -1,3 +1,12 @@
+2011-12-07  Mark Pilgrim  pilg...@chromium.org
+
+[FileSystem API] requestFileSystem successCallback is required
+https://bugs.webkit.org/show_bug.cgi?id=69637
+
+Reviewed by Darin Adler.
+
+* page/DOMWindow.idl: remove [Optional]

[webkit-changes] [102306] trunk

2011-12-07 Thread commit-queue

Title: [102306] trunk








Revision 102306
Author commit-qu...@webkit.org
Date 2011-12-07 20:13:57 -0800 (Wed, 07 Dec 2011)


Log Message
Force LTR layout for media controls even in RTL documents.
https://bugs.webkit.org/show_bug.cgi?id=74024

Patch by Ami Fischman fisch...@chromium.org on 2011-12-07
Reviewed by Darin Adler.

Source/WebCore:

Test: media/controls-layout-direction.html

* css/mediaControls.css:
(::-webkit-media-controls):

LayoutTests:

* media/controls-layout-direction-expected.txt: Added.
* media/controls-layout-direction.html: Added.
* platform/chromium-linux/media/controls-layout-direction-expected.png: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/mediaControls.css


Added Paths

trunk/LayoutTests/media/controls-layout-direction-expected.txt
trunk/LayoutTests/media/controls-layout-direction.html
trunk/LayoutTests/platform/chromium-linux/media/controls-layout-direction-expected.png




Diff

Modified: trunk/LayoutTests/ChangeLog (102305 => 102306)

--- trunk/LayoutTests/ChangeLog	2011-12-08 03:55:33 UTC (rev 102305)
+++ trunk/LayoutTests/ChangeLog	2011-12-08 04:13:57 UTC (rev 102306)
@@ -1,3 +1,14 @@
+2011-12-07  Ami Fischman  fisch...@chromium.org
+
+Force LTR layout for media controls even in RTL documents.
+https://bugs.webkit.org/show_bug.cgi?id=74024
+
+Reviewed by Darin Adler.
+
+* media/controls-layout-direction-expected.txt: Added.
+* media/controls-layout-direction.html: Added.
+* platform/chromium-linux/media/controls-layout-direction-expected.png: Added.
+
 2011-12-07  Mark Pilgrim  pilg...@chromium.org
 
 [FileSystem API] requestFileSystem successCallback is required


Added: trunk/LayoutTests/media/controls-layout-direction-expected.txt (0 => 102306)

--- trunk/LayoutTests/media/controls-layout-direction-expected.txt	(rev 0)
+++ trunk/LayoutTests/media/controls-layout-direction-expected.txt	2011-12-08 04:13:57 UTC (rev 102306)
@@ -0,0 +1 @@
+


Added: trunk/LayoutTests/media/controls-layout-direction.html (0 => 102306)

--- trunk/LayoutTests/media/controls-layout-direction.html	(rev 0)
+++ trunk/LayoutTests/media/controls-layout-direction.html	2011-12-08 04:13:57 UTC (rev 102306)
@@ -0,0 +1,15 @@
+!DOCTYPE html
+head
+script
+if (window.layoutTestController)
+layoutTestController.dumpAsText(true);
+/script
+/head
+body
+!-- Test that audio  video controls lay out identically in RTL and LTR contexts. --
+div style=direction:ltr;video controls/video/div
+div style=direction:rtl; text-align:left;video controls/video/div
+div style=direction:ltr;audio controls/audio/div
+div style=direction:rtl; text-align:left;audio controls/audio/div
+/div
+/body


Added: trunk/LayoutTests/platform/chromium-linux/media/controls-layout-direction-expected.png (0 => 102306)

--- trunk/LayoutTests/platform/chromium-linux/media/controls-layout-direction-expected.png	(rev 0)
+++ trunk/LayoutTests/platform/chromium-linux/media/controls-layout-direction-expected.png	2011-12-08 04:13:57 UTC (rev 102306)
@@ -0,0 +1,23 @@
+\x89PNG
+
+
+IHDR X')tEXtchecksumb56d56afcd55fc7ffba8473ae25e09d9\xA8\xF0[4\xE2IDATx\x9C\xED\xDD\xC1N\xED\xDB\xC0\xE1\xC1\xB0@\xA1k\x81\xA4M\xED51bt\xE1\xD6p\xB2\xF38ܻ7z\x82Kܛ\xB8\xFCoDS
+\x92\xF2b\x8C\xC1\xA4\x84
+%\xF2\xD6o1\x81\x90\xF8Q\xA4\xBD\xD4^ת\xED\xEENB\xBFLg\x9E\xFC\xF8\xF1# ΅\xF3\x80\xBF\x8D\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \x98\xC0\xB0\x82	,\x80` \xD8\xE0q333ٽk\xA9TZ]]\xCDnd\xE7\xCC\xBDsssg\xF0.d\xC1,\x80` \x98\xC0\xB0\x82	,\x80` ر\xDB4\xA7X,~\xFF\xFE\xFD\xF3\xE7ϱ\xC7q\xE1

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

2011-12-07 Thread commit-queue

Title: [102307] trunk/Source/WebCore








Revision 102307
Author commit-qu...@webkit.org
Date 2011-12-07 20:25:47 -0800 (Wed, 07 Dec 2011)


Log Message
Editor::markAndReplaceFor should take Range instead of TextCheckingParagraph.
https://bugs.webkit.org/show_bug.cgi?id=74035

Patch by Shinya Kawanaka shin...@google.com on 2011-12-07
Reviewed by Hajime Morita.

Editor::markAndReplaceFor takes chekcing range and paragraph range instead of
spelling paragraph and grammar paragraph.

No new tests. Covered by existing tests.

* editing/Editor.cpp:
(WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges):
(WebCore::Editor::markAndReplaceFor):
* editing/Editor.h:
* editing/TextCheckingHelper.cpp:
(WebCore::TextCheckingParagraph::TextCheckingParagraph):
* editing/TextCheckingHelper.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/editing/Editor.cpp
trunk/Source/WebCore/editing/Editor.h
trunk/Source/WebCore/editing/TextCheckingHelper.cpp
trunk/Source/WebCore/editing/TextCheckingHelper.h


Property Changed

trunk/Source/WebCore/ChangeLog




Diff

Modified: trunk/Source/WebCore/ChangeLog (102306 => 102307)

--- trunk/Source/WebCore/ChangeLog	2011-12-08 04:13:57 UTC (rev 102306)
+++ trunk/Source/WebCore/ChangeLog	2011-12-08 04:25:47 UTC (rev 102307)
@@ -1,3 +1,23 @@
+2011-12-07  Shinya Kawanaka  shin...@google.com
+
+Editor::markAndReplaceFor should take Range instead of TextCheckingParagraph.
+https://bugs.webkit.org/show_bug.cgi?id=74035
+
+Reviewed by Hajime Morita.
+
+Editor::markAndReplaceFor takes chekcing range and paragraph range instead of
+spelling paragraph and grammar paragraph.
+
+No new tests. Covered by existing tests.
+
+* editing/Editor.cpp:
+(WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges):
+(WebCore::Editor::markAndReplaceFor):
+* editing/Editor.h:
+* editing/TextCheckingHelper.cpp:
+(WebCore::TextCheckingParagraph::TextCheckingParagraph):
+* editing/TextCheckingHelper.h:
+
 2011-12-07  Ami Fischman  fisch...@chromium.org
 
 Force LTR layout for media controls even in RTL documents.
Property changes on: trunk/Source/WebCore/ChangeLog
___


Deleted: svn:executable

Modified: trunk/Source/WebCore/editing/Editor.cpp (102306 => 102307)

--- trunk/Source/WebCore/editing/Editor.cpp	2011-12-08 04:13:57 UTC (rev 102306)
+++ trunk/Source/WebCore/editing/Editor.cpp	2011-12-08 04:25:47 UTC (rev 102307)
@@ -2010,34 +2010,27 @@
 if (!isSpellCheckingEnabledFor(editableNode))
 return;
 
-TextCheckingParagraph spellingParagraph(spellingRange);
-TextCheckingParagraph grammarParagraph(shouldMarkGrammar ? grammarRange : 0);
-
-if (shouldMarkGrammar ? (spellingParagraph.isRangeEmpty()  grammarParagraph.isEmpty()) : spellingParagraph.isEmpty())
+Range* rangeToCheck = shouldMarkGrammar ? grammarRange : spellingRange;
+TextCheckingParagraph paragraphToCheck(rangeToCheck);
+if (paragraphToCheck.isRangeEmpty() || paragraphToCheck.isEmpty())
 return;
 
 bool asynchronous = m_frame  m_frame-settings()  m_frame-settings()-asynchronousSpellCheckingEnabled()  !shouldShowCorrectionPanel;
 if (asynchronous) {
-if (shouldMarkGrammar)
-m_spellChecker-requestCheckingFor(resolveTextCheckingTypeMask(textCheckingOptions), grammarParagraph.paragraphRange());
-else
-m_spellChecker-requestCheckingFor(resolveTextCheckingTypeMask(textCheckingOptions), spellingParagraph.paragraphRange());
+m_spellChecker-requestCheckingFor(resolveTextCheckingTypeMask(textCheckingOptions), paragraphToCheck.paragraphRange());
 return;
 }
 
 VectorTextCheckingResult results;
-if (shouldMarkGrammar)
-checkTextOfParagraph(textChecker(), grammarParagraph.textCharacters(), grammarParagraph.textLength(), 
-resolveTextCheckingTypeMask(textCheckingOptions), results);
-else
-checkTextOfParagraph(textChecker(), spellingParagraph.textCharacters(), spellingParagraph.textLength(), 
-resolveTextCheckingTypeMask(textCheckingOptions), results);
-
-markAndReplaceFor(textCheckingOptions, results, spellingParagraph, grammarParagraph);
+checkTextOfParagraph(textChecker(), paragraphToCheck.textCharacters(), paragraphToCheck.textLength(),
+resolveTextCheckingTypeMask(textCheckingOptions), results);
+markAndReplaceFor(textCheckingOptions, results, rangeToCheck, paragraphToCheck.paragraphRange());
 }
 
-void Editor::markAndReplaceFor(TextCheckingTypeMask textCheckingOptions, const VectorTextCheckingResult results, const TextCheckingParagraph spellingParagraph, const TextCheckingParagraph grammarParagraph)
+void Editor::markAndReplaceFor(TextCheckingTypeMask textCheckingOptions, const VectorTextCheckingResult results,

[webkit-changes] [102308] trunk/Source

2011-12-07 Thread commit-queue

Title: [102308] trunk/Source








Revision 102308
Author commit-qu...@webkit.org
Date 2011-12-07 20:35:33 -0800 (Wed, 07 Dec 2011)


Log Message
[chromium] Add page-scale animation support to Impl thread
https://bugs.webkit.org/show_bug.cgi?id=72996

Patch by Alexandre Elias ael...@google.com on 2011-12-07
Reviewed by James Robinson.

This adds a new math helper class to compute the progress of the
animation, and code in the CCLayerTreeHostImpl to apply the animation
frame by frame.

No new tests. (https://bugs.webkit.org/show_bug.cgi?id=71529 filed.)

Source/WebCore:

* WebCore.gypi:
* platform/graphics/chromium/cc/CCInputHandler.h:
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
(WebCore::CCLayerTreeHostImpl::animate):
(WebCore::CCLayerTreeHostImpl::startPageScaleAnimation):
(WebCore::CCLayerTreeHostImpl::processScrollDeltas):
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
* platform/graphics/chromium/cc/CCPageScaleAnimation.cpp: Added.
(WebCore::CCPageScaleAnimation::CCPageScaleAnimation):
(WebCore::CCPageScaleAnimation::initialize):
(WebCore::CCPageScaleAnimation::zoomTo):
(WebCore::CCPageScaleAnimation::zoomWithAnchor):
(WebCore::CCPageScaleAnimation::zoomElsewhere):
(WebCore::CCPageScaleAnimation::scrollOffsetAtTime):
(WebCore::CCPageScaleAnimation::pageScaleAtTime):
(WebCore::CCPageScaleAnimation::isAnimationCompleteAtTime):
(WebCore::CCPageScaleAnimation::progressRatioForTime):
(WebCore::CCPageScaleAnimation::scrollOffsetAtRatio):
(WebCore::CCPageScaleAnimation::pageScaleAtRatio):
* platform/graphics/chromium/cc/CCPageScaleAnimation.h: Added.
(WebCore::CCPageScaleAnimation::startTime):
(WebCore::CCPageScaleAnimation::duration):
(WebCore::CCPageScaleAnimation::endTime):
(WebCore::CCPageScaleAnimation::finalScrollOffset):
(WebCore::CCPageScaleAnimation::finalPageScale):

Source/WebKit/chromium:

* public/WebCompositor.h:
* public/WebInputEvent.h:
(WebKit::WebPageScaleAnimationEvent::WebPageScaleAnimationEvent):
* public/android/WebInputEventFactory.h:
* src/WebCompositorImpl.cpp:
(WebKit::WebCompositorImpl::handlePageScaleAnimationEvent):
* src/WebCompositorImpl.h:
* src/WebPopupMenuImpl.cpp:
(WebKit::WebPopupMenuImpl::handleInputEvent):
* src/android/WebInputEventFactory.cpp:
(WebKit::WebInputEventFactory::pageScaleAnimationEvent):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.gypi
trunk/Source/WebCore/platform/graphics/chromium/cc/CCInputHandler.h
trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp
trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h
trunk/Source/WebKit/chromium/ChangeLog


Added Paths

trunk/Source/WebCore/platform/graphics/chromium/cc/CCPageScaleAnimation.cpp
trunk/Source/WebCore/platform/graphics/chromium/cc/CCPageScaleAnimation.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (102307 => 102308)

--- trunk/Source/WebCore/ChangeLog	2011-12-08 04:25:47 UTC (rev 102307)
+++ trunk/Source/WebCore/ChangeLog	2011-12-08 04:35:33 UTC (rev 102308)
@@ -1,3 +1,42 @@
+2011-12-07  Alexandre Elias  ael...@google.com
+
+[chromium] Add page-scale animation support to Impl thread
+https://bugs.webkit.org/show_bug.cgi?id=72996
+
+Reviewed by James Robinson.
+
+This adds a new math helper class to compute the progress of the
+animation, and code in the CCLayerTreeHostImpl to apply the animation
+frame by frame.
+
+No new tests. (https://bugs.webkit.org/show_bug.cgi?id=71529 filed.)
+
+* WebCore.gypi:
+* platform/graphics/chromium/cc/CCInputHandler.h:
+* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+(WebCore::CCLayerTreeHostImpl::animate):
+(WebCore::CCLayerTreeHostImpl::startPageScaleAnimation):
+(WebCore::CCLayerTreeHostImpl::processScrollDeltas):
+* platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
+* platform/graphics/chromium/cc/CCPageScaleAnimation.cpp: Added.
+(WebCore::CCPageScaleAnimation::CCPageScaleAnimation):
+(WebCore::CCPageScaleAnimation::initialize):
+(WebCore::CCPageScaleAnimation::zoomTo):
+(WebCore::CCPageScaleAnimation::zoomWithAnchor):
+(WebCore::CCPageScaleAnimation::zoomElsewhere):
+(WebCore::CCPageScaleAnimation::scrollOffsetAtTime):
+(WebCore::CCPageScaleAnimation::pageScaleAtTime):
+(WebCore::CCPageScaleAnimation::isAnimationCompleteAtTime):
+(WebCore::CCPageScaleAnimation::progressRatioForTime):
+(WebCore::CCPageScaleAnimation::scrollOffsetAtRatio):
+(WebCore::CCPageScaleAnimation::pageScaleAtRatio):
+* platform/graphics/chromium/cc/CCPageScaleAnimation.h: Added.
+(WebCore::CCPageScaleAnimation::startTime):
+(WebCore::CCPageScaleAnimation::duration):
+(WebCore::CCPageScaleAnimation::endTime):
+(WebCore::CCPageScaleAnimation::finalScrollOffset):
+(WebCore::CCPageScaleAnimation::finalPageScale):
+
 2011-12-07

[webkit-changes] [102309] trunk/LayoutTests

2011-12-07 Thread bashi

Title: [102309] trunk/LayoutTests








Revision 102309
Author ba...@chromium.org
Date 2011-12-07 20:42:10 -0800 (Wed, 07 Dec 2011)


Log Message
Unreviewed chromium expectations update.

Patch by Kenichi Ishibashi ba...@chromium.org on 2011-12-07

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt


Property Changed

trunk/LayoutTests/ChangeLog




Diff

Modified: trunk/LayoutTests/ChangeLog (102308 => 102309)

--- trunk/LayoutTests/ChangeLog	2011-12-08 04:35:33 UTC (rev 102308)
+++ trunk/LayoutTests/ChangeLog	2011-12-08 04:42:10 UTC (rev 102309)
@@ -1,3 +1,9 @@
+2011-12-07  Kenichi Ishibashi  ba...@chromium.org
+
+Unreviewed chromium expectations update.
+
+* platform/chromium/test_expectations.txt:
+
 2011-12-07  Ami Fischman  fisch...@chromium.org
 
 Force LTR layout for media controls even in RTL documents.
Property changes on: trunk/LayoutTests/ChangeLog
___


Deleted: svn:executable

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (102308 => 102309)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-08 04:35:33 UTC (rev 102308)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-08 04:42:10 UTC (rev 102309)
@@ -3803,3 +3803,5 @@
 BUGWK73991 WIN7 VISTA RELEASE : platform/win/fast/text/uniscribe-missing-glyph.html = IMAGE
 BUGWK73991 WIN7 VISTA RELEASE : fast/text/international/bidi-neutral-run.html = TEXT
 BUGWK73991 WIN7 VISTA RELEASE : fast/text/international/thai-line-breaks.html = TEXT
+
+BUGWK74050 : compositing/reflections/nested-reflection-on-overflow.html = IMAGE PASS






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

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

2011-12-07 Thread macpherson

Title: [102311] trunk/Source/WebCore








Revision 102311
Author macpher...@chromium.org
Date 2011-12-07 21:08:32 -0800 (Wed, 07 Dec 2011)


Log Message
Implement border image source properties in CSSStyleApplyProperty.
https://bugs.webkit.org/show_bug.cgi?id=73981

Reviewed by Andreas Kling.

No new tests / refactoring only.

* css/CSSStyleApplyProperty.cpp:
(WebCore::ApplyPropertyBorderImageSource::applyValue):
(WebCore::ApplyPropertyBorderImageSource::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 (102310 => 102311)

--- trunk/Source/WebCore/ChangeLog	2011-12-08 04:58:00 UTC (rev 102310)
+++ trunk/Source/WebCore/ChangeLog	2011-12-08 05:08:32 UTC (rev 102311)
@@ -1,3 +1,19 @@
+2011-12-07  Luke Macpherson   macpher...@chromium.org
+
+Implement border image source properties in CSSStyleApplyProperty.
+https://bugs.webkit.org/show_bug.cgi?id=73981
+
+Reviewed by Andreas Kling.
+
+No new tests / refactoring only.
+
+* css/CSSStyleApplyProperty.cpp:
+(WebCore::ApplyPropertyBorderImageSource::applyValue):
+(WebCore::ApplyPropertyBorderImageSource::createHandler):
+(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+* css/CSSStyleSelector.cpp:
+(WebCore::CSSStyleSelector::applyProperty):
+
 2011-12-07  Noel Gordon  noel.gor...@gmail.com
 
 WebPImageDecoder should not do a full image decode if progressive decoding is active


Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (102310 => 102311)

--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp	2011-12-08 04:58:00 UTC (rev 102310)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp	2011-12-08 05:08:32 UTC (rev 102311)
@@ -704,6 +704,17 @@
 static PropertyHandler createHandler() { return PropertyHandler(applyInheritValue, applyInitialValue, applyValue); }
 };
 
+template CSSPropertyID id, StyleImage* (RenderStyle::*getterFunction)() const, void (RenderStyle::*setterFunction)(PassRefPtrStyleImage), StyleImage* (*initialFunction)()
+class ApplyPropertyBorderImageSource {
+public:
+static void applyValue(CSSStyleSelector* selector, CSSValue* value) { (selector-style()-*setterFunction)(selector-styleImage(id, value)); }
+static PropertyHandler createHandler()
+{
+PropertyHandler handler = ApplyPropertyDefaultBaseStyleImage*, getterFunction, PassRefPtrStyleImage, setterFunction, StyleImage*, initialFunction::createHandler();
+return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), applyValue);
+}
+};
+
 enum CounterBehavior {Increment = 0, Reset};
 template CounterBehavior counterBehavior
 class ApplyPropertyCounter {
@@ -1362,6 +1373,9 @@
 setPropertyHandler(CSSPropertyBorderImageWidth, ApplyPropertyBorderImageModifierImage, Width::createHandler());
 setPropertyHandler(CSSPropertyWebkitMaskBoxImageWidth, ApplyPropertyBorderImageModifierMask, Width::createHandler());
 
+setPropertyHandler(CSSPropertyBorderImageSource, ApplyPropertyBorderImageSourceCSSPropertyBorderImageSource, RenderStyle::borderImageSource, RenderStyle::setBorderImageSource, RenderStyle::initialBorderImageSource::createHandler());
+setPropertyHandler(CSSPropertyWebkitMaskBoxImageSource, ApplyPropertyBorderImageSourceCSSPropertyWebkitMaskBoxImageSource, RenderStyle::maskBoxImageSource, RenderStyle::setMaskBoxImageSource, RenderStyle::initialMaskBoxImageSource::createHandler());
+
 setPropertyHandler(CSSPropertyBorderTopLeftRadius, ApplyPropertyBorderRadiusRenderStyle::borderTopLeftRadius, RenderStyle::setBorderTopLeftRadius, RenderStyle::initialBorderRadius::createHandler());
 setPropertyHandler(CSSPropertyBorderTopRightRadius, ApplyPropertyBorderRadiusRenderStyle::borderTopRightRadius, RenderStyle::setBorderTopRightRadius, RenderStyle::initialBorderRadius::createHandler());
 setPropertyHandler(CSSPropertyBorderBottomLeftRadius, ApplyPropertyBorderRadiusRenderStyle::borderBottomLeftRadius, RenderStyle::setBorderBottomLeftRadius, RenderStyle::initialBorderRadius::createHandler());


Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (102310 => 102311)

--- trunk/Source/WebCore/css/CSSStyleSelector.cpp	2011-12-08 04:58:00 UTC (rev 102310)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp	2011-12-08 05:08:32 UTC (rev 102311)
@@ -2708,18 +2708,6 @@
 HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(whiteSpace, WhiteSpace)
 return;
 // uri || inherit
-case CSSPropertyBorderImageSource:
-{
-HANDLE_INHERIT_AND_INITIAL(borderImageSource, BorderImageSource)
-m_style-setBorderImageSource(styleImage(CSSPropertyBorderImageSource, value));
-return;
-}
-case

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

2011-12-07 Thread commit-queue

Title: [102312] trunk/Source/WebCore








Revision 102312
Author commit-qu...@webkit.org
Date 2011-12-07 21:23:42 -0800 (Wed, 07 Dec 2011)


Log Message
Implement the SSE optimization in SincResampler::process()
https://bugs.webkit.org/show_bug.cgi?id=73789

Patch by Xingnan Wang xingnan.w...@intel.com on 2011-12-07
Reviewed by Benjamin Poulain.

Here is about 70% performance improvement on the hot spot of sample convolving.

* platform/audio/SincResampler.cpp:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/audio/SincResampler.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (102311 => 102312)

--- trunk/Source/WebCore/ChangeLog	2011-12-08 05:08:32 UTC (rev 102311)
+++ trunk/Source/WebCore/ChangeLog	2011-12-08 05:23:42 UTC (rev 102312)
@@ -1,3 +1,14 @@
+2011-12-07  Xingnan Wang  xingnan.w...@intel.com
+
+Implement the SSE optimization in SincResampler::process()
+https://bugs.webkit.org/show_bug.cgi?id=73789
+
+Reviewed by Benjamin Poulain.
+
+Here is about 70% performance improvement on the hot spot of sample convolving.
+
+* platform/audio/SincResampler.cpp:
+
 2011-12-07  Luke Macpherson   macpher...@chromium.org
 
 Implement border image source properties in CSSStyleApplyProperty.


Modified: trunk/Source/WebCore/platform/audio/SincResampler.cpp (102311 => 102312)

--- trunk/Source/WebCore/platform/audio/SincResampler.cpp	2011-12-08 05:08:32 UTC (rev 102311)
+++ trunk/Source/WebCore/platform/audio/SincResampler.cpp	2011-12-08 05:23:42 UTC (rev 102312)
@@ -35,6 +35,10 @@
 #include AudioBus.h
 #include wtf/MathExtras.h
 
+#ifdef __SSE2__
+#include emmintrin.h
+#endif
+
 using namespace std;
 
 // Input buffer layout, dividing the total buffer into regions (r0 - r5):
@@ -246,8 +250,6 @@
 // Generate a single output sample. 
 int n = m_kernelSize;
 
-// FIXME: add SIMD optimizations for the following. The scalar code-path can probably also be optimized better.
-
 #define CONVOLVE_ONE_SAMPLE  \
 input = *inputP++;   \
 sum1 += input * *k1; \
@@ -257,6 +259,76 @@
 
 {
 float input;
+
+#ifdef __SSE2__
+// If the sourceP address is not 16-byte aligned, the first several frames (at most three) should be processed seperately.
+while ((reinterpret_castuintptr_t(inputP)  0x0F)  n) {
+CONVOLVE_ONE_SAMPLE
+n--;
+}
+
+// Now the inputP is aligned and start to apply SSE.
+float* endP = inputP + n - n % 4;
+__m128 mInput;
+__m128 mK1;
+__m128 mK2;
+__m128 mul1;
+__m128 mul2;
+
+__m128 sums1 = _mm_setzero_ps();
+__m128 sums2 = _mm_setzero_ps();
+bool k1Aligned = !(reinterpret_castuintptr_t(k1)  0x0F);
+bool k2Aligned = !(reinterpret_castuintptr_t(k2)  0x0F);
+
+#define LOAD_DATA(l1, l2)\
+mInput = _mm_load_ps(inputP);\
+mK1 = _mm_##l1##_ps(k1); \
+mK2 = _mm_##l2##_ps(k2);
+
+#define CONVOLVE_4_SAMPLES   \
+mul1 = _mm_mul_ps(mInput, mK1);  \
+mul2 = _mm_mul_ps(mInput, mK2);  \
+sums1 = _mm_add_ps(sums1, mul1); \
+sums2 = _mm_add_ps(sums2, mul2); \
+inputP += 4; \
+k1 += 4; \
+k2 += 4;
+
+if (k1Aligned  k2Aligned) { // both aligned
+while (inputP  endP) {
+LOAD_DATA(load, load)
+CONVOLVE_4_SAMPLES
+}
+} else if (!k1Aligned  k2Aligned) { // only k2 aligned
+while (inputP  endP) {
+LOAD_DATA(loadu, load)
+CONVOLVE_4_SAMPLES
+}
+} else if (k1Aligned  !k2Aligned) { // only k1 aligned
+while (inputP  endP) {
+LOAD_DATA(load, loadu)
+CONVOLVE_4_SAMPLES
+}
+} else { // both non-aligned
+while (inputP  endP) {
+LOAD_DATA(loadu, loadu)
+CONVOLVE_4_SAMPLES
+}
+}
+
+// Summarize the SSE results to sum1 and sum2.
+float* groupSumP = reinterpret_castfloat*(sums1);
+sum1 += groupSumP[0] + groupSumP[1] + groupSumP[2] + groupSumP[3];
+groupSumP = reinterpret_castfloat*(sums2);
+sum2 += groupSumP[0] + groupSumP[1] + groupSumP[2] + groupSumP[3];
+
+n %= 4;
+while (n) {
+CONVOLVE_ONE_SAMPLE
+

[webkit-changes] [102313] trunk

2011-12-07 Thread bashi

Title: [102313] trunk








Revision 102313
Author ba...@chromium.org
Date 2011-12-07 21:38:26 -0800 (Wed, 07 Dec 2011)


Log Message
Refactor CSSParser::parseFontFaceSrc()
https://bugs.webkit.org/show_bug.cgi?id=73989

Reviewed by Darin Adler.

Source/WebCore:

Test: fast/css/font-face-src-parsing.html

* css/CSSParser.cpp:
(WebCore::CSSParser::parseFontFaceSrcURI): Added.
(WebCore::CSSParser::parseFontFaceSrcLocal): Added.
(WebCore::CSSParser::parseFontFaceSrc): Rewrote.
* css/CSSParser.h:

LayoutTests:

Added a test that checks parsing result of the src descriptor of @font-face.

* fast/css/font-face-src-parsing-expected.txt: Added.
* fast/css/font-face-src-parsing.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSParser.cpp
trunk/Source/WebCore/css/CSSParser.h


Added Paths

trunk/LayoutTests/fast/css/font-face-src-parsing-expected.txt
trunk/LayoutTests/fast/css/font-face-src-parsing.html




Diff

Modified: trunk/LayoutTests/ChangeLog (102312 => 102313)

--- trunk/LayoutTests/ChangeLog	2011-12-08 05:23:42 UTC (rev 102312)
+++ trunk/LayoutTests/ChangeLog	2011-12-08 05:38:26 UTC (rev 102313)
@@ -1,5 +1,17 @@
 2011-12-07  Kenichi Ishibashi  ba...@chromium.org
 
+Refactor CSSParser::parseFontFaceSrc()
+https://bugs.webkit.org/show_bug.cgi?id=73989
+
+Reviewed by Darin Adler.
+
+Added a test that checks parsing result of the src descriptor of @font-face.
+
+* fast/css/font-face-src-parsing-expected.txt: Added.
+* fast/css/font-face-src-parsing.html: Added.
+
+2011-12-07  Kenichi Ishibashi  ba...@chromium.org
+
 Unreviewed chromium expectations update.
 
 * platform/chromium/test_expectations.txt:


Added: trunk/LayoutTests/fast/css/font-face-src-parsing-expected.txt (0 => 102313)

--- trunk/LayoutTests/fast/css/font-face-src-parsing-expected.txt	(rev 0)
+++ trunk/LayoutTests/fast/css/font-face-src-parsing-expected.txt	2011-12-08 05:38:26 UTC (rev 102313)
@@ -0,0 +1,51 @@
+Test parsing the src descriptor of @font-face.
+
+Valid rules form the stylesheet:
+
+@font-face { src: url(font.ttf); }
+@font-face { src: url(http://foo/bar/font.ttf); }
+@font-face { src: url(font.svg#id); }
+@font-face { src: url(font.ttf) format(truetype); }
+@font-face { src: url(font.woff) format(woff), local(font2); }
+@font-face { src: url(font2.ttf); }
+@font-face { src: url(font2.ttf) format(truetype); }
+@font-face { src: url(font3.otf) format(opentype), local(foo bar); }
+@font-face { src: local(foo); }
+@font-face { src: local(font), local(foo bar); }
+@font-face { src: local(foo); }
+@font-face { src: local(foo bar); }
+Expected result for valid rules:
+
+@font-face { src: url(font.ttf); }
+@font-face { src: url(http://foo/bar/font.ttf); }
+@font-face { src: url(font.svg#id); }
+@font-face { src: url(font.ttf) format(truetype); }
+@font-face { src: url(font.woff) format(woff), local(font2); }
+@font-face { src: url(font2.ttf); }
+@font-face { src: url(font2.ttf) format(truetype); }
+@font-face { src: url(font3.otf) format(opentype), local(foo bar); }
+@font-face { src: local(foo); }
+@font-face { src: local(font), local(foo bar); }
+@font-face { src: local(foo); }
+@font-face { src: local(foo bar); }
+Invalid rules form the stylesheet:
+
+@font-face { }
+@font-face { }
+@font-face { }
+@font-face { }
+@font-face { }
+@font-face { }
+@font-face { }
+@font-face { }
+Expected result for invalid rules:
+
+@font-face { }
+@font-face { }
+@font-face { }
+@font-face { }
+@font-face { }
+@font-face { }
+@font-face { }
+@font-face { }
+


Added: trunk/LayoutTests/fast/css/font-face-src-parsing.html (0 => 102313)

--- trunk/LayoutTests/fast/css/font-face-src-parsing.html	(rev 0)
+++ trunk/LayoutTests/fast/css/font-face-src-parsing.html	2011-12-08 05:38:26 UTC (rev 102313)
@@ -0,0 +1,122 @@
+!-- Valid src descriptor rules. --
+style
+@font-face {
+src: url(font.ttf);
+}
+@font-face {
+src: url(http://foo/bar/font.ttf);
+}
+@font-face {
+src: url(font.svg#id);
+}
+@font-face {
+src: url(font.ttf) format(truetype);
+}
+@font-face {
+src: url(font.woff) format(woff), local(font2);
+}
+@font-face {
+src: url(font.ttf) format(truetype), url(font2.ttf);
+}
+@font-face {
+src: url(font.ttf), url(font2.ttf) format(truetype);
+}
+@font-face {
+src: url(font.ttf), local(font2), url(font3.otf) format(opentype), local(foo bar);
+}
+@font-face {
+src: local(foo);
+}
+@font-face {
+src: local(font), local(foo bar);
+}
+@font-face {
+src: local(foo);
+}
+@font-face {
+src: local(foo bar);
+}
+/style
+
+!-- Invalid src descriptor rules. --
+style
+@font-face {
+src: url(font.ttf invalid);
+}
+@font-face {
+src: url(font.ttf),;
+}
+@font-face {
+src: url(font.ttf), local(font2),;
+}
+@font-face {
+src: ,local(font);
+}
+@font-face {
+src: url(font.ttf), invalid();
+}
+@font-face {
+src: url(foo.ttf)

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

2011-12-07 Thread commit-queue

Title: [102314] trunk/Source/WebCore








Revision 102314
Author commit-qu...@webkit.org
Date 2011-12-07 22:01:08 -0800 (Wed, 07 Dec 2011)


Log Message
Upstream 4 files into WebCore/platform/blackberry
https://bugs.webkit.org/show_bug.cgi?id=73541

Patch by Mary Wu mary...@torchmobile.com.cn on 2011-12-07
Reviewed by Antonio Gomes.

Initial upstream of BlackBerry porting of PlatformScreen/
SSLKeyGenerator/Sound/Widget, no new tests.

* PlatformBlackBerry.cmake: Modified to remove empty file WheelEventBlackBerry.cpp
* platform/blackberry/PlatformScreenBlackBerry.cpp: Added.
(WebCore::screenIsMonochrome):
(WebCore::screenDepthPerComponent):
(WebCore::screenDepth):
(WebCore::screenAvailableRect):
(WebCore::screenRect):
* platform/blackberry/SSLKeyGeneratorBlackBerry.cpp: Added.
(WebCore::getSupportedKeySizes):
(WebCore::signedPublicKeyAndChallengeString):
* platform/blackberry/SoundBlackBerry.cpp: Added.
(WebCore::systemBeep):
* platform/blackberry/WidgetBlackBerry.cpp: Added.
(WebCore::Widget::Widget):
(WebCore::Widget::~Widget):
(WebCore::Widget::hide):
(WebCore::Widget::paint):
(WebCore::Widget::setCursor):
(WebCore::Widget::setFocus):
(WebCore::Widget::setFrameRect):
(WebCore::Widget::setIsSelected):
(WebCore::Widget::show):
(WebCore::Widget::frameRect):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/PlatformBlackBerry.cmake


Added Paths

trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp
trunk/Source/WebCore/platform/blackberry/SSLKeyGeneratorBlackBerry.cpp
trunk/Source/WebCore/platform/blackberry/SoundBlackBerry.cpp
trunk/Source/WebCore/platform/blackberry/WidgetBlackBerry.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (102313 => 102314)

--- trunk/Source/WebCore/ChangeLog	2011-12-08 05:38:26 UTC (rev 102313)
+++ trunk/Source/WebCore/ChangeLog	2011-12-08 06:01:08 UTC (rev 102314)
@@ -1,3 +1,37 @@
+2011-12-07  Mary Wu  mary...@torchmobile.com.cn
+
+Upstream 4 files into WebCore/platform/blackberry
+https://bugs.webkit.org/show_bug.cgi?id=73541
+
+Reviewed by Antonio Gomes.
+
+Initial upstream of BlackBerry porting of PlatformScreen/
+SSLKeyGenerator/Sound/Widget, no new tests.
+
+* PlatformBlackBerry.cmake: Modified to remove empty file WheelEventBlackBerry.cpp
+* platform/blackberry/PlatformScreenBlackBerry.cpp: Added.
+(WebCore::screenIsMonochrome):
+(WebCore::screenDepthPerComponent):
+(WebCore::screenDepth):
+(WebCore::screenAvailableRect):
+(WebCore::screenRect):
+* platform/blackberry/SSLKeyGeneratorBlackBerry.cpp: Added.
+(WebCore::getSupportedKeySizes):
+(WebCore::signedPublicKeyAndChallengeString):
+* platform/blackberry/SoundBlackBerry.cpp: Added.
+(WebCore::systemBeep):
+* platform/blackberry/WidgetBlackBerry.cpp: Added.
+(WebCore::Widget::Widget):
+(WebCore::Widget::~Widget):
+(WebCore::Widget::hide):
+(WebCore::Widget::paint):
+(WebCore::Widget::setCursor):
+(WebCore::Widget::setFocus):
+(WebCore::Widget::setFrameRect):
+(WebCore::Widget::setIsSelected):
+(WebCore::Widget::show):
+(WebCore::Widget::frameRect):
+
 2011-12-07  Kenichi Ishibashi  ba...@chromium.org
 
 Refactor CSSParser::parseFontFaceSrc()


Modified: trunk/Source/WebCore/PlatformBlackBerry.cmake (102313 => 102314)

--- trunk/Source/WebCore/PlatformBlackBerry.cmake	2011-12-08 05:38:26 UTC (rev 102313)
+++ trunk/Source/WebCore/PlatformBlackBerry.cmake	2011-12-08 06:01:08 UTC (rev 102314)
@@ -160,7 +160,6 @@
 platform/blackberry/SoundBlackBerry.cpp
 platform/blackberry/SystemTimeBlackBerry.cpp
 platform/blackberry/TemporaryLinkStubs.cpp
-platform/blackberry/WheelEventBlackBerry.cpp
 platform/blackberry/WidgetBlackBerry.cpp
 platform/graphics/blackberry/FloatPointBlackBerry.cpp
 platform/graphics/blackberry/FloatRectBlackBerry.cpp


Added: trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp (0 => 102314)

--- trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp	(rev 0)
+++ trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp	2011-12-08 06:01:08 UTC (rev 102314)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2009, 2010, 2011 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General

[webkit-changes] [102315] trunk/LayoutTests

2011-12-07 Thread bashi

Title: [102315] trunk/LayoutTests








Revision 102315
Author ba...@chromium.org
Date 2011-12-07 22:29:05 -0800 (Wed, 07 Dec 2011)


Log Message
Unreviewed chromium test expectation update.

Patch by Kenichi Ishibashi ba...@chromium.org on 2011-12-07

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (102314 => 102315)

--- trunk/LayoutTests/ChangeLog	2011-12-08 06:01:08 UTC (rev 102314)
+++ trunk/LayoutTests/ChangeLog	2011-12-08 06:29:05 UTC (rev 102315)
@@ -1,5 +1,11 @@
 2011-12-07  Kenichi Ishibashi  ba...@chromium.org
 
+Unreviewed chromium test expectation update.
+
+* platform/chromium/test_expectations.txt:
+
+2011-12-07  Kenichi Ishibashi  ba...@chromium.org
+
 Refactor CSSParser::parseFontFaceSrc()
 https://bugs.webkit.org/show_bug.cgi?id=73989
 


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (102314 => 102315)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-08 06:01:08 UTC (rev 102314)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-08 06:29:05 UTC (rev 102315)
@@ -3805,3 +3805,5 @@
 BUGWK73991 WIN7 VISTA RELEASE : fast/text/international/thai-line-breaks.html = TEXT
 
 BUGWK74050 : compositing/reflections/nested-reflection-on-overflow.html = IMAGE PASS
+
+BUGWK74055 LEOPARD : fast/canvas/canvas-largedraws.html = TIMEOUT






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

[webkit-changes] [102317] trunk

2011-12-07 Thread dslomov

Title: [102317] trunk








Revision 102317
Author dslo...@google.com
Date 2011-12-07 22:59:10 -0800 (Wed, 07 Dec 2011)


Log Message
https://bugs.webkit.org/show_bug.cgi?id=74038
[V8][Chromium] Support legacy argument order in window.postMessage/window.webkitPostMessage.

Reviewed by David Levin.

Source/WebCore:

* bindings/v8/custom/V8DOMWindowCustom.cpp:
(WebCore::isLegacyTargetOriginDesignation):
(WebCore::handlePostMessageCallback):

LayoutTests:

* fast/dom/Window/window-postmessage-args-expected.txt:
* fast/dom/Window/window-postmessage-args.html: New tests for legacy argument order.
* platform/chromium/fast/dom/Window/window-postmessage-args-expected.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/dom/Window/window-postmessage-args-expected.txt
trunk/LayoutTests/fast/dom/Window/window-postmessage-args.html
trunk/LayoutTests/platform/chromium/fast/dom/Window/window-postmessage-args-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (102316 => 102317)

--- trunk/LayoutTests/ChangeLog	2011-12-08 06:50:01 UTC (rev 102316)
+++ trunk/LayoutTests/ChangeLog	2011-12-08 06:59:10 UTC (rev 102317)
@@ -1,3 +1,14 @@
+2011-12-07  Dmitry Lomov  dslo...@google.com
+
+https://bugs.webkit.org/show_bug.cgi?id=74038
+[V8][Chromium] Support legacy argument order in window.postMessage/window.webkitPostMessage.
+
+Reviewed by David Levin.
+
+* fast/dom/Window/window-postmessage-args-expected.txt:
+* fast/dom/Window/window-postmessage-args.html: New tests for legacy argument order.
+* platform/chromium/fast/dom/Window/window-postmessage-args-expected.txt:
+
 2011-12-07  Kenichi Ishibashi  ba...@chromium.org
 
 Unreviewed, rebaseline media/controls-layout-direction.html


Modified: trunk/LayoutTests/fast/dom/Window/window-postmessage-args-expected.txt (102316 => 102317)

--- trunk/LayoutTests/fast/dom/Window/window-postmessage-args-expected.txt	2011-12-08 06:50:01 UTC (rev 102316)
+++ trunk/LayoutTests/fast/dom/Window/window-postmessage-args-expected.txt	2011-12-08 06:59:10 UTC (rev 102317)
@@ -8,11 +8,14 @@
 PASS: Posting message ('3', [object Object]): threw exception TypeError: Type error
 FAIL: Posting message ('4', [object DOMWindow]): threw exception TypeError: Type error
 FAIL: Posting message ('4', [object DOMWindow]): threw exception TypeError: Type error
+PASS: Posting message ('4a', *) did not throw an exception
+PASS: Posting message ('4a', *) did not throw an exception
 PASS: Posting message ('5', null) did not throw an exception
 PASS: Posting message ('5', null) did not throw an exception
 PASS: Posting message ('6', undefined) did not throw an exception
 PASS: Posting message ('6', undefined) did not throw an exception
 FAIL: Posting message ('7', [object MessagePort],[object MessagePort]): threw exception TypeError: Type error
+PASS: Posting message ('7a', *) did not throw an exception
 FAIL: Posting message ('7', [object MessagePort],[object MessagePort]): threw exception TypeError: Type error
 PASS: Posting message ('2147483648', null) did not throw an exception
 PASS: Posting message ('2147483648', null) did not throw an exception
@@ -23,10 +26,13 @@
 FAIL: arrayBuffer not neutered; byteLength = 30
 FAIL: view was not neutered; length = 10
 PASS: Posting message ('done', undefined) did not throw an exception
+Received message '4a' with 0 ports.
+Received message '4a' with 0 ports.
 Received message '5' with 0 ports.
 Received message '5' with 0 ports.
 Received message '6' with 0 ports.
 Received message '6' with 0 ports.
+Received message '7a' with 2 ports.
 Received message '2147483648' with 0 ports.
 Received message '2147483648' with 0 ports.
 Received message 'done' with 0 ports.


Modified: trunk/LayoutTests/fast/dom/Window/window-postmessage-args.html (102316 => 102317)

--- trunk/LayoutTests/fast/dom/Window/window-postmessage-args.html	2011-12-08 06:50:01 UTC (rev 102316)
+++ trunk/LayoutTests/fast/dom/Window/window-postmessage-args.html	2011-12-08 06:59:10 UTC (rev 102317)
@@ -46,10 +46,13 @@
 tryPostMessage('2', '*', 'c', true);
 tryPostMessage('3', '*', { x: 1 }, true);
 tryPostMessage('4', '*', window);  // Passes because window has a length attribute of value '0', so it looks like an array
+tryPostMessage('4a', window, '*'); // Legacy argument order.
 tryPostMessage('5', '*', null);
 tryPostMessage('6', '*', void 0);
 var channel1 = new MessageChannel;
 tryPostMessageFunction(window.postMessage, '7', '*', [channel1.port1, channel1.port2]);
+var channel1a = new MessageChannel;
+tryPostMessageFunction(window.postMessage, '7a', [channel1a.port1, channel1a.port2], '*');
 var channel2 = new MessageChannel;
 tryPostMessageFunction(window.webkitPostMessage, '7', '*', [channel2.port1, channel2.port2]);
 var channel3 = new MessageChannel;


Modified:

[webkit-changes] [102318] trunk/Source/WebKit/qt

2011-12-07 Thread ossy

Title: [102318] trunk/Source/WebKit/qt








Revision 102318
Author o...@webkit.org
Date 2011-12-07 23:31:08 -0800 (Wed, 07 Dec 2011)


Log Message
[Qt] Unreviewed buildfix after r102262.

* Api/qwebelement.cpp:
(QWebElement::setStyleProperty):

Modified Paths

trunk/Source/WebKit/qt/Api/qwebelement.cpp
trunk/Source/WebKit/qt/ChangeLog




Diff

Modified: trunk/Source/WebKit/qt/Api/qwebelement.cpp (102317 => 102318)

--- trunk/Source/WebKit/qt/Api/qwebelement.cpp	2011-12-08 06:59:10 UTC (rev 102317)
+++ trunk/Source/WebKit/qt/Api/qwebelement.cpp	2011-12-08 07:31:08 UTC (rev 102318)
@@ -916,7 +916,7 @@
 return;
 
 ExceptionCode exception = 0;
-style-setProperty(name, value, exception);
+style-setProperty(name, value,emptyString(), exception);
 }
 
 /*!


Modified: trunk/Source/WebKit/qt/ChangeLog (102317 => 102318)

--- trunk/Source/WebKit/qt/ChangeLog	2011-12-08 06:59:10 UTC (rev 102317)
+++ trunk/Source/WebKit/qt/ChangeLog	2011-12-08 07:31:08 UTC (rev 102318)
@@ -1,3 +1,10 @@
+2011-12-07  Csaba Osztrogonác  o...@webkit.org
+
+[Qt] Unreviewed buildfix after r102262.
+
+* Api/qwebelement.cpp:
+(QWebElement::setStyleProperty):
+
 2011-12-07  Mary Wu  mary...@torchmobile.com.cn
 
 Change function name InitializeLoggingChannelsIfNecessary to follow coding style guideline






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

[webkit-changes] [102319] trunk/Source

2011-12-07 Thread mrowe

Title: [102319] trunk/Source








Revision 102319
Author mr...@apple.com
Date 2011-12-07 23:33:51 -0800 (Wed, 07 Dec 2011)


Log Message
Fix the 32-bit build.

Ignore some warnings that only occur in 32-bit.

Source/WebKit/mac:

* Plugins/WebNetscapePluginPackage.mm:

Source/WebKit2:

* PluginProcess/mac/PluginProcessShim.mm:
* Shared/Plugins/Netscape/NetscapePluginModule.cpp:
(WebKit::NetscapePluginModule::tryLoad):

Modified Paths

trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm
trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp




Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (102318 => 102319)

--- trunk/Source/WebKit/mac/ChangeLog	2011-12-08 07:31:08 UTC (rev 102318)
+++ trunk/Source/WebKit/mac/ChangeLog	2011-12-08 07:33:51 UTC (rev 102319)
@@ -1,3 +1,11 @@
+2011-12-07  Mark Rowe  mr...@apple.com
+
+Fix the 32-bit build.
+
+Ignore some warnings that only occur in 32-bit.
+
+* Plugins/WebNetscapePluginPackage.mm:
+
 2011-12-07  Mary Wu  mary...@torchmobile.com.cn
 
 Change function name InitializeLoggingChannelsIfNecessary to follow coding style guideline


Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm (102318 => 102319)

--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm	2011-12-08 07:31:08 UTC (rev 102318)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm	2011-12-08 07:33:51 UTC (rev 102319)
@@ -67,6 +67,12 @@
 @implementation WebNetscapePluginPackage
 
 #ifndef __LP64__
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored -Wdeprecated-declarations
+#endif
+
 + (void)initialize
 {
 // The Shockwave plugin requires a valid file in CurApRefNum.
@@ -92,8 +98,13 @@
 UseResFile(savedCurResFile);
 }
 }
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
 #endif
 
+#endif
+
 - (ResFileRefNum)openResourceFile
 {
 #ifdef SUPPORT_CFM


Modified: trunk/Source/WebKit2/ChangeLog (102318 => 102319)

--- trunk/Source/WebKit2/ChangeLog	2011-12-08 07:31:08 UTC (rev 102318)
+++ trunk/Source/WebKit2/ChangeLog	2011-12-08 07:33:51 UTC (rev 102319)
@@ -1,3 +1,13 @@
+2011-12-07  Mark Rowe  mr...@apple.com
+
+Fix the 32-bit build.
+
+Ignore some warnings that only occur in 32-bit.
+
+* PluginProcess/mac/PluginProcessShim.mm:
+* Shared/Plugins/Netscape/NetscapePluginModule.cpp:
+(WebKit::NetscapePluginModule::tryLoad):
+
 2011-12-07  Balazs Kelemen  kbal...@webkit.org
 
 ShareableBitmapGtk.cpp has no reason to exist


Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm (102318 => 102319)

--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm	2011-12-08 07:31:08 UTC (rev 102318)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm	2011-12-08 07:33:51 UTC (rev 102319)
@@ -72,6 +72,12 @@
 }
 
 #ifndef __LP64__
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored -Wdeprecated-declarations
+#endif
+
 static void shimDebugger(void)
 {
 if (!pluginProcessShimCallbacks.shouldCallRealDebugger())
@@ -130,8 +136,12 @@
 DYLD_INTERPOSE(shimShowWindow, ShowWindow);
 DYLD_INTERPOSE(shimHideWindow, HideWindow);
 
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
 #endif
 
+#endif
+
 __attribute__((visibility(default)))
 void WebKitPluginProcessShimInitialize(const PluginProcessShimCallbacks callbacks)
 {


Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp (102318 => 102319)

--- trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp	2011-12-08 07:31:08 UTC (rev 102318)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp	2011-12-08 07:33:51 UTC (rev 102319)
@@ -227,19 +227,31 @@
 // in Flash and QuickTime on Windows).
 #if PLUGIN_ARCHITECTURE(MAC)
 #ifndef NP_NO_CARBON
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored -Wdeprecated-declarations
+#endif
+
 // Plugins (at least QT) require that you call UseResFile on the resource file before loading it.
 ResFileRefNum currentResourceFile = CurResFile();
 
 ResFileRefNum pluginResourceFile = m_module-bundleResourceMap();
 UseResFile(pluginResourceFile);
+
 #endif
 bool result = initializeFuncPtr(netscapeBrowserFuncs()) == NPERR_NO_ERROR  getEntryPointsFuncPtr(m_pluginFuncs) == NPERR_NO_ERROR;
 
 #ifndef NP_NO_CARBON
 // Restore the resource file.
 UseResFile(currentResourceFile);
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
 #endif
 
+#endif
+
 return result;
 #elif PLUGIN_ARCHITECTURE(WIN)
 if (getEntryPointsFuncPtr(m_pluginFuncs) != NPERR_NO_ERROR || initializeFuncPtr(netscapeBrowserFuncs()) != NPERR_NO_ERROR)






___
webkit-changes mailing list

[webkit-changes] [102320] trunk

2011-12-07 Thread commit-queue

Title: [102320] trunk








Revision 102320
Author commit-qu...@webkit.org
Date 2011-12-07 23:53:01 -0800 (Wed, 07 Dec 2011)


Log Message
CSS color gets adjusted for disabled input elements
https://bugs.webkit.org/show_bug.cgi?id=54643

Patch by Yosifumi Inoue yo...@chromium.org on 2011-12-07
Reviewed by Kent Tamura.

Source/WebCore:

No new tests. covered by existing tests. Need rebasing some existing tests for Chromimum.

Remove automatic color adjustment for disabled text control for Chromimum.

* css/themeChromium.css: Add CSS entries for default style for disabled input and textarea elements.
* WebCore/rendering/RenderTextControl.cpp:
(disabledTextColor): Removed for PLATFORM(CHROMIUM)
(RenderTextControl::adjustInnerTextStyle): Don't call disabledTextColor for Chromium.

LayoutTests:

* platform/chromium/test_expectations.txt: Add files need to be updated.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/themeChromium.css
trunk/Source/WebCore/rendering/RenderTextControl.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (102319 => 102320)

--- trunk/LayoutTests/ChangeLog	2011-12-08 07:33:51 UTC (rev 102319)
+++ trunk/LayoutTests/ChangeLog	2011-12-08 07:53:01 UTC (rev 102320)
@@ -1,3 +1,12 @@
+2011-12-07  Yosifumi Inoue  yo...@chromium.org
+
+CSS color gets adjusted for disabled input elements
+https://bugs.webkit.org/show_bug.cgi?id=54643
+
+Reviewed by Kent Tamura.
+
+* platform/chromium/test_expectations.txt: Add files need to be updated.
+
 2011-12-07  Dmitry Lomov  dslo...@google.com
 
 https://bugs.webkit.org/show_bug.cgi?id=74038


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (102319 => 102320)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-08 07:33:51 UTC (rev 102319)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-12-08 07:53:01 UTC (rev 102320)
@@ -3788,6 +3788,17 @@
 
 BUGWK73838 LEOPARD DEBUG : animations/animation-add-events-in-handler.html = CRASH
 
+// Need rebase - Removing auto gray for disabled text inputs.
+BUGWK54643 : fast/forms/basic-inputs.html = FAIL
+BUGWK54643 : fast/forms/basic-textareas-quirks.html = FAIL
+BUGWK54643 : fast/forms/basic-textareas.html = FAIL
+BUGWK54643 : fast/forms/file/file-input-disabled.html = FAIL
+BUGWK54643 : fast/forms/input-appearance-disabled.html = FAIL
+BUGWK54643 : fast/forms/input-disabled-color.html = FAIL
+BUGWK54643 : fast/forms/number/input-appearance-spinbutton-disabled-readonly.html = FAIL
+BUGWK54643 : fast/forms/placeholder-pseudo-style.html = FAIL
+BUGWK54643 : fast/forms/textarea-placeholder-pseudo-style.html = FAIL
+
 // Need rebaseline on Linux and Win GPU
 BUGWK73905 GPU LINUX : media/video-layer-crash.html = IMAGE+TEXT
 BUGWK73905 GPU LINUX : media/video-transformed.html = IMAGE


Modified: trunk/Source/WebCore/ChangeLog (102319 => 102320)

--- trunk/Source/WebCore/ChangeLog	2011-12-08 07:33:51 UTC (rev 102319)
+++ trunk/Source/WebCore/ChangeLog	2011-12-08 07:53:01 UTC (rev 102320)
@@ -1,3 +1,19 @@
+2011-12-07  Yosifumi Inoue  yo...@chromium.org
+
+CSS color gets adjusted for disabled input elements
+https://bugs.webkit.org/show_bug.cgi?id=54643
+
+Reviewed by Kent Tamura.
+
+No new tests. covered by existing tests. Need rebasing some existing tests for Chromimum.
+
+Remove automatic color adjustment for disabled text control for Chromimum.
+
+* css/themeChromium.css: Add CSS entries for default style for disabled input and textarea elements.
+* WebCore/rendering/RenderTextControl.cpp:
+(disabledTextColor): Removed for PLATFORM(CHROMIUM)
+(RenderTextControl::adjustInnerTextStyle): Don't call disabledTextColor for Chromium.
+
 2011-12-07  Dmitry Lomov  dslo...@google.com
 
 https://bugs.webkit.org/show_bug.cgi?id=74038


Modified: trunk/Source/WebCore/css/themeChromium.css (102319 => 102320)

--- trunk/Source/WebCore/css/themeChromium.css	2011-12-08 07:33:51 UTC (rev 102319)
+++ trunk/Source/WebCore/css/themeChromium.css	2011-12-08 07:53:01 UTC (rev 102320)
@@ -70,3 +70,8 @@
 font-size: smaller;
 color: #444;
 }
+
+input:disabled, isindex:disabled, textarea:disabled {
+color: #545454; /* Color::light() for #00. See RenderTextControl.cpp:disabledTextColor */
+}
+


Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (102319 => 102320)

--- trunk/Source/WebCore/rendering/RenderTextControl.cpp	2011-12-08 07:33:51 UTC (rev 102319)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp	2011-12-08 07:53:01 UTC (rev 102320)
@@ -34,6 +34,7 @@
 
 namespace WebCore {
 
+#if !PLATFORM(CHROMIUM)
 // Value chosen by observation.  This can be tweaked.
 static const int minColorContrastValue = 1300;
 // For transparent or translucent background color, use lightening.
@@ -57,6 +58,7 @@
 
 return disabledColor;
 }

77 matches

Mail list logo