[webkit-changes] [88909] trunk/LayoutTests
Title: [88909] trunk/LayoutTests Revision 88909 Author o...@webkit.org Date 2011-06-14 23:27:29 -0700 (Tue, 14 Jun 2011) Log Message [Qt] Update platform specific expected file. * platform/qt/fast/dom/prototype-inheritance-2-expected.txt: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/qt/fast/dom/prototype-inheritance-2-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (88908 => 88909) --- trunk/LayoutTests/ChangeLog 2011-06-15 06:24:15 UTC (rev 88908) +++ trunk/LayoutTests/ChangeLog 2011-06-15 06:27:29 UTC (rev 88909) @@ -1,3 +1,9 @@ +2011-06-14 Csaba Osztrogonác + +[Qt] Update platform specific expected file. + +* platform/qt/fast/dom/prototype-inheritance-2-expected.txt: + 2011-06-14 Ryosuke Niwa Skip editing/inserting/return-key-span-start.html added by r88890 on Mac WebKit2 Modified: trunk/LayoutTests/platform/qt/fast/dom/prototype-inheritance-2-expected.txt (88908 => 88909) --- trunk/LayoutTests/platform/qt/fast/dom/prototype-inheritance-2-expected.txt 2011-06-15 06:24:15 UTC (rev 88908) +++ trunk/LayoutTests/platform/qt/fast/dom/prototype-inheritance-2-expected.txt 2011-06-15 06:27:29 UTC (rev 88909) @@ -302,6 +302,7 @@ Never found SVGAngle Never found SVGAnimateColorElement Never found SVGAnimateElement +Never found SVGAnimateMotionElement Never found SVGAnimateTransformElement Never found SVGAnimatedAngle Never found SVGAnimatedBoolean @@ -369,6 +370,7 @@ Never found SVGLengthList Never found SVGLineElement Never found SVGLinearGradientElement +Never found SVGMPathElement Never found SVGMarkerElement Never found SVGMaskElement Never found SVGMatrix ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88908] trunk/Source/WebCore
Title: [88908] trunk/Source/WebCore
Revision 88908
Author morr...@google.com
Date 2011-06-14 23:24:15 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-09 MORITA Hajime
Reviewed by Dimitri Glazkov.
ShadowContentElement should detach its inclusions before attaching them.
https://bugs.webkit.org/show_bug.cgi?id=62428
- On ShadowContentElement::attach(), changed inclusion attach scheme
from per-node reattach() to detach()-all-and-attach()-them. This
eliminates attach() order problems which ShadowContentElement
possibly has.
- Changed ShadowContentElement to have m_inclusions as a member variable,
which will be used by upcoming changes.
- Moved attach() code from ShadowContentSelector to ShadowContentElement
because the element now owns the inclusion list.
No new tests. No visible behavioral change yet.
* dom/ShadowContentElement.cpp:
(WebCore::ShadowContentElement::attach):
(WebCore::ShadowContentElement::detach): Added.
* dom/ShadowContentElement.h:
(WebCore::ShadowContentElement::inclusionAt): Added.
(WebCore::ShadowContentElement::inclusionCount): Added.
(WebCore::toShadowContentElement):
* dom/ShadowContentSelector.cpp: Removed attachChildrenFor()
(WebCore::ShadowContentSelector::selectInclusion): Extracted from attachChildrenFor()
(WebCore::ShadowContentSelector::willAttachContentFor): Extracted from attachChildrenFor()
(WebCore::ShadowContentSelector::didAttachContent): Extracted from attachChildrenFor()
(WebCore::ShadowContentSelector::activeElement):
* dom/ShadowContentSelector.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/ShadowContentElement.cpp
trunk/Source/WebCore/dom/ShadowContentElement.h
trunk/Source/WebCore/dom/ShadowContentSelector.cpp
trunk/Source/WebCore/dom/ShadowContentSelector.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (88907 => 88908)
--- trunk/Source/WebCore/ChangeLog 2011-06-15 06:13:05 UTC (rev 88907)
+++ trunk/Source/WebCore/ChangeLog 2011-06-15 06:24:15 UTC (rev 88908)
@@ -1,3 +1,35 @@
+2011-06-09 MORITA Hajime
+
+Reviewed by Dimitri Glazkov.
+
+ShadowContentElement should detach its inclusions before attaching them.
+https://bugs.webkit.org/show_bug.cgi?id=62428
+
+- On ShadowContentElement::attach(), changed inclusion attach scheme
+ from per-node reattach() to detach()-all-and-attach()-them. This
+ eliminates attach() order problems which ShadowContentElement
+ possibly has.
+- Changed ShadowContentElement to have m_inclusions as a member variable,
+ which will be used by upcoming changes.
+- Moved attach() code from ShadowContentSelector to ShadowContentElement
+ because the element now owns the inclusion list.
+
+No new tests. No visible behavioral change yet.
+
+* dom/ShadowContentElement.cpp:
+(WebCore::ShadowContentElement::attach):
+(WebCore::ShadowContentElement::detach): Added.
+* dom/ShadowContentElement.h:
+(WebCore::ShadowContentElement::inclusionAt): Added.
+(WebCore::ShadowContentElement::inclusionCount): Added.
+(WebCore::toShadowContentElement):
+* dom/ShadowContentSelector.cpp: Removed attachChildrenFor()
+(WebCore::ShadowContentSelector::selectInclusion): Extracted from attachChildrenFor()
+(WebCore::ShadowContentSelector::willAttachContentFor): Extracted from attachChildrenFor()
+(WebCore::ShadowContentSelector::didAttachContent): Extracted from attachChildrenFor()
+(WebCore::ShadowContentSelector::activeElement):
+* dom/ShadowContentSelector.h:
+
2011-06-14 David Kilzer
Part 2/2: Remove duplicate header entries in WebCore project file
Modified: trunk/Source/WebCore/dom/ShadowContentElement.cpp (88907 => 88908)
--- trunk/Source/WebCore/dom/ShadowContentElement.cpp 2011-06-15 06:13:05 UTC (rev 88907)
+++ trunk/Source/WebCore/dom/ShadowContentElement.cpp 2011-06-15 06:24:15 UTC (rev 88908)
@@ -34,9 +34,22 @@
void ShadowContentElement::attach()
{
ASSERT(!firstChild()); // Currently doesn't support any light child.
-Element::attach();
-if (ShadowContentSelector* selector = ShadowContentSelector::currentInstance())
-selector->attachChildrenFor(this);
+StyledElement::attach();
+if (ShadowContentSelector* selector = ShadowContentSelector::currentInstance()) {
+selector->willAttachContentFor(this);
+selector->selectInclusion(m_inclusions);
+for (size_t i = 0; i < m_inclusions.size(); ++i)
+m_inclusions[i]->detach();
+for (size_t i = 0; i < m_inclusions.size(); ++i)
+m_inclusions[i]->attach();
+selector->didAttachContent();
+}
}
+void ShadowContentElement::detach()
+{
+m_inc
[webkit-changes] [88907] trunk/Source/WebKit2
Title: [88907] trunk/Source/WebKit2
Revision 88907
Author commit-qu...@webkit.org
Date 2011-06-14 23:13:05 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Eunmi Lee
Reviewed by Sam Weinig.
[EFL][WK2] Change string operation to makeString()
https://bugs.webkit.org/show_bug.cgi?id=62527
Use makeString() because it is better than creating individual strings and concatenating them.
* UIProcess/efl/WebPageProxyEfl.cpp:
(WebKit::WebPageProxy::standardUserAgent):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88906 => 88907)
--- trunk/Source/WebKit2/ChangeLog 2011-06-15 05:29:08 UTC (rev 88906)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-15 06:13:05 UTC (rev 88907)
@@ -1,3 +1,15 @@
+2011-06-14 Eunmi Lee
+
+Reviewed by Sam Weinig.
+
+[EFL][WK2] Change string operation to makeString()
+https://bugs.webkit.org/show_bug.cgi?id=62527
+
+Use makeString() because it is better than creating individual strings and concatenating them.
+
+* UIProcess/efl/WebPageProxyEfl.cpp:
+(WebKit::WebPageProxy::standardUserAgent):
+
2011-06-14 Sam Weinig
Reviewed by Simon Fraser.
Modified: trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp (88906 => 88907)
--- trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2011-06-15 05:29:08 UTC (rev 88906)
+++ trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2011-06-15 06:13:05 UTC (rev 88907)
@@ -30,6 +30,7 @@
#include "PageClientImpl.h"
#include
+#include
namespace WebKit {
@@ -40,9 +41,9 @@
String WebPageProxy::standardUserAgent(const String& applicationNameForUserAgent)
{
-WTF::String platform;
-WTF::String version;
-WTF::String osVersion;
+String platform;
+String version;
+String osVersion;
#if PLATFORM(X11)
platform = "X11";
@@ -53,7 +54,7 @@
String::number(WEBKIT_USER_AGENT_MINOR_VERSION), '+');
struct utsname name;
if (uname(&name) != -1)
-osVersion = WTF::String(name.sysname) + " " + WTF::String(name.machine);
+osVersion = makeString(name.sysname, ' ', name.machine);
else
osVersion = "Unknown";
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88906] trunk/Source/WebKit2
Title: [88906] trunk/Source/WebKit2
Revision 88906
Author wei...@apple.com
Date 2011-06-14 22:29:08 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Sam Weinig
Reviewed by Simon Fraser.
Follow up for Callers should be robust against WebImage::create() returning an image with a null snapshot
https://bugs.webkit.org/show_bug.cgi?id=62666
* Shared/API/c/cg/WKImageCG.cpp:
(WKImageCreateCGImage):
(WKImageCreateFromCGImage):
Don't null check the arguments (as per our API design) or the direct result of WebImage::create.
* Shared/UserMessageCoders.h:
(WebKit::UserMessageEncoder::baseEncode):
Remove redundant check and make not being able to create a handle the same
as not being backed by shareable memory.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp
trunk/Source/WebKit2/Shared/UserMessageCoders.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88905 => 88906)
--- trunk/Source/WebKit2/ChangeLog 2011-06-15 04:37:51 UTC (rev 88905)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-15 05:29:08 UTC (rev 88906)
@@ -1,3 +1,20 @@
+2011-06-14 Sam Weinig
+
+Reviewed by Simon Fraser.
+
+Follow up for Callers should be robust against WebImage::create() returning an image with a null snapshot
+https://bugs.webkit.org/show_bug.cgi?id=62666
+
+* Shared/API/c/cg/WKImageCG.cpp:
+(WKImageCreateCGImage):
+(WKImageCreateFromCGImage):
+Don't null check the arguments (as per our API design) or the direct result of WebImage::create.
+
+* Shared/UserMessageCoders.h:
+(WebKit::UserMessageEncoder::baseEncode):
+Remove redundant check and make not being able to create a handle the same
+as not being backed by shareable memory.
+
2011-06-14 John Sullivan
Reviewed by Ada Chan.
Modified: trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp (88905 => 88906)
--- trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp 2011-06-15 04:37:51 UTC (rev 88905)
+++ trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp 2011-06-15 05:29:08 UTC (rev 88906)
@@ -36,13 +36,10 @@
CGImageRef WKImageCreateCGImage(WKImageRef imageRef)
{
-if (!imageRef)
-return 0;
-
WebImage* webImage = toImpl(imageRef);
-if (!webImage || !webImage->bitmap())
+if (!webImage->bitmap())
return 0;
-
+
return webImage->bitmap()->makeCGImageCopy().leakRef();
}
@@ -53,9 +50,9 @@
IntSize imageSize(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef));
RefPtr webImage = WebImage::create(imageSize, toImageOptions(options));
-if (!webImage || !webImage->bitmap())
+if (!webImage->bitmap())
return 0;
-
+
OwnPtr graphicsContext = webImage->bitmap()->createGraphicsContext();
CGContextDrawImage(graphicsContext->platformContext(), CGRectMake(0, 0, imageSize.width(), imageSize.height()), imageRef);
return toAPI(webImage.release().leakRef());
Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (88905 => 88906)
--- trunk/Source/WebKit2/Shared/UserMessageCoders.h 2011-06-15 04:37:51 UTC (rev 88905)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h 2011-06-15 05:29:08 UTC (rev 88906)
@@ -128,17 +128,17 @@
}
case APIObject::TypeImage: {
WebImage* image = static_cast(m_root);
-if (!image->bitmap() || !image->bitmap()->isBackedBySharedMemory()) {
+
+ShareableBitmap::Handle handle;
+if (!image->bitmap() || !image->bitmap()->isBackedBySharedMemory() || !image->bitmap()->createHandle(handle)) {
+// Initial false indicates no allocated bitmap or is not shareable.
encoder->encode(false);
return true;
}
-ShareableBitmap::Handle handle;
-if (!image->bitmap() || !image->bitmap()->createHandle(handle))
-return false;
+// Initial true indicates a bitmap was allocated and is shareable.
+encoder->encode(true);
-encoder->encode(true);
-
encoder->encode(handle);
return true;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88904] trunk/Source/WebCore
Title: [88904] trunk/Source/WebCore Revision 88904 Author ddkil...@apple.com Date 2011-06-14 21:37:34 -0700 (Tue, 14 Jun 2011) Log Message Part 1/2: Remove duplicate header entries in WebCore project file Reviewed by Darin Adler. These headers were added as duplicates in r83256: DefaultAudioDestinationNode.h JSOfflineAudioCompletionEvent.h OfflineAudioCompletionEvent.h OfflineAudioDestinationNode.h The following duplicates were introduced in r84053 (after having been originally added in r83729): StorageInfo.h StorageInfoErrorCallback.h StorageInfoQuotaCallback.h StorageInfoUsageCallback.h * WebCore.xcodeproj/project.pbxproj: Remove duplicates using 'uniq' since sort-Xcode-project-file did most of the work. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj Diff Modified: trunk/Source/WebCore/ChangeLog (88903 => 88904) --- trunk/Source/WebCore/ChangeLog 2011-06-15 03:51:50 UTC (rev 88903) +++ trunk/Source/WebCore/ChangeLog 2011-06-15 04:37:34 UTC (rev 88904) @@ -1,3 +1,27 @@ +2011-06-14 David Kilzer + + Part 1/2: Remove duplicate header entries in WebCore project file + +Reviewed by Darin Adler. + +These headers were added as duplicates in r83256: + +DefaultAudioDestinationNode.h +JSOfflineAudioCompletionEvent.h +OfflineAudioCompletionEvent.h +OfflineAudioDestinationNode.h + +The following duplicates were introduced in r84053 (after having +been originally added in r83729): + +StorageInfo.h +StorageInfoErrorCallback.h +StorageInfoQuotaCallback.h +StorageInfoUsageCallback.h + +* WebCore.xcodeproj/project.pbxproj: Remove duplicates using +'uniq' since sort-Xcode-project-file did most of the work. + 2011-06-14 Kent Tamura Reviewed by Hajime Morita. Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (88903 => 88904) --- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-06-15 03:51:50 UTC (rev 88903) +++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-06-15 04:37:34 UTC (rev 88904) @@ -20408,7 +20408,6 @@ 4162A451101145AE00DFF3ED /* DedicatedWorkerContext.h in Headers */, 41A3D58F101C152D00316D07 /* DedicatedWorkerThread.h in Headers */, FD06DFA6134A4DEF006F5D7D /* DefaultAudioDestinationNode.h in Headers */, -FD06DFA6134A4DEF006F5D7D /* DefaultAudioDestinationNode.h in Headers */, BCC36EB91342AA3F004BEEF7 /* DefaultLocalizationStrategy.h in Headers */, 4167EBF6102962BA003D252A /* DefaultSharedWorkerRepository.h in Headers */, FD31602C12B0267600C1A359 /* DelayDSPKernel.h in Headers */, @@ -21932,7 +21931,6 @@ 6EBF0E7712A9868800DB1709 /* JSOESTextureFloat.h in Headers */, 77A17AA712F28B2A004E02F6 /* JSOESVertexArrayObject.h in Headers */, FDF6BAF9134A4C9800822920 /* JSOfflineAudioCompletionEvent.h in Headers */, -FDF6BAF9134A4C9800822920 /* JSOfflineAudioCompletionEvent.h in Headers */, 2E24476913959173004B6C19 /* JSOperationNotAllowedException.h in Headers */, A826E8AE0A1A8F2300CD1BB6 /* JSOptionConstructor.h in Headers */, 1A0D57410A5C7867007EDD4C /* JSOverflowEvent.h in Headers */, @@ -22323,9 +22321,7 @@ 6EBF0E4912A8926100DB1709 /* OESTextureFloat.h in Headers */, 77A17A7212F28182004E02F6 /* OESVertexArrayObject.h in Headers */, FDA3E95A134A49EF008D4B5A /* OfflineAudioCompletionEvent.h in Headers */, -FDA3E95A134A49EF008D4B5A /* OfflineAudioCompletionEvent.h in Headers */, FDA3E95C134A49EF008D4B5A /* OfflineAudioDestinationNode.h in Headers */, -FDA3E95C134A49EF008D4B5A /* OfflineAudioDestinationNode.h in Headers */, F4EAF4AF10C742B1009100D3 /* OpenTypeSanitizer.h in Headers */, 2E2445F71395893A004B6C19 /* OperationNotAllowedException.h in Headers */, 087281560F26B9B600AFC596 /* OptionElement.h in Headers */, @@ -22721,13 +22717,9 @@ 51E0BABB0DA5547100A9E417 /* StorageEvent.h in Headers */, C5EBDD84105EDDEC0056816F /* StorageEventDispatcher.h in Headers */, 892CF1ED134C655500AAEDA1 /* StorageInfo.h in Headers */, -892CF1ED134C655500AAEDA1 /* StorageInfo.h in Headers */, 892CF192134C620D00AAEDA1 /* StorageInfoErrorCallback.h in Headers */, -892CF192134C620D00AAEDA1 /* StorageInfoErrorCallback.h in Headers */, 892CF193134C620D00AAEDA1 /* StorageInfoQuotaCallback.h in Headers */, -892CF193134C620D00AAEDA1 /* StorageInfoQuotaCallback.h in Headers */, 892CF194134C620D00AAEDA1 /* StorageInfoUsageCallback.h in Headers */, -892CF194134C620D00AAEDA1 /* StorageInfoUsageCallback.h in Headers */, 51E0BB380DA5ACB600A9E417 /* StorageMap.h in Headers */, C50D0E830FF4272900AC2644 /* StorageNamespace.h in Headers */, C55E38BF10040D5D00A56BDB /* StorageNamespaceImpl.h in Headers */, ___ webkit-chang
[webkit-changes] [88903] trunk/Source/WebKit2
Title: [88903] trunk/Source/WebKit2 Revision 88903 Author sulli...@apple.com Date 2011-06-14 20:51:50 -0700 (Tue, 14 Jun 2011) Log Message windowsKeyCodeForKeyEvent should be robust against NSFlagsChanged events Reviewed by Ada Chan. * Shared/mac/WebEventFactory.mm: (WebKit::windowsKeyCodeForKeyEvent): Explicitly check for NSFlagsChanged before calling -charactersIgnoringModifiers, since charactersIgnoringModifiers throws an exception for NSFlagsChanged events. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (88902 => 88903) --- trunk/Source/WebKit2/ChangeLog 2011-06-15 03:44:36 UTC (rev 88902) +++ trunk/Source/WebKit2/ChangeLog 2011-06-15 03:51:50 UTC (rev 88903) @@ -1,3 +1,16 @@ +2011-06-14 John Sullivan + +Reviewed by Ada Chan. + + + +windowsKeyCodeForKeyEvent should be robust against NSFlagsChanged events + +* Shared/mac/WebEventFactory.mm: +(WebKit::windowsKeyCodeForKeyEvent): +Explicitly check for NSFlagsChanged before calling -charactersIgnoringModifiers, since +charactersIgnoringModifiers throws an exception for NSFlagsChanged events. + 2011-06-14 Anders Carlsson Reviewed by Sam Weinig. Modified: trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm (88902 => 88903) --- trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2011-06-15 03:44:36 UTC (rev 88902) +++ trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2011-06-15 03:51:50 UTC (rev 88903) @@ -696,6 +696,9 @@ // VK_DIVIDE (6F) Divide key case 75: return 0x6F; } + +if ([event type] == NSFlagsChanged) +return 0; NSString* s = [event charactersIgnoringModifiers]; if ([s length] != 1) ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88902] trunk/LayoutTests
Title: [88902] trunk/LayoutTests Revision 88902 Author rn...@webkit.org Date 2011-06-14 20:44:36 -0700 (Tue, 14 Jun 2011) Log Message 2011-06-14 Ryosuke Niwa Skip editing/inserting/return-key-span-start.html added by r88890 on Mac WebKit2 since TestRunner doesn't implement eventSender.keyDown. * platform/mac-wk2/Skipped: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/mac-wk2/Skipped Diff Modified: trunk/LayoutTests/ChangeLog (88901 => 88902) --- trunk/LayoutTests/ChangeLog 2011-06-15 03:41:24 UTC (rev 88901) +++ trunk/LayoutTests/ChangeLog 2011-06-15 03:44:36 UTC (rev 88902) @@ -1,3 +1,10 @@ +2011-06-14 Ryosuke Niwa + +Skip editing/inserting/return-key-span-start.html added by r88890 on Mac WebKit2 +since TestRunner doesn't implement eventSender.keyDown. + +* platform/mac-wk2/Skipped: + 2011-06-14 Julien Chaffraix Reviewed by James Robinson. Modified: trunk/LayoutTests/platform/mac-wk2/Skipped (88901 => 88902) --- trunk/LayoutTests/platform/mac-wk2/Skipped 2011-06-15 03:41:24 UTC (rev 88901) +++ trunk/LayoutTests/platform/mac-wk2/Skipped 2011-06-15 03:44:36 UTC (rev 88902) @@ -1781,6 +1781,7 @@ fast/forms/focus-with-display-block.html fast/forms/ValidityState-valueMissing-002.html svg/custom/focus-event-handling-keyboard.xhtml +editing/inserting/return-key-span-start.html # eventSender.contextClick() is unimplemented editing/spelling/spellcheck-input-search-crash.html ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88901] trunk/Source/WebCore
Title: [88901] trunk/Source/WebCore
Revision 88901
Author tk...@chromium.org
Date 2011-06-14 20:41:24 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Kent Tamura
Reviewed by Hajime Morita.
REGRESSION(r88757): [Chromium] Vertical position of media slider thumb is wrong.
https://bugs.webkit.org/show_bug.cgi?id=62685
No new tests. Covered by existing tests.
* rendering/RenderSlider.cpp:
(WebCore::RenderSlider::layout): Center the thumb position.
* rendering/RenderSlider.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderSlider.cpp
trunk/Source/WebCore/rendering/RenderSlider.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (88900 => 88901)
--- trunk/Source/WebCore/ChangeLog 2011-06-15 03:27:37 UTC (rev 88900)
+++ trunk/Source/WebCore/ChangeLog 2011-06-15 03:41:24 UTC (rev 88901)
@@ -1,3 +1,16 @@
+2011-06-14 Kent Tamura
+
+Reviewed by Hajime Morita.
+
+REGRESSION(r88757): [Chromium] Vertical position of media slider thumb is wrong.
+https://bugs.webkit.org/show_bug.cgi?id=62685
+
+No new tests. Covered by existing tests.
+
+* rendering/RenderSlider.cpp:
+(WebCore::RenderSlider::layout): Center the thumb position.
+* rendering/RenderSlider.h:
+
2011-06-14 Gyuyoung Kim
Reviewed by Kent Tamura.
Modified: trunk/Source/WebCore/rendering/RenderSlider.cpp (88900 => 88901)
--- trunk/Source/WebCore/rendering/RenderSlider.cpp 2011-06-15 03:27:37 UTC (rev 88900)
+++ trunk/Source/WebCore/rendering/RenderSlider.cpp 2011-06-15 03:41:24 UTC (rev 88901)
@@ -95,6 +95,17 @@
setPreferredLogicalWidthsDirty(false);
}
+void RenderSlider::layout()
+{
+RenderBlock::layout();
+RenderBox* thumbBox = sliderThumbElementOf(node())->renderBox();
+if (!thumbBox)
+return;
+int heightDiff = thumbBox->height() - contentHeight();
+if (heightDiff > 0)
+thumbBox->setY(thumbBox->y() - (heightDiff / 2));
+}
+
bool RenderSlider::inDragMode() const
{
return sliderThumbElementOf(node())->active();
Modified: trunk/Source/WebCore/rendering/RenderSlider.h (88900 => 88901)
--- trunk/Source/WebCore/rendering/RenderSlider.h 2011-06-15 03:27:37 UTC (rev 88900)
+++ trunk/Source/WebCore/rendering/RenderSlider.h 2011-06-15 03:41:24 UTC (rev 88901)
@@ -43,6 +43,7 @@
virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
virtual void computePreferredLogicalWidths();
virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+virtual void layout();
};
inline RenderSlider* toRenderSlider(RenderObject* object)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88900] branches/safari-534-branch/Tools/BuildSlaveSupport/ kill-old-processes
Title: [88900] branches/safari-534-branch/Tools/BuildSlaveSupport/kill-old-processes
Revision 88900
Author lforsch...@apple.com
Date 2011-06-14 20:27:37 -0700 (Tue, 14 Jun 2011)
Log Message
Merge r88857.
Added Paths
branches/safari-534-branch/Tools/BuildSlaveSupport/kill-old-processes
Diff
Added: branches/safari-534-branch/Tools/BuildSlaveSupport/kill-old-processes (0 => 88900)
--- branches/safari-534-branch/Tools/BuildSlaveSupport/kill-old-processes (rev 0)
+++ branches/safari-534-branch/Tools/BuildSlaveSupport/kill-old-processes 2011-06-15 03:27:37 UTC (rev 88900)
@@ -0,0 +1,82 @@
+#!/usr/bin/python
+
+# Copyright (C) 2010 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import os, sys
+
+def main():
+
+tasksToKillWin = [ "cl.exe",
+ "devenv.com",
+ "devenv.exe",
+ "DumpRenderTree.exe",
+ "DumpRenderTree_debug.exe",
+ "httpd.exe",
+ "imagediff.exe",
+ "imagediff_debug.exe",
+ "jsc.exe",
+ "jsc_debug.exe",
+ "LightTPD.exe",
+ "link.exe",
+ "midl.exe",
+ "perl.exe",
+ "Safari.exe",
+ "svn.exe",
+ "testapi.exe",
+ "testapi_debug.exe",
+ "VcBuildHelper.exe",
+ "wdiff.exe",
+ "WebKit2WebProcess.exe",
+ "WebKit2WebProcess_debug.exe",
+ "WebKitTestRunner.exe",
+ "WebKitTestRunner_debug.exe" ]
+
+tasksToKillMac = [ "DumpRenderTree",
+ "make",
+ "perl",
+ "per5.12",
+ "ruby",
+ "Safari",
+ "Safari Web Content",
+ "WebProcess"
+ "svn",
+ "WebKitTestRunner",
+ "WebKitTestRunner Web Content",
+ "TestWebKitAPI",
+ "TestWebKitAPI Web Content",
+ "jsc",
+ "Problem Reporter",
+ "WebKitPluginAgen" ]
+
+if sys.platform == 'darwin':
+for task in tasksToKillMac:
+os.system("killall -9 -v -m " + task)
+elif sys.platform == 'cygwin' or sys.platform == 'win32':
+for task in tasksToKillWin:
+os.system("taskkill /t /f /im " + task)
+else:
+raise Exception("Have not implemented kill-old-processes for this platform")
+
+if __name__ == '__main__':
+sys.exit(main())
Property changes on: branches/safari-534-branch/Tools/BuildSlaveSupport/kill-old-processes
___
Added: svn:executable
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88899] branches/safari-534-branch/Tools/ChangeLog
Title: [88899] branches/safari-534-branch/Tools/ChangeLog Revision 88899 Author lforsch...@apple.com Date 2011-06-14 20:26:11 -0700 (Tue, 14 Jun 2011) Log Message Merge r88857. Modified Paths branches/safari-534-branch/Tools/ChangeLog Diff Modified: branches/safari-534-branch/Tools/ChangeLog (88898 => 88899) --- branches/safari-534-branch/Tools/ChangeLog 2011-06-15 02:58:23 UTC (rev 88898) +++ branches/safari-534-branch/Tools/ChangeLog 2011-06-15 03:26:11 UTC (rev 88899) @@ -1,3 +1,21 @@ +2011-06-14 Lucas Forschler + +Merged 88857. +Fix branch build tools break. + +2011-06-14 Lucas Forschler + +Reviewed by Stephanie Lewis. + +https://bugs.webkit.org/show_bug.cgi?id=62495 +Bug 62495 - combine windows and mac kill-old-processes script +Add a platform agnostic script. Remove the recently added mac flavor. +Note: Leaving the windows one alone, since it is currently used by the WebKit bots. + +* BuildSlaveSupport/kill-old-processes: Added. +* BuildSlaveSupport/mac: Removed. +* BuildSlaveSupport/mac/kill-old-processes: Removed. + 2011-05-27 Mark Rowe Merge r87421. ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88896] trunk
Title: [88896] trunk
Revision 88896
Author jchaffr...@webkit.org
Date 2011-06-14 19:40:25 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Julien Chaffraix
Reviewed by James Robinson.
Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html
https://bugs.webkit.org/show_bug.cgi?id=48293
And
Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html
https://bugs.webkit.org/show_bug.cgi?id=48303
* canvas/philip/tests/2d.composite.uncovered.pattern.destination-in-expected.txt:
Added a trailing line.
* fast/canvas/canvas-composite-alpha.html:
Updated now that we clear what is outside the source.
* platform/chromium/test_expectations.txt:
* platform/gtk/Skipped:
* platform/mac/Skipped:
* platform/qt/Skipped:
Update platform skipped lists.
2011-06-14 Julien Chaffraix
Reviewed by James Robinson.
Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html
https://bugs.webkit.org/show_bug.cgi?id=48293
And
Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html
https://bugs.webkit.org/show_bug.cgi?id=48303
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::shouldDisplayTransparencyElsewhere): Added CompositeDestinationIn
as this is the only one that needs a specific treatment.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-in-expected.txt
trunk/LayoutTests/fast/canvas/canvas-composite-alpha.html
trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/LayoutTests/platform/gtk/Skipped
trunk/LayoutTests/platform/mac/Skipped
trunk/LayoutTests/platform/qt/Skipped
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
Diff
Modified: trunk/LayoutTests/ChangeLog (88895 => 88896)
--- trunk/LayoutTests/ChangeLog 2011-06-15 02:10:33 UTC (rev 88895)
+++ trunk/LayoutTests/ChangeLog 2011-06-15 02:40:25 UTC (rev 88896)
@@ -1,3 +1,27 @@
+2011-06-14 Julien Chaffraix
+
+Reviewed by James Robinson.
+
+Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html
+https://bugs.webkit.org/show_bug.cgi?id=48293
+
+And
+
+Fix LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html
+https://bugs.webkit.org/show_bug.cgi?id=48303
+
+* canvas/philip/tests/2d.composite.uncovered.pattern.destination-in-expected.txt:
+Added a trailing line.
+
+* fast/canvas/canvas-composite-alpha.html:
+Updated now that we clear what is outside the source.
+
+* platform/chromium/test_expectations.txt:
+* platform/gtk/Skipped:
+* platform/mac/Skipped:
+* platform/qt/Skipped:
+Update platform skipped lists.
+
2011-06-14 Ryosuke Niwa
GTK rebaseline for r3.
Modified: trunk/LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-in-expected.txt (88895 => 88896)
--- trunk/LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-in-expected.txt 2011-06-15 02:10:33 UTC (rev 88895)
+++ trunk/LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.destination-in-expected.txt 2011-06-15 02:40:25 UTC (rev 88896)
@@ -1 +1,2 @@
Passed
+
Modified: trunk/LayoutTests/fast/canvas/canvas-composite-alpha.html (88895 => 88896)
--- trunk/LayoutTests/fast/canvas/canvas-composite-alpha.html 2011-06-15 02:10:33 UTC (rev 88895)
+++ trunk/LayoutTests/fast/canvas/canvas-composite-alpha.html 2011-06-15 02:40:25 UTC (rev 88896)
@@ -117,21 +117,21 @@
{ source: [255, 0, 255, 191], composition: [109, 145, 255, 222], destination: [0, 255, 255, 127] }
],
[
- { source: [0, 0, 0, 0], composition: [0, 255, 0, 255], destination: [0, 255, 0, 255] },
+ { source: [0, 0, 0, 0], composition: [0, 255, 0, 255], destination: [0, 0, 0, 0] },
{ source: [0, 0, 0, 0], composition: [0, 0, 0, 0], destination: [0, 0, 0, 0] },
- { source: [0, 0, 0, 0], composition: [0, 255, 0, 1], destination: [0, 255, 0, 1] },
- { source: [0, 0, 0, 0], composition: [0, 0, 0, 0], destination: [255, 0, 0, 255] },
- { source: [0, 0, 0, 0], composition: [255, 0, 0, 1], destination: [255, 0, 0, 255] },
- { source: [0, 0, 0, 0], composition: [0, 0, 0, 0], destination: [0, 255, 0, 255] },
- { source: [0, 0, 0, 0], composition: [0, 255, 0, 64], destination: [0, 255, 0, 127] },
- { source: [0, 0, 0, 0], composition: [0, 255, 0, 127], destination: [0, 255, 0, 127] },
- { source: [0, 0, 0, 0], composition: [0, 255, 0, 127], destination: [0, 255, 0, 255] },
-
[webkit-changes] [88894] trunk/LayoutTests
Title: [88894] trunk/LayoutTests Revision 88894 Author rn...@webkit.org Date 2011-06-14 19:03:27 -0700 (Tue, 14 Jun 2011) Log Message 2011-06-14 Ryosuke Niwa GTK rebaseline for r3. * platform/gtk/fast/forms/basic-textareas-expected.txt: * platform/gtk/fast/forms/basic-textareas-quirks-expected.txt: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/gtk/fast/forms/basic-textareas-expected.txt trunk/LayoutTests/platform/gtk/fast/forms/basic-textareas-quirks-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (88893 => 88894) --- trunk/LayoutTests/ChangeLog 2011-06-15 01:57:32 UTC (rev 88893) +++ trunk/LayoutTests/ChangeLog 2011-06-15 02:03:27 UTC (rev 88894) @@ -1,3 +1,10 @@ +2011-06-14 Ryosuke Niwa + +GTK rebaseline for r3. + +* platform/gtk/fast/forms/basic-textareas-expected.txt: +* platform/gtk/fast/forms/basic-textareas-quirks-expected.txt: + 2011-06-14 Annie Sullivan Reviewed by Ryosuke Niwa. Modified: trunk/LayoutTests/platform/gtk/fast/forms/basic-textareas-expected.txt (88893 => 88894) --- trunk/LayoutTests/platform/gtk/fast/forms/basic-textareas-expected.txt 2011-06-15 01:57:32 UTC (rev 88893) +++ trunk/LayoutTests/platform/gtk/fast/forms/basic-textareas-expected.txt 2011-06-15 02:03:27 UTC (rev 88894) @@ -275,8 +275,8 @@ text run at (0,19) width 13: "m" text run at (13,19) width 4: " " text run at (0,38) width 43: "ipsum" -text run at (0,57) width 36: "dolor" -text run at (36,57) width 4: " " +text run at (0,57) width 44: " dolor" +text run at (44,57) width 0: " " text run at (0,76) width 34: "ABC" text run at (0,95) width 33: "DEF" text run at (0,114) width 36: "GHIJ" @@ -299,8 +299,8 @@ text run at (0,19) width 13: "m" text run at (13,19) width 4: " " text run at (0,38) width 43: "ipsum" -text run at (0,57) width 36: "dolor" -text run at (36,57) width 4: " " +text run at (0,57) width 44: " dolor" +text run at (44,57) width 0: " " text run at (0,76) width 34: "ABC" text run at (0,95) width 33: "DEF" text run at (0,114) width 36: "GHIJ" @@ -323,8 +323,8 @@ text run at (0,19) width 13: "m" text run at (13,19) width 4: " " text run at (0,38) width 43: "ipsum" -text run at (0,57) width 36: "dolor" -text run at (36,57) width 4: " " +text run at (0,57) width 44: " dolor" +text run at (44,57) width 0: " " text run at (0,76) width 34: "ABC" text run at (0,95) width 33: "DEF" text run at (0,114) width 36: "GHIJ" @@ -357,8 +357,8 @@ text run at (0,19) width 13: "m" text run at (13,19) width 4: " " text run at (0,38) width 43: "ipsum" -text run at (0,57) width 36: "dolor" -text run at (36,57) width 4: " " +text run at (0,57) width 44: " dolor" +text run at (44,57) width 0: " " text run at (0,76) width 34: "ABC" text run at (0,95) width 33: "DEF" text run at (0,114) width 36: "GHIJ" @@ -420,8 +420,8 @@ text run at (0,19) width 13: "m" text run at (13,19) width 4: " " text run at (0,38) width 43: "ipsum" -text run at (0,57) width 36: "dolor" -text run at (36,57) width 4: " " +text run at (0,57) width 44: " dolor" +text run at (44,57) width 0: " " text run at (0,76) width 34: "ABC" text run at (0,95) width 33: "DEF" text run at (0,114) width 36: "GHIJ" @@ -444,8 +444,8 @@ text run at (0,19) width 13: "m" text run at (13,19) width 4: " " text run at (0,38) width 43: "ipsum" -text run at (0,57) width 36: "dolor" -text run at (36,57) width 4: " " +text run at (0,57) width 44: " dolor" +text run at (44,57) width 0: " " text run at (0,76) width 34: "ABC" text run at (0,95) width 33: "DEF" text run at (0,114) width 36: "GHIJ" @@ -468,8 +468,8 @@ text run at (0,19) width 13: "m" text run at (13,19) width 4: " " text run at (0,38) width 43: "ipsum" -text run at (0,57) width 36: "dolor" -text run at (36,57) width 4: " " +text run at (0,57) width 44: " dolor" +text run at (44,57) width 0: " "
[webkit-changes] [88893] branches/safari-534-branch/Source
Title: [88893] branches/safari-534-branch/Source Revision 88893 Author lforsch...@apple.com Date 2011-06-14 18:57:32 -0700 (Tue, 14 Jun 2011) Log Message Versioning. Modified Paths branches/safari-534-branch/Source/_javascript_Core/Configurations/Version.xcconfig branches/safari-534-branch/Source/_javascript_Glue/Configurations/Version.xcconfig branches/safari-534-branch/Source/WebCore/Configurations/Version.xcconfig branches/safari-534-branch/Source/WebKit/mac/Configurations/Version.xcconfig branches/safari-534-branch/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: branches/safari-534-branch/Source/_javascript_Core/Configurations/Version.xcconfig (88892 => 88893) --- branches/safari-534-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2011-06-15 01:56:43 UTC (rev 88892) +++ branches/safari-534-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2011-06-15 01:57:32 UTC (rev 88893) @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 534; -MINOR_VERSION = 46; +MINOR_VERSION = 47; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); Modified: branches/safari-534-branch/Source/_javascript_Glue/Configurations/Version.xcconfig (88892 => 88893) --- branches/safari-534-branch/Source/_javascript_Glue/Configurations/Version.xcconfig 2011-06-15 01:56:43 UTC (rev 88892) +++ branches/safari-534-branch/Source/_javascript_Glue/Configurations/Version.xcconfig 2011-06-15 01:57:32 UTC (rev 88893) @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 534; -MINOR_VERSION = 46; +MINOR_VERSION = 47; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); Modified: branches/safari-534-branch/Source/WebCore/Configurations/Version.xcconfig (88892 => 88893) --- branches/safari-534-branch/Source/WebCore/Configurations/Version.xcconfig 2011-06-15 01:56:43 UTC (rev 88892) +++ branches/safari-534-branch/Source/WebCore/Configurations/Version.xcconfig 2011-06-15 01:57:32 UTC (rev 88893) @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 534; -MINOR_VERSION = 46; +MINOR_VERSION = 47; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); Modified: branches/safari-534-branch/Source/WebKit/mac/Configurations/Version.xcconfig (88892 => 88893) --- branches/safari-534-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2011-06-15 01:56:43 UTC (rev 88892) +++ branches/safari-534-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2011-06-15 01:57:32 UTC (rev 88893) @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 534; -MINOR_VERSION = 46; +MINOR_VERSION = 47; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); Modified: branches/safari-534-branch/Source/WebKit2/Configurations/Version.xcconfig (88892 => 88893) --- branches/safari-534-branch/Source/WebKit2/Configurations/Version.xcconfig 2011-06-15 01:56:43 UTC (rev 88892) +++ branches/safari-534-branch/Source/WebKit2/Configurations/Version.xcconfig 2011-06-15 01:57:32 UTC (rev 88893) @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 534; -MINOR_VERSION = 46; +MINOR_VERSION = 47; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88892] trunk/Source/JavaScriptCore
Title: [88892] trunk/Source/_javascript_Core
Revision 88892
Author barraclo...@apple.com
Date 2011-06-14 18:56:43 -0700 (Tue, 14 Jun 2011)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=43841
SegmentedVector::operator== typo
Reviewed by Sam Weinig.
* wtf/SegmentedVector.h:
(WTF::SegmentedVectorIterator::operator==):
(WTF::SegmentedVectorIterator::operator!=):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/wtf/SegmentedVector.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (88891 => 88892)
--- trunk/Source/_javascript_Core/ChangeLog 2011-06-15 01:56:20 UTC (rev 88891)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-06-15 01:56:43 UTC (rev 88892)
@@ -1,3 +1,14 @@
+2011-06-14 Gavin Barraclough
+
+Reviewed by Sam Weinig.
+
+https://bugs.webkit.org/show_bug.cgi?id=43841
+SegmentedVector::operator== typo
+
+* wtf/SegmentedVector.h:
+(WTF::SegmentedVectorIterator::operator==):
+(WTF::SegmentedVectorIterator::operator!=):
+
2011-06-14 Oliver Hunt
Reviewed by Gavin Barraclough.
Modified: trunk/Source/_javascript_Core/wtf/SegmentedVector.h (88891 => 88892)
--- trunk/Source/_javascript_Core/wtf/SegmentedVector.h 2011-06-15 01:56:20 UTC (rev 88891)
+++ trunk/Source/_javascript_Core/wtf/SegmentedVector.h 2011-06-15 01:56:43 UTC (rev 88892)
@@ -67,12 +67,12 @@
bool operator==(const Iterator& other) const
{
-return (m_index == other.m_index && m_segment = other.m_segment && &m_vector == &other.m_vector);
+return m_index == other.m_index && m_segment == other.m_segment && &m_vector == &other.m_vector;
}
bool operator!=(const Iterator& other) const
{
-return (m_index != other.m_index || m_segment != other.m_segment || &m_vector != &other.m_vector);
+return m_index != other.m_index || m_segment != other.m_segment || &m_vector != &other.m_vector;
}
SegmentedVectorIterator& operator=(const SegmentedVectorIterator& other)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88891] tags/Safari-534.46/
Title: [88891] tags/Safari-534.46/ Revision 88891 Author lforsch...@apple.com Date 2011-06-14 18:56:20 -0700 (Tue, 14 Jun 2011) Log Message New tag. Added Paths tags/Safari-534.46/ Diff Property changes: tags/Safari-534.46 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88890] trunk
Title: [88890] trunk
Revision 88890
Author commit-qu...@webkit.org
Date 2011-06-14 18:51:54 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Annie Sullivan
Reviewed by Ryosuke Niwa.
Span ID duplicated when pressing enter at beginning of span
https://bugs.webkit.org/show_bug.cgi?id=62621
Added test for span id not getting duplicated when span is cloned.
* editing/inserting/return-key-span-start-expected.txt: Added.
* editing/inserting/return-key-span-start.html: Added.
2011-06-14 Annie Sullivan
Reviewed by Ryosuke Niwa.
Span ID duplicated when pressing enter at beginning of span
https://bugs.webkit.org/show_bug.cgi?id=62621
Strip id from cloned span, so that it is not duplicated.
Test: editing/inserting/return-key-span-start.html
* editing/InsertParagraphSeparatorCommand.cpp:
(WebCore::InsertParagraphSeparatorCommand::cloneHierarchyUnderNewBlock):
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp
Added Paths
trunk/LayoutTests/editing/inserting/return-key-span-start-expected.txt
trunk/LayoutTests/editing/inserting/return-key-span-start.html
Diff
Modified: trunk/LayoutTests/ChangeLog (9 => 88890)
--- trunk/LayoutTests/ChangeLog 2011-06-15 01:33:56 UTC (rev 9)
+++ trunk/LayoutTests/ChangeLog 2011-06-15 01:51:54 UTC (rev 88890)
@@ -1,3 +1,15 @@
+2011-06-14 Annie Sullivan
+
+Reviewed by Ryosuke Niwa.
+
+Span ID duplicated when pressing enter at beginning of span
+https://bugs.webkit.org/show_bug.cgi?id=62621
+
+Added test for span id not getting duplicated when span is cloned.
+
+* editing/inserting/return-key-span-start-expected.txt: Added.
+* editing/inserting/return-key-span-start.html: Added.
+
2011-06-14 Ryosuke Niwa
Mac, Windows, and Chromium rebaseline for r3.
Added: trunk/LayoutTests/editing/inserting/return-key-span-start-expected.txt (0 => 88890)
--- trunk/LayoutTests/editing/inserting/return-key-span-start-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/inserting/return-key-span-start-expected.txt 2011-06-15 01:51:54 UTC (rev 88890)
@@ -0,0 +1,8 @@
+This sets the selection to the start of a span, and hits the enter key.
+Expected behavior: when the span is split, its ID should not be duplicated. See bug 62621.
+|
+| id="dupe"
+|
+|
+|
+| "<#selection-caret>hello"
Added: trunk/LayoutTests/editing/inserting/return-key-span-start.html (0 => 88890)
--- trunk/LayoutTests/editing/inserting/return-key-span-start.html (rev 0)
+++ trunk/LayoutTests/editing/inserting/return-key-span-start.html 2011-06-15 01:51:54 UTC (rev 88890)
@@ -0,0 +1,15 @@
+
+
+
+hello
+
+var sel = window.getSelection();
+sel.setPosition(document.getElementById("dupe"), 0);
+eventSender.keyDown("\n");
+Markup.description("This sets the selection to the start of a span, and hits the enter key.\n"
++ "Expected behavior: when the span is split, its ID should not be duplicated. See bug 62621.");
+Markup.dump(root);
+
+
+
Modified: trunk/Source/WebCore/ChangeLog (9 => 88890)
--- trunk/Source/WebCore/ChangeLog 2011-06-15 01:33:56 UTC (rev 9)
+++ trunk/Source/WebCore/ChangeLog 2011-06-15 01:51:54 UTC (rev 88890)
@@ -1,3 +1,17 @@
+2011-06-14 Annie Sullivan
+
+Reviewed by Ryosuke Niwa.
+
+Span ID duplicated when pressing enter at beginning of span
+https://bugs.webkit.org/show_bug.cgi?id=62621
+
+Strip id from cloned span, so that it is not duplicated.
+
+Test: editing/inserting/return-key-span-start.html
+
+* editing/InsertParagraphSeparatorCommand.cpp:
+(WebCore::InsertParagraphSeparatorCommand::cloneHierarchyUnderNewBlock):
+
2011-06-13 Ryosuke Niwa
Reviewed by David Hyatt.
Modified: trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp (9 => 88890)
--- trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp 2011-06-15 01:33:56 UTC (rev 9)
+++ trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp 2011-06-15 01:51:54 UTC (rev 88890)
@@ -136,6 +136,10 @@
RefPtr parent = blockToInsert;
for (size_t i = ancestors.size(); i != 0; --i) {
RefPtr child = ancestors[i - 1]->cloneElementWithoutChildren();
+// It should always be okay to remove id from the cloned elements, since the originals are not deleted.
+ExceptionCode ec = 0;
+child->removeAttribute(idAttr, ec);
+ASSERT(!ec);
appendNode(child, parent);
parent = child.release();
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88888] trunk/LayoutTests
Title: [8] trunk/LayoutTests Revision 8 Author tk...@chromium.org Date 2011-06-14 18:13:16 -0700 (Tue, 14 Jun 2011) Log Message 2011-06-14 Kent Tamura [Chromium][Qt] Assign new bug numbers for slider failures, and skip a test on Qt. * platform/chromium/test_expectations.txt: * platform/qt/Skipped: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/test_expectations.txt trunk/LayoutTests/platform/qt/Skipped Diff Modified: trunk/LayoutTests/ChangeLog (7 => 8) --- trunk/LayoutTests/ChangeLog 2011-06-15 01:11:10 UTC (rev 7) +++ trunk/LayoutTests/ChangeLog 2011-06-15 01:13:16 UTC (rev 8) @@ -1,3 +1,10 @@ +2011-06-14 Kent Tamura + +[Chromium][Qt] Assign new bug numbers for slider failures, and skip a test on Qt. + +* platform/chromium/test_expectations.txt: +* platform/qt/Skipped: + 2011-06-14 Chris Fleizach Unreviewed. Fixing skip list. Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (7 => 8) --- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-06-15 01:11:10 UTC (rev 7) +++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-06-15 01:13:16 UTC (rev 8) @@ -2889,7 +2889,7 @@ BUGWK55968 GPU WIN DEBUG : compositing/webgl/webgl-nonpremultiplied-blend.html = IMAGE // 2 pixel stretching when rendering some videos with the GPU (Now it's flaky) -BUGCR74102 GPU LINUX : media/video-controls-rendering.html = IMAGE PASS +//BUGCR74102 GPU LINUX : media/video-controls-rendering.html = IMAGE PASS // BUGCR74102 GPU WIN : media/video-layer-crash.html = IMAGE @@ -3948,25 +3948,27 @@ BUGWK61936 : fast/filesystem/filesystem-no-callback-null-ptr-crash.html = CRASH PASS BUGABARTH LINUX : svg/text/scaling-font-with-geometric-precision.html = IMAGE PASS -// REGRESSION(r88757): There is a problem on event handling. -BUGWK52920 : fast/forms/slider-delete-while-dragging-thumb.html = FAIL -BUGWK52920 : fast/forms/slider-mouse-events.html = FAIL -BUGWK52920 : fast/forms/slider-onchange-event.html = FAIL -BUGWK52920 : fast/layers/video-layer.html = FAIL +// REGRESSION(r88757) +BUGWK62683 : fast/forms/slider-delete-while-dragging-thumb.html = FAIL +BUGWK62683 : fast/forms/slider-mouse-events.html = FAIL +BUGWK62683 : fast/forms/slider-onchange-event.html = FAIL // REGRESSION(r88757): The position of the time slider thumb is wrong. -BUGWK52920 : media/audio-controls-rendering.html = FAIL -BUGWK52920 : media/audio-repaint.html = FAIL -BUGWK52920 : media/controls-after-reload.html = FAIL -BUGWK52920 : media/controls-strict.html = FAIL -BUGWK52920 : media/controls-styling.html = FAIL -BUGWK52920 : media/controls-without-preload.html = FAIL -BUGWK52920 MAC WIN : media/video-controls-rendering.html = FAIL -BUGWK52920 LINUX CPU : media/video-controls-rendering.html = FAIL -BUGWK52920 : media/video-display-toggle.html = FAIL -BUGWK52920 : media/video-empty-source.html = FAIL -BUGWK52920 : media/video-no-audio.html = FAIL -BUGWK52920 : media/video-volume-slider.html = FAIL -BUGWK52920 : media/video-zoom-controls.html = FAIL +BUGWK62685 : fast/layers/video-layer.html = FAIL +BUGWK62685 : media/audio-controls-rendering.html = FAIL +BUGWK62685 : media/audio-repaint.html = FAIL +BUGWK62685 : media/controls-after-reload.html = FAIL +BUGWK62685 : media/controls-strict.html = FAIL +BUGWK62685 : media/controls-styling.html = FAIL +BUGWK62685 : media/controls-without-preload.html = FAIL +BUGWK62685 MAC WIN : media/video-controls-rendering.html = FAIL +BUGWK62685 LINUX CPU : media/video-controls-rendering.html = FAIL +// There is another entry for GPU video-controls-rendering.html. +BUGWK62685 LINUX GPU : media/video-controls-rendering.html = FAIL +BUGWK62685 : media/video-display-toggle.html = FAIL +BUGWK62685 : media/video-empty-source.html = FAIL +BUGWK62685 : media/video-no-audio.html = FAIL +BUGWK62685 : media/video-volume-slider.html = FAIL +BUGWK62685 : media/video-zoom-controls.html = FAIL BUGCR84157 GPU : plugins/embed-attributes-style.html = IMAGE+TEXT BUGCR84157 GPU : svg/as-image/svg-as-background-with-relative-size.html = IMAGE+TEXT Modified: trunk/LayoutTests/platform/qt/Skipped (7 => 8) --- trunk/LayoutTests/platform/qt/Skipped 2011-06-15 01:11:10 UTC (rev 7) +++ trunk/LayoutTests/platform/qt/Skipped 2011-06-15 01:13:16 UTC (rev 8) @@ -2530,6 +2530,9 @@ svg/zoom/page/zoom-svg-through-object-with-auto-size.html http/tests/misc/object-embedding-svg-delayed-size-negotiation.xhtml +# REGRESSION(r88757): [Chromium][Qt] Some slider clicking tests fail +fast/forms/slider-onchange-event.html + # New tests introduced in r88307, but fail on Qt # https://bugs.webkit.org/show_bug.cgi?id=54417 fast/events/touch/touch-gesture-click.html ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88887] trunk/LayoutTests
Title: [7] trunk/LayoutTests Revision 7 Author cfleiz...@apple.com Date 2011-06-14 18:11:10 -0700 (Tue, 14 Jun 2011) Log Message Unreviewed. Fixing skip list. VoiceOver cannot navigate the itunes album view table https://bugs.webkit.org/show_bug.cgi?id=62335 * platform/mac-leopard/Skipped: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/mac-leopard/Skipped Diff Modified: trunk/LayoutTests/ChangeLog (6 => 7) --- trunk/LayoutTests/ChangeLog 2011-06-15 00:48:59 UTC (rev 6) +++ trunk/LayoutTests/ChangeLog 2011-06-15 01:11:10 UTC (rev 7) @@ -1,3 +1,12 @@ +2011-06-14 Chris Fleizach + +Unreviewed. Fixing skip list. + +VoiceOver cannot navigate the itunes album view table +https://bugs.webkit.org/show_bug.cgi?id=62335 + +* platform/mac-leopard/Skipped: + 2011-06-13 Ryosuke Niwa Reviewed by David Hyatt. Modified: trunk/LayoutTests/platform/mac-leopard/Skipped (6 => 7) --- trunk/LayoutTests/platform/mac-leopard/Skipped 2011-06-15 00:48:59 UTC (rev 6) +++ trunk/LayoutTests/platform/mac-leopard/Skipped 2011-06-15 01:11:10 UTC (rev 7) @@ -3,7 +3,7 @@ # Tests of table accessibility functionality not supported on Leopard platform/mac/accessibility/table-multi-bodies.html -platform/mac/accessibility/aria-grid-with-strange-hierarchy-actual.txt +platform/mac/accessibility/aria-grid-with-strange-hierarchy.html # Lists are not supported on Leopard. platform/mac/accessibility/aria-directory.html ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88886] trunk/Source/WebKit2
Title: [6] trunk/Source/WebKit2 Revision 6 Author ander...@apple.com Date 2011-06-14 17:48:59 -0700 (Tue, 14 Jun 2011) Log Message 2011-06-14 Anders Carlsson Reviewed by Sam Weinig. Use new byte array encoding/decoding functions for WTF argument coders https://bugs.webkit.org/show_bug.cgi?id=62682 * Platform/CoreIPC/ArgumentCoders.cpp: (CoreIPCencode): (CoreIPCdecode): Use the new functions for the string argument coders. * Platform/CoreIPC/ArgumentCoders.h: (CoreIPC::SimpleArgumentCoder::encode): (CoreIPC::SimpleArgumentCoder::decode): Use the new functions to avoid encoding/decoding the size when it's known at decode time. * Platform/CoreIPC/ArgumentDecoder.cpp: (CoreIPC::roundUpToAlignment): Assert that the alignment is a power of 2. (CoreIPC::decodeFixedLengthData): Alignment comes before the size. * UIProcess/cf/WebBackForwardListCF.cpp: (WebKit::WebBackForwardList::createCFDictionaryRepresentation): Add a FIXME about now using the internal CoreIPC encoding format here. * UIProcess/cf/WebPageProxyCF.cpp: Bump the current session state data version number. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (5 => 6) --- trunk/Source/WebKit2/ChangeLog 2011-06-15 00:26:08 UTC (rev 5) +++ trunk/Source/WebKit2/ChangeLog 2011-06-15 00:48:59 UTC (rev 6) @@ -1,3 +1,34 @@ +2011-06-14 Anders Carlsson + +Reviewed by Sam Weinig. + +Use new byte array encoding/decoding functions for WTF argument coders +https://bugs.webkit.org/show_bug.cgi?id=62682 + +* Platform/CoreIPC/ArgumentCoders.cpp: +(CoreIPCencode): +(CoreIPCdecode): +Use the new functions for the string argument coders. + +* Platform/CoreIPC/ArgumentCoders.h: +(CoreIPC::SimpleArgumentCoder::encode): +(CoreIPC::SimpleArgumentCoder::decode): +Use the new functions to avoid encoding/decoding the size when it's known at decode time. + +* Platform/CoreIPC/ArgumentDecoder.cpp: +(CoreIPC::roundUpToAlignment): +Assert that the alignment is a power of 2. + +(CoreIPC::decodeFixedLengthData): +Alignment comes before the size. + +* UIProcess/cf/WebBackForwardListCF.cpp: +(WebKit::WebBackForwardList::createCFDictionaryRepresentation): +Add a FIXME about now using the internal CoreIPC encoding format here. + +* UIProcess/cf/WebPageProxyCF.cpp: +Bump the current session state data version number. + 2011-06-14 No'am Rosenthal Reviewed by Kenneth Rohde Christiansen. Modified: trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp (5 => 6) --- trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp 2011-06-15 00:26:08 UTC (rev 5) +++ trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp 2011-06-15 00:48:59 UTC (rev 6) @@ -56,7 +56,7 @@ uint32_t length = string.length(); encoder->encode(length); -encoder->encodeBytes(reinterpret_cast(string.data()), length); +encoder->encodeFixedLengthData(reinterpret_cast(string.data()), length, 1); } bool ArgumentCoder::decode(ArgumentDecoder* decoder, CString& result) @@ -79,7 +79,7 @@ char* buffer; CString string = CString::newUninitialized(length, buffer); -if (!decoder->decodeBytes(reinterpret_cast(buffer), length)) +if (!decoder->decodeFixedLengthData(reinterpret_cast(buffer), length, 1)) return false; result = string; @@ -97,7 +97,7 @@ uint32_t length = string.length(); encoder->encode(length); -encoder->encodeBytes(reinterpret_cast(string.characters()), length * sizeof(UChar)); +encoder->encodeFixedLengthData(reinterpret_cast(string.characters()), length * sizeof(UChar), __alignof(UChar)); } bool ArgumentCoder::decode(ArgumentDecoder* decoder, String& result) @@ -120,7 +120,7 @@ UChar* buffer; String string = String::createUninitialized(length, buffer); -if (!decoder->decodeBytes(reinterpret_cast(buffer), length * sizeof(UChar))) +if (!decoder->decodeFixedLengthData(reinterpret_cast(buffer), length * sizeof(UChar), __alignof(UChar))) return false; result = string; Modified: trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h (5 => 6) --- trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h 2011-06-15 00:26:08 UTC (rev 5) +++ trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h 2011-06-15 00:48:59 UTC (rev 6)
[webkit-changes] [88885] branches/safari-534-branch/Source/WebKit2
Title: [5] branches/safari-534-branch/Source/WebKit2
Revision 5
Author lforsch...@apple.com
Date 2011-06-14 17:26:08 -0700 (Tue, 14 Jun 2011)
Log Message
Merge r88856.
Modified Paths
branches/safari-534-branch/Source/WebKit2/ChangeLog
branches/safari-534-branch/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp
branches/safari-534-branch/Source/WebKit2/Shared/UserMessageCoders.h
branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (4 => 5)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-15 00:24:46 UTC (rev 4)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-15 00:26:08 UTC (rev 5)
@@ -1,5 +1,35 @@
2011-06-14 Lucas Forschler
+Merged 88856.
+
+2011-06-14 John Sullivan
+
+Reviewed by Dan Bernstein.
+
+
+
+Callers should be robust against WebImage::create() returning an image with a null snapshot
+
+* Shared/API/c/cg/WKImageCG.cpp:
+(WKImageCreateCGImage):
+Return 0 if no bitmap was created.
+(WKImageCreateFromCGImage):
+Ditto.
+
+* Shared/UserMessageCoders.h:
+(WebKit::UserMessageEncoder::baseEncode):
+Check for null before dereferencing image->bitmap() in two places.
+
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::snapshotInViewCoordinates):
+Return 0 if no bitmap was created.
+(WebKit::WebPage::scaledSnapshotInDocumentCoordinates):
+Ditto.
+(WebKit::WebPage::createSnapshotOfVisibleContent):
+Bail out if no bitmap was created.
+
+2011-06-14 Lucas Forschler
+
Merged 88833.
2011-06-14 Stephanie Lewis
Modified: branches/safari-534-branch/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp (4 => 5)
--- branches/safari-534-branch/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp 2011-06-15 00:24:46 UTC (rev 4)
+++ branches/safari-534-branch/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp 2011-06-15 00:26:08 UTC (rev 5)
@@ -36,13 +36,26 @@
CGImageRef WKImageCreateCGImage(WKImageRef imageRef)
{
-return toImpl(imageRef)->bitmap()->makeCGImageCopy().leakRef();
+if (!imageRef)
+return 0;
+
+WebImage* webImage = toImpl(imageRef);
+if (!webImage || !webImage->bitmap())
+return 0;
+
+return webImage->bitmap()->makeCGImageCopy().leakRef();
}
WKImageRef WKImageCreateFromCGImage(CGImageRef imageRef, WKImageOptions options)
{
+if (!imageRef)
+return 0;
+
IntSize imageSize(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef));
RefPtr webImage = WebImage::create(imageSize, toImageOptions(options));
+if (!webImage || !webImage->bitmap())
+return 0;
+
OwnPtr graphicsContext = webImage->bitmap()->createGraphicsContext();
CGContextDrawImage(graphicsContext->platformContext(), CGRectMake(0, 0, imageSize.width(), imageSize.height()), imageRef);
return toAPI(webImage.release().leakRef());
Modified: branches/safari-534-branch/Source/WebKit2/Shared/UserMessageCoders.h (4 => 5)
--- branches/safari-534-branch/Source/WebKit2/Shared/UserMessageCoders.h 2011-06-15 00:24:46 UTC (rev 4)
+++ branches/safari-534-branch/Source/WebKit2/Shared/UserMessageCoders.h 2011-06-15 00:26:08 UTC (rev 5)
@@ -127,13 +127,13 @@
}
case APIObject::TypeImage: {
WebImage* image = static_cast(m_root);
-if (!image->bitmap()->isBackedBySharedMemory()) {
+if (!image->bitmap() || !image->bitmap()->isBackedBySharedMemory()) {
encoder->encode(false);
return true;
}
ShareableBitmap::Handle handle;
-if (!image->bitmap()->createHandle(handle))
+if (!image->bitmap() || !image->bitmap()->createHandle(handle))
return false;
encoder->encode(true);
Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (4 => 5)
--- branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-06-15 00:24:46 UTC (rev 4)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-06-15 00:26:08 UTC (rev 5)
@@ -858,6 +858,9 @@
frameView->setPaintBehavior(oldBehavior | PaintBehaviorFlattenCompositingLayers);
RefPtr snapshot = WebImage::create(rect.size(), options);
+if (!snapshot->bitmap())
+return 0;
+
OwnPtr graphicsContext = snapshot->bitmap()->createGraphicsContext();
graphicsContext->save();
@@ -887,6 +890,9 @@
size = IntSize(ceil(rect.width() * scaleFactor), ceil(rect.height() * scaleFactor));
RefPtr snapshot = WebImage::create(size, options);
+if (!snapshot->bitmap())
+return 0;
+
OwnPtr graphicsContext = snapshot->bitmap()->createGraphicsContext();
graphicsContext->s
[webkit-changes] [88882] branches/safari-534-branch/Source/WebKit2
Title: [2] branches/safari-534-branch/Source/WebKit2
Revision 2
Author lforsch...@apple.com
Date 2011-06-14 17:15:10 -0700 (Tue, 14 Jun 2011)
Log Message
Merge r88735.
Modified Paths
branches/safari-534-branch/Source/WebKit2/ChangeLog
branches/safari-534-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
branches/safari-534-branch/Source/WebKit2/Shared/Plugins/PluginQuirks.h
branches/safari-534-branch/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h
branches/safari-534-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (1 => 2)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-15 00:12:35 UTC (rev 1)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-15 00:15:10 UTC (rev 2)
@@ -1,5 +1,41 @@
2011-06-14 Lucas Forschler
+Merged 88735.
+
+2011-06-13 Anders Carlsson
+
+Reviewed by Sam Weinig.
+
+Crash when trying to use Netflix Watch Instantly with Silverlight 3
+https://bugs.webkit.org/show_bug.cgi?id=62611
+
+
+* Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+(WebKit::NetscapePluginModule::getPluginInfo):
+Get the plug-in version string instead of the version number.
+
+(WebKit::PluginVersion::isValid):
+(WebKit::PluginVersion::PluginVersion):
+(WebKit::PluginVersion::parse):
+(WebKit::PluginVersion::isLessThan):
+Add a new PluginVersion class that represents a plug-in version. The idea is
+that this class be made cross platform.
+
+(WebKit::NetscapePluginModule::determineQuirks):
+Add the ReturnsNonRetainedScriptableNPObject quirk for versions of Silverlight less than 4.
+
+* Shared/Plugins/PluginQuirks.h:
+Add the ReturnsNonRetainedScriptableNPObject quirk.
+
+* UIProcess/Plugins/PluginInfoStore.h:
+Use a version string. Eventually this should hold the PluginVersion class we added.
+
+* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+(WebKit::NetscapePlugin::pluginScriptableNPObject):
+If the plug-in has the ReturnsNonRetainedScriptableNPObject quirk, do an extra retain.
+
+2011-06-14 Lucas Forschler
+
Merged 88607.
2011-06-11 Stephanie Lewis
Modified: branches/safari-534-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (1 => 2)
--- branches/safari-534-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2011-06-15 00:12:35 UTC (rev 1)
+++ branches/safari-534-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2011-06-15 00:15:10 UTC (rev 2)
@@ -364,7 +364,10 @@
plugin.path = pluginPath;
plugin.bundleIdentifier = CFBundleGetIdentifier(bundle.get());
-plugin.versionNumber = CFBundleGetVersionNumber(bundle.get());
+if (CFTypeRef versionTypeRef = CFBundleGetValueForInfoDictionaryKey(bundle.get(), kCFBundleVersionKey)) {
+if (CFGetTypeID(versionTypeRef) == CFStringGetTypeID())
+plugin.versionString = static_cast(versionTypeRef);
+}
// Check that there's valid info for this plug-in.
if (!getPluginInfoFromPropertyLists(bundle.get(), plugin) &&
@@ -398,11 +401,52 @@
void (*createPluginMIMETypesPreferences)(void) = reinterpret_cast(CFBundleGetFunctionPointerForName(bundle.get(), CFSTR("BP_CreatePluginMIMETypesPreferences")));
if (!createPluginMIMETypesPreferences)
return false;
-
+
createPluginMIMETypesPreferences();
return true;
}
+// FIXME: This doesn't need to be platform-specific.
+class PluginVersion {
+public:
+static PluginVersion parse(const String& versionString);
+
+bool isLessThan(unsigned componentA) const;
+bool isValid() const { return !m_versionComponents.isEmpty(); }
+
+private:
+PluginVersion()
+{
+}
+
+Vector m_versionComponents;
+};
+
+PluginVersion PluginVersion::parse(const String& versionString)
+{
+PluginVersion version;
+
+Vector versionStringComponents;
+versionString.split(".", versionStringComponents);
+for (size_t i = 0; i < versionStringComponents.size(); ++i) {
+bool successfullyParsed = false;
+unsigned versionComponent = versionStringComponents[i].toUInt(&successfullyParsed);
+if (!successfullyParsed)
+return PluginVersion();
+
+version.m_versionComponents.append(versionComponent);
+}
+
+return version;
+}
+
+bool PluginVersion::isLessThan(unsigned componentA) const
+{
+ASSERT(isValid());
+
+return m_versionComponents[0] < componentA;
+}
+
void NetscapePluginModule::determineQuirks()
{
PluginInfoStore::Plugin plugin;
@@ -427,6 +471,14 @@
// Silverlight doesn't explicitly opt into transparency, so we'll do it whenever
// there's a 'background' attribute.
m_pluginQu
[webkit-changes] [88881] branches/safari-534-branch/Source/WebKit2
Title: [1] branches/safari-534-branch/Source/WebKit2
Revision 1
Author lforsch...@apple.com
Date 2011-06-14 17:12:35 -0700 (Tue, 14 Jun 2011)
Log Message
Merge r88607.
Modified Paths
branches/safari-534-branch/Source/WebKit2/ChangeLog
branches/safari-534-branch/Source/WebKit2/UIProcess/API/C/WKContext.cpp
branches/safari-534-branch/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h
branches/safari-534-branch/Source/WebKit2/UIProcess/WebContext.cpp
branches/safari-534-branch/Source/WebKit2/UIProcess/WebContext.h
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (0 => 1)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-15 00:12:26 UTC (rev 0)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-15 00:12:35 UTC (rev 1)
@@ -1,5 +1,25 @@
2011-06-14 Lucas Forschler
+Merged 88607.
+
+2011-06-11 Stephanie Lewis
+
+Reviewed by Sam Weinig.
+
+https://bugs.webkit.org/show_bug.cgi?id=62480
+part of
+Add API to launch the WebProcess. Launching it earlier can save time
+when loading the first page.
+
+* UIProcess/API/C/WKContext.cpp:
+(WKContextWarmInitialProcess):
+* UIProcess/API/C/WKContextPrivate.h:
+* UIProcess/WebContext.cpp:
+(WebKit::WebContext::warmInitialProcess):
+* UIProcess/WebContext.h:
+
+2011-06-14 Lucas Forschler
+
Merged 88677.
2011-06-13 Anders Carlsson
Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/API/C/WKContext.cpp (0 => 1)
--- branches/safari-534-branch/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2011-06-15 00:12:26 UTC (rev 0)
+++ branches/safari-534-branch/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2011-06-15 00:12:35 UTC (rev 1)
@@ -232,3 +232,9 @@
{
toImpl(contextRef)->setHTTPPipeliningEnabled(enabled);
}
+
+void WKContextWarmInitialProcess(WKContextRef contextRef)
+{
+toImpl(contextRef)->warmInitialProcess();
+}
+
Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h (0 => 1)
--- branches/safari-534-branch/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2011-06-15 00:12:26 UTC (rev 0)
+++ branches/safari-534-branch/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2011-06-15 00:12:35 UTC (rev 1)
@@ -67,6 +67,8 @@
WK_EXPORT void WKContextEnableProcessTermination(WKContextRef context);
WK_EXPORT void _WKContextSetHTTPPipeliningEnabled(WKContextRef context, bool enabled);
+
+WK_EXPORT void WKContextWarmInitialProcess(WKContextRef context);
#ifdef __cplusplus
}
Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/WebContext.cpp (0 => 1)
--- branches/safari-534-branch/Source/WebKit2/UIProcess/WebContext.cpp 2011-06-15 00:12:26 UTC (rev 0)
+++ branches/safari-534-branch/Source/WebKit2/UIProcess/WebContext.cpp 2011-06-15 00:12:35 UTC (rev 1)
@@ -260,6 +260,11 @@
m_pendingMessagesToPostToInjectedBundle.clear();
}
+void WebContext::warmInitialProcess()
+{
+ensureWebProcess();
+}
+
void WebContext::enableProcessTermination()
{
m_processTerminationEnabled = true;
Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/WebContext.h (0 => 1)
--- branches/safari-534-branch/Source/WebKit2/UIProcess/WebContext.h 2011-06-15 00:12:26 UTC (rev 0)
+++ branches/safari-534-branch/Source/WebKit2/UIProcess/WebContext.h 2011-06-15 00:12:35 UTC (rev 1)
@@ -165,6 +165,7 @@
void setLocalStorageDirectory(const String& dir) { m_overrideLocalStorageDirectory = dir; }
void ensureWebProcess();
+void warmInitialProcess();
bool shouldTerminate(WebProcessProxy*);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88880] trunk/Source/WebKit2
Title: [0] trunk/Source/WebKit2
Revision 0
Author noam.rosent...@nokia.com
Date 2011-06-14 17:12:26 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 No'am Rosenthal
Reviewed by Kenneth Rohde Christiansen.
[Qt] Implement accelerated compositing on WK2 Qt port
https://bugs.webkit.org/show_bug.cgi?id=56935
Expose viewportVisibleRect(), so that we can detect which parts of a texture actually
need to be uploaded.
Together with Viatcheslav Ostapenko.
* UIProcess/API/qt/qwkpage.cpp:
(QWKPagePrivate::viewportVisibleRect):
* UIProcess/API/qt/qwkpage_p.h:
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.h:
* UIProcess/qt/WebPageProxyQt.cpp:
(WebKit::WebPageProxy::viewportVisibleRect):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h
trunk/Source/WebKit2/UIProcess/PageClient.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
trunk/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88879 => 0)
--- trunk/Source/WebKit2/ChangeLog 2011-06-15 00:12:11 UTC (rev 88879)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-15 00:12:26 UTC (rev 0)
@@ -1,3 +1,23 @@
+2011-06-14 No'am Rosenthal
+
+Reviewed by Kenneth Rohde Christiansen.
+
+[Qt] Implement accelerated compositing on WK2 Qt port
+https://bugs.webkit.org/show_bug.cgi?id=56935
+
+Expose viewportVisibleRect(), so that we can detect which parts of a texture actually
+need to be uploaded.
+
+Together with Viatcheslav Ostapenko.
+
+* UIProcess/API/qt/qwkpage.cpp:
+(QWKPagePrivate::viewportVisibleRect):
+* UIProcess/API/qt/qwkpage_p.h:
+* UIProcess/PageClient.h:
+* UIProcess/WebPageProxy.h:
+* UIProcess/qt/WebPageProxyQt.cpp:
+(WebKit::WebPageProxy::viewportVisibleRect):
+
2011-06-14 Anders Carlsson
Reviewed by Sam Weinig.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp (88879 => 0)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp 2011-06-15 00:12:11 UTC (rev 88879)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp 2011-06-15 00:12:26 UTC (rev 0)
@@ -831,6 +831,12 @@
emit q->zoomableAreaFound(QRect(area));
}
+WebCore::IntRect QWKPagePrivate::viewportVisibleRect() const
+{
+QGraphicsWKView* wkView = static_cast(view);
+return enclosingIntRect(FloatRect(wkView->visibleRect()));
+}
+
bool QWKPage::isConnectedToEngine() const
{
return d->isConnectedToEngine;
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h (88879 => 0)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h 2011-06-15 00:12:11 UTC (rev 88879)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h 2011-06-15 00:12:26 UTC (rev 0)
@@ -69,6 +69,7 @@
virtual void didRelaunchProcess();
virtual void didChangeContentsSize(const WebCore::IntSize&);
virtual void didFindZoomableArea(const WebCore::IntRect&);
+virtual WebCore::IntRect viewportVisibleRect() const;
virtual void setCursor(const WebCore::Cursor&);
virtual void setViewportArguments(const WebCore::ViewportArguments&);
virtual void toolTipChanged(const WTF::String&, const WTF::String&);
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (88879 => 0)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2011-06-15 00:12:11 UTC (rev 88879)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2011-06-15 00:12:26 UTC (rev 0)
@@ -101,6 +101,7 @@
#if PLATFORM(QT)
virtual void didChangeContentsSize(const WebCore::IntSize&) = 0;
virtual void didFindZoomableArea(const WebCore::IntRect&) = 0;
+virtual WebCore::IntRect viewportVisibleRect() const = 0;
#endif
virtual void setCursor(const WebCore::Cursor&) = 0;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (88879 => 0)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-06-15 00:12:11 UTC (rev 88879)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-06-15 00:12:26 UTC (rev 0)
@@ -489,6 +489,7 @@
#if PLATFORM(QT)
void findZoomableAreaForPoint(const WebCore::IntPoint&);
+WebCore::IntRect viewportVisibleRect();
#endif
void advanceToNextMisspelling(bool startBeforeSelection) const;
Modified: trunk/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp (88879 => 0)
--- trunk/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp 2011-06-15 00:12:11 UTC (rev 88879)
+++ trunk/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp 2011-06-15 00:12:26 UTC (rev 0)
@@ -26,6 +26,7 @@
#include "config.h"
#include "WebPageProxy.h"
+#include "PageClient.h"
#include
namespace WebKit {
@@ -46,4 +47,9 @@
notImplemented();
}
+WebCore::IntRect WebPageProxy::viewportVisibleRect()
+{
+return m_pageClient->viewportVisibleRect();
+}
+
} // namespace WebKit
_
[webkit-changes] [88879] trunk/LayoutTests
Title: [88879] trunk/LayoutTests
Revision 88879
Author rn...@webkit.org
Date 2011-06-14 17:12:11 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Ryosuke Niwa
Qt rebaseline after r88757.
* platform/qt/fast/forms/range-thumb-height-percentage-expected.txt:
* platform/qt/fast/forms/thumbslider-no-parent-slider-expected.txt:
* platform/qt/fast/multicol/client-rects-expected.txt:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/qt/fast/forms/range-thumb-height-percentage-expected.txt
trunk/LayoutTests/platform/qt/fast/forms/thumbslider-no-parent-slider-expected.txt
trunk/LayoutTests/platform/qt/fast/multicol/client-rects-expected.txt
Diff
Modified: trunk/LayoutTests/ChangeLog (88878 => 88879)
--- trunk/LayoutTests/ChangeLog 2011-06-15 00:11:10 UTC (rev 88878)
+++ trunk/LayoutTests/ChangeLog 2011-06-15 00:12:11 UTC (rev 88879)
@@ -1,3 +1,11 @@
+2011-06-14 Ryosuke Niwa
+
+Qt rebaseline after r88757.
+
+* platform/qt/fast/forms/range-thumb-height-percentage-expected.txt:
+* platform/qt/fast/forms/thumbslider-no-parent-slider-expected.txt:
+* platform/qt/fast/multicol/client-rects-expected.txt:
+
2011-06-14 Dimitri Glazkov
[Chromium] Turns out, inspector/cookie-parser.html can timeout out.
Modified: trunk/LayoutTests/platform/qt/fast/forms/range-thumb-height-percentage-expected.txt (88878 => 88879)
--- trunk/LayoutTests/platform/qt/fast/forms/range-thumb-height-percentage-expected.txt 2011-06-15 00:11:10 UTC (rev 88878)
+++ trunk/LayoutTests/platform/qt/fast/forms/range-thumb-height-percentage-expected.txt 2011-06-15 00:12:11 UTC (rev 88879)
@@ -8,5 +8,9 @@
text run at (0,0) width 572: "The slider thumb below has a height specified as 50%. It should be a 10 pixel square."
RenderBlock (anonymous) at (0,38) size 784x24
RenderSlider {INPUT} at (2,2) size 200x20 [bgcolor=#C0C0C0]
- RenderBlock {DIV} at (95,5) size 10x10 [bgcolor=#008000]
+ RenderFlexibleBox {DIV} at (0,0) size 200x20
+RenderBlock {DIV} at (0,5) size 190x10
+RenderBlock {DIV} at (190,5) size 10x10 [bgcolor=#008000]
RenderText {#text} at (0,0) size 0x0
+layer at (105,53) size 10x10
+ RenderBlock (relative positioned) {DIV} at (0,0) size 10x10 [bgcolor=#008000]
Modified: trunk/LayoutTests/platform/qt/fast/forms/thumbslider-no-parent-slider-expected.txt (88878 => 88879)
--- trunk/LayoutTests/platform/qt/fast/forms/thumbslider-no-parent-slider-expected.txt 2011-06-15 00:11:10 UTC (rev 88878)
+++ trunk/LayoutTests/platform/qt/fast/forms/thumbslider-no-parent-slider-expected.txt 2011-06-15 00:12:11 UTC (rev 88879)
@@ -3,7 +3,7 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {SPAN} at (0,0) size 20x20
- RenderBR {BR} at (20,20) size 0x0
- RenderBlock {SPAN} at (0,20) size 20x20
+ RenderBlock {SPAN} at (0,0) size 11x16
+ RenderBR {BR} at (11,16) size 0x0
+ RenderBlock {SPAN} at (0,16) size 11x16
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/qt/fast/multicol/client-rects-expected.txt (88878 => 88879)
--- trunk/LayoutTests/platform/qt/fast/multicol/client-rects-expected.txt 2011-06-15 00:11:10 UTC (rev 88878)
+++ trunk/LayoutTests/platform/qt/fast/multicol/client-rects-expected.txt 2011-06-15 00:12:11 UTC (rev 88879)
@@ -61,7 +61,9 @@
RenderBlock {DIV} at (13,38) size 50x54
RenderBR {BR} at (0,0) size 0x25
RenderSlider {INPUT} at (2,27) size 25x25 [color=#00] [bgcolor=#ADD8E6]
-RenderBlock {DIV} at (12,12) size 0x0
+RenderFlexibleBox {DIV} at (0,0) size 25x25
+ RenderBlock {DIV} at (0,12) size 25x0
+ RenderBlock {DIV} at (25,12) size 0x0
layer at (8,516) size 136x76
RenderBlock {DIV} at (0,508) size 136x76 [color=#ADD8E6] [border: (3px solid #00)]
RenderBlock (anonymous) at (13,13) size 50x25
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88877] trunk/Source/WebCore
Title: [88877] trunk/Source/WebCore
Revision 88877
Author bda...@apple.com
Date 2011-06-14 17:09:01 -0700 (Tue, 14 Jun 2011)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=62678
When the window is small enough, the scrollbars are misplaced with painting
artifacts, after changing the scrollbar appearance
-and corresponding-
Reviewed by Dan Bernstein.
Get rid of the FrameView implementation of scrollbarStyleChanged(). Its approach
is just not good.
* page/FrameView.cpp:
* page/FrameView.h:
Implement scrollbarStyleChanged() on ScrollView instead. And just call
updatedScrollbars().
* platform/ScrollView.cpp:
(WebCore::ScrollView::scrollbarStyleChanged):
* platform/ScrollView.h:
Invalidate the old scrollbar before changing it to the new scrollbar. This way
when the scrollbar gets smaller, the older, larger pieces still repaint properly.
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::updateScrollerStyle):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/FrameView.cpp
trunk/Source/WebCore/page/FrameView.h
trunk/Source/WebCore/platform/ScrollView.cpp
trunk/Source/WebCore/platform/ScrollView.h
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (88876 => 88877)
--- trunk/Source/WebCore/ChangeLog 2011-06-14 23:50:53 UTC (rev 88876)
+++ trunk/Source/WebCore/ChangeLog 2011-06-15 00:09:01 UTC (rev 88877)
@@ -1,3 +1,29 @@
+2011-06-14 Beth Dakin
+
+Reviewed by Dan Bernstein.
+
+https://bugs.webkit.org/show_bug.cgi?id=62678
+When the window is small enough, the scrollbars are misplaced with painting
+artifacts, after changing the scrollbar appearance
+-and corresponding-
+
+
+Get rid of the FrameView implementation of scrollbarStyleChanged(). Its approach
+is just not good.
+* page/FrameView.cpp:
+* page/FrameView.h:
+
+Implement scrollbarStyleChanged() on ScrollView instead. And just call
+updatedScrollbars().
+* platform/ScrollView.cpp:
+(WebCore::ScrollView::scrollbarStyleChanged):
+* platform/ScrollView.h:
+
+Invalidate the old scrollbar before changing it to the new scrollbar. This way
+when the scrollbar gets smaller, the older, larger pieces still repaint properly.
+* platform/mac/ScrollAnimatorMac.mm:
+(WebCore::ScrollAnimatorMac::updateScrollerStyle):
+
2011-06-14 Michael Saboff
Reviewed by Joseph Pecoraro.
Modified: trunk/Source/WebCore/page/FrameView.cpp (88876 => 88877)
--- trunk/Source/WebCore/page/FrameView.cpp 2011-06-14 23:50:53 UTC (rev 88876)
+++ trunk/Source/WebCore/page/FrameView.cpp 2011-06-15 00:09:01 UTC (rev 88877)
@@ -2216,14 +2216,6 @@
return page->chrome()->client()->didCompleteAnimatedScroll();
}
-void FrameView::scrollbarStyleChanged()
-{
-Page* page = m_frame->page();
-if (!page)
-return;
-page->setNeedsRecalcStyleInAllFrames();
-}
-
void FrameView::setVisibleScrollerThumbRect(const IntRect& scrollerThumb)
{
Page* page = m_frame->page();
Modified: trunk/Source/WebCore/page/FrameView.h (88876 => 88877)
--- trunk/Source/WebCore/page/FrameView.h 2011-06-14 23:50:53 UTC (rev 88876)
+++ trunk/Source/WebCore/page/FrameView.h 2011-06-15 00:09:01 UTC (rev 88877)
@@ -327,7 +327,6 @@
virtual void didCompleteRubberBand(const IntSize&) const;
virtual void didStartAnimatedScroll() const;
virtual void didCompleteAnimatedScroll() const;
-virtual void scrollbarStyleChanged();
virtual void setVisibleScrollerThumbRect(const IntRect&);
#if USE(ACCELERATED_COMPOSITING)
virtual GraphicsLayer* layerForHorizontalScrollbar() const;
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (88876 => 88877)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2011-06-14 23:50:53 UTC (rev 88876)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2011-06-15 00:09:01 UTC (rev 88877)
@@ -938,6 +938,11 @@
return !scrollCornerRect().isEmpty();
}
+void ScrollView::scrollbarStyleChanged()
+{
+updateScrollbars(scrollOffset());
+}
+
void ScrollView::updateScrollCorner()
{
}
Modified: trunk/Source/WebCore/platform/ScrollView.h (88876 => 88877)
--- trunk/Source/WebCore/platform/ScrollView.h 2011-06-14 23:50:53 UTC (rev 88876)
+++ trunk/Source/WebCore/platform/ScrollView.h 2011-06-15 00:09:01 UTC (rev 88877)
@@ -59,6 +59,7 @@
virtual void didCompleteRubberBand(const IntSize&) const;
virtual void notifyPageThatContentAreaWillPaint() const;
virtual bool isScrollCornerVisible() const;
+virtual void scrollbarStyleChanged();
// NOTE: This should only be called by the overriden setScrollOffset from ScrollableArea.
virtual void scrollTo(const IntSize& newOffset);
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (88876 => 88877)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-06-14 23:50:53 UTC (rev 8
[webkit-changes] [88876] branches/safari-534-branch/Source/WebCore
Title: [88876] branches/safari-534-branch/Source/WebCore
Revision 88876
Author lforsch...@apple.com
Date 2011-06-14 16:50:53 -0700 (Tue, 14 Jun 2011)
Log Message
Merge r88685.
Modified Paths
branches/safari-534-branch/Source/WebCore/ChangeLog
branches/safari-534-branch/Source/WebCore/dom/Position.cpp
branches/safari-534-branch/Source/WebCore/editing/VisiblePosition.cpp
branches/safari-534-branch/Source/WebCore/page/Frame.cpp
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (88875 => 88876)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-14 23:49:06 UTC (rev 88875)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-14 23:50:53 UTC (rev 88876)
@@ -1,5 +1,27 @@
2011-06-14 Lucas Forschler
+Merged 88685.
+
+2011-06-13 Ryosuke Niwa
+
+Reviewed by Dan Bernstein.
+
+REGRESSION (r81518): Crash in makeRange() when invoking the dictionary panel over a file input
+https://bugs.webkit.org/show_bug.cgi?id=62544
+
+Fixed the crash by adding null pointer checks.
+
+No new tests since there's no way to open dictionary panel.
+
+* dom/Position.cpp:
+(WebCore::Position::parentAnchoredEquivalent):
+* editing/VisiblePosition.cpp:
+(WebCore::makeRange):
+* page/Frame.cpp:
+(WebCore::Frame::rangeForPoint):
+
+2011-06-14 Lucas Forschler
+
Merged 88654.
2011-06-11 Jer Noble
Modified: branches/safari-534-branch/Source/WebCore/dom/Position.cpp (88875 => 88876)
--- branches/safari-534-branch/Source/WebCore/dom/Position.cpp 2011-06-14 23:49:06 UTC (rev 88875)
+++ branches/safari-534-branch/Source/WebCore/dom/Position.cpp 2011-06-14 23:50:53 UTC (rev 88876)
@@ -172,7 +172,8 @@
return firstPositionInOrBeforeNode(m_anchorNode.get());
}
if (!m_anchorNode->offsetInCharacters() && (m_anchorType == PositionIsAfterAnchor || static_cast(m_offset) == m_anchorNode->childNodeCount())
-&& (editingIgnoresContent(m_anchorNode.get()) || isTableElement(m_anchorNode.get( {
+&& (editingIgnoresContent(m_anchorNode.get()) || isTableElement(m_anchorNode.get()))
+&& containerNode()) {
return positionInParentAfterNode(m_anchorNode.get());
}
Modified: branches/safari-534-branch/Source/WebCore/editing/VisiblePosition.cpp (88875 => 88876)
--- branches/safari-534-branch/Source/WebCore/editing/VisiblePosition.cpp 2011-06-14 23:49:06 UTC (rev 88875)
+++ branches/safari-534-branch/Source/WebCore/editing/VisiblePosition.cpp 2011-06-14 23:50:53 UTC (rev 88876)
@@ -632,6 +632,9 @@
Position s = start.deepEquivalent().parentAnchoredEquivalent();
Position e = end.deepEquivalent().parentAnchoredEquivalent();
+if (s.isNull() || e.isNull())
+return 0;
+
return Range::create(s.containerNode()->document(), s.containerNode(), s.offsetInContainerNode(), e.containerNode(), e.offsetInContainerNode());
}
Modified: branches/safari-534-branch/Source/WebCore/page/Frame.cpp (88875 => 88876)
--- branches/safari-534-branch/Source/WebCore/page/Frame.cpp 2011-06-14 23:49:06 UTC (rev 88875)
+++ branches/safari-534-branch/Source/WebCore/page/Frame.cpp 2011-06-14 23:50:53 UTC (rev 88876)
@@ -898,8 +898,7 @@
}
VisiblePosition next = position.next();
-if (next.isNotNull()) {
-RefPtr nextCharacterRange = makeRange(position, next);
+if (RefPtr nextCharacterRange = makeRange(position, next)) {
IntRect rect = editor()->firstRectForRange(nextCharacterRange.get());
if (rect.contains(framePoint))
return nextCharacterRange.release();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88875] branches/safari-534-branch/Source/WebKit2
Title: [88875] branches/safari-534-branch/Source/WebKit2
Revision 88875
Author lforsch...@apple.com
Date 2011-06-14 16:49:06 -0700 (Tue, 14 Jun 2011)
Log Message
Merge r88677.
Modified Paths
branches/safari-534-branch/Source/WebKit2/ChangeLog
branches/safari-534-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
branches/safari-534-branch/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (88874 => 88875)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-14 23:46:50 UTC (rev 88874)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-14 23:49:06 UTC (rev 88875)
@@ -1,5 +1,27 @@
2011-06-14 Lucas Forschler
+Merged 88677.
+
+2011-06-13 Anders Carlsson
+
+Reviewed by Dan Bernstein.
+
+BankID plug-in isn't instantiated correctly
+https://bugs.webkit.org/show_bug.cgi?id=62588
+
+
+* Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+(WebKit::NetscapePluginModule::determineQuirks):
+The BankID plug-in uses the QuickDraw drawing model but doesn't draw anything so we can
+use the half-baked QuickDraw support.
+
+* WebProcess/Plugins/PluginProcessConnection.cpp:
+(WebKit::defaultSyncMessageTimeout):
+Don't use a sync message timeout for the BankID plug-in since it sends synchronous Apple Events
+and we don't want the plug-in to die while it's waiting for a reply.
+
+2011-06-14 Lucas Forschler
+
Merged 88654.
2011-06-11 Jer Noble
Modified: branches/safari-534-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (88874 => 88875)
--- branches/safari-534-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2011-06-14 23:46:50 UTC (rev 88874)
+++ branches/safari-534-branch/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2011-06-14 23:49:06 UTC (rev 88875)
@@ -441,6 +441,12 @@
// so we'll allow it to be instantiated even though we don't support QuickDraw.
m_pluginQuirks.add(PluginQuirks::AllowHalfBakedQuickDrawSupport);
}
+
+if (plugin.bundleIdentifier == "com.jattesaker.macid2.NPPlugin") {
+// The BankID plug-in uses QuickDraw but doesn't paint or receive events
+// so we'll allow it to be instantiated even though we don't support QuickDraw.
+m_pluginQuirks.add(PluginQuirks::AllowHalfBakedQuickDrawSupport);
+}
#endif
}
Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp (88874 => 88875)
--- branches/safari-534-branch/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2011-06-14 23:46:50 UTC (rev 88874)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2011-06-14 23:49:06 UTC (rev 88875)
@@ -58,7 +58,12 @@
// This way we could check if the plug-in process is actually hung or not.
if (pathGetFileName(pluginPath) == "SharePointBrowserPlugin.plugin")
return CoreIPC::Connection::NoTimeout;
-
+
+// We don't want a message timeout for the BankID plug-in since it can spin a nested
+// run loop when it's waiting for a reply to an AppleEvent.
+if (pathGetFileName(pluginPath) == "PersonalPlugin.bundle")
+return CoreIPC::Connection::NoTimeout;
+
return syncMessageTimeout;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88874] branches/safari-534-branch/Source
Title: [88874] branches/safari-534-branch/Source
Revision 88874
Author lforsch...@apple.com
Date 2011-06-14 16:46:50 -0700 (Tue, 14 Jun 2011)
Log Message
Merge r88654.
Modified Paths
branches/safari-534-branch/Source/WebCore/ChangeLog
branches/safari-534-branch/Source/WebCore/dom/Document.cpp
branches/safari-534-branch/Source/WebKit2/ChangeLog
branches/safari-534-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm
branches/safari-534-branch/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp
branches/safari-534-branch/Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (88873 => 88874)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-14 23:39:25 UTC (rev 88873)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-14 23:46:50 UTC (rev 88874)
@@ -1,5 +1,26 @@
2011-06-14 Lucas Forschler
+Merged 88654.
+
+2011-06-11 Jer Noble
+
+Reviewed by Anders Carlsson.
+
+Avoid flashing when exiting full-screen mode.
+https://bugs.webkit.org/show_bug.cgi?id=62338
+
+No new tests; covered by the existing full-screen tests.
+
+Now that we are forcing a repaint inside of setRootFullScreenLayer() instead of during
+the next run loop, make sure that we have disabled animation before calling
+setRootFullScreenLayer() so that the RenderFullScreen renderer and its contents are
+painted.
+
+* dom/Document.cpp:
+(WebCore::Document::webkitDidEnterFullScreenForElement):
+
+2011-06-14 Lucas Forschler
+
Merged 88653.
2011-06-10 Jer Noble
Modified: branches/safari-534-branch/Source/WebCore/dom/Document.cpp (88873 => 88874)
--- branches/safari-534-branch/Source/WebCore/dom/Document.cpp 2011-06-14 23:39:25 UTC (rev 88873)
+++ branches/safari-534-branch/Source/WebCore/dom/Document.cpp 2011-06-14 23:46:50 UTC (rev 88874)
@@ -4913,12 +4913,10 @@
m_fullScreenElement->didBecomeFullscreenElement();
if (m_fullScreenRenderer) {
-#if USE(ACCELERATED_COMPOSITING)
-page()->chrome()->client()->setRootFullScreenLayer(0);
-#endif
setAnimatingFullScreen(false);
#if USE(ACCELERATED_COMPOSITING)
view()->updateCompositingLayers();
+page()->chrome()->client()->setRootFullScreenLayer(0);
#endif
}
m_fullScreenChangeEventTargetQueue.append(m_fullScreenElement);
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (88873 => 88874)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-14 23:39:25 UTC (rev 88873)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-14 23:46:50 UTC (rev 88874)
@@ -1,5 +1,47 @@
2011-06-14 Lucas Forschler
+Merged 88654.
+
+2011-06-11 Jer Noble
+
+Reviewed by Anders Carlsson.
+
+Avoid flashing when exiting full-screen mode.
+https://bugs.webkit.org/show_bug.cgi?id=62338
+
+Instead of making a round-trip between processes by calling forceRepaint
+and waiting for a callback, instead make a WebProcess-side call to
+forceRepaintWithoutCallback before sending the ExitAcceleratedCompositingMode
+message to the WebFullScreenControllerProxy. This also means we can get rid of
+the dragImage creation and display.
+
+Because this redraw will happen during the current run-loop instead of a future
+one, make sure the background color has been set before the redraw in
+didEnterFullScreen().
+
+Wait to hide the full-screen window until after we have received the
+ExitAcceleratedCompositingMode message. By this time, repaint will have already
+completed.
+
+* UIProcess/mac/WKFullScreenWindowController.h:
+* UIProcess/mac/WKFullScreenWindowController.mm:
+(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]): Disable
+screen updates, to be re-enabled during exitAcceleratedCompositingMode.
+(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]): Don't hide
+the full-screen window here; wait for exitAcceleratedCompositing instead.
+(-[WKFullScreenWindowController exitAcceleratedCompositingMode]): Collapse
+the redrawCompleted method into this one.
+(-[WKFullScreenWindowController close]): Remove the reference to
+exitCompositedModeRepaintCompleted.
+* WebProcess/FullScreen/WebFullScreenManager.cpp:
+(WebKit::WebFullScreenManager::didEnterFullScreen): Set the full screen
+background color first.
+* WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm:
+(WebKit::WebFullScreenManagerMac::setRootFullScreenLayer): Repaint before
+sending the ExitAcceleratedCompositingMode message.
+
+2011-06-14 Lucas Forschler
+
Merged 88647.
2011-06-13 Anders Carlsson
Modified: branches/safari-
[webkit-changes] [88873] trunk/Source/JavaScriptCore
Title: [88873] trunk/Source/_javascript_Core
Revision 88873
Author oli...@apple.com
Date 2011-06-14 16:39:25 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Oliver Hunt
Reviewed by Gavin Barraclough.
Constant array literals result in unnecessarily large amounts of code
https://bugs.webkit.org/show_bug.cgi?id=62658
Add a new version of op_new_array that simply copies values from a buffer
we hang off of the CodeBlock, rather than generating code to place each
entry into the registerfile, and then copying it from the registerfile into
the array. This is a slight improvement on some sunspider tests, but no
measurable overall change. That's okay though as our goal was to reduce
code size without hurting performance.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dump):
* bytecode/CodeBlock.h:
(JSC::CodeBlock::addImmediateBuffer):
(JSC::CodeBlock::immediateBuffer):
* bytecode/Opcode.h:
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::addImmediateBuffer):
(JSC::BytecodeGenerator::emitNewArray):
* bytecompiler/BytecodeGenerator.h:
* bytecompiler/NodesCodegen.cpp:
(JSC::ArrayNode::emitBytecode):
* interpreter/Interpreter.cpp:
(JSC::Interpreter::privateExecute):
* jit/JIT.cpp:
(JSC::JIT::privateCompileMainPass):
* jit/JIT.h:
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_new_array):
(JSC::JIT::emit_op_new_array_buffer):
* jit/JITOpcodes32_64.cpp:
* jit/JITStubs.cpp:
(JSC::DEFINE_STUB_FUNCTION):
* jit/JITStubs.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp
trunk/Source/_javascript_Core/bytecode/CodeBlock.h
trunk/Source/_javascript_Core/bytecode/Opcode.h
trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp
trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h
trunk/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp
trunk/Source/_javascript_Core/interpreter/Interpreter.cpp
trunk/Source/_javascript_Core/jit/JIT.cpp
trunk/Source/_javascript_Core/jit/JIT.h
trunk/Source/_javascript_Core/jit/JITOpcodes.cpp
trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp
trunk/Source/_javascript_Core/jit/JITStubs.cpp
trunk/Source/_javascript_Core/jit/JITStubs.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (88872 => 88873)
--- trunk/Source/_javascript_Core/ChangeLog 2011-06-14 23:35:43 UTC (rev 88872)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-06-14 23:39:25 UTC (rev 88873)
@@ -1,3 +1,42 @@
+2011-06-14 Oliver Hunt
+
+Reviewed by Gavin Barraclough.
+
+Constant array literals result in unnecessarily large amounts of code
+https://bugs.webkit.org/show_bug.cgi?id=62658
+
+Add a new version of op_new_array that simply copies values from a buffer
+we hang off of the CodeBlock, rather than generating code to place each
+entry into the registerfile, and then copying it from the registerfile into
+the array. This is a slight improvement on some sunspider tests, but no
+measurable overall change. That's okay though as our goal was to reduce
+code size without hurting performance.
+
+* bytecode/CodeBlock.cpp:
+(JSC::CodeBlock::dump):
+* bytecode/CodeBlock.h:
+(JSC::CodeBlock::addImmediateBuffer):
+(JSC::CodeBlock::immediateBuffer):
+* bytecode/Opcode.h:
+* bytecompiler/BytecodeGenerator.cpp:
+(JSC::BytecodeGenerator::addImmediateBuffer):
+(JSC::BytecodeGenerator::emitNewArray):
+* bytecompiler/BytecodeGenerator.h:
+* bytecompiler/NodesCodegen.cpp:
+(JSC::ArrayNode::emitBytecode):
+* interpreter/Interpreter.cpp:
+(JSC::Interpreter::privateExecute):
+* jit/JIT.cpp:
+(JSC::JIT::privateCompileMainPass):
+* jit/JIT.h:
+* jit/JITOpcodes.cpp:
+(JSC::JIT::emit_op_new_array):
+(JSC::JIT::emit_op_new_array_buffer):
+* jit/JITOpcodes32_64.cpp:
+* jit/JITStubs.cpp:
+(JSC::DEFINE_STUB_FUNCTION):
+* jit/JITStubs.h:
+
2011-06-14 Sheriff Bot
Unreviewed, rolling out r88841.
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (88872 => 88873)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2011-06-14 23:35:43 UTC (rev 88872)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2011-06-14 23:39:25 UTC (rev 88873)
@@ -530,6 +530,13 @@
printf("[%4d] new_array\t %s, %s, %d\n", location, registerName(exec, dst).data(), registerName(exec, argv).data(), argc);
break;
}
+case op_new_array_buffer: {
+int dst = (++it)->u.operand;
+int argv = (++it)->u.operand;
+int argc = (++it)->u.operand;
+
[webkit-changes] [88872] trunk/Source/WebKit/gtk
Title: [88872] trunk/Source/WebKit/gtk Revision 88872 Author x...@webkit.org Date 2011-06-14 16:35:43 -0700 (Tue, 14 Jun 2011) Log Message 2011-06-14 Xan Lopez Reviewed by Martin Robinson. [GTK] Remove G_CONST_RETURN usage https://bugs.webkit.org/show_bug.cgi?id=62673 Change G_CONST_RETURN for a simple "const" throughout the codebase, since G_CONST_RETURN is deprecated now. This should be totally equivalent since for all practical purposes the macro is always expanded to const. * webkit/webkitapplicationcache.cpp: (webkit_application_cache_get_database_directory_path): use const instead of G_CONST_RETURN. * webkit/webkitapplicationcache.h: * webkit/webkiticondatabase.cpp: (webkit_icon_database_get_path): ditto. * webkit/webkiticondatabase.h: * webkit/webkitnetworkrequest.cpp: (webkit_network_request_get_uri): ditto. * webkit/webkitnetworkrequest.h: * webkit/webkitnetworkresponse.cpp: (webkit_network_response_get_uri): ditto. * webkit/webkitnetworkresponse.h: * webkit/webkitsecurityorigin.cpp: (webkit_security_origin_get_protocol): ditto. (webkit_security_origin_get_host): ditto. * webkit/webkitsecurityorigin.h: * webkit/webkitwebdatabase.cpp: (webkit_web_database_get_name): ditto. (webkit_web_database_get_display_name): ditto. (webkit_web_database_get_filename): ditto. (webkit_get_web_database_directory_path): ditto. * webkit/webkitwebdatabase.h: * webkit/webkitwebdatasource.cpp: (webkit_web_data_source_get_encoding): ditto. (webkit_web_data_source_get_unreachable_uri): ditto. * webkit/webkitwebdatasource.h: * webkit/webkitwebframe.cpp: (webkit_web_frame_get_title): ditto. (webkit_web_frame_get_uri): ditto. (webkit_web_frame_get_name): ditto. * webkit/webkitwebframe.h: * webkit/webkitwebhistoryitem.cpp: (webkit_web_history_item_get_title): ditto. (webkit_web_history_item_get_alternate_title): ditto. (webkit_web_history_item_get_uri): ditto. (webkit_web_history_item_get_original_uri): ditto. (webkit_web_history_item_get_target): ditto. * webkit/webkitwebhistoryitem.h: * webkit/webkitwebhistoryitemprivate.h: * webkit/webkitwebnavigationaction.cpp: (webkit_web_navigation_action_get_target_frame): ditto. * webkit/webkitwebnavigationaction.h: * webkit/webkitwebresource.cpp: (webkit_web_resource_get_uri): ditto. (webkit_web_resource_get_mime_type): ditto. (webkit_web_resource_get_encoding): ditto. (webkit_web_resource_get_frame_name): ditto. * webkit/webkitwebresource.h: * webkit/webkitwebsettings.cpp: (webkit_web_settings_get_user_agent): ditto. * webkit/webkitwebsettings.h: * webkit/webkitwebview.cpp: (webkit_web_view_get_title): ditto. (webkit_web_view_get_uri): ditto. (webkit_web_view_get_icon_uri): ditto. * webkit/webkitwebview.h: * webkit/webkitwebviewcommon.h: Modified Paths trunk/Source/WebKit/gtk/ChangeLog trunk/Source/WebKit/gtk/webkit/webkitapplicationcache.cpp trunk/Source/WebKit/gtk/webkit/webkitapplicationcache.h trunk/Source/WebKit/gtk/webkit/webkiticondatabase.cpp trunk/Source/WebKit/gtk/webkit/webkiticondatabase.h trunk/Source/WebKit/gtk/webkit/webkitnetworkrequest.cpp trunk/Source/WebKit/gtk/webkit/webkitnetworkrequest.h trunk/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp trunk/Source/WebKit/gtk/webkit/webkitnetworkresponse.h trunk/Source/WebKit/gtk/webkit/webkitsecurityorigin.cpp trunk/Source/WebKit/gtk/webkit/webkitsecurityorigin.h trunk/Source/WebKit/gtk/webkit/webkitwebdatabase.cpp trunk/Source/WebKit/gtk/webkit/webkitwebdatabase.h trunk/Source/WebKit/gtk/webkit/webkitwebdatasource.cpp trunk/Source/WebKit/gtk/webkit/webkitwebdatasource.h trunk/Source/WebKit/gtk/webkit/webkitwebframe.cpp trunk/Source/WebKit/gtk/webkit/webkitwebframe.h trunk/Source/WebKit/gtk/webkit/webkitwebhistoryitem.cpp trunk/Source/WebKit/gtk/webkit/webkitwebhistoryitem.h trunk/Source/WebKit/gtk/webkit/webkitwebhistoryitemprivate.h trunk/Source/WebKit/gtk/webkit/webkitwebnavigationaction.cpp trunk/Source/WebKit/gtk/webkit/webkitwebnavigationaction.h trunk/Source/WebKit/gtk/webkit/webkitwebresource.cpp trunk/Source/WebKit/gtk/webkit/webkitwebresource.h trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp trunk/Source/WebKit/gtk/webkit/webkitwebsettings.h trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp trunk/Source/WebKit/gtk/webkit/webkitwebview.h trunk/Source/WebKit/gtk/webkit/webkitwebviewcommon.h Diff Modified: trunk/Source/WebKit/gtk/ChangeLog (88871 => 88872) --- trunk/Source/WebKit/gtk/ChangeLog 2011-06-14 23:29:51 UTC (rev 88871) +++ trunk/Source/WebKit/gtk/ChangeLog 2011-06
[webkit-changes] [88871] trunk/Source/WebCore
Title: [88871] trunk/Source/WebCore
Revision 88871
Author msab...@apple.com
Date 2011-06-14 16:29:51 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Michael Saboff
Reviewed by Joseph Pecoraro.
Incorrect #if[n]def for building without DISPATCH_VM_PRESSURE
https://bugs.webkit.org/show_bug.cgi?id=62649
Take 2.
The #ifdef DISPATCH_VM_PRESSURE doesn't work. Combined the code
inside this #ifdef with the prior #ifndef DISPATCH_SOURCE_TYPE_VM.
No functional changes, fixing build issue therefore no tests.
* platform/mac/MemoryPressureHandlerMac.mm:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (88870 => 88871)
--- trunk/Source/WebCore/ChangeLog 2011-06-14 23:25:45 UTC (rev 88870)
+++ trunk/Source/WebCore/ChangeLog 2011-06-14 23:29:51 UTC (rev 88871)
@@ -1,3 +1,18 @@
+2011-06-14 Michael Saboff
+
+Reviewed by Joseph Pecoraro.
+
+Incorrect #if[n]def for building without DISPATCH_VM_PRESSURE
+https://bugs.webkit.org/show_bug.cgi?id=62649
+
+Take 2.
+The #ifdef DISPATCH_VM_PRESSURE doesn't work. Combined the code
+inside this #ifdef with the prior #ifndef DISPATCH_SOURCE_TYPE_VM.
+
+No functional changes, fixing build issue therefore no tests.
+
+* platform/mac/MemoryPressureHandlerMac.mm:
+
2011-06-14 Jeffrey Pfau
Reviewed by David Hyatt.
Modified: trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm (88870 => 88871)
--- trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2011-06-14 23:25:45 UTC (rev 88870)
+++ trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2011-06-14 23:29:51 UTC (rev 88871)
@@ -38,9 +38,7 @@
#ifndef DISPATCH_SOURCE_TYPE_VM
#define DISPATCH_SOURCE_TYPE_VM (&_dispatch_source_type_vm)
DISPATCH_EXPORT const struct dispatch_source_type_s _dispatch_source_type_vm;
-#endif
-#ifdef DISPATCH_VM_PRESSURE
enum {
DISPATCH_VM_PRESSURE = 0x8000,
};
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88870] trunk/Source/WebKit2
Title: [88870] trunk/Source/WebKit2
Revision 88870
Author ander...@apple.com
Date 2011-06-14 16:25:45 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Anders Carlsson
Reviewed by Sam Weinig.
Start using the new encode/decode functions
https://bugs.webkit.org/show_bug.cgi?id=62676
* Platform/CoreIPC/DataReference.cpp:
(CoreIPC::DataReference::encode):
Use encodeVariableLengthByteArray.
* Shared/UserMessageCoders.h:
(WebKit::UserMessageEncoder::baseEncode):
Use encodeVariableLengthByteArray and the new dataReference accessors.
(WebKit::UserMessageDecoder::baseDecode):
Use decodeVariableLengthByteArray.
* Shared/WebData.h:
(WebKit::WebData::dataReference):
Return a reference to the data.
* Shared/WebSerializedScriptValue.h:
(WebKit::WebSerializedScriptValue::dataReference):
Ditto.
* Shared/cf/ArgumentCodersCF.cpp:
(CoreIPC::encode):
Use encodeVariableLengthByteArray.
* Shared/mac/SandboxExtensionMac.mm:
(WebKit::SandboxExtension::Handle::encode):
Use encodeVariableLengthByteArray.
* WebProcess/WebPage/DecoderAdapter.cpp:
(WebKit::DecoderAdapter::decodeBytes):
Use decodeVariableLengthByteArray.
* WebProcess/WebPage/EncoderAdapter.cpp:
(WebKit::EncoderAdapter::dataReference):
Rename data() to dataReference() to indicate that it returns a reference to the data.
(WebKit::EncoderAdapter::encodeBytes):
Use encodeVariableLengthByteArray.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/CoreIPC/DataReference.cpp
trunk/Source/WebKit2/Shared/UserMessageCoders.h
trunk/Source/WebKit2/Shared/WebData.h
trunk/Source/WebKit2/Shared/WebSerializedScriptValue.h
trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp
trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm
trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp
trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp
trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.h
trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88869 => 88870)
--- trunk/Source/WebKit2/ChangeLog 2011-06-14 23:13:03 UTC (rev 88869)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-14 23:25:45 UTC (rev 88870)
@@ -2,6 +2,51 @@
Reviewed by Sam Weinig.
+Start using the new encode/decode functions
+https://bugs.webkit.org/show_bug.cgi?id=62676
+
+* Platform/CoreIPC/DataReference.cpp:
+(CoreIPC::DataReference::encode):
+Use encodeVariableLengthByteArray.
+
+* Shared/UserMessageCoders.h:
+(WebKit::UserMessageEncoder::baseEncode):
+Use encodeVariableLengthByteArray and the new dataReference accessors.
+
+(WebKit::UserMessageDecoder::baseDecode):
+Use decodeVariableLengthByteArray.
+
+* Shared/WebData.h:
+(WebKit::WebData::dataReference):
+Return a reference to the data.
+
+* Shared/WebSerializedScriptValue.h:
+(WebKit::WebSerializedScriptValue::dataReference):
+Ditto.
+
+* Shared/cf/ArgumentCodersCF.cpp:
+(CoreIPC::encode):
+Use encodeVariableLengthByteArray.
+
+* Shared/mac/SandboxExtensionMac.mm:
+(WebKit::SandboxExtension::Handle::encode):
+Use encodeVariableLengthByteArray.
+
+* WebProcess/WebPage/DecoderAdapter.cpp:
+(WebKit::DecoderAdapter::decodeBytes):
+Use decodeVariableLengthByteArray.
+
+* WebProcess/WebPage/EncoderAdapter.cpp:
+(WebKit::EncoderAdapter::dataReference):
+Rename data() to dataReference() to indicate that it returns a reference to the data.
+
+(WebKit::EncoderAdapter::encodeBytes):
+Use encodeVariableLengthByteArray.
+
+2011-06-14 Anders Carlsson
+
+Reviewed by Sam Weinig.
+
Add encodeVariableLengthByteArray and decodeVariableLengthByteArray
https://bugs.webkit.org/show_bug.cgi?id=62674
Modified: trunk/Source/WebKit2/Platform/CoreIPC/DataReference.cpp (88869 => 88870)
--- trunk/Source/WebKit2/Platform/CoreIPC/DataReference.cpp 2011-06-14 23:13:03 UTC (rev 88869)
+++ trunk/Source/WebKit2/Platform/CoreIPC/DataReference.cpp 2011-06-14 23:25:45 UTC (rev 88870)
@@ -33,7 +33,7 @@
void DataReference::encode(ArgumentEncoder* encoder) const
{
-encoder->encodeBytes(m_data, m_size);
+encoder->encodeVariableLengthByteArray(*this);
}
bool DataReference::decode(ArgumentDecoder* decoder, DataReference& dataReference)
Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (88869 => 88870)
--- trunk/Source/WebKit2/Shared/UserMessageCoders.h 2011-06-14 23:13:03 UTC (rev 88869)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h 2011-06-14 23:25:45 UTC (rev 88870)
@@ -28,6 +28,7 @@
#include "ArgumentDecoder.h"
#include "Ar
[webkit-changes] [88869] trunk/Source/WebKit2
Title: [88869] trunk/Source/WebKit2
Revision 88869
Author ander...@apple.com
Date 2011-06-14 16:13:03 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Anders Carlsson
Reviewed by Sam Weinig.
Add encodeVariableLengthByteArray and decodeVariableLengthByteArray
https://bugs.webkit.org/show_bug.cgi?id=62674
Rename the ArgumentDecoder::decodeBytes overload that takes a DataReference to
decodeVariableLengthByteArray, to match the added encodeVariableLengthByteArray.
* Platform/CoreIPC/ArgumentDecoder.cpp:
(CoreIPC::ArgumentDecoder::decodeVariableLengthByteArray):
* Platform/CoreIPC/ArgumentDecoder.h:
* Platform/CoreIPC/ArgumentEncoder.cpp:
(CoreIPC::ArgumentEncoder::encodeFixedLengthData):
(CoreIPC::ArgumentEncoder::encodeVariableLengthByteArray):
* Platform/CoreIPC/ArgumentEncoder.h:
* Platform/CoreIPC/DataReference.cpp:
(CoreIPC::DataReference::decode):
* Shared/mac/SandboxExtensionMac.mm:
(WebKit::SandboxExtension::Handle::decode):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp
trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h
trunk/Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp
trunk/Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.h
trunk/Source/WebKit2/Platform/CoreIPC/DataReference.cpp
trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88868 => 88869)
--- trunk/Source/WebKit2/ChangeLog 2011-06-14 23:09:17 UTC (rev 88868)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-14 23:13:03 UTC (rev 88869)
@@ -2,6 +2,28 @@
Reviewed by Sam Weinig.
+Add encodeVariableLengthByteArray and decodeVariableLengthByteArray
+https://bugs.webkit.org/show_bug.cgi?id=62674
+
+Rename the ArgumentDecoder::decodeBytes overload that takes a DataReference to
+decodeVariableLengthByteArray, to match the added encodeVariableLengthByteArray.
+
+* Platform/CoreIPC/ArgumentDecoder.cpp:
+(CoreIPC::ArgumentDecoder::decodeVariableLengthByteArray):
+* Platform/CoreIPC/ArgumentDecoder.h:
+* Platform/CoreIPC/ArgumentEncoder.cpp:
+(CoreIPC::ArgumentEncoder::encodeFixedLengthData):
+(CoreIPC::ArgumentEncoder::encodeVariableLengthByteArray):
+* Platform/CoreIPC/ArgumentEncoder.h:
+* Platform/CoreIPC/DataReference.cpp:
+(CoreIPC::DataReference::decode):
+* Shared/mac/SandboxExtensionMac.mm:
+(WebKit::SandboxExtension::Handle::decode):
+
+2011-06-14 Anders Carlsson
+
+Reviewed by Sam Weinig.
+
Add functions for converting between DataReferences and vectors
https://bugs.webkit.org/show_bug.cgi?id=62671
Modified: trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp (88868 => 88869)
--- trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp 2011-06-14 23:09:17 UTC (rev 88868)
+++ trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp 2011-06-14 23:13:03 UTC (rev 88869)
@@ -129,7 +129,7 @@
return true;
}
-bool ArgumentDecoder::decodeBytes(DataReference& dataReference)
+bool ArgumentDecoder::decodeVariableLengthByteArray(DataReference& dataReference)
{
uint64_t size;
if (!decodeUInt64(size))
Modified: trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h (88868 => 88869)
--- trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h 2011-06-14 23:09:17 UTC (rev 88868)
+++ trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h 2011-06-14 23:13:03 UTC (rev 88869)
@@ -49,12 +49,12 @@
bool decodeFixedLengthData(uint8_t*, size_t, unsigned alignment);
+// The data in the data reference here will only be valid for the lifetime of the ArgumentDecoder object.
+bool decodeVariableLengthByteArray(DataReference&);
+
bool decodeBytes(Vector&);
bool decodeBytes(uint8_t*, size_t);
-// The data in the data reference here will only be valid for the lifetime of the ArgumentDecoder object.
-bool decodeBytes(DataReference&);
-
bool decodeBool(bool&);
bool decodeUInt32(uint32_t&);
bool decodeUInt64(uint64_t&);
Modified: trunk/Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp (88868 => 88869)
--- trunk/Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp 2011-06-14 23:09:17 UTC (rev 88868)
+++ trunk/Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp 2011-06-14 23:13:03 UTC (rev 88869)
@@ -26,6 +26,7 @@
#include "config.h"
#include "ArgumentEncoder.h"
+#include "DataReference.h"
#include
#include
@@ -87,17 +88,18 @@
void ArgumentEncoder::encodeFixedLengthData(const uint8_t* data, size_t size, unsigned alignment)
{
+ASSERT(!(reinterpret_cast(data) % alignment));
+
uint8_t* buffer = grow(alignment, size);
memcpy(buffer, data, size);
}
-void ArgumentEncoder::encodeVariableLengthData(const uint8_t* data, size_t size, unsigned alignment)
+
[webkit-changes] [88868] branches/safari-534-branch/Source/WebCore
Title: [88868] branches/safari-534-branch/Source/WebCore
Revision 88868
Author lforsch...@apple.com
Date 2011-06-14 16:09:17 -0700 (Tue, 14 Jun 2011)
Log Message
Merge r88653.
Modified Paths
branches/safari-534-branch/Source/WebCore/ChangeLog
branches/safari-534-branch/Source/WebCore/platform/graphics/GraphicsLayer.h
branches/safari-534-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
branches/safari-534-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
branches/safari-534-branch/Source/WebCore/rendering/RenderLayerBacking.cpp
branches/safari-534-branch/Source/WebCore/rendering/RenderLayerBacking.h
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (88867 => 88868)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-14 23:06:52 UTC (rev 88867)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-14 23:09:17 UTC (rev 88868)
@@ -1,5 +1,43 @@
2011-06-14 Lucas Forschler
+Merged 88653.
+
+2011-06-10 Jer Noble
+
+Reviewed by Darin Adler.
+
+Flash of white on left and right edges of screen when showing fullscreen controller when movie doesn't fill the entire screen
+https://bugs.webkit.org/show_bug.cgi?id=62491
+
+
+No new tests; should be covered by existing fullscreen pixel tests.
+
+On certain displays, when a RenderFullScreen renderer is created, it is large enough to trigger the
+creation of a tiled CALayer (instead of a normal CALayer). Painting in these layers necessarily
+happens asynchronously, so the flash is occurring because of the async painting of the RenderFullScreen
+renderer's background color. Since we know the RenderFullScreen does not otherwise paint its contents,
+we can add a special case in the RenderLayerBacking to set the GraphicsLayer contents to be the
+renderer's background color. Fill in support for creating a contentLayer to contain the background
+color inside GraphicsLayerCA.
+
+* platform/graphics/GraphicsLayer.h:
+(WebCore::GraphicsLayer::setContentsToBackgroundColor): Renamed from setContentsBackgroundColor to match
+the other setContentsTo... functions.
+* platform/graphics/ca/GraphicsLayerCA.cpp:
+(WebCore::GraphicsLayerCA::setContentsToBackgroundColor): Added. Creates a contentsLayer to host the
+background color.
+(WebCore::GraphicsLayerCA::updateLayerBackgroundColor): Removed a comment only.
+* platform/graphics/ca/GraphicsLayerCA.h:
+* rendering/RenderLayerBacking.cpp:
+(WebCore::RenderLayerBacking::updateGraphicsLayerConfiguration): Special case the RenderFullScreen
+renderer to call updateBackgroundColor.
+(WebCore::RenderLayerBacking::updateBackgroundColor): Added.
+(WebCore::RenderLayerBacking::containsPaintedContent): Tell the backing that the RenderFullScreen
+renderer does not paint its contents.
+* rendering/RenderLayerBacking.h:
+
+2011-06-14 Lucas Forschler
+
Merged 88629.
2011-06-12 Jer Noble
Modified: branches/safari-534-branch/Source/WebCore/platform/graphics/GraphicsLayer.h (88867 => 88868)
--- branches/safari-534-branch/Source/WebCore/platform/graphics/GraphicsLayer.h 2011-06-14 23:06:52 UTC (rev 88867)
+++ branches/safari-534-branch/Source/WebCore/platform/graphics/GraphicsLayer.h 2011-06-14 23:09:17 UTC (rev 88868)
@@ -301,7 +301,7 @@
// Layer contents
virtual void setContentsToImage(Image*) { }
virtual void setContentsToMedia(PlatformLayer*) { } // video or plug-in
-virtual void setContentsBackgroundColor(const Color&) { }
+virtual void setContentsToBackgroundColor(const Color&) { }
virtual void setContentsToCanvas(PlatformLayer*) { }
virtual bool hasContentsLayer() const { return false; }
Modified: branches/safari-534-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (88867 => 88868)
--- branches/safari-534-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2011-06-14 23:06:52 UTC (rev 88867)
+++ branches/safari-534-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2011-06-14 23:09:17 UTC (rev 88868)
@@ -661,6 +661,26 @@
m_client->notifyAnimationStarted(this, startTime);
}
+void GraphicsLayerCA::setContentsToBackgroundColor(const Color& color)
+{
+setBackgroundColor(color);
+if (color != Color::transparent) {
+m_contentsLayerPurpose = ContentsLayerForBackgroundColor;
+m_contentsLayer = PlatformCALayer::create(PlatformCALayer::LayerTypeLayer, this);
+#ifndef NDEBUG
+m_contentsLayer->setName("Background Color Layer");
+#endif
+updateContentsRect();
+setupContentsLayer(m_contentsLayer.get());
+} else {
+m_contentsLayerPurpose = NoContentsLayer;
+m_contentsLayer = 0;
+}
+
+noteSublayersChanged();
+noteLayerPropertyChanged(BackgroundColorChang
[webkit-changes] [88867] branches/safari-534-branch/Source/WebKit2
Title: [88867] branches/safari-534-branch/Source/WebKit2 Revision 88867 Author lforsch...@apple.com Date 2011-06-14 16:06:52 -0700 (Tue, 14 Jun 2011) Log Message Merge r88647. Modified Paths branches/safari-534-branch/Source/WebKit2/ChangeLog branches/safari-534-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp Diff Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (88866 => 88867) --- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-14 23:05:40 UTC (rev 88866) +++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-14 23:06:52 UTC (rev 88867) @@ -1,5 +1,22 @@ 2011-06-14 Lucas Forschler +Merged 88647. + +2011-06-13 Anders Carlsson + +Reviewed by Dan Bernstein. + +Don't access freed memory in the UI process when a plug-in process crashes +https://bugs.webkit.org/show_bug.cgi?id=62548 + +Call pluginProcessCrashedOrFailedToLaunch after sending messages to all processes about the plug-in crash, +otherwise we'll try to dereference m_pluginInfo.path after the PluginProcessProxy object has been deleted. + +* UIProcess/Plugins/PluginProcessProxy.cpp: +(WebKit::PluginProcessProxy::didClose): + +2011-06-14 Lucas Forschler + Merged 88599. 2011-06-09 Jer Noble Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (88866 => 88867) --- branches/safari-534-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2011-06-14 23:05:40 UTC (rev 88866) +++ branches/safari-534-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2011-06-14 23:06:52 UTC (rev 88867) @@ -167,11 +167,12 @@ exitFullscreen(); #endif -pluginProcessCrashedOrFailedToLaunch(); - const Vector& contexts = WebContext::allContexts(); for (size_t i = 0; i < contexts.size(); ++i) contexts[i]->sendToAllProcesses(Messages::WebProcess::PluginProcessCrashed(m_pluginInfo.path)); + +// This will cause us to be deleted. +pluginProcessCrashedOrFailedToLaunch(); } void PluginProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID) ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [88866] trunk/Source/JavaScriptCore
Title: [88866] trunk/Source/_javascript_Core
Revision 88866
Author commit-qu...@webkit.org
Date 2011-06-14 16:05:40 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Sheriff Bot
Unreviewed, rolling out r88841.
http://trac.webkit.org/changeset/88841
https://bugs.webkit.org/show_bug.cgi?id=62672
Caused many tests to crash (Requested by rniwa on #webkit).
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dump):
* bytecode/CodeBlock.h:
* bytecode/Opcode.h:
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::emitNewArray):
* bytecompiler/BytecodeGenerator.h:
* bytecompiler/NodesCodegen.cpp:
(JSC::ArrayNode::emitBytecode):
* interpreter/Interpreter.cpp:
(JSC::Interpreter::privateExecute):
* jit/JIT.cpp:
(JSC::JIT::privateCompileMainPass):
* jit/JIT.h:
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_new_array):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_new_array):
* jit/JITStubs.cpp:
* jit/JITStubs.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp
trunk/Source/_javascript_Core/bytecode/CodeBlock.h
trunk/Source/_javascript_Core/bytecode/Opcode.h
trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp
trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h
trunk/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp
trunk/Source/_javascript_Core/interpreter/Interpreter.cpp
trunk/Source/_javascript_Core/jit/JIT.cpp
trunk/Source/_javascript_Core/jit/JIT.h
trunk/Source/_javascript_Core/jit/JITOpcodes.cpp
trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp
trunk/Source/_javascript_Core/jit/JITStubs.cpp
trunk/Source/_javascript_Core/jit/JITStubs.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (88865 => 88866)
--- trunk/Source/_javascript_Core/ChangeLog 2011-06-14 23:05:38 UTC (rev 88865)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-06-14 23:05:40 UTC (rev 88866)
@@ -1,3 +1,32 @@
+2011-06-14 Sheriff Bot
+
+Unreviewed, rolling out r88841.
+http://trac.webkit.org/changeset/88841
+https://bugs.webkit.org/show_bug.cgi?id=62672
+
+Caused many tests to crash (Requested by rniwa on #webkit).
+
+* bytecode/CodeBlock.cpp:
+(JSC::CodeBlock::dump):
+* bytecode/CodeBlock.h:
+* bytecode/Opcode.h:
+* bytecompiler/BytecodeGenerator.cpp:
+(JSC::BytecodeGenerator::emitNewArray):
+* bytecompiler/BytecodeGenerator.h:
+* bytecompiler/NodesCodegen.cpp:
+(JSC::ArrayNode::emitBytecode):
+* interpreter/Interpreter.cpp:
+(JSC::Interpreter::privateExecute):
+* jit/JIT.cpp:
+(JSC::JIT::privateCompileMainPass):
+* jit/JIT.h:
+* jit/JITOpcodes.cpp:
+(JSC::JIT::emit_op_new_array):
+* jit/JITOpcodes32_64.cpp:
+(JSC::JIT::emit_op_new_array):
+* jit/JITStubs.cpp:
+* jit/JITStubs.h:
+
2011-06-14 Oliver Hunt
Reviewed by Gavin Barraclough.
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (88865 => 88866)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2011-06-14 23:05:38 UTC (rev 88865)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2011-06-14 23:05:40 UTC (rev 88866)
@@ -530,13 +530,6 @@
printf("[%4d] new_array\t %s, %s, %d\n", location, registerName(exec, dst).data(), registerName(exec, argv).data(), argc);
break;
}
-case op_new_array_buffer: {
-int dst = (++it)->u.operand;
-int argv = (++it)->u.operand;
-int argc = (++it)->u.operand;
-printf("[%4d] new_array_buffer %s, %d, %d\n", location, registerName(exec, dst).data(), argv, argc);
-break;
-}
case op_new_regexp: {
int r0 = (++it)->u.operand;
int re0 = (++it)->u.operand;
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (88865 => 88866)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2011-06-14 23:05:38 UTC (rev 88865)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2011-06-14 23:05:40 UTC (rev 88866)
@@ -456,20 +456,6 @@
}
RegExp* regexp(int index) const { ASSERT(m_rareData); return m_rareData->m_regexps[index].get(); }
-unsigned addImmediateBuffer(unsigned length)
-{
-createRareDataIfNecessary();
-unsigned size = m_rareData->m_immediateBuffers.size();
-m_rareData->m_immediateBuffers.append(Vector(length));
-return size;
-}
-
-JSValue* immediateBuffer(unsigned index)
-{
-ASSERT(m_rareData);
-return m_rareData->m_immediateBuffers[index].data();
-}
-
JSGlobalObject* globalObject() { return m_globalObject.get(); }
// Jump Tables
@@ -57
[webkit-changes] [88865] branches/chromium/782
Title: [88865] branches/chromium/782 Revision 88865 Author cev...@google.com Date 2011-06-14 16:05:38 -0700 (Tue, 14 Jun 2011) Log Message Merge 88601 BUG=85302 Review URL: http://codereview.chromium.org/7169001 Modified Paths branches/chromium/782/Source/WebCore/dom/StyledElement.cpp branches/chromium/782/Source/WebCore/dom/StyledElement.h branches/chromium/782/Source/WebCore/html/HTMLBodyElement.cpp branches/chromium/782/Source/WebCore/html/HTMLBodyElement.h Added Paths branches/chromium/782/LayoutTests/fast/dom/body-link-decl-parent-crash-expected.txt branches/chromium/782/LayoutTests/fast/dom/body-link-decl-parent-crash.html branches/chromium/782/LayoutTests/fast/dom/styled-inline-style-decl-parent-crash-expected.txt branches/chromium/782/LayoutTests/fast/dom/styled-inline-style-decl-parent-crash.html Diff Copied: branches/chromium/782/LayoutTests/fast/dom/body-link-decl-parent-crash-expected.txt (from rev 88601, trunk/LayoutTests/fast/dom/body-link-decl-parent-crash-expected.txt) (0 => 88865) --- branches/chromium/782/LayoutTests/fast/dom/body-link-decl-parent-crash-expected.txt (rev 0) +++ branches/chromium/782/LayoutTests/fast/dom/body-link-decl-parent-crash-expected.txt 2011-06-14 23:05:38 UTC (rev 88865) @@ -0,0 +1,5 @@ +Test passes if it does not crash. +PASS successfullyParsed is true + +TEST COMPLETE + Copied: branches/chromium/782/LayoutTests/fast/dom/body-link-decl-parent-crash.html (from rev 88601, trunk/LayoutTests/fast/dom/body-link-decl-parent-crash.html) (0 => 88865) --- branches/chromium/782/LayoutTests/fast/dom/body-link-decl-parent-crash.html (rev 0) +++ branches/chromium/782/LayoutTests/fast/dom/body-link-decl-parent-crash.html 2011-06-14 23:05:38 UTC (rev 88865) @@ -0,0 +1,27 @@ + + + + + +Test passes if it does not crash. + +