[webkit-changes] [98191] trunk/Source/WebCore
Title: [98191] trunk/Source/WebCore
Revision 98191
Author m...@apple.com
Date 2011-10-21 22:52:52 -0700 (Fri, 21 Oct 2011)
Log Message
Caret is drawn in the wrong place in multi-column blocks
https://bugs.webkit.org/show_bug.cgi?id=70662
Reviewed by Gavin Barraclough.
* manual-tests/caret-in-columns.html: Added.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintCaret): Removed the call to offsetForContents(). That function takes
a point in local coordinates, whereas this function was applying it to a point in painting root
coordinates. The desired effect was only to undo the scroll adjustment done by the caller,
paintObject().
(WebCore::RenderBlock::paintObject): Pass the original, rather than scroll-adjusted, paint offset
to paintCaret().
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBlock.cpp
Added Paths
trunk/Source/WebCore/manual-tests/caret-in-columns.html
Diff
Modified: trunk/Source/WebCore/ChangeLog (98190 => 98191)
--- trunk/Source/WebCore/ChangeLog 2011-10-22 05:32:12 UTC (rev 98190)
+++ trunk/Source/WebCore/ChangeLog 2011-10-22 05:52:52 UTC (rev 98191)
@@ -1,3 +1,19 @@
+2011-10-21 Dan Bernstein
+
+Caret is drawn in the wrong place in multi-column blocks
+https://bugs.webkit.org/show_bug.cgi?id=70662
+
+Reviewed by Gavin Barraclough.
+
+* manual-tests/caret-in-columns.html: Added.
+* rendering/RenderBlock.cpp:
+(WebCore::RenderBlock::paintCaret): Removed the call to offsetForContents(). That function takes
+a point in local coordinates, whereas this function was applying it to a point in painting root
+coordinates. The desired effect was only to undo the scroll adjustment done by the caller,
+paintObject().
+(WebCore::RenderBlock::paintObject): Pass the original, rather than scroll-adjusted, paint offset
+to paintCaret().
+
2011-10-21 Nat Duca
[chromium] Make setVisibility extension- and thread-correct
Added: trunk/Source/WebCore/manual-tests/caret-in-columns.html (0 => 98191)
--- trunk/Source/WebCore/manual-tests/caret-in-columns.html (rev 0)
+++ trunk/Source/WebCore/manual-tests/caret-in-columns.html 2011-10-22 05:52:52 UTC (rev 98191)
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+The blinking insertion point should be here →
+
+
+var target = document.getElementById("target");
+target.focus();
+getSelection().modify("move", "forward", "documentboundary");
+
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (98190 => 98191)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-10-22 05:32:12 UTC (rev 98190)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-10-22 05:52:52 UTC (rev 98191)
@@ -2549,15 +2549,10 @@
}
if (caretPainter == this && (isContentEditable || caretBrowsing)) {
-// Convert the painting offset into the local coordinate system of this renderer,
-// to match the localCaretRect computed by the FrameSelection
-LayoutPoint adjustedPaintOffset = paintOffset;
-offsetForContents(adjustedPaintOffset);
-
if (type == CursorCaret)
-frame()->selection()->paintCaret(paintInfo.context, adjustedPaintOffset, paintInfo.rect);
+frame()->selection()->paintCaret(paintInfo.context, paintOffset, paintInfo.rect);
else
-frame()->page()->dragCaretController()->paintDragCaret(frame(), paintInfo.context, adjustedPaintOffset, paintInfo.rect);
+frame()->page()->dragCaretController()->paintDragCaret(frame(), paintInfo.context, paintOffset, paintInfo.rect);
}
}
@@ -2640,8 +2635,8 @@
// If the caret's node's render object's containing block is this block, and the paint action is PaintPhaseForeground,
// then paint the caret.
if (paintPhase == PaintPhaseForeground) {
-paintCaret(paintInfo, scrolledOffset, CursorCaret);
-paintCaret(paintInfo, scrolledOffset, DragCaret);
+paintCaret(paintInfo, paintOffset, CursorCaret);
+paintCaret(paintInfo, paintOffset, DragCaret);
}
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98189] trunk/Source/WebKit2
Title: [98189] trunk/Source/WebKit2
Revision 98189
Author a...@apple.com
Date 2011-10-21 21:57:09 -0700 (Fri, 21 Oct 2011)
Log Message
[WK2] Clicking a print button in a PDF doesn't do anything
https://bugs.webkit.org/show_bug.cgi?id=70663
Reviewed by Dan Bernstein.
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::printMainFrame): Added a public method
that PDFViewController could call.
* UIProcess/API/mac/PDFViewController.h:
* UIProcess/API/mac/PDFViewController.mm:
(-[WKPDFView PDFViewPerformPrint:]):
(WebKit::PDFViewController::print):
Connect PDFView delegate method for printing.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.h
trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98188 => 98189)
--- trunk/Source/WebKit2/ChangeLog 2011-10-22 03:58:55 UTC (rev 98188)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-22 04:57:09 UTC (rev 98189)
@@ -1,3 +1,21 @@
+2011-10-21 Alexey Proskuryakov
+
+[WK2] Clicking a print button in a PDF doesn't do anything
+https://bugs.webkit.org/show_bug.cgi?id=70663
+
+
+Reviewed by Dan Bernstein.
+
+* UIProcess/WebPageProxy.h:
+* UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::printMainFrame): Added a public method
+that PDFViewController could call.
+
+* UIProcess/API/mac/PDFViewController.h:
+* UIProcess/API/mac/PDFViewController.mm:
+(-[WKPDFView PDFViewPerformPrint:]):
+(WebKit::PDFViewController::print):
+Connect PDFView delegate method for printing.
+
2011-10-21 Sam Weinig
Lookup does not work on text using web fonts in WebKit2
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.h (98188 => 98189)
--- trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.h 2011-10-22 03:58:55 UTC (rev 98188)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.h 2011-10-22 04:57:09 UTC (rev 98189)
@@ -66,6 +66,7 @@
void openPDFInFinder();
void savePDFToDownloadsFolder();
void linkClicked(const String& url);
+void print();
void findString(const String&, FindOptions, unsigned maxMatchCount);
void countStringMatches(const String&, FindOptions, unsigned maxMatchCount);
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm (98188 => 98189)
--- trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm 2011-10-22 03:58:55 UTC (rev 98188)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm 2011-10-22 04:57:09 UTC (rev 98189)
@@ -360,6 +360,11 @@
_pdfViewController->savePDFToDownloadsFolder();
}
+- (void)PDFViewPerformPrint:(PDFView *)sender
+{
+_pdfViewController->print();
+}
+
@end
namespace WebKit {
@@ -603,6 +608,11 @@
page()->linkClicked(url, event);
}
+void PDFViewController::print()
+{
+page()->printMainFrame();
+}
+
void PDFViewController::findString(const String& string, FindOptions options, unsigned maxMatchCount)
{
BOOL forward = !(options & FindOptionsBackwards);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (98188 => 98189)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-10-22 03:58:55 UTC (rev 98188)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-10-22 04:57:09 UTC (rev 98189)
@@ -2200,6 +2200,11 @@
m_isPerformingDOMPrintOperation = false;
}
+void WebPageProxy::printMainFrame()
+{
+printFrame(m_mainFrame->frameID());
+}
+
#if PLATFORM(QT)
void WebPageProxy::didChangeContentsSize(const IntSize& size)
{
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (98188 => 98189)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-10-22 03:58:55 UTC (rev 98188)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-10-22 04:57:09 UTC (rev 98189)
@@ -568,6 +568,8 @@
void setShouldSendEventsSynchronously(bool sync) { m_shouldSendEventsSynchronously = sync; };
+void printMainFrame();
+
private:
WebPageProxy(PageClient*, PassRefPtr, WebPageGroup*, uint64_t pageID);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98188] trunk
Title: [98188] trunk Revision 98188 Author fpi...@apple.com Date 2011-10-21 20:58:55 -0700 (Fri, 21 Oct 2011) Log Message DFG inlining sometimes fails to reset constant references https://bugs.webkit.org/show_bug.cgi?id=70668 Source/_javascript_Core: Reviewed by Anders Carlsson. Reset constant references when we need to (new block created) and not when we don't (change of inlining depth). * dfg/DFGByteCodeParser.cpp: (JSC::DFG::ByteCodeParser::handleInlining): (JSC::DFG::ByteCodeParser::prepareToParseBlock): (JSC::DFG::ByteCodeParser::parseBlock): (JSC::DFG::ByteCodeParser::parseCodeBlock): LayoutTests: Reviewed by Anders Carlsson. Added a new test that covers this specific bug as well as the general ability to perform inlining, and the ability to OSR out of an inline stack. * fast/js/dfg-inline-constant-expected.txt: Added. * fast/js/dfg-inline-constant.html: Added. * fast/js/script-tests/dfg-inline-constant.js: Added. (foo): (bar): Modified Paths trunk/LayoutTests/ChangeLog trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp Added Paths trunk/LayoutTests/fast/js/dfg-inline-constant-expected.txt trunk/LayoutTests/fast/js/dfg-inline-constant.html trunk/LayoutTests/fast/js/script-tests/dfg-inline-constant.js Diff Modified: trunk/LayoutTests/ChangeLog (98187 => 98188) --- trunk/LayoutTests/ChangeLog 2011-10-22 03:56:01 UTC (rev 98187) +++ trunk/LayoutTests/ChangeLog 2011-10-22 03:58:55 UTC (rev 98188) @@ -1,3 +1,20 @@ +2011-10-21 Filip Pizlo + +DFG inlining sometimes fails to reset constant references +https://bugs.webkit.org/show_bug.cgi?id=70668 + +Reviewed by Anders Carlsson. + +Added a new test that covers this specific bug as well as the general +ability to perform inlining, and the ability to OSR out of an inline +stack. + +* fast/js/dfg-inline-constant-expected.txt: Added. +* fast/js/dfg-inline-constant.html: Added. +* fast/js/script-tests/dfg-inline-constant.js: Added. +(foo): +(bar): + 2011-10-21 Ojan Vafai Fixup test expectations now that http://trac.webkit.org/changeset/98173 has landed. Added: trunk/LayoutTests/fast/js/dfg-inline-constant-expected.txt (0 => 98188) --- trunk/LayoutTests/fast/js/dfg-inline-constant-expected.txt (rev 0) +++ trunk/LayoutTests/fast/js/dfg-inline-constant-expected.txt 2011-10-22 03:58:55 UTC (rev 98188) @@ -0,0 +1,13 @@ +This tests that function inlining in the DFG JIT doesn't get confused by constants being reused between inliner and inlinee. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +PASS bar(6, 0) is 10 +PASS bar(6, 1) is 15 +PASS bar(6, false) is 10 +PASS bar(6, true) is 15 +PASS successfullyParsed is true + +TEST COMPLETE + Added: trunk/LayoutTests/fast/js/dfg-inline-constant.html (0 => 98188) --- trunk/LayoutTests/fast/js/dfg-inline-constant.html (rev 0) +++ trunk/LayoutTests/fast/js/dfg-inline-constant.html 2011-10-22 03:58:55 UTC (rev 98188) @@ -0,0 +1,10 @@ + + + +
[webkit-changes] [98187] trunk/Source/WebKit2
Title: [98187] trunk/Source/WebKit2 Revision 98187 Author wei...@apple.com Date 2011-10-21 20:56:01 -0700 (Fri, 21 Oct 2011) Log Message Lookup does not work on text using web fonts in WebKit2 https://bugs.webkit.org/show_bug.cgi?id=70669 Reviewed by Anders Carlsson. * WebProcess/WebPage/mac/WebPageMac.mm: (WebKit::WebPage::performDictionaryLookupForRange): If the font for the range is web font (and therefore no NSFont is available), use the system font of the same size. While not great, it approximates what WebKit1 does. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (98186 => 98187) --- trunk/Source/WebKit2/ChangeLog 2011-10-22 03:25:07 UTC (rev 98186) +++ trunk/Source/WebKit2/ChangeLog 2011-10-22 03:56:01 UTC (rev 98187) @@ -1,5 +1,19 @@ 2011-10-21 Sam Weinig +Lookup does not work on text using web fonts in WebKit2 +https://bugs.webkit.org/show_bug.cgi?id=70669 + + +Reviewed by Anders Carlsson. + +* WebProcess/WebPage/mac/WebPageMac.mm: +(WebKit::WebPage::performDictionaryLookupForRange): +If the font for the range is web font (and therefore no NSFont is +available), use the system font of the same size. While not great, +it approximates what WebKit1 does. + +2011-10-21 Sam Weinig + Fix crash below CoreIPC::MessageSender::send https://bugs.webkit.org/show_bug.cgi?id=70667 Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (98186 => 98187) --- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2011-10-22 03:25:07 UTC (rev 98186) +++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2011-10-22 03:56:01 UTC (rev 98187) @@ -520,9 +520,12 @@ RenderObject* renderer = range->startContainer()->renderer(); RenderStyle* style = renderer->style(); NSFont *font = style->font().primaryFont()->getNSFont(); + +// We won't be able to get an NSFont in the case that a Web Font is being used, so use +// the default system font at the same size instead. if (!font) -return; - +font = [NSFont systemFontOfSize:style->font().primaryFont()->platformData().size()]; + CFDictionaryRef fontDescriptorAttributes = (CFDictionaryRef)[[font fontDescriptor] fontAttributes]; if (!fontDescriptorAttributes) return; ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98186] trunk/Source/WebKit2
Title: [98186] trunk/Source/WebKit2
Revision 98186
Author wei...@apple.com
Date 2011-10-21 20:25:07 -0700 (Fri, 21 Oct 2011)
Log Message
Fix crash below CoreIPC::MessageSender::send
https://bugs.webkit.org/show_bug.cgi?id=70667
Reviewed by Anders Carlsson.
* Shared/DictionaryPopupInfo.cpp:
(WebKit::DictionaryPopupInfo::encode):
(WebKit::DictionaryPopupInfo::decode):
Account for the fact that the options dictionary can be null. This is due to Lookup passing
back a null, rather than empty, dictionary when it could not find any interesting characteristics.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/DictionaryPopupInfo.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98185 => 98186)
--- trunk/Source/WebKit2/ChangeLog 2011-10-22 03:15:41 UTC (rev 98185)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-22 03:25:07 UTC (rev 98186)
@@ -1,5 +1,19 @@
2011-10-21 Sam Weinig
+Fix crash below CoreIPC::MessageSender::send
+https://bugs.webkit.org/show_bug.cgi?id=70667
+
+
+Reviewed by Anders Carlsson.
+
+* Shared/DictionaryPopupInfo.cpp:
+(WebKit::DictionaryPopupInfo::encode):
+(WebKit::DictionaryPopupInfo::decode):
+Account for the fact that the options dictionary can be null. This is due to Lookup passing
+back a null, rather than empty, dictionary when it could not find any interesting characteristics.
+
+2011-10-21 Sam Weinig
+
Add WKBrowsingContextGroup which wraps WKPageGroupRef
https://bugs.webkit.org/show_bug.cgi?id=70665
Modified: trunk/Source/WebKit2/Shared/DictionaryPopupInfo.cpp (98185 => 98186)
--- trunk/Source/WebKit2/Shared/DictionaryPopupInfo.cpp 2011-10-22 03:15:41 UTC (rev 98185)
+++ trunk/Source/WebKit2/Shared/DictionaryPopupInfo.cpp 2011-10-22 03:25:07 UTC (rev 98186)
@@ -41,7 +41,10 @@
encoder->encodeEnum(type);
#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
-CoreIPC::encode(encoder, options.get());
+bool hadOptions = options;
+encoder->encodeBool(hadOptions);
+if (hadOptions)
+CoreIPC::encode(encoder, options.get());
#endif
}
@@ -54,8 +57,13 @@
if (!decoder->decodeEnum(result.type))
return false;
#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
-if (!CoreIPC::decode(decoder, result.options))
+bool hadOptions;
+if (!decoder->decodeBool(hadOptions))
return false;
+if (hadOptions) {
+if (!CoreIPC::decode(decoder, result.options))
+return false;
+}
#endif
return true;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98185] trunk/Source
Title: [98185] trunk/Source
Revision 98185
Author nd...@chromium.org
Date 2011-10-21 20:15:41 -0700 (Fri, 21 Oct 2011)
Log Message
[chromium] Make setVisibility extension- and thread-correct
https://bugs.webkit.org/show_bug.cgi?id=70635
Reviewed by Kenneth Russell.
Source/WebCore:
* platform/graphics/chromium/Extensions3DChromium.h:
* platform/graphics/chromium/LayerRendererChromium.cpp:
(WebCore::LayerRendererChromium::initialize):
(WebCore::LayerRendererChromium::setVisible):
* platform/graphics/chromium/LayerRendererChromium.h:
* platform/graphics/chromium/cc/CCLayerTreeHost.h:
(WebCore::LayerRendererCapabilities::LayerRendererCapabilities):
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
(WebCore::CCLayerTreeHostImpl::setVisible):
Source/WebKit/chromium:
* public/WebGraphicsContext3D.h:
(WebKit::WebGraphicsContext3D::setVisibilityCHROMIUM):
* src/Extensions3DChromium.cpp:
(WebCore::Extensions3DChromium::setVisibilityCHROMIUM):
* src/GraphicsContext3DChromium.cpp:
* src/GraphicsContext3DPrivate.h:
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::setVisibilityState):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h
trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h
trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h
trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/WebGraphicsContext3D.h
trunk/Source/WebKit/chromium/src/Extensions3DChromium.cpp
trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp
trunk/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h
trunk/Source/WebKit/chromium/src/WebViewImpl.cpp
trunk/Source/WebKit/chromium/tests/MockWebGraphicsContext3D.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (98184 => 98185)
--- trunk/Source/WebCore/ChangeLog 2011-10-22 02:51:33 UTC (rev 98184)
+++ trunk/Source/WebCore/ChangeLog 2011-10-22 03:15:41 UTC (rev 98185)
@@ -1,3 +1,20 @@
+2011-10-21 Nat Duca
+
+[chromium] Make setVisibility extension- and thread-correct
+https://bugs.webkit.org/show_bug.cgi?id=70635
+
+Reviewed by Kenneth Russell.
+
+* platform/graphics/chromium/Extensions3DChromium.h:
+* platform/graphics/chromium/LayerRendererChromium.cpp:
+(WebCore::LayerRendererChromium::initialize):
+(WebCore::LayerRendererChromium::setVisible):
+* platform/graphics/chromium/LayerRendererChromium.h:
+* platform/graphics/chromium/cc/CCLayerTreeHost.h:
+(WebCore::LayerRendererCapabilities::LayerRendererCapabilities):
+* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+(WebCore::CCLayerTreeHostImpl::setVisible):
+
2011-10-21 Beth Dakin
https://bugs.webkit.org/show_bug.cgi?id=70647
Modified: trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h (98184 => 98185)
--- trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h 2011-10-22 02:51:33 UTC (rev 98184)
+++ trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h 2011-10-22 03:15:41 UTC (rev 98185)
@@ -70,6 +70,9 @@
void* mapTexSubImage2DCHROMIUM(unsigned target, int level, int xoffset, int yoffset, int width, int height, unsigned format, unsigned type, unsigned access);
void unmapTexSubImage2DCHROMIUM(const void*);
+// GL_CHROMIUM_set_visibility
+void setVisibilityCHROMIUM(bool);
+
// GL_CHROMIUM_swapbuffers_complete_callback
class SwapBuffersCompleteCallbackCHROMIUM {
public:
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (98184 => 98185)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-10-22 02:51:33 UTC (rev 98184)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-10-22 03:15:41 UTC (rev 98185)
@@ -201,6 +201,10 @@
if (extensions->supports("GL_EXT_texture_format_BGRA"))
extensions->ensureEnabled("GL_EXT_texture_format_BGRA");
+m_capabilities.usingSetVisibility = extensions->supports("GL_CHROMIUM_set_visibility");
+if (m_capabilities.usingSetVisibility)
+extensions->ensureEnabled("GL_CHROMIUM_set_visibility");
+
GLC(m_context.get(), m_context->getIntegerv(GraphicsContext3D::MAX_TEXTURE_SIZE, &m_capabilities.maxTextureSize));
m_capabilities.bestTextureFormat = PlatformColor::bestTextureFormat(m_context.get());
@@ -248,6 +252,16 @@
LOG_ERROR("GL command failed: File: %s\n\tLine %d\n\tcommand: %s, error %x\n", file, line, command, static_cast(error));
}
+void LayerRendererChromium::setVisible(bool visible)
+{
+if (!visible)
+releaseRenderSurfaceTextures();
+if (m_capabilities.usingSetVisibility) {
+Extensions3DChromium* extensions3DChromium = static_cas
[webkit-changes] [98184] trunk/Source/WebKit2
Title: [98184] trunk/Source/WebKit2
Revision 98184
Author wei...@apple.com
Date 2011-10-21 19:51:33 -0700 (Fri, 21 Oct 2011)
Log Message
Add WKBrowsingContextGroup which wraps WKPageGroupRef
https://bugs.webkit.org/show_bug.cgi?id=70665
Reviewed by Anders Carlsson.
* UIProcess/API/mac/WKBrowsingContextGroup.h: Added.
* UIProcess/API/mac/WKBrowsingContextGroup.mm: Added.
(-[WKBrowsingContextGroup initWithIdentifier:]):
(-[WKBrowsingContextGroup dealloc]):
(-[WKBrowsingContextGroup pageGroupRef]):
* UIProcess/API/mac/WKBrowsingContextGroupInternal.h: Added.
* UIProcess/API/mac/WKView.h:
* UIProcess/API/mac/WKView.mm:
(-[WKView initWithFrame:processGroup:browsingContextGroup:]):
* WebKit2.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.mm
trunk/Source/WebKit2/UIProcess/API/mac/WKView.h
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Added Paths
trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h
trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm
trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroupInternal.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98183 => 98184)
--- trunk/Source/WebKit2/ChangeLog 2011-10-22 02:24:23 UTC (rev 98183)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-22 02:51:33 UTC (rev 98184)
@@ -1,5 +1,23 @@
2011-10-21 Sam Weinig
+Add WKBrowsingContextGroup which wraps WKPageGroupRef
+https://bugs.webkit.org/show_bug.cgi?id=70665
+
+Reviewed by Anders Carlsson.
+
+* UIProcess/API/mac/WKBrowsingContextGroup.h: Added.
+* UIProcess/API/mac/WKBrowsingContextGroup.mm: Added.
+(-[WKBrowsingContextGroup initWithIdentifier:]):
+(-[WKBrowsingContextGroup dealloc]):
+(-[WKBrowsingContextGroup pageGroupRef]):
+* UIProcess/API/mac/WKBrowsingContextGroupInternal.h: Added.
+* UIProcess/API/mac/WKView.h:
+* UIProcess/API/mac/WKView.mm:
+(-[WKView initWithFrame:processGroup:browsingContextGroup:]):
+* WebKit2.xcodeproj/project.pbxproj:
+
+2011-10-21 Sam Weinig
+
Mark member variables of WebKit2 API @private
https://bugs.webkit.org/show_bug.cgi?id=70655
Added: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h (0 => 98184)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h 2011-10-22 02:51:33 UTC (rev 98184)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2011 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 INC. 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 INC. 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
+#import
+
+@class WKBrowsingContextGroupData;
+
+WK_EXPORT
+@interface WKBrowsingContextGroup : NSObject {
+@private
+WKBrowsingContextGroupData *_data;
+}
+
+- (id)initWithIdentifier:(NSString *)identifier;
+
+@end
Added: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm (0 => 98184)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm 2011-10-22 02:51:33 UTC (rev 98184)
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2011 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 o
[webkit-changes] [98183] trunk/LayoutTests
Title: [98183] trunk/LayoutTests Revision 98183 Author o...@chromium.org Date 2011-10-21 19:24:23 -0700 (Fri, 21 Oct 2011) Log Message Fixup test expectations now that http://trac.webkit.org/changeset/98173 has landed. * platform/chromium-cg-mac-leopard/fast/backgrounds/background-leakage-transforms-expected.png: Added. * platform/chromium-cg-mac-leopard/fast/writing-mode/fallback-orientation-expected.png: * platform/chromium-cg-mac-snowleopard/fast/backgrounds/background-leakage-transforms-expected.png: Added. * platform/chromium-cg-mac-snowleopard/fast/writing-mode/fallback-orientation-expected.png: Added. * platform/chromium-cg-mac/fast/backgrounds/background-leakage-transforms-expected.png: Removed. * platform/chromium-mac-leopard/fast/backgrounds/background-leakage-transforms-expected.png: Added. * platform/chromium-mac-leopard/fast/writing-mode/fallback-orientation-expected.png: Added. * platform/chromium-mac-snowleopard/fast/backgrounds/background-leakage-transforms-expected.png: Added. * platform/chromium-mac-snowleopard/fast/writing-mode/fallback-orientation-expected.png: * platform/chromium-mac/fast/backgrounds/background-leakage-transforms-expected.png: Removed. * platform/chromium-win/fast/backgrounds/background-leakage-transforms-expected.txt: Added. * platform/chromium/fast/backgrounds/background-leakage-transforms-expected.txt: Added. * platform/chromium/fast/writing-mode/fallback-orientation-expected.txt: Added. * platform/chromium/test_expectations.txt: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/test_expectations.txt trunk/LayoutTests/platform/chromium-cg-mac-leopard/fast/writing-mode/fallback-orientation-expected.png trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/writing-mode/fallback-orientation-expected.png Added Paths trunk/LayoutTests/platform/chromium/fast/backgrounds/ trunk/LayoutTests/platform/chromium/fast/backgrounds/background-leakage-transforms-expected.txt trunk/LayoutTests/platform/chromium/fast/writing-mode/ trunk/LayoutTests/platform/chromium/fast/writing-mode/fallback-orientation-expected.txt trunk/LayoutTests/platform/chromium-cg-mac-leopard/fast/backgrounds/background-leakage-transforms-expected.png trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/fast/backgrounds/ trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/fast/backgrounds/background-leakage-transforms-expected.png trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/fast/writing-mode/ trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/fast/writing-mode/fallback-orientation-expected.png trunk/LayoutTests/platform/chromium-mac-leopard/fast/backgrounds/background-leakage-transforms-expected.png trunk/LayoutTests/platform/chromium-mac-leopard/fast/writing-mode/ trunk/LayoutTests/platform/chromium-mac-leopard/fast/writing-mode/fallback-orientation-expected.png trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/backgrounds/ trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/backgrounds/background-leakage-transforms-expected.png trunk/LayoutTests/platform/chromium-win/fast/backgrounds/background-leakage-transforms-expected.txt Removed Paths trunk/LayoutTests/platform/chromium-cg-mac/fast/backgrounds/background-leakage-transforms-expected.png trunk/LayoutTests/platform/chromium-mac/fast/backgrounds/background-leakage-transforms-expected.png Diff Modified: trunk/LayoutTests/ChangeLog (98182 => 98183) --- trunk/LayoutTests/ChangeLog 2011-10-22 01:42:06 UTC (rev 98182) +++ trunk/LayoutTests/ChangeLog 2011-10-22 02:24:23 UTC (rev 98183) @@ -1,3 +1,22 @@ +2011-10-21 Ojan Vafai + +Fixup test expectations now that http://trac.webkit.org/changeset/98173 has landed. + +* platform/chromium-cg-mac-leopard/fast/backgrounds/background-leakage-transforms-expected.png: Added. +* platform/chromium-cg-mac-leopard/fast/writing-mode/fallback-orientation-expected.png: +* platform/chromium-cg-mac-snowleopard/fast/backgrounds/background-leakage-transforms-expected.png: Added. +* platform/chromium-cg-mac-snowleopard/fast/writing-mode/fallback-orientation-expected.png: Added. +* platform/chromium-cg-mac/fast/backgrounds/background-leakage-transforms-expected.png: Removed. +* platform/chromium-mac-leopard/fast/backgrounds/background-leakage-transforms-expected.png: Added. +* platform/chromium-mac-leopard/fast/writing-mode/fallback-orientation-expected.png: Added. +* platform/chromium-mac-snowleopard/fast/backgrounds/background-leakage-transforms-expected.png: Added. +* platform/chromium-mac-snowleopard/fast/writing-mode/fallback-orientation-expected.png: +* platform/chromium-mac/fast/backgrounds/background-leakage-transforms-expected.png: Removed. +* platform/chromium-win/fast/backgrounds/background-leakage-transforms-expected.txt: Added. +* platform/chromium/fast/backgrounds/background-leakage-transforms-expected.txt: Added. +* plat
[webkit-changes] [98182] trunk/LayoutTests
Title: [98182] trunk/LayoutTests Revision 98182 Author jchaffr...@webkit.org Date 2011-10-21 18:42:06 -0700 (Fri, 21 Oct 2011) Log Message [Chromium] Layout Test fast/canvas/webgl/premultiplyalpha-test.html is failing https://bugs.webkit.org/show_bug.cgi?id=68885 Unreviewed gardening. * platform/chromium/test_expectations.txt: Removed the test since it has been passing on the bots for at least a week. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/test_expectations.txt Diff Modified: trunk/LayoutTests/ChangeLog (98181 => 98182) --- trunk/LayoutTests/ChangeLog 2011-10-22 01:32:49 UTC (rev 98181) +++ trunk/LayoutTests/ChangeLog 2011-10-22 01:42:06 UTC (rev 98182) @@ -1,5 +1,15 @@ 2011-10-21 Julien Chaffraix +[Chromium] Layout Test fast/canvas/webgl/premultiplyalpha-test.html is failing +https://bugs.webkit.org/show_bug.cgi?id=68885 + +Unreviewed gardening. + +* platform/chromium/test_expectations.txt: Removed the test since it has been passing on +the bots for at least a week. + +2011-10-21 Julien Chaffraix + Unreviewed rebaseline. This test started failing on the bot. As this is a progression, updating the baseline. Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (98181 => 98182) --- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-22 01:32:49 UTC (rev 98181) +++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-22 01:42:06 UTC (rev 98182) @@ -3689,8 +3689,6 @@ BUGWK68881 DEBUG : svg/text/selection-background-color.xhtml = CRASH IMAGE BUGWK68881 DEBUG : svg/text/selection-styles.xhtml = CRASH IMAGE -BUGWK68885 MAC CPU-CG : fast/canvas/webgl/premultiplyalpha-test.html = TEXT - BUGWK68886 MAC GPU-CG : compositing/geometry/limit-layer-bounds-transformed-overflow.html = TEXT BUGWK68970 MAC CPU-CG : fast/multicol/float-paginate-empty-lines.html = IMAGE ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98181] trunk/LayoutTests
Title: [98181] trunk/LayoutTests
Revision 98181
Author jchaffr...@webkit.org
Date 2011-10-21 18:32:49 -0700 (Fri, 21 Oct 2011)
Log Message
Unreviewed rebaseline.
This test started failing on the bot. As this is a progression, updating the baseline.
* platform/chromium-cg-mac-snowleopard/fast/multicol/flipped-blocks-border-after-expected.png: Removed.
* platform/chromium-cg-mac-snowleopard/fast/multicol/flipped-blocks-border-after-expected.txt: Removed.
* platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.png: Removed.
* platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.txt: Removed.
* platform/chromium/fast/multicol/flipped-blocks-border-after-expected.png: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
Added Paths
trunk/LayoutTests/platform/chromium/fast/multicol/flipped-blocks-border-after-expected.png
Removed Paths
trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/fast/multicol/flipped-blocks-border-after-expected.png
trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/fast/multicol/flipped-blocks-border-after-expected.txt
trunk/LayoutTests/platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.png
trunk/LayoutTests/platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.txt
Diff
Modified: trunk/LayoutTests/ChangeLog (98180 => 98181)
--- trunk/LayoutTests/ChangeLog 2011-10-22 01:26:06 UTC (rev 98180)
+++ trunk/LayoutTests/ChangeLog 2011-10-22 01:32:49 UTC (rev 98181)
@@ -1,5 +1,17 @@
2011-10-21 Julien Chaffraix
+Unreviewed rebaseline.
+
+This test started failing on the bot. As this is a progression, updating the baseline.
+
+* platform/chromium-cg-mac-snowleopard/fast/multicol/flipped-blocks-border-after-expected.png: Removed.
+* platform/chromium-cg-mac-snowleopard/fast/multicol/flipped-blocks-border-after-expected.txt: Removed.
+* platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.png: Removed.
+* platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.txt: Removed.
+* platform/chromium/fast/multicol/flipped-blocks-border-after-expected.png: Added.
+
+2011-10-21 Julien Chaffraix
+
[Chromium] Layout Test canvas/philip/tests/toDataURL.jpeg.*.html is failing on Mac 10.5 CG
https://bugs.webkit.org/show_bug.cgi?id=68879
Added: trunk/LayoutTests/platform/chromium/fast/multicol/flipped-blocks-border-after-expected.png
(Binary files differ)
Property changes on: trunk/LayoutTests/platform/chromium/fast/multicol/flipped-blocks-border-after-expected.png
___
Added: svn:mime-type
Deleted: trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/fast/multicol/flipped-blocks-border-after-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/fast/multicol/flipped-blocks-border-after-expected.txt (98180 => 98181)
--- trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/fast/multicol/flipped-blocks-border-after-expected.txt 2011-10-22 01:26:06 UTC (rev 98180)
+++ trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/fast/multicol/flipped-blocks-border-after-expected.txt 2011-10-22 01:32:49 UTC (rev 98181)
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
-RenderBody {BODY} at (8,8) size 784x50
-layer at (8,8) size 100x150
- RenderBlock {DIV} at (0,0) size 100x150 [bgcolor=#FF] [border: (50px solid #008000) none]
-RenderBlock {DIV} at (0,0) size 50x100 [bgcolor=#008000]
-RenderBlock {DIV} at (0,100) size 50x100 [bgcolor=#008000]
-layer at (8,158) size 100x150
- RenderBlock {DIV} at (0,150) size 100x150 [bgcolor=#FF] [border: none (50px solid #008000) none]
-RenderBlock {DIV} at (0,0) size 50x100 [bgcolor=#008000]
-RenderBlock {DIV} at (0,100) size 50x100 [bgcolor=#008000]
-layer at (8,308) size 150x100
- RenderBlock {DIV} at (0,300) size 150x100 [bgcolor=#FF] [border: none (50px solid #008000)]
-RenderBlock {DIV} at (0,0) size 100x50 [bgcolor=#008000]
-RenderBlock {DIV} at (100,0) size 100x50 [bgcolor=#008000]
-layer at (8,408) size 150x100
- RenderBlock {DIV} at (0,400) size 150x100 [bgcolor=#FF] [border: none (50px solid #008000) none]
-RenderBlock {DIV} at (0,0) size 100x50 [bgcolor=#008000]
-RenderBlock {DIV} at (100,0) size 100x50 [bgcolor=#008000]
Deleted: trunk/LayoutTests/platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.png (98180 => 98181)
--- trunk/LayoutTests/platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.png 2011-10-22 01:26:06 UTC (rev 98180)
+++ trunk/LayoutTests/platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.png 2011-10-22 01:32:49 UTC (rev 98181)
@@ -1,7 +0,0 @@
-\x89PNG
-
-
-IHDR X \x9Av\x82p )tEX
[webkit-changes] [98180] trunk/LayoutTests
Title: [98180] trunk/LayoutTests Revision 98180 Author jchaffr...@webkit.org Date 2011-10-21 18:26:06 -0700 (Fri, 21 Oct 2011) Log Message [Chromium] Layout Test canvas/philip/tests/toDataURL.jpeg.*.html is failing on Mac 10.5 CG https://bugs.webkit.org/show_bug.cgi?id=68879 Reviewed by Adam Barth. * platform/chromium/test_expectations.txt: Those changes have been consistently passing on the bots for at least 10 days. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/test_expectations.txt Diff Modified: trunk/LayoutTests/ChangeLog (98179 => 98180) --- trunk/LayoutTests/ChangeLog 2011-10-22 01:22:46 UTC (rev 98179) +++ trunk/LayoutTests/ChangeLog 2011-10-22 01:26:06 UTC (rev 98180) @@ -1,3 +1,13 @@ +2011-10-21 Julien Chaffraix + +[Chromium] Layout Test canvas/philip/tests/toDataURL.jpeg.*.html is failing on Mac 10.5 CG +https://bugs.webkit.org/show_bug.cgi?id=68879 + +Reviewed by Adam Barth. + +* platform/chromium/test_expectations.txt: Those changes have been consistently passing on +the bots for at least 10 days. + 2011-10-21 Dmitry Lomov https://bugs.webkit.org/show_bug.cgi?id=70580 Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (98179 => 98180) --- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-22 01:22:46 UTC (rev 98179) +++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-22 01:26:06 UTC (rev 98180) @@ -3686,10 +3686,6 @@ BUGCR96861 WIN DEBUG : media/audio-repaint.html = TIMEOUT IMAGE PASS BUGCR97657 MAC CPU DEBUG : media/audio-repaint.html = TIMEOUT IMAGE PASS -BUGWK68879 MAC CPU-CG : canvas/philip/tests/toDataURL.jpeg.alpha.html = TEXT -BUGWK68879 MAC CPU-CG : canvas/philip/tests/toDataURL.jpeg.primarycolours.html = TEXT -BUGWK68879 MAC CPU-CG : canvas/philip/tests/toDataURL.jpeg.quality.basic.html = TEXT - BUGWK68881 DEBUG : svg/text/selection-background-color.xhtml = CRASH IMAGE BUGWK68881 DEBUG : svg/text/selection-styles.xhtml = CRASH IMAGE ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98178] trunk/Source/WebCore
Title: [98178] trunk/Source/WebCore
Revision 98178
Author bda...@apple.com
Date 2011-10-21 18:15:20 -0700 (Fri, 21 Oct 2011)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=70647
Common but unreproducible crash under [ScrollbarPartAnimation setCurrentProgress:]
-and corresponding-
Reviewed by Sam Weinig.
This patch implements two speculative fixes for this crash.
First, block exceptions around all of the code responsible for calling
stopAnimation. If that code throws any exceptions, we want to make sure the other
animations are still stopped.
* platform/mac/ScrollAnimatorMac.mm:
(-[WebScrollbarPartAnimation scrollAnimatorDestroyed]):
(-[WebScrollbarPainterDelegate scrollAnimatorDestroyed]):
(WebCore::ScrollAnimatorMac::~ScrollAnimatorMac):
Only send AppKit these notifications for active pages. I originally made these
assertions, and I found that they were hit a surprising number of times. If we
only send notifications for active pages, then we should greatly reduce and
possibly eliminate our chances of hitting this crash.
(WebCore::ScrollAnimatorMac::notifyPositionChanged):
(WebCore::ScrollAnimatorMac::contentAreaWillPaint):
(WebCore::ScrollAnimatorMac::mouseEnteredContentArea):
(WebCore::ScrollAnimatorMac::mouseExitedContentArea):
(WebCore::ScrollAnimatorMac::mouseMovedInContentArea):
(WebCore::ScrollAnimatorMac::willStartLiveResize):
(WebCore::ScrollAnimatorMac::contentsResized):
(WebCore::ScrollAnimatorMac::willEndLiveResize):
(WebCore::ScrollAnimatorMac::contentAreaDidShow):
(WebCore::ScrollAnimatorMac::contentAreaDidHide):
(WebCore::ScrollAnimatorMac::didBeginScrollGesture):
(WebCore::ScrollAnimatorMac::didEndScrollGesture):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (98177 => 98178)
--- trunk/Source/WebCore/ChangeLog 2011-10-22 00:48:40 UTC (rev 98177)
+++ trunk/Source/WebCore/ChangeLog 2011-10-22 01:15:20 UTC (rev 98178)
@@ -1,3 +1,39 @@
+2011-10-21 Beth Dakin
+
+https://bugs.webkit.org/show_bug.cgi?id=70647
+Common but unreproducible crash under [ScrollbarPartAnimation setCurrentProgress:]
+-and corresponding-
+
+
+Reviewed by Sam Weinig.
+
+This patch implements two speculative fixes for this crash.
+
+First, block exceptions around all of the code responsible for calling
+stopAnimation. If that code throws any exceptions, we want to make sure the other
+animations are still stopped.
+* platform/mac/ScrollAnimatorMac.mm:
+(-[WebScrollbarPartAnimation scrollAnimatorDestroyed]):
+(-[WebScrollbarPainterDelegate scrollAnimatorDestroyed]):
+(WebCore::ScrollAnimatorMac::~ScrollAnimatorMac):
+
+Only send AppKit these notifications for active pages. I originally made these
+assertions, and I found that they were hit a surprising number of times. If we
+only send notifications for active pages, then we should greatly reduce and
+possibly eliminate our chances of hitting this crash.
+(WebCore::ScrollAnimatorMac::notifyPositionChanged):
+(WebCore::ScrollAnimatorMac::contentAreaWillPaint):
+(WebCore::ScrollAnimatorMac::mouseEnteredContentArea):
+(WebCore::ScrollAnimatorMac::mouseExitedContentArea):
+(WebCore::ScrollAnimatorMac::mouseMovedInContentArea):
+(WebCore::ScrollAnimatorMac::willStartLiveResize):
+(WebCore::ScrollAnimatorMac::contentsResized):
+(WebCore::ScrollAnimatorMac::willEndLiveResize):
+(WebCore::ScrollAnimatorMac::contentAreaDidShow):
+(WebCore::ScrollAnimatorMac::contentAreaDidHide):
+(WebCore::ScrollAnimatorMac::didBeginScrollGesture):
+(WebCore::ScrollAnimatorMac::didEndScrollGesture):
+
2011-10-21 Mark Hahnenberg
Add put to the MethodTable
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (98177 => 98178)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-10-22 00:48:40 UTC (rev 98177)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-10-22 01:15:20 UTC (rev 98178)
@@ -29,6 +29,7 @@
#include "ScrollAnimatorMac.h"
+#include "BlockExceptions.h"
#include "FloatPoint.h"
#include "NSScrollerImpDetails.h"
#include "PlatformGestureEvent.h"
@@ -297,7 +298,9 @@
- (void)scrollAnimatorDestroyed
{
+BEGIN_BLOCK_OBJC_EXCEPTIONS;
[self stopAnimation];
+END_BLOCK_OBJC_EXCEPTIONS;
_animator = 0;
}
@@ -331,10 +334,12 @@
- (void)cancelAnimations
{
+BEGIN_BLOCK_OBJC_EXCEPTIONS;
[_verticalKnobAnimation.get() stopAnimation];
[_horizontalKnobAnimation.get() stopAnimation];
[_verticalTrackAnimation.get() stopAnimation];
[_horizontalTrackAnimation.get() stopAnimation];
+END_BLOCK_OBJC_EXCEPTIONS;
}
- (NSRect)convertRectToBacking:(NSRect)aRect
@@ -435,10 +440,12 @@
- (void)scrollAnimatorDestroyed
{
_animator = 0;
[webkit-changes] [98177] trunk/Source
Title: [98177] trunk/Source Revision 98177 Author mhahnenb...@apple.com Date 2011-10-21 17:48:40 -0700 (Fri, 21 Oct 2011) Log Message Add put to the MethodTable https://bugs.webkit.org/show_bug.cgi?id=70439 Reviewed by Oliver Hunt. Source/_javascript_Core: * _javascript_Core.exp: * _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def: * runtime/ClassInfo.h: Added put and putByIndex to the MethodTable. * runtime/JSFunction.h: Changed access modifier for put to protected since some subclasses of JSFunction need to reference it in their MethodTables. Source/WebCore: No new tests. * WebCore.exp.in: * bindings/js/JSDOMWindowCustom.cpp: Added static put since it was overlooked in previous patches. (WebCore::JSDOMWindow::putVirtual): (WebCore::JSDOMWindow::put): * bindings/js/JSDOMWindowShell.cpp: Ditto. (WebCore::JSDOMWindowShell::putVirtual): (WebCore::JSDOMWindowShell::put): * bindings/js/JSDOMWindowShell.h: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/_javascript_Core.exp trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def trunk/Source/_javascript_Core/runtime/ClassInfo.h trunk/Source/_javascript_Core/runtime/JSFunction.h trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.exp.in trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp trunk/Source/WebCore/bindings/js/JSDOMWindowShell.cpp trunk/Source/WebCore/bindings/js/JSDOMWindowShell.h Diff Modified: trunk/Source/_javascript_Core/ChangeLog (98176 => 98177) --- trunk/Source/_javascript_Core/ChangeLog 2011-10-22 00:39:56 UTC (rev 98176) +++ trunk/Source/_javascript_Core/ChangeLog 2011-10-22 00:48:40 UTC (rev 98177) @@ -1,5 +1,18 @@ 2011-10-21 Mark Hahnenberg +Add put to the MethodTable +https://bugs.webkit.org/show_bug.cgi?id=70439 + +Reviewed by Oliver Hunt. + +* _javascript_Core.exp: +* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def: +* runtime/ClassInfo.h: Added put and putByIndex to the MethodTable. +* runtime/JSFunction.h: Changed access modifier for put to protected since some +subclasses of JSFunction need to reference it in their MethodTables. + +2011-10-21 Mark Hahnenberg + Add finalizer to JSObject https://bugs.webkit.org/show_bug.cgi?id=70336 Modified: trunk/Source/_javascript_Core/_javascript_Core.exp (98176 => 98177) --- trunk/Source/_javascript_Core/_javascript_Core.exp 2011-10-22 00:39:56 UTC (rev 98176) +++ trunk/Source/_javascript_Core/_javascript_Core.exp 2011-10-22 00:48:40 UTC (rev 98177) @@ -115,7 +115,9 @@ __ZN3JSC10JSFunctionC1EPNS_9ExecStateEPNS_14JSGlobalObjectEPNS_9StructureE __ZN3JSC10throwErrorEPNS_9ExecStateENS_7JSValueE __ZN3JSC10throwErrorEPNS_9ExecStateEPNS_8JSObjectE +__ZN3JSC11JSByteArray10putByIndexEPNS_6JSCellEPNS_9ExecStateEjNS_7JSValueE __ZN3JSC11JSByteArray15createStructureERNS_12JSGlobalDataEPNS_14JSGlobalObjectENS_7JSValueEPKNS_9ClassInfoE +__ZN3JSC11JSByteArray3putEPNS_6JSCellEPNS_9ExecStateERKNS_10IdentifierENS_7JSValueERNS_15PutPropertySlotE __ZN3JSC11JSByteArray6s_infoE __ZN3JSC11JSByteArrayC1EPNS_9ExecStateEPNS_9StructureEPN3WTF9ByteArrayE __ZN3JSC11ParserArena5resetEv @@ -305,6 +307,7 @@ __ZN3JSC8Debugger6attachEPNS_14JSGlobalObjectE __ZN3JSC8Debugger6detachEPNS_14JSGlobalObjectE __ZN3JSC8DebuggerD2Ev +__ZN3JSC8JSObject10putByIndexEPNS_6JSCellEPNS_9ExecStateEjNS_7JSValueE __ZN3JSC8JSObject10putVirtualEPNS_9ExecStateERKNS_10IdentifierENS_7JSValueERNS_15PutPropertySlotE __ZN3JSC8JSObject10putVirtualEPNS_9ExecStateEjNS_7JSValueE __ZN3JSC8JSObject11hasInstanceEPNS_9ExecStateENS_7JSValueES3_ Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (98176 => 98177) --- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-10-22 00:39:56 UTC (rev 98176) +++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-10-22 00:48:40 UTC (rev 98177) @@ -271,8 +271,11 @@ ?protectedGlobalObjectCount@Heap@JSC@@QAEIXZ ?protectedObjectCount@Heap@JSC@@QAEIXZ ?protectedObjectTypeCounts@Heap@JSC@@QAE?AV?$PassOwnPtr@V?$HashCountedSet@PBDU?$PtrHash@PBD@WTF@@U?$HashTraits@PBD@2@@WTF@@@WTF@@XZ +?put@JSByteArray@JSC@@SAXPAVJSCell@2@PAVExecState@2@ABVIdentifier@2@VJSValue@2@AAVPutPropertySlot@2@@Z ?put@JSGlobalObject@JSC@@SAXPAVJSCell@2@PAVExecState@2@ABVIdentifier@2@VJSValue@2@AAVPutPropertySlot@2@@Z ?put@JSObject@JSC@@SAXPAVJSCell@2@PAVExecState@2@ABVIdentifier@2@VJSValue@2@AAVPutPropertySlot@2@@Z +?putByIndex@JSByteArray@JSC@@SAXPAVJSCell@2@PAVExecState@2@IVJSValue@2@@Z +?putByIndex@JSObject@JSC@@SAXPAVJSCell@2@PAVExecState@2@IVJSValue@2@@Z ?putDirectInternal@JSObject@JSC@@AAE_NAAVJSGlobalData@2@ABVIdentifier@2@VJSValue@2@I_NAAVPutPropertySlot@2@PAVJSCell@2@@Z ?putVirtual@JSCell@JSC@@UAEXPAVExecState@2@ABVIdentifier@2@
[webkit-changes] [98176] branches/safari-534.52-branch/Source/WebCore
Title: [98176] branches/safari-534.52-branch/Source/WebCore
Revision 98176
Author lforsch...@apple.com
Date 2011-10-21 17:39:56 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r98112.
Modified Paths
branches/safari-534.52-branch/Source/WebCore/ChangeLog
branches/safari-534.52-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp
Diff
Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (98175 => 98176)
--- branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-22 00:38:14 UTC (rev 98175)
+++ branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-22 00:39:56 UTC (rev 98176)
@@ -1,5 +1,16 @@
2011-10-21 Lucas Forschler
+Merge 98112
+
+2011-10-21 Simon Fraser
+
+Fix Windows build.
+
+* rendering/RenderLayerCompositor.cpp:
+(WebCore::RenderLayerCompositor::hasAnyAdditionalCompositedLayers):
+
+2011-10-21 Lucas Forschler
+
Merge 98027
2011-10-20 Alexey Proskuryakov
Modified: branches/safari-534.52-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (98175 => 98176)
--- branches/safari-534.52-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-10-22 00:38:14 UTC (rev 98175)
+++ branches/safari-534.52-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-10-22 00:39:56 UTC (rev 98176)
@@ -240,7 +240,7 @@
bool RenderLayerCompositor::hasAnyAdditionalCompositedLayers(const RenderLayer* rootLayer) const
{
-return m_compositedLayerCount > rootLayer->isComposited();
+return m_compositedLayerCount > (rootLayer->isComposited() ? 1 : 0);
}
void RenderLayerCompositor::updateCompositingLayers(CompositingUpdateType updateType, RenderLayer* updateRoot)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98175] trunk
Title: [98175] trunk
Revision 98175
Author dslo...@google.com
Date 2011-10-21 17:38:14 -0700 (Fri, 21 Oct 2011)
Log Message
Source/WebCore: https://bugs.webkit.org/show_bug.cgi?id=70580
[Chromium] Implement MessagePort transfer in chromium port of webkit.
Reviewed by David Levin.
* bindings/v8/SerializedScriptValue.cpp:
(WebCore::V8ObjectMap::Writer::writeTransferredMessagePort):
(WebCore::V8ObjectMap::Serializer::Serializer):
(WebCore::V8ObjectMap::Serializer::doSerialize):
(WebCore::V8ObjectMap::Reader::read):
(WebCore::V8ObjectMap::Deserializer::Deserializer):
(WebCore::V8ObjectMap::Deserializer::tryGetTransferredMessagePort):
(WebCore::SerializedScriptValue::SerializedScriptValue):
(WebCore::SerializedScriptValue::deserialize):
LayoutTests: https://bugs.webkit.org/show_bug.cgi?id=70580
[Chromium] Implement MessagePort transfer in chromium port of webkit.
Results for JSC include some FAILs - this will be addressed when JSC
implements message port transfers as well (https://bugs.webkit.org/show_bug.cgi?id=70658)
Reviewed by David Levin.
* fast/dom/Window/window-postmessage-args-expected.txt:
* fast/dom/Window/window-postmessage-args.html:
* fast/events/message-port-multi-expected.txt:
* fast/events/resources/message-port-multi.js:
(testTransfers.channel0.port2.onmessage):
(testTransfers):
(channel.port2.onmessage):
* platform/chromium-win/fast/events/message-port-multi-expected.txt:
* platform/chromium/fast/dom/Window/window-postmessage-args-expected.txt:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/dom/Window/window-postmessage-args-expected.txt
trunk/LayoutTests/fast/dom/Window/window-postmessage-args.html
trunk/LayoutTests/fast/events/message-port-multi-expected.txt
trunk/LayoutTests/fast/events/resources/message-port-multi.js
trunk/LayoutTests/platform/chromium/fast/dom/Window/window-postmessage-args-expected.txt
trunk/LayoutTests/platform/chromium-win/fast/events/message-port-multi-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/v8/SerializedScriptValue.cpp
Diff
Modified: trunk/LayoutTests/ChangeLog (98174 => 98175)
--- trunk/LayoutTests/ChangeLog 2011-10-22 00:16:17 UTC (rev 98174)
+++ trunk/LayoutTests/ChangeLog 2011-10-22 00:38:14 UTC (rev 98175)
@@ -1,3 +1,22 @@
+2011-10-21 Dmitry Lomov
+
+https://bugs.webkit.org/show_bug.cgi?id=70580
+[Chromium] Implement MessagePort transfer in chromium port of webkit.
+Results for JSC include some FAILs - this will be addressed when JSC
+implements message port transfers as well (https://bugs.webkit.org/show_bug.cgi?id=70658)
+
+Reviewed by David Levin.
+
+* fast/dom/Window/window-postmessage-args-expected.txt:
+* fast/dom/Window/window-postmessage-args.html:
+* fast/events/message-port-multi-expected.txt:
+* fast/events/resources/message-port-multi.js:
+(testTransfers.channel0.port2.onmessage):
+(testTransfers):
+(channel.port2.onmessage):
+* platform/chromium-win/fast/events/message-port-multi-expected.txt:
+* platform/chromium/fast/dom/Window/window-postmessage-args-expected.txt:
+
2011-10-21 Vineet Chaudhary
Setting form.enctype reflected attribute behaves strangely.
Modified: trunk/LayoutTests/fast/dom/Window/window-postmessage-args-expected.txt (98174 => 98175)
--- trunk/LayoutTests/fast/dom/Window/window-postmessage-args-expected.txt 2011-10-22 00:16:17 UTC (rev 98174)
+++ trunk/LayoutTests/fast/dom/Window/window-postmessage-args-expected.txt 2011-10-22 00:38:14 UTC (rev 98175)
@@ -16,6 +16,9 @@
PASS: Posting message ('7', [object MessagePort],[object MessagePort]) did not throw an exception
PASS: Posting message ('2147483648', null) did not throw an exception
PASS: Posting message ('2147483648', null) did not throw an exception
+FAIL: Posting message ('[object MessagePort]', [object MessagePort],[object MessagePort]) did not throw an exception
+PASS: Posting message ('[object MessagePort]', [object MessagePort],[object MessagePort]) did not throw an exception
+PASS: Posting message ('[object MessagePort],[object MessagePort]', [object MessagePort],[object MessagePort]) did not throw an exception
PASS: Posting message ('done', *) did not throw an exception
Received message '4' with 0 ports.
Received message '4' with 0 ports.
@@ -27,5 +30,8 @@
Received message '7' with 2 ports.
Received message '2147483648' with 0 ports.
Received message '2147483648' with 0 ports.
+Received message '[object Object]' with 2 ports.
+Received message '[object Object]' with 2 ports.
+Received message '[object Object],[object Object]' with 2 ports.
Received message 'done' with 0 ports.
Modified: trunk/LayoutTests/fast/dom/Window/window-postmessage-args.html (98174 => 98175)
--- trunk/LayoutTests/fast/dom/Window/window-postmessage-args.html 2011-10-22 00:16:17 UTC (rev 98174)
+++ trunk/LayoutTests/fast/dom/Window/window-postmessage-args.html 2011-10-22 00:38:14
[webkit-changes] [98173] trunk/Source/WebCore
Title: [98173] trunk/Source/WebCore
Revision 98173
Author o...@chromium.org
Date 2011-10-21 17:10:58 -0700 (Fri, 21 Oct 2011)
Log Message
r97693 caused 42 failures on the chromium mac bots
https://bugs.webkit.org/show_bug.cgi?id=70300
Can't test this until https://bugs.webkit.org/show_bug.cgi?id=70660
is fixed. The fix for that bug will test this codepath as well though.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeBlockPreferredLogicalWidths):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBlock.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (98172 => 98173)
--- trunk/Source/WebCore/ChangeLog 2011-10-22 00:04:18 UTC (rev 98172)
+++ trunk/Source/WebCore/ChangeLog 2011-10-22 00:10:58 UTC (rev 98173)
@@ -1,3 +1,14 @@
+2011-10-21 Ojan Vafai
+
+r97693 caused 42 failures on the chromium mac bots
+https://bugs.webkit.org/show_bug.cgi?id=70300
+
+Can't test this until https://bugs.webkit.org/show_bug.cgi?id=70660
+is fixed. The fix for that bug will test this codepath as well though.
+
+* rendering/RenderBlock.cpp:
+(WebCore::RenderBlock::computeBlockPreferredLogicalWidths):
+
2011-10-21 Vineet Chaudhary
Setting form.enctype reflected attribute behaves strangely.
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (98172 => 98173)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-10-22 00:04:18 UTC (rev 98172)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-10-22 00:10:58 UTC (rev 98173)
@@ -5258,7 +5258,7 @@
if (child->isBox() && child->isHorizontalWritingMode() != isHorizontalWritingMode()) {
RenderBox* childBox = toRenderBox(child);
LayoutUnit oldHeight = childBox->logicalHeight();
-setLogicalHeight(childBox->borderAndPaddingLogicalHeight());
+childBox->setLogicalHeight(childBox->borderAndPaddingLogicalHeight());
childBox->computeLogicalHeight();
childMinPreferredLogicalWidth = childMaxPreferredLogicalWidth = childBox->logicalHeight();
childBox->setLogicalHeight(oldHeight);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98172] trunk
Title: [98172] trunk Revision 98172 Author commit-qu...@webkit.org Date 2011-10-21 17:04:18 -0700 (Fri, 21 Oct 2011) Log Message Setting form.enctype reflected attribute behaves strangely. https://bugs.webkit.org/show_bug.cgi?id=44879 Patch by Vineet Chaudhary on 2011-10-21 Reviewed by Darin Adler. Source/WebCore: The spec says form.enctype should be application/x-www-form-urlencoded, So as "text", "plain", "multipart" or "form-data" these are not a valid value so must be ignored. * loader/FormSubmission.cpp: (WebCore::FormSubmission::Attributes::parseEncodingType): LayoutTests: Leading/trailing white-spaces should not be allowed while specifying attribute value. Added more test coverage for form.enctype attribute. * fast/forms/encoding-test.html: * fast/forms/enctype-attribute-expected.txt: * fast/forms/enctype-attribute.html: Corrected test case as per new behavior. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/fast/forms/encoding-test.html trunk/LayoutTests/fast/forms/enctype-attribute-expected.txt trunk/LayoutTests/fast/forms/enctype-attribute.html trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/FormSubmission.cpp Diff Modified: trunk/LayoutTests/ChangeLog (98171 => 98172) --- trunk/LayoutTests/ChangeLog 2011-10-22 00:01:58 UTC (rev 98171) +++ trunk/LayoutTests/ChangeLog 2011-10-22 00:04:18 UTC (rev 98172) @@ -1,3 +1,17 @@ +2011-10-21 Vineet Chaudhary + +Setting form.enctype reflected attribute behaves strangely. +https://bugs.webkit.org/show_bug.cgi?id=44879 + +Reviewed by Darin Adler. + +Leading/trailing white-spaces should not be allowed while specifying attribute value. +Added more test coverage for form.enctype attribute. + +* fast/forms/encoding-test.html: +* fast/forms/enctype-attribute-expected.txt: +* fast/forms/enctype-attribute.html: Corrected test case as per new behavior. + 2011-10-21 Julien Chaffraix Gardening update. Modified: trunk/LayoutTests/fast/forms/encoding-test.html (98171 => 98172) --- trunk/LayoutTests/fast/forms/encoding-test.html 2011-10-22 00:01:58 UTC (rev 98171) +++ trunk/LayoutTests/fast/forms/encoding-test.html 2011-10-22 00:04:18 UTC (rev 98172) @@ -2,6 +2,6 @@-document.forms[0].enctype = 'multipart/formdata';+document.forms[0].enctype = 'multipart/form-data'; document.write(document.forms[0].encoding); Modified: trunk/LayoutTests/fast/forms/enctype-attribute-expected.txt (98171 => 98172) --- trunk/LayoutTests/fast/forms/enctype-attribute-expected.txt 2011-10-22 00:01:58 UTC (rev 98171) +++ trunk/LayoutTests/fast/forms/enctype-attribute-expected.txt 2011-10-22 00:04:18 UTC (rev 98172) @@ -9,14 +9,59 @@ PASS form1.getAttribute("enctype") is "foobar" PASS form1.setAttribute("enctype", "baz"); form1.enctype is "application/x-www-form-urlencoded" +Text and its subtypes: +PASS form1.enctype = "text"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "plain"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/1d-interleaved-parityfec"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/calendar"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/css"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/csv"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/dns"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/enriched"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/example"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/fwdred"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/html"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/rfc822-headers"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/richtext"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/rtx"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/sgml"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/t140"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/troff"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/ulpfec"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/uri-list"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/vcard"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/xml"; form1.enctype is "application/x-www-form-urlencoded" +PASS form1.enctype = "text/xml-external-parsed-entity"; form1.enctype is "application/x-www-form-urlencoded" + +Multipart and its su
[webkit-changes] [98171] trunk/Source/WebCore
Title: [98171] trunk/Source/WebCore
Revision 98171
Author mdela...@apple.com
Date 2011-10-21 17:01:58 -0700 (Fri, 21 Oct 2011)
Log Message
Ensure periodic flushing of canvas drawing context
https://bugs.webkit.org/show_bug.cgi?id=70646
Reviewed by Simon Fraser.
No new tests. No current way to track tests that cause hangs or
non-deterministic drops in performance.
* platform/graphics/cg/ImageBufferDataCG.h: Adds a timestamp of last tracked flush.
* platform/graphics/cg/ImageBufferCG.cpp: Ensures periodic flushes on the drawing context.
(WebCore::ImageBuffer::ImageBuffer):
(WebCore::ImageBuffer::context): Flushes context if we're beyond flush interval.
(WebCore::ImageBuffer::copyNativeImage): Updates last flush timestamp.
(WebCore::ImageBuffer::getUnmultipliedImageData): Updates last flush timestamp.
(WebCore::ImageBuffer::getPremultipliedImageData): Updates last flush timestamp.
(WebCore::ImageBuffer::putUnmultipliedImageData): Updates last flush timestamp.
(WebCore::ImageBuffer::putPremultipliedImageData): Updates last flush timestamp.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (98170 => 98171)
--- trunk/Source/WebCore/ChangeLog 2011-10-21 23:54:04 UTC (rev 98170)
+++ trunk/Source/WebCore/ChangeLog 2011-10-22 00:01:58 UTC (rev 98171)
@@ -1,3 +1,23 @@
+2011-10-21 Matthew Delaney
+
+Ensure periodic flushing of canvas drawing context
+https://bugs.webkit.org/show_bug.cgi?id=70646
+
+Reviewed by Simon Fraser.
+
+No new tests. No current way to track tests that cause hangs or
+non-deterministic drops in performance.
+
+* platform/graphics/cg/ImageBufferDataCG.h: Adds a timestamp of last tracked flush.
+* platform/graphics/cg/ImageBufferCG.cpp: Ensures periodic flushes on the drawing context.
+(WebCore::ImageBuffer::ImageBuffer):
+(WebCore::ImageBuffer::context): Flushes context if we're beyond flush interval.
+(WebCore::ImageBuffer::copyNativeImage): Updates last flush timestamp.
+(WebCore::ImageBuffer::getUnmultipliedImageData): Updates last flush timestamp.
+(WebCore::ImageBuffer::getPremultipliedImageData): Updates last flush timestamp.
+(WebCore::ImageBuffer::putUnmultipliedImageData): Updates last flush timestamp.
+(WebCore::ImageBuffer::putPremultipliedImageData): Updates last flush timestamp.
+
2011-10-21 Adam Barth
Introduce Event::hasInterface to make uses of interfaceName more readable
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (98170 => 98171)
--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2011-10-21 23:54:04 UTC (rev 98170)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2011-10-22 00:01:58 UTC (rev 98171)
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -164,10 +165,11 @@
if (!cgContext)
return;
-m_context= adoptPtr(new GraphicsContext(cgContext.get()));
+m_context = adoptPtr(new GraphicsContext(cgContext.get()));
m_context->scale(FloatSize(1, -1));
m_context->translate(0, -height.unsafeGet());
m_context->setIsAcceleratedContext(accelerateRendering);
+m_data.m_lastFlushTime = currentTimeMS();
success = true;
}
@@ -182,6 +184,18 @@
GraphicsContext* ImageBuffer::context() const
{
+// Force a flush if last flush was more than 20ms ago
+if (m_context->isAcceleratedContext()) {
+double elapsedTime = currentTimeMS() - m_data.m_lastFlushTime;
+double maxFlushInterval = 20; // in ms
+
+if (elapsedTime > maxFlushInterval) {
+CGContextRef context = m_context->platformContext();
+CGContextFlush(context);
+m_data.m_lastFlushTime = currentTimeMS();
+}
+}
+
return m_context.get();
}
@@ -212,8 +226,10 @@
}
}
#if USE(IOSURFACE_CANVAS_BACKING_STORE)
-else
+else {
image = wkIOSurfaceContextCreateImage(context()->platformContext());
+m_data.m_lastFlushTime = currentTimeMS();
+}
#endif
return image;
@@ -262,29 +278,37 @@
PassRefPtr ImageBuffer::getUnmultipliedImageData(const IntRect& rect) const
{
-if (m_context->isAcceleratedContext())
+if (m_context->isAcceleratedContext()) {
CGContextFlush(context()->platformContext());
+m_data.m_lastFlushTime = currentTimeMS();
+}
return m_data.getData(rect, m_size, m_context->isAcceleratedContext(), true);
}
PassRefPtr ImageBuffer::getPremultipliedImageData(const IntRect& rect) const
{
-if (m_context->isAcceleratedContext())
+if (m_context->isAcceleratedContext()) {
CGContextFlush(context()->platformContext());
+m_data.m_lastFlushTime = currentTimeMS();
+}
return m_data.getData(rect, m_s
[webkit-changes] [98170] branches/safari-534.52-branch/Source
Title: [98170] branches/safari-534.52-branch/Source Revision 98170 Author lforsch...@apple.com Date 2011-10-21 16:54:04 -0700 (Fri, 21 Oct 2011) Log Message Merged r98027. Modified Paths branches/safari-534.52-branch/Source/WebCore/ChangeLog branches/safari-534.52-branch/Source/WebCore/plugins/PluginView.cpp branches/safari-534.52-branch/Source/WebKit/mac/ChangeLog branches/safari-534.52-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm branches/safari-534.52-branch/Source/WebKit2/ChangeLog branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/Plugin.h branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.h branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp Diff Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (98169 => 98170) --- branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 23:53:56 UTC (rev 98169) +++ branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 23:54:04 UTC (rev 98170) @@ -1,5 +1,21 @@ 2011-10-21 Lucas Forschler +Merge 98027 + +2011-10-20 Alexey Proskuryakov + +REGRESSION (r96823): Contextual menu closes immediately when control-clicking in Flash plug-in +https://bugs.webkit.org/show_bug.cgi?id=70534 + + +Reviewed by Darin Adler. + +* plugins/PluginView.cpp: (WebCore::PluginView::handleEvent): Return true for contextmenu +event, so that plug-ins won't get a default WebKit context menu. We can't know if the +plug-in is handling mousedown (or even mouseup) by displaying a menu. + +2011-10-21 Lucas Forschler + Merge 97810 & 97813 2011-10-18 Sam Weinig Modified: branches/safari-534.52-branch/Source/WebCore/plugins/PluginView.cpp (98169 => 98170) --- branches/safari-534.52-branch/Source/WebCore/plugins/PluginView.cpp 2011-10-21 23:53:56 UTC (rev 98169) +++ branches/safari-534.52-branch/Source/WebCore/plugins/PluginView.cpp 2011-10-21 23:54:04 UTC (rev 98170) @@ -170,6 +170,8 @@ handleMouseEvent(static_cast(event)); else if (event->isKeyboardEvent()) handleKeyboardEvent(static_cast(event)); +else if (event->type() == eventNames().contextmenuEvent) +event->setDefaultHandled(); // We don't know if the plug-in has handled mousedown event by displaying a context menu, so we never want WebKit to show a default one. #if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API) else if (event->type() == eventNames().focusoutEvent) handleFocusOutEvent(); Modified: branches/safari-534.52-branch/Source/WebKit/mac/ChangeLog (98169 => 98170) --- branches/safari-534.52-branch/Source/WebKit/mac/ChangeLog 2011-10-21 23:53:56 UTC (rev 98169) +++ branches/safari-534.52-branch/Source/WebKit/mac/ChangeLog 2011-10-21 23:54:04 UTC (rev 98170) @@ -1,3 +1,19 @@ +2011-10-21 Lucas Forschler + +Merge 98027 + +2011-10-20 Alexey Proskuryakov + +REGRESSION (r96823): Contextual menu closes immediately when control-clicking in Flash plug-in +https://bugs.webkit.org/show_bug.cgi?id=70534 + + +Reviewed by Darin Adler. + +* WebCoreSupport/WebFrameLoaderClient.mm: (NetscapePluginWidget::handleEvent): Return true +for contextmenu event, so that plug-ins won't get a default WebKit context menu. We can't +know if the plug-in is handling mousedown (or even mouseup) by displaying a menu. + 2011-08-11 Lucas Forschler Merged 91097 Modified: branches/safari-534.52-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (98169 => 98170) --- branches/safari-534.52-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2011-10-21 23:53:56 UTC (rev 98169) +++ branches/safari-534.52-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2011-10-21 23:54:04 UTC (rev 98170) @@ -1630,6 +1630,8 @@ [(WebBaseNetscapePluginView *)platformWidget() handleMouseEntered:currentNSEvent]; else if (event->type() == eventNames().mouseoutEvent) [(WebBaseNetscapePluginView *)platformWidget() handleMouseExited:currentNSEvent]; +else if (event->type() == eventNames().contextmenuEvent) +event->setDefaultHandled(); // We don't know if the plug-in has handled mousedown event by displaying a context menu, so we never want WebKit to show a default one. } private: Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98169 => 98170
[webkit-changes] [98169] trunk/LayoutTests
Title: [98169] trunk/LayoutTests Revision 98169 Author jchaffr...@webkit.org Date 2011-10-21 16:53:56 -0700 (Fri, 21 Oct 2011) Log Message Gardening update. * platform/chromium/test_expectations.txt: We are randomly hitting a known ASSERT on this test case. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/test_expectations.txt Diff Modified: trunk/LayoutTests/ChangeLog (98168 => 98169) --- trunk/LayoutTests/ChangeLog 2011-10-21 23:52:05 UTC (rev 98168) +++ trunk/LayoutTests/ChangeLog 2011-10-21 23:53:56 UTC (rev 98169) @@ -1,3 +1,10 @@ +2011-10-21 Julien Chaffraix + +Gardening update. + +* platform/chromium/test_expectations.txt: We are randomly hitting +a known ASSERT on this test case. + 2011-10-21 Adam Klein [MutationObservers] Implement basic subtree observation Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (98168 => 98169) --- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 23:52:05 UTC (rev 98168) +++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 23:53:56 UTC (rev 98169) @@ -3860,3 +3860,4 @@ BUGWK70640 SNOWLEOPARD : fast/multicol/vertical-rl/rules-with-border-before.html = PASS TEXT BUGWK70641 SNOWLEOPARD : fast/frames/sandboxed-iframe-scripting.html = PASS CRASH +BUGWK67031 SNOWLEOPARD DEBUG : storage/domstorage/events/basic-body-attribute.html = PASS CRASH ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98168] branches/safari-534.52-branch/Source
Title: [98168] branches/safari-534.52-branch/Source
Revision 98168
Author lforsch...@apple.com
Date 2011-10-21 16:52:05 -0700 (Fri, 21 Oct 2011)
Log Message
Merge 97810 & 97813.
Modified Paths
branches/safari-534.52-branch/Source/WebCore/ChangeLog
branches/safari-534.52-branch/Source/WebCore/WebCore.exp.in
branches/safari-534.52-branch/Source/WebCore/rendering/HitTestResult.cpp
branches/safari-534.52-branch/Source/WebCore/rendering/HitTestResult.h
branches/safari-534.52-branch/Source/WebKit2/ChangeLog
branches/safari-534.52-branch/Source/WebKit2/Shared/ContextMenuState.h
branches/safari-534.52-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp
branches/safari-534.52-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h
branches/safari-534.52-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
branches/safari-534.52-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h
branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp
Diff
Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (98167 => 98168)
--- branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 23:20:38 UTC (rev 98167)
+++ branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 23:52:05 UTC (rev 98168)
@@ -1,5 +1,31 @@
2011-10-21 Lucas Forschler
+Merge 97810 & 97813
+
+2011-10-18 Sam Weinig
+
+Fix the build.
+
+* rendering/HitTestResult.cpp:
+(WebCore::HitTestResult::absolutePDFURL):
+Fix typo.
+
+2011-10-18 Alexey Proskuryakov
+
+Expose PDF information in hit test result
+https://bugs.webkit.org/show_bug.cgi?id=70353
+
+Reviewed by Sam Weinig.
+
+* WebCore.exp.in:
+* rendering/HitTestResult.cpp:
+(WebCore::HitTestResult::absolutePDFURL):
+* rendering/HitTestResult.h:
+Added HitTestResult::absolutePDFURL(). It will contain a URL when over a PDF object or embed;
+not sure if we want this for PDFImageDocuments.
+
+2011-10-21 Lucas Forschler
+
Merge
2011-10-21 Alexey Proskuryakov
Modified: branches/safari-534.52-branch/Source/WebCore/WebCore.exp.in (98167 => 98168)
--- branches/safari-534.52-branch/Source/WebCore/WebCore.exp.in 2011-10-21 23:20:38 UTC (rev 98167)
+++ branches/safari-534.52-branch/Source/WebCore/WebCore.exp.in 2011-10-21 23:52:05 UTC (rev 98168)
@@ -1125,6 +1125,7 @@
__ZNK7WebCore13HitTestResult10isSelectedEv
__ZNK7WebCore13HitTestResult11targetFrameEv
__ZNK7WebCore13HitTestResult11textContentEv
+__ZNK7WebCore13HitTestResult14absolutePDFURLEv
__ZNK7WebCore13HitTestResult15absoluteLinkURLEv
__ZNK7WebCore13HitTestResult15spellingToolTipERNS_13TextDirectionE
__ZNK7WebCore13HitTestResult16absoluteImageURLEv
Modified: branches/safari-534.52-branch/Source/WebCore/rendering/HitTestResult.cpp (98167 => 98168)
--- branches/safari-534.52-branch/Source/WebCore/rendering/HitTestResult.cpp 2011-10-21 23:20:38 UTC (rev 98167)
+++ branches/safari-534.52-branch/Source/WebCore/rendering/HitTestResult.cpp 2011-10-21 23:52:05 UTC (rev 98168)
@@ -32,6 +32,7 @@
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
#include "HTMLParserIdioms.h"
+#include "HTMLPlugInImageElement.h"
#include "RenderImage.h"
#include "RenderInline.h"
#include "Scrollbar.h"
@@ -308,6 +309,24 @@
return m_innerNonSharedNode->document()->completeURL(stripLeadingAndTrailingHTMLSpaces(urlString));
}
+KURL HitTestResult::absolutePDFURL() const
+{
+if (!(m_innerNonSharedNode && m_innerNonSharedNode->document()))
+return KURL();
+
+if (!m_innerNonSharedNode->hasTagName(embedTag) && !m_innerNonSharedNode->hasTagName(objectTag))
+return KURL();
+
+HTMLPlugInImageElement* element = static_cast(m_innerNonSharedNode.get());
+KURL url = ""
+if (!url.isValid())
+return KURL();
+
+if (element->serviceType() == "application/pdf" || (element->serviceType().isEmpty() && url.path().lower().endsWith(".pdf")))
+return url;
+return KURL();
+}
+
KURL HitTestResult::absoluteMediaURL() const
{
#if ENABLE(VIDEO)
Modified: branches/safari-534.52-branch/Source/WebCore/rendering/HitTestResult.h (98167 => 98168)
--- branches/safari-534.52-branch/Source/WebCore/rendering/HitTestResult.h 2011-10-21 23:20:38 UTC (rev 98167)
+++ branches/safari-534.52-branch/Source/WebCore/rendering/HitTestResult.h 2011-10-21 23:52:05 UTC (rev 98168)
@@ -83,6 +83,7 @@
Image* image() const;
IntRect imageRect() const;
KURL absoluteImageURL() const;
+KURL absolutePDFURL() const;
KURL absoluteMediaURL() const;
KURL absoluteLinkURL() const;
String textContent() const;
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98167 => 98168)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 23:20:38 UTC (rev 98167)
+++ branches/safari-534.
[webkit-changes] [98167] trunk/Tools
Title: [98167] trunk/Tools
Revision 98167
Author fpi...@apple.com
Date 2011-10-21 16:20:38 -0700 (Fri, 21 Oct 2011)
Log Message
Bencher script doesn't measure GC times accurately
https://bugs.webkit.org/show_bug.cgi?id=70588
Reviewed by Geoff Garen.
Added two new options which allow different ways of measuring GC times:
--measure-gc, which omits calls to gc() between benchmark invocations.
This option takes an optional argument, which is the name of the
VM in which to enable this feature. This allows comparing a single VM
against itself, with and without GC.
--rerun , which causes each sample measurement to include N invocations
which do not have gc() calls between them. The default is N = 1, which
results in the same behavior as before.
You can use either --measure-gc or --rerun for N > 1 (preferably
N >= 3) to get more of a contribution from GC to the measured times.
--rerun results in tighter confidence intervals than --measure-gc, since
it amortizes GC effects in each sample, while with --measure-gc some
samples will see GC and some won't leading to a higher standard devation
and thus requiring more samples to reduce confidence intervals to
managable levels.
* Scripts/bencher:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/bencher
Diff
Modified: trunk/Tools/ChangeLog (98166 => 98167)
--- trunk/Tools/ChangeLog 2011-10-21 23:18:57 UTC (rev 98166)
+++ trunk/Tools/ChangeLog 2011-10-21 23:20:38 UTC (rev 98167)
@@ -1,3 +1,31 @@
+2011-10-21 Filip Pizlo
+
+Bencher script doesn't measure GC times accurately
+https://bugs.webkit.org/show_bug.cgi?id=70588
+
+Reviewed by Geoff Garen.
+
+Added two new options which allow different ways of measuring GC times:
+
+--measure-gc, which omits calls to gc() between benchmark invocations.
+This option takes an optional argument, which is the name of the
+VM in which to enable this feature. This allows comparing a single VM
+against itself, with and without GC.
+
+--rerun , which causes each sample measurement to include N invocations
+which do not have gc() calls between them. The default is N = 1, which
+results in the same behavior as before.
+
+You can use either --measure-gc or --rerun for N > 1 (preferably
+N >= 3) to get more of a contribution from GC to the measured times.
+--rerun results in tighter confidence intervals than --measure-gc, since
+it amortizes GC effects in each sample, while with --measure-gc some
+samples will see GC and some won't leading to a higher standard devation
+and thus requiring more samples to reduce confidence intervals to
+managable levels.
+
+* Scripts/bencher:
+
2011-10-21 Sam Weinig
Remove ability to create a WKView without a WKContextRef and WKPageGroupRef
Modified: trunk/Tools/Scripts/bencher (98166 => 98167)
--- trunk/Tools/Scripts/bencher 2011-10-21 23:18:57 UTC (rev 98166)
+++ trunk/Tools/Scripts/bencher 2011-10-21 23:20:38 UTC (rev 98167)
@@ -198,12 +198,14 @@
# Run-time configuration parameters (can be set with command-line options)
+$rerun=1
$inner=3
$warmup=1
$outer=4
$includeSunSpider=true
$includeV8=true
$includeKraken=true
+$measureGC=false
$benchmarkPattern=nil
$verbosity=0
$innerMode=:reload
@@ -243,6 +245,8 @@
puts "of the form Conf# will be ascribed to the configuration automatically."
puts
puts "Options:"
+ puts "--rerun Set the number of iterations of the benchmark that"
+ puts " contribute to the measured run time. Default is #{$rerun}."
puts "--inner Set the number of inner (per-runtime-invocation)"
puts " iterations. Default is #{$inner}."
puts "--outer Set the number of runtime invocations for each benchmark."
@@ -262,6 +266,10 @@
puts "--exclude-sunspider Exclude SunSpider (only run V8 and Kraken)."
puts "--exclude-kraken Exclude SunSpider (only run SunSpider and V8)."
puts "--benchmarks Only run benchmarks matching the given regular _expression_."
+ puts "--measure-gc Turn off manual calls to gc(), so that GC time is measured."
+ puts " Works best with large values of --inner. You can also say"
+ puts " --measure-gc , which turns this on for one"
+ puts " configuration only."
puts "--keep-files Keep temporary files. Useful for debugging."
puts "--verbose or -v Print more stuff."
puts "--brief Print only the final result for each VM."
@@ -583,7 +591,9 @@
end
doublePuts($stderr,file,"function __bencher_run(__bencher_what) {")
doublePuts($stderr,file," var __bencher_before = __bencher_curTimeMS();")
- doublePuts($stderr,file," run(__bencher_what);")
+ $rerun.times {
+doublePuts($stderr,file,"
[webkit-changes] [98166] trunk/Websites/webkit.org
Title: [98166] trunk/Websites/webkit.org
Revision 98166
Author rn...@webkit.org
Date 2011-10-21 16:18:57 -0700 (Fri, 21 Oct 2011)
Log Message
Style guide should mention the preference of index over iterator
https://bugs.webkit.org/show_bug.cgi?id=70285
Reviewed by Darin Adler.
Per discussion on https://lists.webkit.org/pipermail/webkit-dev/2011-October/018274.html,
we prefer index over iterators.
* coding/coding-style.html:
Modified Paths
trunk/Websites/webkit.org/ChangeLog
trunk/Websites/webkit.org/coding/coding-style.html
Diff
Modified: trunk/Websites/webkit.org/ChangeLog (98165 => 98166)
--- trunk/Websites/webkit.org/ChangeLog 2011-10-21 23:12:31 UTC (rev 98165)
+++ trunk/Websites/webkit.org/ChangeLog 2011-10-21 23:18:57 UTC (rev 98166)
@@ -1,3 +1,15 @@
+2011-10-21 Ryosuke Niwa
+
+Style guide should mention the preference of index over iterator
+https://bugs.webkit.org/show_bug.cgi?id=70285
+
+Reviewed by Darin Adler.
+
+Per discussion on https://lists.webkit.org/pipermail/webkit-dev/2011-October/018274.html,
+we prefer index over iterators.
+
+* coding/coding-style.html:
+
2011-10-10 Ryosuke Niwa
Fix a typo pointed by Sam (Weinig).
Modified: trunk/Websites/webkit.org/coding/coding-style.html (98165 => 98166)
--- trunk/Websites/webkit.org/coding/coding-style.html 2011-10-21 23:12:31 UTC (rev 98165)
+++ trunk/Websites/webkit.org/coding/coding-style.html 2011-10-21 23:18:57 UTC (rev 98166)
@@ -708,6 +708,22 @@
MyOtherClass::MyOtherClass() : MySuperClass() {}
+
+Prefer index over iterator in Vector iterations for a terse, easier-to-read code.
+
+Right:
+
+size_t frameViewsCount = frameViews.size();
+for (size_t i = i; i < frameViewsCount; ++i)
+frameViews[i]->updateLayoutAndStyleIfNeededRecursive();
+
+
+Wrong:
+
+const Vector >::iterator end = frameViews.end();
+for (Vector >::iterator it = frameViews.begin(); it != end; ++it)
+(*it)->updateLayoutAndStyleIfNeededRecursive();
+
Pointers and References
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98164] trunk/Source
Title: [98164] trunk/Source
Revision 98164
Author aba...@webkit.org
Date 2011-10-21 15:56:39 -0700 (Fri, 21 Oct 2011)
Log Message
Introduce Event::hasInterface to make uses of interfaceName more readable
https://bugs.webkit.org/show_bug.cgi?id=70652
Reviewed by Eric Seidel.
Source/WebCore:
Eric felt that this approach would be more readable because it requires
less syntax at each callsite.
* bindings/js/JSErrorHandler.cpp:
(WebCore::JSErrorHandler::handleEvent):
* bindings/objc/DOMEvents.mm:
(kitClass):
* bindings/v8/V8WindowErrorHandler.cpp:
(WebCore::V8WindowErrorHandler::callListenerFunction):
* bindings/v8/V8WorkerContextErrorHandler.cpp:
(WebCore::V8WorkerContextErrorHandler::callListenerFunction):
* dom/Event.cpp:
(WebCore::Event::hasInterface):
* dom/Event.h:
* dom/EventDispatcher.cpp:
(WebCore::EventDispatcher::determineDispatchBehavior):
* dom/Node.cpp:
(WebCore::Node::defaultEventHandler):
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::defaultEventHandler):
* html/HTMLTextAreaElement.cpp:
(WebCore::HTMLTextAreaElement::defaultEventHandler):
* html/TextFieldInputType.cpp:
(WebCore::TextFieldInputType::forwardEvent):
(WebCore::TextFieldInputType::shouldSubmitImplicitly):
* inspector/InspectorDOMStorageResource.cpp:
(WebCore::InspectorDOMStorageResource::handleEvent):
Source/WebKit/chromium:
Update call sites to the new interface.
* src/WebDOMEvent.cpp:
(WebKit::WebDOMEvent::isMutationEvent):
(WebKit::WebDOMEvent::isTextEvent):
(WebKit::WebDOMEvent::isCompositionEvent):
(WebKit::WebDOMEvent::isMessageEvent):
(WebKit::WebDOMEvent::isWheelEvent):
(WebKit::WebDOMEvent::isOverflowEvent):
(WebKit::WebDOMEvent::isPageTransitionEvent):
(WebKit::WebDOMEvent::isPopStateEvent):
(WebKit::WebDOMEvent::isProgressEvent):
(WebKit::WebDOMEvent::isXMLHttpRequestProgressEvent):
(WebKit::WebDOMEvent::isWebKitAnimationEvent):
(WebKit::WebDOMEvent::isWebKitTransitionEvent):
(WebKit::WebDOMEvent::isBeforeLoadEvent):
* src/WebPluginContainerImpl.cpp:
(WebKit::WebPluginContainerImpl::handleEvent):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp
trunk/Source/WebCore/bindings/objc/DOMEvents.mm
trunk/Source/WebCore/bindings/v8/V8WindowErrorHandler.cpp
trunk/Source/WebCore/bindings/v8/V8WorkerContextErrorHandler.cpp
trunk/Source/WebCore/dom/Event.cpp
trunk/Source/WebCore/dom/Event.h
trunk/Source/WebCore/dom/EventDispatcher.cpp
trunk/Source/WebCore/dom/Node.cpp
trunk/Source/WebCore/html/HTMLInputElement.cpp
trunk/Source/WebCore/html/HTMLTextAreaElement.cpp
trunk/Source/WebCore/html/TextFieldInputType.cpp
trunk/Source/WebCore/inspector/InspectorDOMStorageResource.cpp
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/src/WebDOMEvent.cpp
trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (98163 => 98164)
--- trunk/Source/WebCore/ChangeLog 2011-10-21 22:52:29 UTC (rev 98163)
+++ trunk/Source/WebCore/ChangeLog 2011-10-21 22:56:39 UTC (rev 98164)
@@ -1,3 +1,38 @@
+2011-10-21 Adam Barth
+
+Introduce Event::hasInterface to make uses of interfaceName more readable
+https://bugs.webkit.org/show_bug.cgi?id=70652
+
+Reviewed by Eric Seidel.
+
+Eric felt that this approach would be more readable because it requires
+less syntax at each callsite.
+
+* bindings/js/JSErrorHandler.cpp:
+(WebCore::JSErrorHandler::handleEvent):
+* bindings/objc/DOMEvents.mm:
+(kitClass):
+* bindings/v8/V8WindowErrorHandler.cpp:
+(WebCore::V8WindowErrorHandler::callListenerFunction):
+* bindings/v8/V8WorkerContextErrorHandler.cpp:
+(WebCore::V8WorkerContextErrorHandler::callListenerFunction):
+* dom/Event.cpp:
+(WebCore::Event::hasInterface):
+* dom/Event.h:
+* dom/EventDispatcher.cpp:
+(WebCore::EventDispatcher::determineDispatchBehavior):
+* dom/Node.cpp:
+(WebCore::Node::defaultEventHandler):
+* html/HTMLInputElement.cpp:
+(WebCore::HTMLInputElement::defaultEventHandler):
+* html/HTMLTextAreaElement.cpp:
+(WebCore::HTMLTextAreaElement::defaultEventHandler):
+* html/TextFieldInputType.cpp:
+(WebCore::TextFieldInputType::forwardEvent):
+(WebCore::TextFieldInputType::shouldSubmitImplicitly):
+* inspector/InspectorDOMStorageResource.cpp:
+(WebCore::InspectorDOMStorageResource::handleEvent):
+
2011-10-21 Adam Klein
[MutationObservers] Implement basic subtree observation
Modified: trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp (98163 => 98164)
--- trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp 2011-10-21 22:52:29 UTC (rev 98163)
+++ trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp 2011-10-21 22:56:39 UTC (rev 98164)
@@ -53,7 +53,7 @@
void JSErrorHandler::handleEvent(ScriptExecutionContext* scriptExecutionContext, Event* event)
{
-if (event->in
[webkit-changes] [98163] trunk
Title: [98163] trunk
Revision 98163
Author ad...@chromium.org
Date 2011-10-21 15:52:29 -0700 (Fri, 21 Oct 2011)
Log Message
[MutationObservers] Implement basic subtree observation
https://bugs.webkit.org/show_bug.cgi?id=70436
Reviewed by Ryosuke Niwa.
Source/WebCore:
Note that this patch only implements "basic" subtree semantics,
not the fully robust semantics described in
http://lists.w3.org/Archives/Public/public-webapps/2011JulSep/1622.html.
Most importantly, this change does not handle the case where mutations
occur in a temporarily detached subtree.
The plan is to implement those semantics in a followup to avoid
blocking other parts of the MutationObserver spec that rely on
the existence of subtree observation but not its specific
implementation.
Test: fast/mutation/observe-subtree.html
* dom/Node.cpp:
(WebCore::addMatchingObservers): Static helper method for registeredMutationObserversOfType().
(WebCore::Node::registeredMutationObserversOfType): Walk up the tree looking for observers.
* dom/NodeRareData.h:
(WebCore::MutationObserverEntry::hasAllOptions): A stricter, renamed from matches().
LayoutTests:
* fast/mutation/observe-subtree-expected.txt: Added.
* fast/mutation/observe-subtree.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Node.cpp
trunk/Source/WebCore/dom/NodeRareData.h
Added Paths
trunk/LayoutTests/fast/mutation/observe-subtree-expected.txt
trunk/LayoutTests/fast/mutation/observe-subtree.html
Diff
Modified: trunk/LayoutTests/ChangeLog (98162 => 98163)
--- trunk/LayoutTests/ChangeLog 2011-10-21 22:33:35 UTC (rev 98162)
+++ trunk/LayoutTests/ChangeLog 2011-10-21 22:52:29 UTC (rev 98163)
@@ -1,3 +1,13 @@
+2011-10-21 Adam Klein
+
+[MutationObservers] Implement basic subtree observation
+https://bugs.webkit.org/show_bug.cgi?id=70436
+
+Reviewed by Ryosuke Niwa.
+
+* fast/mutation/observe-subtree-expected.txt: Added.
+* fast/mutation/observe-subtree.html: Added.
+
2011-10-21 Joshua Bell
IndexedDB: objectStore.transaction property should be readonly
Added: trunk/LayoutTests/fast/mutation/observe-subtree-expected.txt (0 => 98163)
--- trunk/LayoutTests/fast/mutation/observe-subtree-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mutation/observe-subtree-expected.txt 2011-10-21 22:52:29 UTC (rev 98163)
@@ -0,0 +1,39 @@
+Test WebKitMutationObserver.observe on a subtree
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Testing basic aspects of subtree observation.
+...attribute and characterData changes in subtree
+PASS mutations.length is 2
+PASS mutations[0].type is "attributes"
+PASS mutations[0].target is subDiv
+PASS mutations[0].attributeName is "foo"
+PASS mutations[0].attributeNamespace is null
+PASS mutations[1].type is "characterData"
+PASS mutations[1].target is subDiv.firstChild
+
+Testing two observers at different depths.
+PASS mutations.length is 1
+PASS mutations[0].type is "attributes"
+PASS mutations[0].target is subDiv
+PASS mutations[0].attributeName is "foo"
+PASS mutations[0].attributeNamespace is null
+PASS mutations2.length is 1
+PASS mutations2[0].type is "attributes"
+PASS mutations2[0].target is subDiv
+PASS mutations2[0].attributeName is "foo"
+PASS mutations2[0].attributeNamespace is null
+
+Testing one observer at two different depths.
+PASS calls is 1
+PASS mutations.length is 1
+PASS mutations[0].type is "attributes"
+PASS mutations[0].target is subDiv
+PASS mutations[0].attributeName is "foo"
+PASS mutations[0].attributeNamespace is null
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/mutation/observe-subtree.html (0 => 98163)
--- trunk/LayoutTests/fast/mutation/observe-subtree.html (rev 0)
+++ trunk/LayoutTests/fast/mutation/observe-subtree.html 2011-10-21 22:52:29 UTC (rev 98163)
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+window.jsTestIsAsync = true;
+var mutations;
+var mutations2;
+var div;
+var subDiv;
+var calls;
+
+function testBasic() {
+var observer;
+
+function start() {
+debug('Testing basic aspects of subtree observation.');
+
+mutations = null;
+div = document.createElement('div');
+subDiv = div.appendChild(document.createElement('div'));
+subDiv.innerHTML = 'hello, world';
+observer = new WebKitMutationObserver(function(mutations) {
+window.mutations = mutations;
+});
+
+observer.observe(div, {attributes: true, characterData: true, subtree: true});
+subDiv.setAttribute('foo', 'bar');
+subDiv.firstChild.textContent = 'goodbye!';
+setTimeout(finish, 0);
+}
+
+function finish() {
+debug('...attribute and characterData changes in subtree');
+
+shouldBe('mutations.length', '2');
+shouldBe('mutations[0].type', '"attributes"');
+shouldBe('mu
[webkit-changes] [98162] trunk/Source/WebKit/qt
Title: [98162] trunk/Source/WebKit/qt
Revision 98162
Author commit-qu...@webkit.org
Date 2011-10-21 15:33:35 -0700 (Fri, 21 Oct 2011)
Log Message
[Qt] Remote debugging needs QWebInspector to work
https://bugs.webkit.org/show_bug.cgi?id=70651
Patch by Luiz Agostini on 2011-10-21
Reviewed by Kenneth Rohde Christiansen.
Removing QWebInspector dependency from remote inspector.
* Api/qwebinspector.cpp:
* Api/qwebinspector_p.h:
(QWebInspectorPrivate::QWebInspectorPrivate):
* WebCoreSupport/InspectorClientQt.cpp:
(WebCore::InspectorClientQt::InspectorClientQt):
(WebCore::InspectorClientQt::openInspectorFrontend):
(WebCore::InspectorClientQt::attachAndReplaceRemoteFrontend):
(WebCore::InspectorClientQt::detachRemoteFrontend):
(WebCore::InspectorClientQt::sendMessageToFrontend):
* WebCoreSupport/InspectorClientQt.h:
* WebCoreSupport/InspectorServerQt.cpp:
(WebCore::InspectorServerRequestHandlerQt::tcpReadyRead):
* WebCoreSupport/InspectorServerQt.h:
Modified Paths
trunk/Source/WebKit/qt/Api/qwebinspector.cpp
trunk/Source/WebKit/qt/Api/qwebinspector_p.h
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.h
trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp
trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.h
Diff
Modified: trunk/Source/WebKit/qt/Api/qwebinspector.cpp (98161 => 98162)
--- trunk/Source/WebKit/qt/Api/qwebinspector.cpp 2011-10-21 22:30:29 UTC (rev 98161)
+++ trunk/Source/WebKit/qt/Api/qwebinspector.cpp 2011-10-21 22:33:35 UTC (rev 98162)
@@ -198,31 +198,6 @@
}
}
-/*!
- * \internal
- */
-void QWebInspectorPrivate::attachAndReplaceRemoteFrontend(QObject* newRemoteFrontend)
-{
-if (remoteFrontend)
-remoteFrontend->setParent(0);
-
-remoteFrontend = newRemoteFrontend;
-
-if (remoteFrontend)
-remoteFrontend->setParent(q);
-}
-
-/*!
- * \internal
- */
-void QWebInspectorPrivate::detachRemoteFrontend()
-{
-if (remoteFrontend) {
-remoteFrontend->deleteLater();
-remoteFrontend = 0;
-}
-}
-
void QWebInspectorPrivate::adjustFrontendSize(const QSize& size)
{
if (frontend)
Modified: trunk/Source/WebKit/qt/Api/qwebinspector_p.h (98161 => 98162)
--- trunk/Source/WebKit/qt/Api/qwebinspector_p.h 2011-10-21 22:30:29 UTC (rev 98161)
+++ trunk/Source/WebKit/qt/Api/qwebinspector_p.h 2011-10-21 22:33:35 UTC (rev 98162)
@@ -33,18 +33,14 @@
: q(qq)
, page(0)
, frontend(0)
-, remoteFrontend(0)
{}
void setFrontend(QWidget* newFrontend);
-void attachAndReplaceRemoteFrontend(QObject* newRemoteFrontend);
-void detachRemoteFrontend();
void adjustFrontendSize(const QSize& size);
QWebInspector* q;
QWebPage* page;
QWidget* frontend;
-QObject* remoteFrontend;
};
#endif
Modified: trunk/Source/WebKit/qt/ChangeLog (98161 => 98162)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-21 22:30:29 UTC (rev 98161)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-21 22:33:35 UTC (rev 98162)
@@ -1,5 +1,28 @@
2011-10-21 Luiz Agostini
+[Qt] Remote debugging needs QWebInspector to work
+https://bugs.webkit.org/show_bug.cgi?id=70651
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Removing QWebInspector dependency from remote inspector.
+
+* Api/qwebinspector.cpp:
+* Api/qwebinspector_p.h:
+(QWebInspectorPrivate::QWebInspectorPrivate):
+* WebCoreSupport/InspectorClientQt.cpp:
+(WebCore::InspectorClientQt::InspectorClientQt):
+(WebCore::InspectorClientQt::openInspectorFrontend):
+(WebCore::InspectorClientQt::attachAndReplaceRemoteFrontend):
+(WebCore::InspectorClientQt::detachRemoteFrontend):
+(WebCore::InspectorClientQt::sendMessageToFrontend):
+* WebCoreSupport/InspectorClientQt.h:
+* WebCoreSupport/InspectorServerQt.cpp:
+(WebCore::InspectorServerRequestHandlerQt::tcpReadyRead):
+* WebCoreSupport/InspectorServerQt.h:
+
+2011-10-21 Luiz Agostini
+
[Qt] Wrong type conversion in InspectorServerQt.cpp
https://bugs.webkit.org/show_bug.cgi?id=70639
Modified: trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp (98161 => 98162)
--- trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp 2011-10-21 22:30:29 UTC (rev 98161)
+++ trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp 2011-10-21 22:33:35 UTC (rev 98162)
@@ -179,6 +179,7 @@
: m_inspectedWebPage(page)
, m_frontendWebPage(0)
, m_frontendClient(0)
+, m_remoteFrontEndChannel(0)
{
InspectorServerQt* webInspectorServer = InspectorServerQt::server();
if (webInspectorServer)
@@ -210,7 +211,7 @@
QWebInspector* inspector = m_inspectedWebPage->d->getOrCreateInspector();
// Remote frontend was attached.
-if (m_inspectedWebPage->d->inspector->d->remoteFrontend)
+if (m_remoteFrontEndChannel)
return;
// T
[webkit-changes] [98161] trunk/Source/WebKit2
Title: [98161] trunk/Source/WebKit2
Revision 98161
Author wei...@apple.com
Date 2011-10-21 15:30:29 -0700 (Fri, 21 Oct 2011)
Log Message
Mark member variables of WebKit2 API @private
https://bugs.webkit.org/show_bug.cgi?id=70655
Reviewed by Simon Fraser.
* UIProcess/API/mac/WKBrowsingContextController.h:
* UIProcess/API/mac/WKView.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h
trunk/Source/WebKit2/UIProcess/API/mac/WKView.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98160 => 98161)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 22:26:24 UTC (rev 98160)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 22:30:29 UTC (rev 98161)
@@ -1,5 +1,15 @@
2011-10-21 Sam Weinig
+Mark member variables of WebKit2 API @private
+https://bugs.webkit.org/show_bug.cgi?id=70655
+
+Reviewed by Simon Fraser.
+
+* UIProcess/API/mac/WKBrowsingContextController.h:
+* UIProcess/API/mac/WKView.h:
+
+2011-10-21 Sam Weinig
+
Rename WKProcessCluster to WKProcessGroup
https://bugs.webkit.org/show_bug.cgi?id=70654
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h (98160 => 98161)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h 2011-10-21 22:26:24 UTC (rev 98160)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h 2011-10-21 22:30:29 UTC (rev 98161)
@@ -29,8 +29,8 @@
@class WKBrowsingContextControllerData;
WK_EXPORT
-@interface WKBrowsingContextController : NSObject
-{
+@interface WKBrowsingContextController : NSObject {
+@private
WKBrowsingContextControllerData *_data;
}
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.h (98160 => 98161)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.h 2011-10-21 22:26:24 UTC (rev 98160)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.h 2011-10-21 22:30:29 UTC (rev 98161)
@@ -32,6 +32,7 @@
WK_EXPORT
@interface WKView : NSView {
+@private
WKViewData *_data;
unsigned _unused;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98160] trunk/Source/WebKit2
Title: [98160] trunk/Source/WebKit2
Revision 98160
Author wei...@apple.com
Date 2011-10-21 15:26:24 -0700 (Fri, 21 Oct 2011)
Log Message
Rename WKProcessCluster to WKProcessGroup
https://bugs.webkit.org/show_bug.cgi?id=70654
Reviewed by Simon Fraser.
* UIProcess/API/mac/WKProcessCluster.h: Removed.
* UIProcess/API/mac/WKProcessCluster.mm: Removed.
* UIProcess/API/mac/WKProcessClusterInternal.h: Removed.
* UIProcess/API/mac/WKProcessGroup.h: Copied from Source/WebKit2/UIProcess/API/mac/WKProcessCluster.h.
* UIProcess/API/mac/WKProcessGroup.mm: Copied from Source/WebKit2/UIProcess/API/mac/WKProcessCluster.mm.
(-[WKProcessGroup initWithInjectedBundleURL:]):
* UIProcess/API/mac/WKProcessGroupInternal.h: Copied from Source/WebKit2/UIProcess/API/mac/WKProcessClusterInternal.h.
* UIProcess/API/mac/WKView.h:
* UIProcess/API/mac/WKView.mm:
(-[WKView initWithFrame:processCluster:]):
* WebKit2.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/mac/WKView.h
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Added Paths
trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.h
trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.mm
trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroupInternal.h
Removed Paths
trunk/Source/WebKit2/UIProcess/API/mac/WKProcessCluster.h
trunk/Source/WebKit2/UIProcess/API/mac/WKProcessCluster.mm
trunk/Source/WebKit2/UIProcess/API/mac/WKProcessClusterInternal.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98159 => 98160)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 22:09:22 UTC (rev 98159)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 22:26:24 UTC (rev 98160)
@@ -1,5 +1,24 @@
2011-10-21 Sam Weinig
+Rename WKProcessCluster to WKProcessGroup
+https://bugs.webkit.org/show_bug.cgi?id=70654
+
+Reviewed by Simon Fraser.
+
+* UIProcess/API/mac/WKProcessCluster.h: Removed.
+* UIProcess/API/mac/WKProcessCluster.mm: Removed.
+* UIProcess/API/mac/WKProcessClusterInternal.h: Removed.
+* UIProcess/API/mac/WKProcessGroup.h: Copied from Source/WebKit2/UIProcess/API/mac/WKProcessCluster.h.
+* UIProcess/API/mac/WKProcessGroup.mm: Copied from Source/WebKit2/UIProcess/API/mac/WKProcessCluster.mm.
+(-[WKProcessGroup initWithInjectedBundleURL:]):
+* UIProcess/API/mac/WKProcessGroupInternal.h: Copied from Source/WebKit2/UIProcess/API/mac/WKProcessClusterInternal.h.
+* UIProcess/API/mac/WKView.h:
+* UIProcess/API/mac/WKView.mm:
+(-[WKView initWithFrame:processCluster:]):
+* WebKit2.xcodeproj/project.pbxproj:
+
+2011-10-21 Sam Weinig
+
Remove ability to create a WKView without a WKContextRef and WKPageGroupRef
https://bugs.webkit.org/show_bug.cgi?id=70653
Deleted: trunk/Source/WebKit2/UIProcess/API/mac/WKProcessCluster.h (98159 => 98160)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKProcessCluster.h 2011-10-21 22:09:22 UTC (rev 98159)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKProcessCluster.h 2011-10-21 22:26:24 UTC (rev 98160)
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2011 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 INC. 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 INC. 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
-#import
-
-@class WKProcessClusterData;
-
-WK_EXPORT
-@interface WKProcessCluster : NSObject
-{
-WKProcessClusterData *_data;
-}
-
-- (id)init;
-- (id)initWithInjectedBundleURL:(NSURL *)bundleURL;
-
-@end
Deleted: trunk/Source/WebKit2/UIProcess/API/mac/WKProcessCluster.mm (98159 => 98160)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKProcessCluster.mm 2011-10-21 22:09:22 UTC (rev 98159)
+++ trunk/Source/WebKit2/UIProcess/API/
[webkit-changes] [98159] trunk
Title: [98159] trunk
Revision 98159
Author wei...@apple.com
Date 2011-10-21 15:09:22 -0700 (Fri, 21 Oct 2011)
Log Message
Remove ability to create a WKView without a WKContextRef and WKPageGroupRef
https://bugs.webkit.org/show_bug.cgi?id=70653
Reviewed by Simon Fraser.
Source/WebKit2:
Requiring a context and pagegroup removes the concept of global contexts,
which is something that is both confusing, and makes Objective-C wrapping
harder.
* UIProcess/API/mac/WKView.mm:
(-[WKView initWithFrame:processCluster:]):
* UIProcess/API/mac/WKViewPrivate.h:
Remove init methods that didn't take both a context and a pagegroup.
Tools:
* MiniBrowser/mac/AppDelegate.h:
* MiniBrowser/mac/AppDelegate.m:
(-[BrowserAppDelegate init]):
(-[BrowserAppDelegate newWindow:]):
(-[BrowserAppDelegate openPanelDidEnd:returnCode:contextInfo:]):
* MiniBrowser/mac/BrowserWindowController.h:
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController initWithContext:pageGroup:]):
(-[BrowserWindowController windowWillClose:]):
(createNewPage):
(-[BrowserWindowController awakeFromNib]):
* TestWebKitAPI/mac/WebKitAgnosticTest.mm:
(TestWebKitAPI::WebKitAgnosticTest::runWebKit2Test):
Update testing code to pass a PageGroup as necessary.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
trunk/Source/WebKit2/UIProcess/API/mac/WKViewPrivate.h
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/mac/AppDelegate.h
trunk/Tools/MiniBrowser/mac/AppDelegate.m
trunk/Tools/MiniBrowser/mac/BrowserWindowController.h
trunk/Tools/MiniBrowser/mac/BrowserWindowController.m
trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98158 => 98159)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 22:01:54 UTC (rev 98158)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 22:09:22 UTC (rev 98159)
@@ -1,3 +1,19 @@
+2011-10-21 Sam Weinig
+
+Remove ability to create a WKView without a WKContextRef and WKPageGroupRef
+https://bugs.webkit.org/show_bug.cgi?id=70653
+
+Reviewed by Simon Fraser.
+
+Requiring a context and pagegroup removes the concept of global contexts,
+which is something that is both confusing, and makes Objective-C wrapping
+harder.
+
+* UIProcess/API/mac/WKView.mm:
+(-[WKView initWithFrame:processCluster:]):
+* UIProcess/API/mac/WKViewPrivate.h:
+Remove init methods that didn't take both a context and a pagegroup.
+
2011-10-21 Alexey Proskuryakov
[WK2] Crash after printing a view with accelerated compositing content
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (98158 => 98159)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-10-21 22:01:54 UTC (rev 98158)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-10-21 22:09:22 UTC (rev 98159)
@@ -198,14 +198,9 @@
@implementation WKView
-- (id)initWithFrame:(NSRect)frame
-{
-return [self initWithFrame:frame contextRef:toAPI(WebContext::sharedProcessContext())];
-}
-
- (id)initWithFrame:(NSRect)frame processCluster:(WKProcessCluster *)processCluster
{
-return [self initWithFrame:frame contextRef:processCluster.contextRef];
+return [self initWithFrame:frame contextRef:processCluster.contextRef pageGroupRef:0];
}
- (void)dealloc
@@ -2571,11 +2566,6 @@
@implementation WKView (Private)
-- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef
-{
-return [self initWithFrame:frame contextRef:contextRef pageGroupRef:nil];
-}
-
- (void)_registerDraggedTypes
{
NSMutableSet *types = [[NSMutableSet alloc] initWithArray:PasteboardTypes::forEditing()];
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewPrivate.h (98158 => 98159)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewPrivate.h 2011-10-21 22:01:54 UTC (rev 98158)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewPrivate.h 2011-10-21 22:09:22 UTC (rev 98159)
@@ -31,7 +31,6 @@
@property(readonly) WKPageRef pageRef;
-- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef;
- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef;
- (NSPrintOperation *)printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFrame:(WKFrameRef)frameRef;
Modified: trunk/Tools/ChangeLog (98158 => 98159)
--- trunk/Tools/ChangeLog 2011-10-21 22:01:54 UTC (rev 98158)
+++ trunk/Tools/ChangeLog 2011-10-21 22:09:22 UTC (rev 98159)
@@ -1,3 +1,25 @@
+2011-10-21 Sam Weinig
+
+Remove ability to create a WKView without a WKContextRef and WKPageGroupRef
+https://bugs.webkit.org/show_bug.cgi?id=70653
+
+Reviewed by Simon Fraser.
+
+* MiniBrowser/mac/AppDelegate.h:
+* MiniBrowser/mac/AppDelegate.m:
+(-[BrowserAppDelegate init]):
+(-[BrowserAppDelegate newWindow:]):
+(-[BrowserAppDelegate openPanelDidEnd:returnCode:contextInfo:]):
+* MiniBrowser/mac/Brows
[webkit-changes] [98158] trunk/Source/WebKit/qt
Title: [98158] trunk/Source/WebKit/qt
Revision 98158
Author commit-qu...@webkit.org
Date 2011-10-21 15:01:54 -0700 (Fri, 21 Oct 2011)
Log Message
[Qt] Wrong type conversion in InspectorServerQt.cpp
https://bugs.webkit.org/show_bug.cgi?id=70639
Patch by Luiz Agostini on 2011-10-21
Reviewed by Noam Rosenthal.
Wrong type conversion causes WebSocket handshake failures for the remote inspector.
* WebCoreSupport/InspectorServerQt.cpp:
(WebCore::parseWebSocketChallengeNumber):
Modified Paths
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (98157 => 98158)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-21 21:59:58 UTC (rev 98157)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-21 22:01:54 UTC (rev 98158)
@@ -1,3 +1,15 @@
+2011-10-21 Luiz Agostini
+
+[Qt] Wrong type conversion in InspectorServerQt.cpp
+https://bugs.webkit.org/show_bug.cgi?id=70639
+
+Reviewed by Noam Rosenthal.
+
+Wrong type conversion causes WebSocket handshake failures for the remote inspector.
+
+* WebCoreSupport/InspectorServerQt.cpp:
+(WebCore::parseWebSocketChallengeNumber):
+
2011-10-21 Zeno Albisser
[Qt] WebKit build does not respect QMAKE_MAC_SDK variable.
Modified: trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp (98157 => 98158)
--- trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp 2011-10-21 21:59:58 UTC (rev 98157)
+++ trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp 2011-10-21 22:01:54 UTC (rev 98158)
@@ -78,7 +78,7 @@
else if ((c >= QLatin1Char('0')) && (c <= QLatin1Char('9')))
nString.append(c);
}
-quint32 num = nString.toLong();
+quint32 num = nString.toULong();
quint32 result = (numSpaces ? (num / numSpaces) : num);
return result;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98157] trunk/Tools
Title: [98157] trunk/Tools
Revision 98157
Author commit-qu...@webkit.org
Date 2011-10-21 14:59:58 -0700 (Fri, 21 Oct 2011)
Log Message
webkitpy: Teach NRWT about the EFL port
https://bugs.webkit.org/show_bug.cgi?id=70637
Allows using ``efl'' as a platform when executing NRWT.
Patch by Leandro Pereira on 2011-10-21
Reviewed by Eric Seidel.
* Scripts/webkitpy/layout_tests/port/efl.py: Added.
* Scripts/webkitpy/layout_tests/port/efl_unittest.py: Added.
* Scripts/webkitpy/layout_tests/port/factory.py: Adjust factory to make EflPort objects
when using PortFactory.get(port_name='efl').
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py
Added Paths
trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/efl_unittest.py
Diff
Modified: trunk/Tools/ChangeLog (98156 => 98157)
--- trunk/Tools/ChangeLog 2011-10-21 21:43:39 UTC (rev 98156)
+++ trunk/Tools/ChangeLog 2011-10-21 21:59:58 UTC (rev 98157)
@@ -1,3 +1,17 @@
+2011-10-21 Leandro Pereira
+
+webkitpy: Teach NRWT about the EFL port
+https://bugs.webkit.org/show_bug.cgi?id=70637
+
+Allows using ``efl'' as a platform when executing NRWT.
+
+Reviewed by Eric Seidel.
+
+* Scripts/webkitpy/layout_tests/port/efl.py: Added.
+* Scripts/webkitpy/layout_tests/port/efl_unittest.py: Added.
+* Scripts/webkitpy/layout_tests/port/factory.py: Adjust factory to make EflPort objects
+when using PortFactory.get(port_name='efl').
+
2011-10-21 Devdatta Deshpande
[Gtk] mousemove event always has metaKey == true
Added: trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py (0 => 98157)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py 2011-10-21 21:59:58 UTC (rev 98157)
@@ -0,0 +1,80 @@
+# Copyright (C) 2011 ProFUSION Embedded Systems. All rights reserved.
+# Copyright (C) 2011 Samsung Electronics. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+# OWNER OR 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.
+
+"""WebKit Efl implementation of the Port interface."""
+
+import logging
+import signal
+import subprocess
+
+from webkitpy.layout_tests.models.test_configuration import TestConfiguration
+from webkitpy.layout_tests.port import base, builders, server_process, webkit
+
+
+_log = logging.getLogger(__name__)
+
+
+class EflPort(webkit.WebKitPort):
+port_name = "efl"
+
+def __init__(self, **kwargs):
+webkit.WebKitPort.__init__(self, **kwargs)
+self._version = self.port_name
+
+def _port_flag_for_scripts(self):
+return "--efl"
+
+def setup_environ_for_server(self, server_name=None):
+return webkit.WebKitPort.setup_environ_for_server(self, server_name)
+
+def _generate_all_test_configurations(self):
+return [TestConfiguration(version=self._version, architecture='x86', build_type=build_type, graphics_type='cpu') for build_type in self.ALL_BUILD_TYPES]
+
+def _path_to_driver(self):
+return self._build_path('Programs', self.driver_name())
+
+def _path_to_image_diff(self):
+return self._build_path('Programs', 'ImageDiff')
+
+def check_build(self, needs_http):
+return self._check_driver()
+
+def _path_to_webcore_library(self):
+static_path = self._build_path('WebCore', 'libwebcore_efl.a')
+dyn_path = self._build_path('WebCore', 'libwebcore_efl.so')
+
+return static_path if self._filesystem.exists(static_path) else dyn_path
+
+def _runtime_feature_list(self):
+return None
+
+def show_results_html_file(self, results_filename):
+# FIXME: We should find a way to share
[webkit-changes] [98154] trunk
Title: [98154] trunk
Revision 98154
Author commit-qu...@webkit.org
Date 2011-10-21 14:30:11 -0700 (Fri, 21 Oct 2011)
Log Message
IndexedDB: objectStore.transaction property should be readonly
https://bugs.webkit.org/show_bug.cgi?id=62395
Patch by Joshua Bell on 2011-10-21
Reviewed by Tony Chang.
Source/WebCore:
Implement the IDBObjectStore.transaction property defined by the spec.
Test: storage/indexeddb/readonly-properties.html
* storage/IDBObjectStore.cpp:
(WebCore::IDBObjectStore::transaction):
* storage/IDBObjectStore.h:
* storage/IDBObjectStore.idl:
LayoutTests:
* storage/indexeddb/objectstore-basics-expected.txt:
* storage/indexeddb/objectstore-basics.html:
* storage/indexeddb/readonly-properties-expected.txt: Added.
* storage/indexeddb/readonly-properties.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt
trunk/LayoutTests/storage/indexeddb/objectstore-basics.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/storage/IDBObjectStore.cpp
trunk/Source/WebCore/storage/IDBObjectStore.h
trunk/Source/WebCore/storage/IDBObjectStore.idl
Added Paths
trunk/LayoutTests/storage/indexeddb/readonly-properties-expected.txt
trunk/LayoutTests/storage/indexeddb/readonly-properties.html
Diff
Modified: trunk/LayoutTests/ChangeLog (98153 => 98154)
--- trunk/LayoutTests/ChangeLog 2011-10-21 21:26:15 UTC (rev 98153)
+++ trunk/LayoutTests/ChangeLog 2011-10-21 21:30:11 UTC (rev 98154)
@@ -1,3 +1,15 @@
+2011-10-21 Joshua Bell
+
+IndexedDB: objectStore.transaction property should be readonly
+https://bugs.webkit.org/show_bug.cgi?id=62395
+
+Reviewed by Tony Chang.
+
+* storage/indexeddb/objectstore-basics-expected.txt:
+* storage/indexeddb/objectstore-basics.html:
+* storage/indexeddb/readonly-properties-expected.txt: Added.
+* storage/indexeddb/readonly-properties.html: Added.
+
2011-10-21 Julien Chaffraix
Unreviewed gardening, yet another flaky crashing test.
Modified: trunk/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt (98153 => 98154)
--- trunk/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt 2011-10-21 21:26:15 UTC (rev 98153)
+++ trunk/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt 2011-10-21 21:30:11 UTC (rev 98154)
@@ -39,6 +39,7 @@
store = setVersionTrans.objectStore('storeName')
index = store.createIndex('indexFail', 'x')
PASS db.version is "new version"
+PASS store.transaction is setVersionTrans
PASS store.indexNames is ['indexName']
PASS store.indexNames.length is 1
PASS store.indexNames.contains('') is false
Modified: trunk/LayoutTests/storage/indexeddb/objectstore-basics.html (98153 => 98154)
--- trunk/LayoutTests/storage/indexeddb/objectstore-basics.html 2011-10-21 21:26:15 UTC (rev 98153)
+++ trunk/LayoutTests/storage/indexeddb/objectstore-basics.html 2011-10-21 21:30:11 UTC (rev 98154)
@@ -116,6 +116,7 @@
function checkMetadata()
{
shouldBeEqualToString("db.version", "new version");
+shouldBe("store.transaction", "setVersionTrans");
shouldBe("store.indexNames", "['indexName']");
shouldBe("store.indexNames.length", "1");
shouldBe("store.indexNames.contains('')", "false");
Added: trunk/LayoutTests/storage/indexeddb/readonly-properties-expected.txt (0 => 98154)
--- trunk/LayoutTests/storage/indexeddb/readonly-properties-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/readonly-properties-expected.txt 2011-10-21 21:30:11 UTC (rev 98154)
@@ -0,0 +1,26 @@
+Test IndexedDB readonly properties
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB;
+PASS indexedDB == null is false
+IDBDatabaseException = window.IDBDatabaseException || window.webkitIDBDatabaseException;
+PASS IDBDatabaseException == null is false
+IDBCursor = window.IDBCursor || window.webkitIDBCursor;
+PASS IDBCursor == null is false
+IDBKeyRange = window.IDBKeyRange || window.webkitIDBKeyRange;
+PASS IDBKeyRange == null is false
+indexedDB.open(name, description)
+db = event.target.result
+request = db.setVersion('1')
+transaction = event.target.result;
+Deleted all object stores.
+objectStore = db.createObjectStore('foo');
+trying to set readonly property objectStore.transaction
+objectStore.transaction = this
+PASS objectStore.transaction is still [object IDBTransaction]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/storage/indexeddb/readonly-properties.html (0 => 98154)
--- trunk/LayoutTests/storage/indexeddb/readonly-properties.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/readonly-properties.html 2011-10-21 21:30:11 UTC (rev 98154)
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+description("Test IndexedDB readonly properties");
+if (window.layoutTestController)
+layoutTestController
[webkit-changes] [98153] trunk/Source/WebKit2
Title: [98153] trunk/Source/WebKit2 Revision 98153 Author a...@apple.com Date 2011-10-21 14:26:15 -0700 (Fri, 21 Oct 2011) Log Message [WK2] Crash after printing a view with accelerated compositing content https://bugs.webkit.org/show_bug.cgi?id=70643 Reviewed by Darin Adler. * UIProcess/API/mac/WKPrintingView.mm: (-[WKPrintingView _delayedResumeAutodisplayTimerFired]): We cannot rely on -[WKView drawRect:] calling endPrinting() for us. That call to endPrinting() is still necessary to paint e.g. when resizing a window while a print dialog is present. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (98152 => 98153) --- trunk/Source/WebKit2/ChangeLog 2011-10-21 21:22:50 UTC (rev 98152) +++ trunk/Source/WebKit2/ChangeLog 2011-10-21 21:26:15 UTC (rev 98153) @@ -1,3 +1,15 @@ +2011-10-21 Alexey Proskuryakov + +[WK2] Crash after printing a view with accelerated compositing content +https://bugs.webkit.org/show_bug.cgi?id=70643 + + +Reviewed by Darin Adler. + +* UIProcess/API/mac/WKPrintingView.mm: (-[WKPrintingView _delayedResumeAutodisplayTimerFired]): +We cannot rely on -[WKView drawRect:] calling endPrinting() for us. That call to endPrinting() +is still necessary to paint e.g. when resizing a window while a print dialog is present. + 2011-10-21 Jesus Sanchez-Palencia [WK2] WebFrameLoaderClient::shouldFallback() should use a port-specific implementation Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm (98152 => 98153) --- trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2011-10-21 21:22:50 UTC (rev 98152) +++ trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2011-10-21 21:26:15 UTC (rev 98153) @@ -91,6 +91,9 @@ _autodisplayResumeTimer = nil; [self _setAutodisplay:YES]; + +// Enabling autodisplay normally implicitly calls endPrinting() via -[WKView drawRect:], but not when content is in accelerated compositing mode. +_webFrame->page()->endPrinting(); } - (void)_delayedResumeAutodisplay ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98152] branches/safari-534.52-branch
Title: [98152] branches/safari-534.52-branch
Revision 98152
Author lforsch...@apple.com
Date 2011-10-21 14:22:50 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r98060.
Modified Paths
branches/safari-534.52-branch/LayoutTests/ChangeLog
branches/safari-534.52-branch/Source/WebCore/ChangeLog
branches/safari-534.52-branch/Source/WebCore/rendering/RenderLayer.cpp
branches/safari-534.52-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp
branches/safari-534.52-branch/Source/WebCore/rendering/RenderLayerCompositor.h
Added Paths
branches/safari-534.52-branch/LayoutTests/compositing/visibility/
branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe-expected.txt
branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe.html
Removed Paths
branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe-expected.txt
branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe.html
Diff
Modified: branches/safari-534.52-branch/LayoutTests/ChangeLog (98151 => 98152)
--- branches/safari-534.52-branch/LayoutTests/ChangeLog 2011-10-21 21:16:03 UTC (rev 98151)
+++ branches/safari-534.52-branch/LayoutTests/ChangeLog 2011-10-21 21:22:50 UTC (rev 98152)
@@ -1,5 +1,21 @@
2011-10-21 Lucas Forschler
+Merge 98060
+
+2011-10-20 Simon Fraser
+
+Hidden composited iframes cause infinite loop
+https://bugs.webkit.org/show_bug.cgi?id=52655
+
+Reviewed by Darin Adler.
+
+Test with a visibility:hidden iframe, whose subframe becomes composited.
+
+* compositing/visibility/hidden-iframe-expected.txt: Added.
+* compositing/visibility/hidden-iframe.html: Added.
+
+2011-10-21 Lucas Forschler
+
Merge 97821
2011-10-18 Anders Carlsson
Deleted: branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe-expected.txt (98060 => 98152)
--- trunk/LayoutTests/compositing/visibility/hidden-iframe-expected.txt 2011-10-21 03:02:05 UTC (rev 98060)
+++ branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe-expected.txt 2011-10-21 21:22:50 UTC (rev 98152)
@@ -1,3 +0,0 @@
-PASS: test did not hang.
-
-
Copied: branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe-expected.txt (from rev 98060, trunk/LayoutTests/compositing/visibility/hidden-iframe-expected.txt) (0 => 98152)
--- branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe-expected.txt (rev 0)
+++ branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe-expected.txt 2011-10-21 21:22:50 UTC (rev 98152)
@@ -0,0 +1,3 @@
+PASS: test did not hang.
+
+
Deleted: branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe.html (98060 => 98152)
--- trunk/LayoutTests/compositing/visibility/hidden-iframe.html 2011-10-21 03:02:05 UTC (rev 98060)
+++ branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe.html 2011-10-21 21:22:50 UTC (rev 98152)
@@ -1,31 +0,0 @@
-
-
-
- iframe {
-visibility: hidden;
-position: absolute;
- }
-
-
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
-
- // Called from subframe.
- function testDone()
- {
-// This timeout is necessary to detect the hang.
-window.setTimeout(function() {
- document.getElementById('results').innerText = 'PASS: test did not hang.';
- if (window.layoutTestController)
-layoutTestController.notifyDone();
-}, 0);
- }
-
-
-
-This test should not hang.
-
-
Copied: branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe.html (from rev 98060, trunk/LayoutTests/compositing/visibility/hidden-iframe.html) (0 => 98152)
--- branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe.html (rev 0)
+++ branches/safari-534.52-branch/LayoutTests/compositing/visibility/hidden-iframe.html 2011-10-21 21:22:50 UTC (rev 98152)
@@ -0,0 +1,31 @@
+
+
+
+ iframe {
+visibility: hidden;
+position: absolute;
+ }
+
+
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ }
+
+ // Called from subframe.
+ function testDone()
+ {
+// This timeout is necessary to detect the hang.
+window.setTimeout(function() {
+ document.getElementById('results').innerText = 'PASS: test did not hang.';
+ if (window.layoutTestController)
+layoutTestController.notifyDone();
+}, 0);
+ }
+
+
+
+This test should not hang.
+
+
Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (98151 => 98152)
--- branch
[webkit-changes] [98151] branches/safari-534.52-branch/Source/WebKit2
Title: [98151] branches/safari-534.52-branch/Source/WebKit2
Revision 98151
Author lforsch...@apple.com
Date 2011-10-21 14:16:03 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r98013.
Modified Paths
branches/safari-534.52-branch/Source/WebKit2/ChangeLog
branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Diff
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98150 => 98151)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 21:13:53 UTC (rev 98150)
+++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 21:16:03 UTC (rev 98151)
@@ -1,5 +1,22 @@
2011-10-21 Lucas Forschler
+Merge 98013
+
+2011-10-20 Brady Eidson
+
+ and https://bugs.webkit.org/show_bug.cgi?id=70535
+WK2 - Crash deref'ing a null context menu
+
+Reviewed by Darin Adler.
+
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::didSelectItemFromActiveContextMenu): In some cases that we still can't reproduce,
+ this message can be received in the WebProcess after the context menu has been cleared, leading
+ to a crash. Turning the ASSERT in to an early return will prevent the crash while we try to learn more
+ about how this could happen.
+
+2011-10-21 Lucas Forschler
+
Merge 97808
2011-10-18 Enrica Casucci
Modified: branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (98150 => 98151)
--- branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-10-21 21:13:53 UTC (rev 98150)
+++ branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-10-21 21:16:03 UTC (rev 98151)
@@ -1901,7 +1901,9 @@
void WebPage::didSelectItemFromActiveContextMenu(const WebContextMenuItemData& item)
{
-ASSERT(m_contextMenu);
+if (!m_contextMenu)
+return;
+
m_contextMenu->itemSelected(item);
m_contextMenu = 0;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98150] branches/safari-534.52-branch
Title: [98150] branches/safari-534.52-branch
Revision 98150
Author lforsch...@apple.com
Date 2011-10-21 14:13:53 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r97821.
Modified Paths
branches/safari-534.52-branch/LayoutTests/ChangeLog
branches/safari-534.52-branch/Source/WebCore/ChangeLog
branches/safari-534.52-branch/Source/WebCore/loader/HistoryController.cpp
Added Paths
branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert-expected.txt
branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert.html
Diff
Modified: branches/safari-534.52-branch/LayoutTests/ChangeLog (98149 => 98150)
--- branches/safari-534.52-branch/LayoutTests/ChangeLog 2011-10-21 21:10:39 UTC (rev 98149)
+++ branches/safari-534.52-branch/LayoutTests/ChangeLog 2011-10-21 21:13:53 UTC (rev 98150)
@@ -1,5 +1,20 @@
2011-10-21 Lucas Forschler
+Merge 97821
+
+2011-10-18 Anders Carlsson
+
+Assertion failure when going back in page with navigated subframes
+https://bugs.webkit.org/show_bug.cgi?id=70389
+
+
+Reviewed by Darin Adler.
+
+* fast/history/history-back-twice-with-subframes-assert-expected.txt: Added.
+* fast/history/history-back-twice-with-subframes-assert.html: Added.
+
+2011-10-21 Lucas Forschler
+
Merge 95226
2011-09-15 Jon Lee
Copied: branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert-expected.txt (from rev 97821, trunk/LayoutTests/fast/history/history-back-twice-with-subframes-assert-expected.txt) (0 => 98150)
--- branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert-expected.txt (rev 0)
+++ branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert-expected.txt 2011-10-21 21:13:53 UTC (rev 98150)
@@ -0,0 +1,4 @@
+This tests that navigating two subframes and then going back using history.go(-2) won't assert.
+
+This tests that navigating two subframes and then going back using history.go(-2) won't assert.
+
Copied: branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert.html (from rev 97821, trunk/LayoutTests/fast/history/history-back-twice-with-subframes-assert.html) (0 => 98150)
--- branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert.html (rev 0)
+++ branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert.html 2011-10-21 21:13:53 UTC (rev 98150)
@@ -0,0 +1,38 @@
+
+
+if (layoutTestController) {
+layoutTestController.dumpAsText();
+layoutTestController.waitUntilDone();
+}
+
+function runTest() {
+var loadCount = 2;
+var didGoBack = false;
+
+var frame1 = document.getElementById('frame1');
+var frame2 = document.getElementById('frame2');
+frame1._onload_ = frame2._onload_ = function() {
+loadCount--;
+if (loadCount)
+return;
+
+if (!didGoBack) {
+// We've navigated both frames, now go back 2 steps.
+loadCount = 2;
+history.go(-2);
+didGoBack = true;
+return;
+}
+
+if (layoutTestController)
+layoutTestController.notifyDone();
+}
+
+frame1.src = "" = '';
+}
+
+
+This tests that navigating two subframes and then going back using history.go(-2) won't assert.
+
+
+
Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (98149 => 98150)
--- branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 21:10:39 UTC (rev 98149)
+++ branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 21:13:53 UTC (rev 98150)
@@ -1,5 +1,31 @@
2011-10-21 Lucas Forschler
+Merge 97821
+
+2011-10-18 Anders Carlsson
+
+Assertion failure when going back in page with navigated subframes
+https://bugs.webkit.org/show_bug.cgi?id=70389
+
+
+Reviewed by Darin Adler.
+
+Test: fast/history/history-back-twice-with-subframes-assert.html
+
+If a single navigation ends up loading multiple frame, the first committed frame will
+end up calling recursiveUpdateForCommit on the main frame which will null out the provisional item
+for all frames on the page. This means that it can null out the provisional item for any frames
+that are still yet to be committed which causes the aforementioned assertion failure.
+
+Fix this by only nulling out the provisional history item (and saving/restoring the scroll position and
+some other things) for frames that already contain the URL that the item requested. If a frame is being loaded,
+it will null out its provisional history item when it's committed.
+
+* loader/HistoryCon
[webkit-changes] [98149] branches/safari-534.52-branch/Source/WebKit2
Title: [98149] branches/safari-534.52-branch/Source/WebKit2
Revision 98149
Author lforsch...@apple.com
Date 2011-10-21 14:10:39 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r97808.
Modified Paths
branches/safari-534.52-branch/Source/WebKit2/ChangeLog
branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
Diff
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98148 => 98149)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 21:09:20 UTC (rev 98148)
+++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 21:10:39 UTC (rev 98149)
@@ -1,5 +1,29 @@
2011-10-21 Lucas Forschler
+Merge 97808
+
+2011-10-18 Enrica Casucci
+
+Crash in WebProcess at com.apple.AppKit: -[NSFilePromiseDragSource draggedImage:endedAt:operation:] + 101
+https://bugs.webkit.org/show_bug.cgi?id=70340
+
+
+We have seen a number of crash reports for this issue that seem to occurr when
+the user drags an image from a web page onto the desktop.
+We have not been able to reproduce this crash, therefore this is a speculative fix,
+but the theory is that the dragging source has been already released when draggedImage
+is called.
+This patch attempts a fix for the problem by retaining the dragging source when
+NSFilePromiseDragSource is created.
+
+Reviewed by Darin Adler.
+
+* WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+(-[WKPasteboardFilePromiseOwner initWithSource:]):
+(-[WKPasteboardFilePromiseOwner dealloc]):
+
+2011-10-21 Lucas Forschler
+
Merge 97807
2011-10-18 Alexey Proskuryakov
Modified: branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (98148 => 98149)
--- branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2011-10-21 21:09:20 UTC (rev 98148)
+++ branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2011-10-21 21:10:39 UTC (rev 98149)
@@ -58,6 +58,7 @@
// Create it explicitly because dragImage is called in the UI process.
@interface NSFilePromiseDragSource : NSObject
{
+id _dragSource;
char _unknownFields[256];
}
- (id)initWithSource:(id)dragSource;
@@ -189,6 +190,21 @@
@implementation WKPasteboardFilePromiseOwner
+- (id)initWithSource:(id)dragSource
+{
+self = [super initWithSource:dragSource];
+if (!self)
+return nil;
+[_dragSource retain];
+return self;
+}
+
+- (void)dealloc
+{
+[_dragSource release];
+[super dealloc];
+}
+
// The AppKit implementation of copyDropDirectory gets the current pasteboard in
// a way that only works in the process where the drag is initiated. We supply
// an implementation that gets the pasteboard by name instead.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98148] branches/safari-534.52-branch/Source/WebKit2
Title: [98148] branches/safari-534.52-branch/Source/WebKit2 Revision 98148 Author lforsch...@apple.com Date 2011-10-21 14:09:20 -0700 (Fri, 21 Oct 2011) Log Message Merged r97807. Modified Paths branches/safari-534.52-branch/Source/WebKit2/ChangeLog branches/safari-534.52-branch/Source/WebKit2/Shared/mac/SecKeychainItemResponseData.cpp Diff Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98147 => 98148) --- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 21:08:05 UTC (rev 98147) +++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 21:09:20 UTC (rev 98148) @@ -1,5 +1,23 @@ 2011-10-21 Lucas Forschler +Merge 97807 + +2011-10-18 Alexey Proskuryakov + +[WK2] Crash after storing credentials in Keychain +https://bugs.webkit.org/show_bug.cgi?id=70376 + + +Reviewed by Dan Bernstein. + +* Shared/mac/SecKeychainItemResponseData.cpp: +(WebKit::SecKeychainItemResponseData::encode): +(WebKit::SecKeychainItemResponseData::decode): +Actually send keychain item over, too. In shimSecKeychainItemCreateFromContent(), we are +going to use it to override SecKeychainItemCreateFromContent(), and we cannot return noErr +from this function without returning a non-null keychain item. +2011-10-21 Lucas Forschler + Merge 97681 2011-10-17 Jon Lee Modified: branches/safari-534.52-branch/Source/WebKit2/Shared/mac/SecKeychainItemResponseData.cpp (98147 => 98148) --- branches/safari-534.52-branch/Source/WebKit2/Shared/mac/SecKeychainItemResponseData.cpp 2011-10-21 21:08:05 UTC (rev 98147) +++ branches/safari-534.52-branch/Source/WebKit2/Shared/mac/SecKeychainItemResponseData.cpp 2011-10-21 21:09:20 UTC (rev 98148) @@ -72,6 +72,10 @@ encoder->encodeBool(m_data.get()); if (m_data) CoreIPC::encode(encoder, m_data.get()); + +encoder->encodeBool(m_keychainItem.get()); +if (m_keychainItem) +CoreIPC::encode(encoder, m_keychainItem.get()); } bool SecKeychainItemResponseData::decode(CoreIPC::ArgumentDecoder* decoder, SecKeychainItemResponseData& secKeychainItemResponseData) @@ -105,6 +109,13 @@ if (expectData && !CoreIPC::decode(decoder, secKeychainItemResponseData.m_data)) return false; +bool expectItem; +if (!decoder->decodeBool(expectItem)) +return false; + +if (expectItem && !CoreIPC::decode(decoder, secKeychainItemResponseData.m_keychainItem)) +return false; + return true; } ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98147] branches/safari-534.52-branch/Source/WebKit2
Title: [98147] branches/safari-534.52-branch/Source/WebKit2
Revision 98147
Author lforsch...@apple.com
Date 2011-10-21 14:08:05 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r97681.
Modified Paths
branches/safari-534.52-branch/Source/WebKit2/ChangeLog
branches/safari-534.52-branch/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp
Diff
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98146 => 98147)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 21:07:12 UTC (rev 98146)
+++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 21:08:05 UTC (rev 98147)
@@ -1,5 +1,32 @@
2011-10-21 Lucas Forschler
+Merge 97681
+
+2011-10-17 Jon Lee
+
+Filtering of URLs when serializing back forward list saves bad current index value
+https://bugs.webkit.org/show_bug.cgi?id=70282
+
+
+Reviewed by Sam Weinig.
+
+When reading the serialized b-f list, perform a sanity check on the current index.
+If it is invalid, we set it to NoCurrentItemIndex to prevent further corruption of
+the list.
+
+When serializing the b-f list, currentIndex can be negative in the case where the list
+has one item only, and that item gets filtered out. In this instance currentIndex should
+just be -1. A crashing case showed an index that was more negative, a situation that I
+could not replicate. Since this value will get cleaned up when the b-f list is restored,
+I just strengthened the assertion to check for a more negative index in case we run into it again.
+
+* UIProcess/cf/WebBackForwardListCF.cpp:
+(WebKit::WebBackForwardList::createCFDictionaryRepresentation): Update the assertion
+in case we go beyond NoCurrentItemIndex (which, as an int, is -1).
+(WebKit::WebBackForwardList::restoreFromCFDictionaryRepresentation):
+
+2011-10-21 Lucas Forschler
+
Merge 96864
2011-10-06 Anders Carlsson
Modified: branches/safari-534.52-branch/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp (98146 => 98147)
--- branches/safari-534.52-branch/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp 2011-10-21 21:07:12 UTC (rev 98146)
+++ branches/safari-534.52-branch/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp 2011-10-21 21:08:05 UTC (rev 98147)
@@ -79,7 +79,7 @@
CFArrayAppendValue(entries.get(), entryDictionary.get());
}
-ASSERT(currentIndex < CFArrayGetCount(entries.get()));
+ASSERT(currentIndex < CFArrayGetCount(entries.get()) && currentIndex >= static_cast(NoCurrentItemIndex));
RetainPtr currentIndexNumber(AdoptCF, CFNumberCreate(0, kCFNumberIntType, ¤tIndex));
const void* keys[2] = { SessionHistoryCurrentIndexKey(), SessionHistoryEntriesKey() };
@@ -155,8 +155,11 @@
newEntries.append(WebBackForwardListItem::create(originalURL, entryURL, entryTitle, CFDataGetBytePtr(backForwardData), CFDataGetLength(backForwardData), generateWebBackForwardItemID()));
}
+m_entries = newEntries;
m_current = currentIndex;
-m_entries = newEntries;
+// Perform a sanity check: in case we're out of range, we reset.
+if (m_current != NoCurrentItemIndex && m_current >= newEntries.size())
+m_current = NoCurrentItemIndex;
return true;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98146] trunk/Source
Title: [98146] trunk/Source Revision 98146 Author aba...@webkit.org Date 2011-10-21 14:07:12 -0700 (Fri, 21 Oct 2011) Log Message Event.h has too many virtual isMumbleEvent() functions https://bugs.webkit.org/show_bug.cgi?id=70636 Reviewed by Dimitri Glazkov. Source/WebCore: We should use the new interfaceName() way of doing run-time type inference. * bindings/js/JSErrorHandler.cpp: (WebCore::JSErrorHandler::handleEvent): * bindings/js/JSEventCustom.cpp: (WebCore::JSEvent::clipboardData): * bindings/objc/DOMEvents.mm: (kitClass): * bindings/v8/V8WindowErrorHandler.cpp: (WebCore::V8WindowErrorHandler::callListenerFunction): * bindings/v8/V8WorkerContextErrorHandler.cpp: (WebCore::V8WorkerContextErrorHandler::callListenerFunction): * bindings/v8/custom/V8EventCustom.cpp: (WebCore::V8Event::clipboardDataAccessorGetter): * dom/BeforeLoadEvent.h: (WebCore::BeforeLoadEvent::interfaceName): * dom/BeforeTextInsertedEvent.h: * dom/ClipboardEvent.cpp: * dom/ClipboardEvent.h: * dom/CompositionEvent.cpp: * dom/CompositionEvent.h: * dom/ErrorEvent.cpp: * dom/ErrorEvent.h: * dom/Event.cpp: (WebCore::Event::storesResultAsString): (WebCore::Event::storeResult): (WebCore::Event::clipboardData): * dom/Event.h: * dom/Event.idl: - Remove this interface from the CPP bindings because this function no longer exists. It's unclear to me how strong our API commitments are in the CPP bindings. * dom/EventDispatcher.cpp: (WebCore::EventDispatcher::determineDispatchBehavior): * dom/MessageEvent.cpp: * dom/MessageEvent.h: * dom/MutationEvent.cpp: * dom/MutationEvent.h: * dom/Node.cpp: (WebCore::Node::defaultEventHandler): * dom/OverflowEvent.cpp: * dom/OverflowEvent.h: * dom/PageTransitionEvent.h: * dom/ProgressEvent.h: * dom/TextEvent.cpp: * dom/TextEvent.h: * dom/WheelEvent.cpp: * dom/WheelEvent.h: * html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::defaultEventHandler): * html/HTMLTextAreaElement.cpp: (WebCore::HTMLTextAreaElement::defaultEventHandler): * html/TextFieldInputType.cpp: (WebCore::TextFieldInputType::forwardEvent): (WebCore::TextFieldInputType::shouldSubmitImplicitly): * html/shadow/TextControlInnerElements.cpp: (WebCore::TextControlInnerTextElement::defaultEventHandler): * svg/SVGZoomEvent.cpp: * svg/SVGZoomEvent.h: Source/WebKit/chromium: Update these callsites to the new API. * src/WebDOMEvent.cpp: (WebKit::WebDOMEvent::isKeyboardEvent): (WebKit::WebDOMEvent::isMutationEvent): (WebKit::WebDOMEvent::isTextEvent): (WebKit::WebDOMEvent::isCompositionEvent): (WebKit::WebDOMEvent::isClipboardEvent): (WebKit::WebDOMEvent::isMessageEvent): (WebKit::WebDOMEvent::isWheelEvent): (WebKit::WebDOMEvent::isBeforeTextInsertedEvent): (WebKit::WebDOMEvent::isOverflowEvent): (WebKit::WebDOMEvent::isPageTransitionEvent): (WebKit::WebDOMEvent::isProgressEvent): (WebKit::WebDOMEvent::isBeforeLoadEvent): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp trunk/Source/WebCore/bindings/objc/DOMEvents.mm trunk/Source/WebCore/bindings/v8/V8WindowErrorHandler.cpp trunk/Source/WebCore/bindings/v8/V8WorkerContextErrorHandler.cpp trunk/Source/WebCore/dom/BeforeLoadEvent.h trunk/Source/WebCore/dom/CompositionEvent.cpp trunk/Source/WebCore/dom/CompositionEvent.h trunk/Source/WebCore/dom/ErrorEvent.cpp trunk/Source/WebCore/dom/ErrorEvent.h trunk/Source/WebCore/dom/Event.cpp trunk/Source/WebCore/dom/Event.h trunk/Source/WebCore/dom/Event.idl trunk/Source/WebCore/dom/EventDispatcher.cpp trunk/Source/WebCore/dom/MessageEvent.cpp trunk/Source/WebCore/dom/MessageEvent.h trunk/Source/WebCore/dom/MutationEvent.cpp trunk/Source/WebCore/dom/MutationEvent.h trunk/Source/WebCore/dom/Node.cpp trunk/Source/WebCore/dom/OverflowEvent.cpp trunk/Source/WebCore/dom/OverflowEvent.h trunk/Source/WebCore/dom/PageTransitionEvent.h trunk/Source/WebCore/dom/ProgressEvent.h trunk/Source/WebCore/dom/TextEvent.cpp trunk/Source/WebCore/dom/TextEvent.h trunk/Source/WebCore/dom/WheelEvent.cpp trunk/Source/WebCore/dom/WheelEvent.h trunk/Source/WebCore/html/HTMLInputElement.cpp trunk/Source/WebCore/html/HTMLTextAreaElement.cpp trunk/Source/WebCore/html/TextFieldInputType.cpp trunk/Source/WebCore/svg/SVGZoomEvent.cpp trunk/Source/WebCore/svg/SVGZoomEvent.h trunk/Source/WebKit/chromium/ChangeLog trunk/Source/WebKit/chromium/src/WebDOMEvent.cpp trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (98145 => 98146) --- trunk/Source/WebCore/ChangeLog 2011-10-21 21:06:33 UTC (rev 98145) +++ trunk/Source/WebCore/ChangeLog 2011-10-21 21:07:12 UTC (rev 98146) @@ -1,3 +1,70 @@ +2011-10-21 Adam Barth + +Event.h has too many virtual isMumbleEvent() functions +https://bugs.webkit.org/show_bug.cgi?id=70636 + +Reviewed by Dimitri Glazkov. + +We should use the new interfaceName() way of doing run-time type inference. + +* bindings/js/JSErrorHandler.cpp: +(WebCore::JSErrorHandler::handleEvent): +
[webkit-changes] [98145] branches/safari-534.52-branch/Source/WebCore
Title: [98145] branches/safari-534.52-branch/Source/WebCore
Revision 98145
Author lforsch...@apple.com
Date 2011-10-21 14:06:33 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r97433.
Modified Paths
branches/safari-534.52-branch/Source/WebCore/ChangeLog
branches/safari-534.52-branch/Source/WebCore/platform/MemoryPressureHandler.cpp
branches/safari-534.52-branch/Source/WebCore/platform/MemoryPressureHandler.h
branches/safari-534.52-branch/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm
Diff
Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (98144 => 98145)
--- branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 21:04:43 UTC (rev 98144)
+++ branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 21:06:33 UTC (rev 98145)
@@ -1,5 +1,26 @@
2011-10-21 Lucas Forschler
+Merge 97433
+
+2011-10-13 Michael Saboff
+
+REGRESSION: High frequency memory warnings cause Safari to hog the CPU doing useless garbage collection
+https://bugs.webkit.org/show_bug.cgi?id=69774
+
+Throttle the processing of memory pressure events to no more often than once every 5 seconds.
+
+Reviewed by Geoffrey Garen.
+
+No new tests.
+
+* platform/MemoryPressureHandler.cpp:
+(WebCore::MemoryPressureHandler::MemoryPressureHandler):
+* platform/MemoryPressureHandler.h:
+* platform/mac/MemoryPressureHandlerMac.mm:
+(WebCore::MemoryPressureHandler::respondToMemoryPressure):
+
+2011-10-21 Lucas Forschler
+
Merge 96874
2011-10-06 Dan Bernstein
Modified: branches/safari-534.52-branch/Source/WebCore/platform/MemoryPressureHandler.cpp (98144 => 98145)
--- branches/safari-534.52-branch/Source/WebCore/platform/MemoryPressureHandler.cpp 2011-10-21 21:04:43 UTC (rev 98144)
+++ branches/safari-534.52-branch/Source/WebCore/platform/MemoryPressureHandler.cpp 2011-10-21 21:06:33 UTC (rev 98145)
@@ -38,12 +38,17 @@
MemoryPressureHandler::MemoryPressureHandler()
: m_installed(false)
+, m_lastRespondTime(0)
{
}
#if !PLATFORM(MAC) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
void MemoryPressureHandler::install() { }
+void MemoryPressureHandler::uninstall() { }
+
+void MemoryPressureHandler::holdOff(unsigned) { }
+
void MemoryPressureHandler::respondToMemoryPressure() { }
#endif
Modified: branches/safari-534.52-branch/Source/WebCore/platform/MemoryPressureHandler.h (98144 => 98145)
--- branches/safari-534.52-branch/Source/WebCore/platform/MemoryPressureHandler.h 2011-10-21 21:04:43 UTC (rev 98144)
+++ branches/safari-534.52-branch/Source/WebCore/platform/MemoryPressureHandler.h 2011-10-21 21:06:33 UTC (rev 98145)
@@ -35,7 +35,10 @@
friend MemoryPressureHandler& memoryPressureHandler();
void install();
+void uninstall();
+void holdOff(unsigned);
+
private:
MemoryPressureHandler();
~MemoryPressureHandler();
@@ -43,6 +46,7 @@
void respondToMemoryPressure();
bool m_installed;
+time_t m_lastRespondTime;
};
// Function to obtain the global memory pressure object.
Modified: branches/safari-534.52-branch/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm (98144 => 98145)
--- branches/safari-534.52-branch/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2011-10-21 21:04:43 UTC (rev 98144)
+++ branches/safari-534.52-branch/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2011-10-21 21:06:33 UTC (rev 98145)
@@ -54,12 +54,17 @@
#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
static dispatch_source_t _cache_event_source = 0;
+static dispatch_source_t _timer_event_source = 0;
+static int _notifyToken;
+// Disable memory event reception for 5 seconds after receiving an event.
+// This value seems reasonable and testing verifies that it throttles frequent
+// low memory events, greatly reducing CPU usage.
+static const time_t s_secondsBetweenMemoryCleanup = 5;
+
void MemoryPressureHandler::install()
{
-static int notifyToken;
-
-if (m_installed)
+if (m_installed || _timer_event_source)
return;
dispatch_async(dispatch_get_main_queue(), ^{
@@ -71,14 +76,47 @@
}
});
-notify_register_dispatch("org.WebKit.lowMemory", ¬ifyToken,
+notify_register_dispatch("org.WebKit.lowMemory", &_notifyToken,
dispatch_get_main_queue(), ^(int) { memoryPressureHandler().respondToMemoryPressure();});
m_installed = true;
}
+void MemoryPressureHandler::uninstall()
+{
+if (!m_installed)
+return;
+
+dispatch_source_cancel(_cache_event_source);
+_cache_event_source = 0;
+m_installed = false;
+
+notify_cancel(_notifyToken);
+}
+
+void MemoryPressureHandler::holdOff(unsigned seconds)
+{
+uninstall();
+
+dispatch_async(dispatch_get_main_queue(), ^{
+_timer_event_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0,
[webkit-changes] [98144] trunk/Source/WebCore
Title: [98144] trunk/Source/WebCore
Revision 98144
Author commit-qu...@webkit.org
Date 2011-10-21 14:04:43 -0700 (Fri, 21 Oct 2011)
Log Message
Flush denormals in Biquad, ZeroPole, and DynamicsCompressor.
We only flush when saving the state variables instead of in the
loops so that we don't impact performance too much when there are
no denormals. This will at least not propagate the denormals any
further within the class.
https://bugs.webkit.org/show_bug.cgi?id=70626
Patch by Raymond Toy on 2011-10-21
Reviewed by Kenneth Russell.
* platform/audio/Biquad.cpp:
(WebCore::Biquad::process):
Flush denormals when storing the filter state back in to class
filter state.
* platform/audio/DynamicsCompressorKernel.cpp:
(WebCore::DynamicsCompressorKernel::process):
Ditto.
* platform/audio/ZeroPole.cpp:
(WebCore::ZeroPole::process):
Ditto.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/audio/Biquad.cpp
trunk/Source/WebCore/platform/audio/DynamicsCompressorKernel.cpp
trunk/Source/WebCore/platform/audio/ZeroPole.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (98143 => 98144)
--- trunk/Source/WebCore/ChangeLog 2011-10-21 21:01:07 UTC (rev 98143)
+++ trunk/Source/WebCore/ChangeLog 2011-10-21 21:04:43 UTC (rev 98144)
@@ -1,3 +1,27 @@
+2011-10-21 Raymond Toy
+
+Flush denormals in Biquad, ZeroPole, and DynamicsCompressor.
+
+We only flush when saving the state variables instead of in the
+loops so that we don't impact performance too much when there are
+no denormals. This will at least not propagate the denormals any
+further within the class.
+
+https://bugs.webkit.org/show_bug.cgi?id=70626
+
+Reviewed by Kenneth Russell.
+
+* platform/audio/Biquad.cpp:
+(WebCore::Biquad::process):
+Flush denormals when storing the filter state back in to class
+filter state.
+* platform/audio/DynamicsCompressorKernel.cpp:
+(WebCore::DynamicsCompressorKernel::process):
+Ditto.
+* platform/audio/ZeroPole.cpp:
+(WebCore::ZeroPole::process):
+Ditto.
+
2011-10-21 Vsevolod Vlasov
Web Inspector: Advanced search results should be cleared on navigation.
Modified: trunk/Source/WebCore/platform/audio/Biquad.cpp (98143 => 98144)
--- trunk/Source/WebCore/platform/audio/Biquad.cpp 2011-10-21 21:01:07 UTC (rev 98143)
+++ trunk/Source/WebCore/platform/audio/Biquad.cpp 2011-10-21 21:04:43 UTC (rev 98144)
@@ -32,6 +32,7 @@
#include "Biquad.h"
+#include "DenormalDisabler.h"
#include
#include
#include
@@ -96,11 +97,12 @@
y1 = y;
}
-// Local variables back to member
-m_x1 = x1;
-m_x2 = x2;
-m_y1 = y1;
-m_y2 = y2;
+// Local variables back to member. Flush denormals here so we
+// don't slow down the inner loop above.
+m_x1 = DenormalDisabler::flushDenormalFloatToZero(x1);
+m_x2 = DenormalDisabler::flushDenormalFloatToZero(x2);
+m_y1 = DenormalDisabler::flushDenormalFloatToZero(y1);
+m_y2 = DenormalDisabler::flushDenormalFloatToZero(y2);
m_b0 = b0;
m_b1 = b1;
Modified: trunk/Source/WebCore/platform/audio/DynamicsCompressorKernel.cpp (98143 => 98144)
--- trunk/Source/WebCore/platform/audio/DynamicsCompressorKernel.cpp 2011-10-21 21:01:07 UTC (rev 98143)
+++ trunk/Source/WebCore/platform/audio/DynamicsCompressorKernel.cpp 2011-10-21 21:04:43 UTC (rev 98144)
@@ -33,6 +33,7 @@
#include "DynamicsCompressorKernel.h"
#include "AudioUtilities.h"
+#include "DenormalDisabler.h"
#include
#include
@@ -352,8 +353,8 @@
// Locals back to member variables.
m_preDelayReadIndex = preDelayReadIndex;
m_preDelayWriteIndex = preDelayWriteIndex;
-m_detectorAverage = detectorAverage;
-m_compressorGain = compressorGain;
+m_detectorAverage = DenormalDisabler::flushDenormalFloatToZero(detectorAverage);
+m_compressorGain = DenormalDisabler::flushDenormalFloatToZero(compressorGain);
}
}
}
Modified: trunk/Source/WebCore/platform/audio/ZeroPole.cpp (98143 => 98144)
--- trunk/Source/WebCore/platform/audio/ZeroPole.cpp 2011-10-21 21:01:07 UTC (rev 98143)
+++ trunk/Source/WebCore/platform/audio/ZeroPole.cpp 2011-10-21 21:04:43 UTC (rev 98144)
@@ -32,6 +32,8 @@
#include "ZeroPole.h"
+#include "DenormalDisabler.h"
+
namespace WebCore {
void ZeroPole::process(float *source, float *destination, unsigned framesToProcess)
@@ -61,9 +63,10 @@
*destination++ = output2;
}
-// Locals to member variables.
-m_lastX = lastX;
-m_lastY = lastY;
+// Locals to member variables. Flush denormals here so we don't
+// slow down the inner loop above.
+m_lastX = DenormalDisabler::flushDenormalFloatToZero(lastX);
+m_lastY = DenormalDisabler::flushDenormalFloatToZero(lastY);
}
} // namespace WebCore
[webkit-changes] [98143] branches/safari-534.52-branch/Source/WebCore
Title: [98143] branches/safari-534.52-branch/Source/WebCore
Revision 98143
Author lforsch...@apple.com
Date 2011-10-21 14:01:07 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r96874.
Modified Paths
branches/safari-534.52-branch/Source/WebCore/ChangeLog
branches/safari-534.52-branch/Source/WebCore/platform/ScrollView.cpp
Diff
Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (98142 => 98143)
--- branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 20:57:56 UTC (rev 98142)
+++ branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 21:01:07 UTC (rev 98143)
@@ -1,5 +1,20 @@
2011-10-21 Lucas Forschler
+Merge 96874
+
+2011-10-06 Dan Bernstein
+
+ Flash of white when navigating daringfireball.net
+https://bugs.webkit.org/show_bug.cgi?id=69581
+
+Reviewed by Darin Adler.
+
+* platform/ScrollView.cpp:
+(WebCore::ScrollView::updateScrollbars): Moved the calls to Scrollbar::setEnabled() into the code
+section where invalidation is suppressed if necessary, so that they do not trigger premature invalidation.
+
+2011-10-21 Lucas Forschler
+
Merge 95226
2011-09-15 Jon Lee
Modified: branches/safari-534.52-branch/Source/WebCore/platform/ScrollView.cpp (98142 => 98143)
--- branches/safari-534.52-branch/Source/WebCore/platform/ScrollView.cpp 2011-10-21 20:57:56 UTC (rev 98142)
+++ branches/safari-534.52-branch/Source/WebCore/platform/ScrollView.cpp 2011-10-21 21:01:07 UTC (rev 98143)
@@ -538,7 +538,6 @@
if (m_horizontalScrollbar) {
int clientWidth = visibleWidth();
-m_horizontalScrollbar->setEnabled(contentsWidth() > clientWidth);
int pageStep = max(max(clientWidth * Scrollbar::minFractionToStepWhenPaging(), clientWidth - Scrollbar::maxOverlapBetweenPages()), 1);
IntRect oldRect(m_horizontalScrollbar->frameRect());
IntRect hBarRect = IntRect(0,
@@ -551,6 +550,7 @@
if (m_scrollbarsSuppressed)
m_horizontalScrollbar->setSuppressInvalidation(true);
+m_horizontalScrollbar->setEnabled(contentsWidth() > clientWidth);
m_horizontalScrollbar->setSteps(Scrollbar::pixelsPerLineStep(), pageStep);
m_horizontalScrollbar->setProportion(clientWidth, contentsWidth());
if (m_scrollbarsSuppressed)
@@ -559,7 +559,6 @@
if (m_verticalScrollbar) {
int clientHeight = visibleHeight();
-m_verticalScrollbar->setEnabled(contentsHeight() > clientHeight);
int pageStep = max(max(clientHeight * Scrollbar::minFractionToStepWhenPaging(), clientHeight - Scrollbar::maxOverlapBetweenPages()), 1);
IntRect oldRect(m_verticalScrollbar->frameRect());
IntRect vBarRect = IntRect(m_boundsSize.width() - m_verticalScrollbar->width(),
@@ -572,6 +571,7 @@
if (m_scrollbarsSuppressed)
m_verticalScrollbar->setSuppressInvalidation(true);
+m_verticalScrollbar->setEnabled(contentsHeight() > clientHeight);
m_verticalScrollbar->setSteps(Scrollbar::pixelsPerLineStep(), pageStep);
m_verticalScrollbar->setProportion(clientHeight, contentsHeight());
if (m_scrollbarsSuppressed)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98142] branches/safari-534.52-branch/Source/WebKit2
Title: [98142] branches/safari-534.52-branch/Source/WebKit2
Revision 98142
Author lforsch...@apple.com
Date 2011-10-21 13:57:56 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r96864.
Modified Paths
branches/safari-534.52-branch/Source/WebKit2/ChangeLog
branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
Diff
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98141 => 98142)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 20:56:35 UTC (rev 98141)
+++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 20:57:56 UTC (rev 98142)
@@ -1,5 +1,22 @@
2011-10-21 Lucas Forschler
+Merge 96864
+
+2011-10-06 Anders Carlsson
+
+In background window, page flashes white if it enters and then immediately leaves compositing mode
+https://bugs.webkit.org/show_bug.cgi?id=69566
+
+
+Reviewed by Dan Bernstein.
+
+Don't update the backing store state if we're just about to exit accelerated compositing mode. Otherwise
+the UI process will try to render an empty layer tree for a short period of time, leading to a white flash.
+
+* WebProcess/WebPage/DrawingAreaImpl.cpp:
+(WebKit::DrawingAreaImpl::layerHostDidFlushLayers):
+2011-10-21 Lucas Forschler
+
Merge 96855
2011-10-06 Anders Carlsson
Modified: branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (98141 => 98142)
--- branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-10-21 20:56:35 UTC (rev 98141)
+++ branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-10-21 20:57:56 UTC (rev 98142)
@@ -242,7 +242,7 @@
m_layerTreeHost->forceRepaint();
-if (m_shouldSendDidUpdateBackingStoreState) {
+if (m_shouldSendDidUpdateBackingStoreState && !exitAcceleratedCompositingModePending()) {
sendDidUpdateBackingStoreState();
return;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98141] branches/safari-534.52-branch/Source/WebKit2
Title: [98141] branches/safari-534.52-branch/Source/WebKit2
Revision 98141
Author lforsch...@apple.com
Date 2011-10-21 13:56:35 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r96855.
Modified Paths
branches/safari-534.52-branch/Source/WebKit2/ChangeLog
branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
Diff
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98140 => 98141)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 20:54:22 UTC (rev 98140)
+++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 20:56:35 UTC (rev 98141)
@@ -1,5 +1,25 @@
2011-10-21 Lucas Forschler
+Merge 96855
+
+2011-10-06 Anders Carlsson
+
+Crash when PluginProxy object is destroyed inside PluginProxy::pluginScriptableNPObject
+https://bugs.webkit.org/show_bug.cgi?id=69559
+
+
+Reviewed by Maciej Stachowiak.
+
+Protect the plug-in itself in the call to pluginScriptableNPObject. In some cases, sending
+the synchronous message to the plug-in process can end up causing the web process to handle
+an incoming message that will destroy t he plug-in.
+
+Unfortunately, this is highly timing-dependent and can't be tested reliably.
+
+* WebProcess/Plugins/PluginProxy.cpp:
+(WebKit::PluginProxy::pluginScriptableNPObject):
+2011-10-21 Lucas Forschler
+
Merge 94472
2011-09-02 Michael Saboff
Modified: branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (98140 => 98141)
--- branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-10-21 20:54:22 UTC (rev 98140)
+++ branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-10-21 20:56:35 UTC (rev 98141)
@@ -337,6 +337,10 @@
NPObject* PluginProxy::pluginScriptableNPObject()
{
+// Sending the synchronous Messages::PluginControllerProxy::GetPluginScriptableNPObject message can cause us to dispatch an
+// incoming synchronous message that ends up destroying the PluginProxy object.
+PluginController::PluginDestructionProtector protector(controller());
+
uint64_t pluginScriptableNPObjectID = 0;
if (!m_connection->connection()->sendSync(Messages::PluginControllerProxy::GetPluginScriptableNPObject(), Messages::PluginControllerProxy::GetPluginScriptableNPObject::Reply(pluginScriptableNPObjectID), m_pluginInstanceID))
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98140] branches/safari-534.52-branch/Source/WebKit2
Title: [98140] branches/safari-534.52-branch/Source/WebKit2 Revision 98140 Author lforsch...@apple.com Date 2011-10-21 13:54:22 -0700 (Fri, 21 Oct 2011) Log Message Merged r94472. Modified Paths branches/safari-534.52-branch/Source/WebKit2/ChangeLog branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp Diff Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98139 => 98140) --- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 20:52:16 UTC (rev 98139) +++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 20:54:22 UTC (rev 98140) @@ -1,5 +1,18 @@ 2011-10-21 Lucas Forschler +Merge 94472 + +2011-09-02 Michael Saboff + +Fixed release build by removing #ifndef NDEBUG to +allow definition of gcController(). + +Rubber-stamp by Sam Weinig. + +* WebProcess/WebProcess.cpp: + +2011-10-21 Lucas Forschler + Merge 96765 2011-10-05 Anders Carlsson Modified: branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp (98139 => 98140) --- branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2011-10-21 20:52:16 UTC (rev 98139) +++ branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2011-10-21 20:54:22 UTC (rev 98140) @@ -59,6 +59,7 @@ #include #include #include +#include #include #include #include @@ -78,10 +79,6 @@ #include #include -#ifndef NDEBUG -#include -#endif - #if !OS(WINDOWS) #include #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98139] branches/safari-534.52-branch/Source/WebKit2
Title: [98139] branches/safari-534.52-branch/Source/WebKit2
Revision 98139
Author lforsch...@apple.com
Date 2011-10-21 13:52:16 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r96765.
Modified Paths
branches/safari-534.52-branch/Source/WebKit2/ChangeLog
branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
Diff
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98138 => 98139)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 20:52:11 UTC (rev 98138)
+++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 20:52:16 UTC (rev 98139)
@@ -1,5 +1,22 @@
2011-10-21 Lucas Forschler
+Merge 96765
+
+2011-10-05 Anders Carlsson
+
+Flash of white when unminimizing windows
+https://bugs.webkit.org/show_bug.cgi?id=69476
+
+
+Reviewed by Simon Fraser.
+
+Whenever the UI process requests an immediate backing store update, make sure to resume
+painting if it's suspended.
+
+* WebProcess/WebPage/DrawingAreaImpl.cpp:
+(WebKit::DrawingAreaImpl::updateBackingStoreState):
+2011-10-21 Lucas Forschler
+
Merge 96555
2011-10-03 Anders Carlsson
Modified: branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (98138 => 98139)
--- branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-10-21 20:52:11 UTC (rev 98138)
+++ branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-10-21 20:52:16 UTC (rev 98139)
@@ -352,8 +352,14 @@
// sendDidUpdateBackingStoreState; otherwise we shouldn't do one right now.
m_isWaitingForDidUpdate = false;
-if (respondImmediately)
+if (respondImmediately) {
+// Make sure to resume painting if we're supposed to respond immediately, otherwise we'll just
+// send back an empty UpdateInfo struct.
+if (m_isPaintingSuspended)
+resumePainting();
+
sendDidUpdateBackingStoreState();
+}
m_inUpdateBackingStoreState = false;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98138] trunk/Source/WebKit2
Title: [98138] trunk/Source/WebKit2 Revision 98138 Author commit-qu...@webkit.org Date 2011-10-21 13:52:11 -0700 (Fri, 21 Oct 2011) Log Message [WK2] WebFrameLoaderClient::shouldFallback() should use a port-specific implementation https://bugs.webkit.org/show_bug.cgi?id=70055 Patch by Jesus Sanchez-Palencia on 2011-10-21 Reviewed by Luiz Agostini. In QtWebKit 1, our FrameLoaderClient::shouldFallback was checking for InterruptedForPolicyChange error. In WebKit2, we are relying on the common implementation for WebFrameLoaderClient::shouldFallback which doesn't check for the same error. Here we add this check only for Qt. * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::shouldFallBack): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (98137 => 98138) --- trunk/Source/WebKit2/ChangeLog 2011-10-21 20:51:47 UTC (rev 98137) +++ trunk/Source/WebKit2/ChangeLog 2011-10-21 20:52:11 UTC (rev 98138) @@ -1,3 +1,17 @@ +2011-10-21 Jesus Sanchez-Palencia + +[WK2] WebFrameLoaderClient::shouldFallback() should use a port-specific implementation +https://bugs.webkit.org/show_bug.cgi?id=70055 + +Reviewed by Luiz Agostini. + +In QtWebKit 1, our FrameLoaderClient::shouldFallback was checking for InterruptedForPolicyChange +error. In WebKit2, we are relying on the common implementation for WebFrameLoaderClient::shouldFallback +which doesn't check for the same error. Here we add this check only for Qt. + +* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: +(WebKit::WebFrameLoaderClient::shouldFallBack): + 2011-10-21 Anders Carlsson Flash of white when loading a page after a web process crash Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (98137 => 98138) --- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2011-10-21 20:51:47 UTC (rev 98137) +++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2011-10-21 20:52:11 UTC (rev 98138) @@ -990,6 +990,13 @@ if (error.errorCode() == pluginWillHandleLoadError.errorCode() && error.domain() == pluginWillHandleLoadError.domain()) return false; +#if PLATFORM(QT) +DEFINE_STATIC_LOCAL(const ResourceError, errorInterruptedForPolicyChange, (this->interruptedForPolicyChangeError(ResourceRequest(; + +if (error.errorCode() == errorInterruptedForPolicyChange.errorCode() && error.domain() == errorInterruptedForPolicyChange.domain()) +return false; +#endif + return true; } ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98137] trunk/LayoutTests
Title: [98137] trunk/LayoutTests Revision 98137 Author jchaffr...@webkit.org Date 2011-10-21 13:51:47 -0700 (Fri, 21 Oct 2011) Log Message Unreviewed gardening, yet another flaky crashing test. * platform/chromium/test_expectations.txt: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/test_expectations.txt Diff Modified: trunk/LayoutTests/ChangeLog (98136 => 98137) --- trunk/LayoutTests/ChangeLog 2011-10-21 20:50:34 UTC (rev 98136) +++ trunk/LayoutTests/ChangeLog 2011-10-21 20:51:47 UTC (rev 98137) @@ -1,5 +1,11 @@ 2011-10-21 Julien Chaffraix +Unreviewed gardening, yet another flaky crashing test. + +* platform/chromium/test_expectations.txt: + +2011-10-21 Julien Chaffraix + Gardening rebaselines. * platform/chromium-linux-x86/fast/multicol/vertical-lr: Removed. Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (98136 => 98137) --- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 20:50:34 UTC (rev 98136) +++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 20:51:47 UTC (rev 98137) @@ -3858,3 +3858,5 @@ BUGWK70640 SNOWLEOPARD : fast/multicol/vertical-lr/rules-with-border-before.html = PASS TEXT BUGWK70640 SNOWLEOPARD : fast/multicol/vertical-rl/rules-with-border-before.html = PASS TEXT + +BUGWK70641 SNOWLEOPARD : fast/frames/sandboxed-iframe-scripting.html = PASS CRASH ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98136] branches/safari-534.52-branch/Source/WebKit2
Title: [98136] branches/safari-534.52-branch/Source/WebKit2 Revision 98136 Author lforsch...@apple.com Date 2011-10-21 13:50:34 -0700 (Fri, 21 Oct 2011) Log Message Merged r96555. Modified Paths branches/safari-534.52-branch/Source/WebKit2/ChangeLog branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp Diff Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98135 => 98136) --- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 20:48:50 UTC (rev 98135) +++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 20:50:34 UTC (rev 98136) @@ -1,5 +1,21 @@ 2011-10-21 Lucas Forschler +Merge 96555 + +2011-10-03 Anders Carlsson + +Content area does not return to the correct position after rubberbanding +https://bugs.webkit.org/show_bug.cgi?id=69302 + + +Reviewed by Sam Weinig. + +Make sure to schedule a display after adding to the dirty region. + +* WebProcess/WebPage/DrawingAreaImpl.cpp: +(WebKit::DrawingAreaImpl::scroll): +2011-10-21 Lucas Forschler + Merge 94454 2011-09-02 Ada Chan Modified: branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (98135 => 98136) --- branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-10-21 20:48:50 UTC (rev 98135) +++ branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-10-21 20:50:34 UTC (rev 98136) @@ -147,6 +147,7 @@ Region scrollRepaintRegion = subtract(scrollRect, translate(scrollRect, scrollOffset)); m_dirtyRegion.unite(scrollRepaintRegion); +scheduleDisplay(); m_scrollRect = scrollRect; m_scrollOffset += scrollOffset; ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98135] branches/safari-534.52-branch
Title: [98135] branches/safari-534.52-branch
Revision 98135
Author lforsch...@apple.com
Date 2011-10-21 13:48:50 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r95226.
Modified Paths
branches/safari-534.52-branch/LayoutTests/ChangeLog
branches/safari-534.52-branch/Source/WebCore/ChangeLog
branches/safari-534.52-branch/Source/WebCore/page/EventHandler.cpp
branches/safari-534.52-branch/Source/WebCore/page/mac/EventHandlerMac.mm
branches/safari-534.52-branch/Source/WebKit/chromium/ChangeLog
branches/safari-534.52-branch/Source/WebKit/chromium/src/WebViewImpl.cpp
Added Paths
branches/safari-534.52-branch/LayoutTests/fast/forms/resources/submit-to-blank-multiple-times-form-action.html
branches/safari-534.52-branch/LayoutTests/fast/forms/submit-to-blank-multiple-times-expected.txt
branches/safari-534.52-branch/LayoutTests/fast/forms/submit-to-blank-multiple-times.html
Diff
Modified: branches/safari-534.52-branch/LayoutTests/ChangeLog (98134 => 98135)
--- branches/safari-534.52-branch/LayoutTests/ChangeLog 2011-10-21 20:37:59 UTC (rev 98134)
+++ branches/safari-534.52-branch/LayoutTests/ChangeLog 2011-10-21 20:48:50 UTC (rev 98135)
@@ -1,3 +1,20 @@
+2011-10-21 Lucas Forschler
+
+Merge 95226
+
+2011-09-15 Jon Lee
+
+Submitting a form with target=_blank works only once
+https://bugs.webkit.org/show_bug.cgi?id=28633
+
+
+Reviewed by Andy Estes.
+
+New test that simulates mouse clicking submit button twice (which didn't work), as well as using the keyboard twice (which did work).
+
+* fast/forms/resources/submit-to-blank-multiple-times-form-action.html: Added.
+* fast/forms/submit-to-blank-multiple-times-expected.txt: Added.
+* fast/forms/submit-to-blank-multiple-times.html: Added.
2011-09-15 Mark Rowe
Merge r89705.
Copied: branches/safari-534.52-branch/LayoutTests/fast/forms/resources/submit-to-blank-multiple-times-form-action.html (from rev 95226, trunk/LayoutTests/fast/forms/resources/submit-to-blank-multiple-times-form-action.html) (0 => 98135)
--- branches/safari-534.52-branch/LayoutTests/fast/forms/resources/submit-to-blank-multiple-times-form-action.html (rev 0)
+++ branches/safari-534.52-branch/LayoutTests/fast/forms/resources/submit-to-blank-multiple-times-form-action.html 2011-10-21 20:48:50 UTC (rev 98135)
@@ -0,0 +1,17 @@
+
+if (opener) {
+opener.log("PASS");
+
+var result = {}, queryString = location.search.substring(1),
+re = /([^&=]+)=([^&]*)/g, m;
+while (m = re.exec(queryString)) {
+ result[decodeURIComponent(m[1])] = decodeURIComponent(m[2]);
+}
+if (result["nextOp"] == "click" && opener.click)
+opener.click();
+else if (result["nextOp"] == "space" && opener.pressSpace)
+opener.pressSpace();
+else if (result["nextOp"] == "notifyDone" && opener.notifyDone)
+opener.notifyDone();
+}
+
\ No newline at end of file
Copied: branches/safari-534.52-branch/LayoutTests/fast/forms/submit-to-blank-multiple-times-expected.txt (from rev 95226, trunk/LayoutTests/fast/forms/submit-to-blank-multiple-times-expected.txt) (0 => 98135)
--- branches/safari-534.52-branch/LayoutTests/fast/forms/submit-to-blank-multiple-times-expected.txt (rev 0)
+++ branches/safari-534.52-branch/LayoutTests/fast/forms/submit-to-blank-multiple-times-expected.txt 2011-10-21 20:48:50 UTC (rev 98135)
@@ -0,0 +1,15 @@
+Test for Bug 28633 - Submitting a form with target=_blank works only once
+
+This test will click the first submit button twice, then press the space bar on the second submit button twice. Both should popup two blank windows.
+
+
+
+Clicking first button, should open new window
+PASS
+Clicking first button, should open new window
+PASS
+Pressing space on second button, should open new window
+PASS
+Pressing space on second button, should open new window
+PASS
+
Copied: branches/safari-534.52-branch/LayoutTests/fast/forms/submit-to-blank-multiple-times.html (from rev 95226, trunk/LayoutTests/fast/forms/submit-to-blank-multiple-times.html) (0 => 98135)
--- branches/safari-534.52-branch/LayoutTests/fast/forms/submit-to-blank-multiple-times.html (rev 0)
+++ branches/safari-534.52-branch/LayoutTests/fast/forms/submit-to-blank-multiple-times.html 2011-10-21 20:48:50 UTC (rev 98135)
@@ -0,0 +1,73 @@
+
+
+
+
+Test for
+
+
+This test will click the first submit button twice, then press the space bar on the second submit button twice. Both should popup two blank windows.
+
+
+
+
+
+
+
+
+
+
+
+if (window.layoutTestController) {
+layoutTestController.dumpAsText();
+layoutTestController.setCanOpenWindows();
+layoutTestController.waitUntilDone();
+}
+
[webkit-changes] [98134] trunk/LayoutTests
Title: [98134] trunk/LayoutTests Revision 98134 Author jchaffr...@webkit.org Date 2011-10-21 13:37:59 -0700 (Fri, 21 Oct 2011) Log Message Gardening rebaselines. * platform/chromium-linux-x86/fast/multicol/vertical-lr: Removed. * platform/chromium-linux-x86/fast/multicol/vertical-lr/rules-with-border-before-expected.png: Removed. * platform/chromium-linux-x86/fast/multicol/vertical-rl: Removed. * platform/chromium-linux-x86/fast/multicol/vertical-rl/rules-with-border-before-expected.png: Removed. * platform/chromium-linux/fast/multicol/vertical-lr/rules-with-border-before-expected.png: Removed. * platform/chromium-linux/fast/multicol/vertical-rl/rules-with-border-before-expected.png: Removed. * platform/chromium-win/fast/multicol/vertical-lr/rules-with-border-before-expected.png: Added. * platform/chromium-win/fast/multicol/vertical-rl/rules-with-border-before-expected.png: Added. * platform/chromium/fast/multicol: Added. * platform/chromium/fast/multicol/vertical-lr: Added. * platform/chromium/fast/multicol/vertical-lr/rules-with-border-before-expected.png: Added. * platform/chromium/fast/multicol/vertical-rl: Added. * platform/chromium/fast/multicol/vertical-rl/rules-with-border-before-expected.png: Added. * platform/chromium/test_expectations.txt: The dumps are weird on SL so we don't land them but mark the test as PASS TEXT. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/test_expectations.txt Added Paths trunk/LayoutTests/platform/chromium/fast/multicol/ trunk/LayoutTests/platform/chromium/fast/multicol/vertical-lr/ trunk/LayoutTests/platform/chromium/fast/multicol/vertical-lr/rules-with-border-before-expected.png trunk/LayoutTests/platform/chromium/fast/multicol/vertical-rl/ trunk/LayoutTests/platform/chromium/fast/multicol/vertical-rl/rules-with-border-before-expected.png trunk/LayoutTests/platform/chromium-win/fast/multicol/vertical-lr/rules-with-border-before-expected.png trunk/LayoutTests/platform/chromium-win/fast/multicol/vertical-rl/rules-with-border-before-expected.png Removed Paths trunk/LayoutTests/platform/chromium-linux/fast/multicol/vertical-lr/rules-with-border-before-expected.png trunk/LayoutTests/platform/chromium-linux/fast/multicol/vertical-rl/rules-with-border-before-expected.png trunk/LayoutTests/platform/chromium-linux-x86/fast/multicol/vertical-lr/ trunk/LayoutTests/platform/chromium-linux-x86/fast/multicol/vertical-rl/ Diff Modified: trunk/LayoutTests/ChangeLog (98133 => 98134) --- trunk/LayoutTests/ChangeLog 2011-10-21 20:02:49 UTC (rev 98133) +++ trunk/LayoutTests/ChangeLog 2011-10-21 20:37:59 UTC (rev 98134) @@ -1,5 +1,25 @@ 2011-10-21 Julien Chaffraix +Gardening rebaselines. + +* platform/chromium-linux-x86/fast/multicol/vertical-lr: Removed. +* platform/chromium-linux-x86/fast/multicol/vertical-lr/rules-with-border-before-expected.png: Removed. +* platform/chromium-linux-x86/fast/multicol/vertical-rl: Removed. +* platform/chromium-linux-x86/fast/multicol/vertical-rl/rules-with-border-before-expected.png: Removed. +* platform/chromium-linux/fast/multicol/vertical-lr/rules-with-border-before-expected.png: Removed. +* platform/chromium-linux/fast/multicol/vertical-rl/rules-with-border-before-expected.png: Removed. +* platform/chromium-win/fast/multicol/vertical-lr/rules-with-border-before-expected.png: Added. +* platform/chromium-win/fast/multicol/vertical-rl/rules-with-border-before-expected.png: Added. +* platform/chromium/fast/multicol: Added. +* platform/chromium/fast/multicol/vertical-lr: Added. +* platform/chromium/fast/multicol/vertical-lr/rules-with-border-before-expected.png: Added. +* platform/chromium/fast/multicol/vertical-rl: Added. +* platform/chromium/fast/multicol/vertical-rl/rules-with-border-before-expected.png: Added. +* platform/chromium/test_expectations.txt: +The dumps are weird on SL so we don't land them but mark the test as PASS TEXT. + +2011-10-21 Julien Chaffraix + Unreviewed gardening. * platform/chromium/test_expectations.txt: This test is flaky and crashing Added: trunk/LayoutTests/platform/chromium/fast/multicol/vertical-lr/rules-with-border-before-expected.png (Binary files differ) Property changes on: trunk/LayoutTests/platform/chromium/fast/multicol/vertical-lr/rules-with-border-before-expected.png ___ Added: svn:mime-type Added: trunk/LayoutTests/platform/chromium/fast/multicol/vertical-rl/rules-with-border-before-expected.png (Binary files differ) Property changes on: trunk/LayoutTests/platform/chromium/fast/multicol/vertical-rl/rules-with-border-before-expected.png ___ Added: svn:mime-type Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (98133 => 98134) --- trunk/LayoutTests
[webkit-changes] [98133] trunk/LayoutTests
Title: [98133] trunk/LayoutTests Revision 98133 Author jchaffr...@webkit.org Date 2011-10-21 13:02:49 -0700 (Fri, 21 Oct 2011) Log Message Unreviewed gardening. * platform/chromium/test_expectations.txt: This test is flaky and crashing sometimes on snow-leopard. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/test_expectations.txt Diff Modified: trunk/LayoutTests/ChangeLog (98132 => 98133) --- trunk/LayoutTests/ChangeLog 2011-10-21 20:00:43 UTC (rev 98132) +++ trunk/LayoutTests/ChangeLog 2011-10-21 20:02:49 UTC (rev 98133) @@ -1,5 +1,12 @@ 2011-10-21 Julien Chaffraix +Unreviewed gardening. + +* platform/chromium/test_expectations.txt: This test is flaky and crashing +sometimes on snow-leopard. + +2011-10-21 Julien Chaffraix + Fix r98125 by having duplicate entries for Win Debug. * platform/chromium/test_expectations.txt: Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (98132 => 98133) --- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 20:00:43 UTC (rev 98132) +++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 20:02:49 UTC (rev 98133) @@ -2688,6 +2688,7 @@ // Snow Leopard-only flakiness BUGWK54322 SNOWLEOPARD : dom/html/level1/core/hc_textwithnomarkup.html = PASS TIMEOUT BUGWK54322 SNOWLEOPARD : fast/canvas/translate-text.html = PASS TIMEOUT +BUGWK70633 SNOWLEOPARD : fast/history/history-back-forward-within-subframe-hash.html = PASS CRASH BUGWK54322 SNOWLEOPARD : fast/history/history-back-within-subframe-hash.html = PASS TIMEOUT BUGWK54322 SNOWLEOPARD : fast/loader/loadInProgress.html = PASS TIMEOUT BUGWK54322 SNOWLEOPARD : http/tests/loading/location-hash-reload-cycle.html = PASS TEXT ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98132] branches/safari-534.52-branch/Source/WebKit2
Title: [98132] branches/safari-534.52-branch/Source/WebKit2
Revision 98132
Author lforsch...@apple.com
Date 2011-10-21 13:00:43 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r94454.
Modified Paths
branches/safari-534.52-branch/Source/WebKit2/ChangeLog
branches/safari-534.52-branch/Source/WebKit2/UIProcess/API/C/WKContext.cpp
branches/safari-534.52-branch/Source/WebKit2/UIProcess/API/C/WKContext.h
branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.cpp
branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.h
branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp
branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.h
branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.messages.in
Diff
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98131 => 98132)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 19:58:51 UTC (rev 98131)
+++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 20:00:43 UTC (rev 98132)
@@ -1,5 +1,26 @@
2011-10-21 Lucas Forschler
+Merge 94454
+
+2011-09-02 Ada Chan
+
+Add WKContextGarbageCollectJavaScriptObjects() which does a garbage collection in the WebProcess
+https://bugs.webkit.org/show_bug.cgi?id=67526
+
+Reviewed by Darin Adler.
+
+* UIProcess/API/C/WKContext.cpp:
+(WKContextGarbageCollectJavaScriptObjects):
+* UIProcess/API/C/WKContext.h:
+* UIProcess/WebContext.cpp:
+(WebKit::WebContext::garbageCollectJavaScriptObjects): Send a message to WebProcess to garbage collect JS objects.
+* UIProcess/WebContext.h:
+* WebProcess/WebProcess.cpp:
+(WebKit::WebProcess::garbageCollectJavaScriptObjects): Call GCController::garbageCollectNow().
+* WebProcess/WebProcess.h:
+* WebProcess/WebProcess.messages.in: Add GarbageCollectJavaScriptObjects message.
+2011-10-21 Lucas Forschler
+
Merge 94371
2011-09-01 Ada Chan
Modified: branches/safari-534.52-branch/Source/WebKit2/UIProcess/API/C/WKContext.cpp (98131 => 98132)
--- branches/safari-534.52-branch/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2011-10-21 19:58:51 UTC (rev 98131)
+++ branches/safari-534.52-branch/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2011-10-21 20:00:43 UTC (rev 98132)
@@ -243,3 +243,8 @@
toImpl(contextRef)->getWebCoreStatistics(DictionaryCallback::create(context, callback));
}
+void WKContextGarbageCollectJavaScriptObjects(WKContextRef contextRef)
+{
+toImpl(contextRef)->garbageCollectJavaScriptObjects();
+}
+
Modified: branches/safari-534.52-branch/Source/WebKit2/UIProcess/API/C/WKContext.h (98131 => 98132)
--- branches/safari-534.52-branch/Source/WebKit2/UIProcess/API/C/WKContext.h 2011-10-21 19:58:51 UTC (rev 98131)
+++ branches/safari-534.52-branch/Source/WebKit2/UIProcess/API/C/WKContext.h 2011-10-21 20:00:43 UTC (rev 98132)
@@ -134,6 +134,8 @@
typedef void (*WKContextGetStatisticsFunction)(WKDictionaryRef statistics, WKErrorRef error, void* functionContext);
WK_EXPORT void WKContextGetStatistics(WKContextRef context, void* functionContext, WKContextGetStatisticsFunction function);
+
+WK_EXPORT void WKContextGarbageCollectJavaScriptObjects(WKContextRef context);
#ifdef __cplusplus
}
Modified: branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.cpp (98131 => 98132)
--- branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.cpp 2011-10-21 19:58:51 UTC (rev 98131)
+++ branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.cpp 2011-10-21 20:00:43 UTC (rev 98132)
@@ -824,4 +824,9 @@
callback->performCallbackWithReturnValue(statistics.get());
}
+void WebContext::garbageCollectJavaScriptObjects()
+{
+process()->send(Messages::WebProcess::GarbageCollectJavaScriptObjects(), 0);
+}
+
} // namespace WebKit
Modified: branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.h (98131 => 98132)
--- branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.h 2011-10-21 19:58:51 UTC (rev 98131)
+++ branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.h 2011-10-21 20:00:43 UTC (rev 98132)
@@ -181,6 +181,7 @@
bool httpPipeliningEnabled();
void getWebCoreStatistics(PassRefPtr);
+void garbageCollectJavaScriptObjects();
private:
WebContext(ProcessModel, const String& injectedBundlePath);
Modified: branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp (98131 => 98132)
--- branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2011-10-21 19:58:51 UTC (rev 98131)
+++ branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2011-10-21 20:00:43 UTC (rev 98132)
@@ -926,6 +926,11 @@
m_connection->send(Messages::WebContext::DidGetWebCoreStatistics(data, callbackID), 0);
}
+void WebProcess::garbageCollectJavaScriptObjects
[webkit-changes] [98131] branches/safari-534.52-branch/Source
Title: [98131] branches/safari-534.52-branch/Source Revision 98131 Author lforsch...@apple.com Date 2011-10-21 12:58:51 -0700 (Fri, 21 Oct 2011) Log Message Merged r94371. Modified Paths branches/safari-534.52-branch/Source/WebCore/ChangeLog branches/safari-534.52-branch/Source/WebCore/loader/cache/MemoryCache.h branches/safari-534.52-branch/Source/WebKit2/ChangeLog branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp Diff Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (98130 => 98131) --- branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 19:56:23 UTC (rev 98130) +++ branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 19:58:51 UTC (rev 98131) @@ -1,3 +1,19 @@ +2011-10-21 Lucas Forschler + +Merge 94371 + +2011-09-01 Ada Chan + +Cleanup refactoring for https://bugs.webkit.org/show_bug.cgi?id=67160 + +Don't ifdef out the data member xslStyleSheets in MemoryCache::Statistics to cut down +the ifdefs in getWebCoreMemoryCacheStatistics() in WebKit2/WebProcess/WebProcess.cpp. + +Reviewed by Darin Adler. + +No new tests required. Just small code refactoring. + +* loader/cache/MemoryCache.h: 2011-09-26 Mark Rowe Merge r95863. Modified: branches/safari-534.52-branch/Source/WebCore/loader/cache/MemoryCache.h (98130 => 98131) --- branches/safari-534.52-branch/Source/WebCore/loader/cache/MemoryCache.h 2011-10-21 19:56:23 UTC (rev 98130) +++ branches/safari-534.52-branch/Source/WebCore/loader/cache/MemoryCache.h 2011-10-21 19:58:51 UTC (rev 98131) @@ -99,9 +99,7 @@ TypeStatistic images; TypeStatistic cssStyleSheets; TypeStatistic scripts; -#if ENABLE(XSLT) TypeStatistic xslStyleSheets; -#endif TypeStatistic fonts; }; Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98130 => 98131) --- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 19:56:23 UTC (rev 98130) +++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 19:58:51 UTC (rev 98131) @@ -1,5 +1,18 @@ 2011-10-21 Lucas Forschler +Merge 94371 + +2011-09-01 Ada Chan + +Cut down the ifdefs in WebKit::getWebCoreMemoryCacheStatistics() now that +MemoryCache::Statistics always has the xslStyleSheets field. + +Reviewed by Darin Adler. + +* WebProcess/WebProcess.cpp: +(WebKit::getWebCoreMemoryCacheStatistics): +2011-10-21 Lucas Forschler + Merge 94340 2011-09-01 Ada Chan Modified: branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp (98130 => 98131) --- branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2011-10-21 19:56:23 UTC (rev 98130) +++ branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2011-10-21 19:58:51 UTC (rev 98131) @@ -839,66 +839,42 @@ HashMap counts; counts.set(imagesString, memoryCacheStatistics.images.count); counts.set(cssString, memoryCacheStatistics.cssStyleSheets.count); -#if ENABLE(XSLT) counts.set(xslString, memoryCacheStatistics.xslStyleSheets.count); -#else -counts.set(xslString, 0); -#endif counts.set(_javascript_String, memoryCacheStatistics.scripts.count); result.append(counts); HashMap sizes; sizes.set(imagesString, memoryCacheStatistics.images.size); sizes.set(cssString, memoryCacheStatistics.cssStyleSheets.size); -#if ENABLE(XSLT) sizes.set(xslString, memoryCacheStatistics.xslStyleSheets.size); -#else -sizes.set(xslString, 0); -#endif sizes.set(_javascript_String, memoryCacheStatistics.scripts.size); result.append(sizes); HashMap liveSizes; liveSizes.set(imagesString, memoryCacheStatistics.images.liveSize); liveSizes.set(cssString, memoryCacheStatistics.cssStyleSheets.liveSize); -#if ENABLE(XSLT) liveSizes.set(xslString, memoryCacheStatistics.xslStyleSheets.liveSize); -#else -liveSizes.set(xslString, 0); -#endif liveSizes.set(_javascript_String, memoryCacheStatistics.scripts.liveSize); result.append(liveSizes); HashMap decodedSizes; decodedSizes.set(imagesString, memoryCacheStatistics.images.decodedSize); decodedSizes.set(cssString, memoryCacheStatistics.cssStyleSheets.decodedSize); -#if ENABLE(XSLT) decodedSizes.set(xslString, memoryCacheStatistics.xslStyleSheets.decodedSize); -#else -decodedSizes.set(xslString, 0); -#endif decodedSizes.set(_javascript_String, memoryCacheStatistics.scripts.decodedSize); result.append(decodedSizes); HashMap purgeableSizes; purgeableSizes.set(imagesString, memoryCacheStatistics.images.purgeableSize); purgeableSizes.set(cssString, memoryCacheStatistics.cssStyleSheets.purgeableSize); -#if ENABLE(XSLT) purgeableSizes.set(xslString, memoryCacheStatistics.xslStyleSheets.purgeableSize); -#else -
[webkit-changes] [98129] branches/safari-534.52-branch/Source/WebKit2
Title: [98129] branches/safari-534.52-branch/Source/WebKit2
Revision 98129
Author lforsch...@apple.com
Date 2011-10-21 12:56:10 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r94340.
Modified Paths
branches/safari-534.52-branch/Source/WebKit2/ChangeLog
branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.cpp
branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.h
branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.cpp
branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp
Diff
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98128 => 98129)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 19:54:55 UTC (rev 98128)
+++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 19:56:10 UTC (rev 98129)
@@ -1,5 +1,30 @@
2011-10-21 Lucas Forschler
+Merge 94340
+
+2011-09-01 Ada Chan
+
+Gather memory cache statistics in WebProcess::getWebCoreStatistics().
+https://bugs.webkit.org/show_bug.cgi?id=67160
+
+Reviewed by Darin Adler.
+
+Encode and decode webCoreCacheStatistics data member in StatisticsData.
+* Shared/StatisticsData.cpp:
+(WebKit::StatisticsData::encode):
+(WebKit::StatisticsData::decode):
+* Shared/StatisticsData.h:
+
+Convert the cache statistics data into an ImmutableArray and return it in WebContext::didGetWebCoreStatistics().
+* UIProcess/WebContext.cpp:
+(WebKit::WebContext::didGetWebCoreStatistics):
+
+Store memory cache statistics into the StatisticsData object.
+* WebProcess/WebProcess.cpp:
+(WebKit::getWebCoreMemoryCacheStatistics):
+(WebKit::WebProcess::getWebCoreStatistics):
+2011-10-21 Lucas Forschler
+
Merge 94298
2011-09-01 Ada Chan
Modified: branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.cpp (98128 => 98129)
--- branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.cpp 2011-10-21 19:54:55 UTC (rev 98128)
+++ branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.cpp 2011-10-21 19:56:10 UTC (rev 98129)
@@ -35,6 +35,7 @@
encoder->encode(statisticsNumbers);
encoder->encode(_javascript_ProtectedObjectTypeCounts);
encoder->encode(_javascript_ObjectTypeCounts);
+encoder->encode(webCoreCacheStatistics);
}
bool StatisticsData::decode(CoreIPC::ArgumentDecoder* decoder, StatisticsData& statisticsData)
@@ -45,6 +46,8 @@
return false;
if (!decoder->decode(statisticsData._javascript_ObjectTypeCounts))
return false;
+if (!decoder->decode(statisticsData.webCoreCacheStatistics))
+return false;
return true;
}
Modified: branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.h (98128 => 98129)
--- branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.h 2011-10-21 19:54:55 UTC (rev 98128)
+++ branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.h 2011-10-21 19:56:10 UTC (rev 98129)
@@ -29,6 +29,7 @@
#include "ArgumentDecoder.h"
#include "ArgumentEncoder.h"
#include
+#include
#include
#include
@@ -41,6 +42,7 @@
HashMap statisticsNumbers;
HashMap _javascript_ProtectedObjectTypeCounts;
HashMap _javascript_ObjectTypeCounts;
+Vector > webCoreCacheStatistics;
StatisticsData();
};
Modified: branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.cpp (98128 => 98129)
--- branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.cpp 2011-10-21 19:54:55 UTC (rev 98128)
+++ branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.cpp 2011-10-21 19:56:10 UTC (rev 98129)
@@ -815,6 +815,12 @@
statistics->set("_javascript_ProtectedObjectTypeCounts", createDictionaryFromHashMap(statisticsData._javascript_ProtectedObjectTypeCounts).get());
statistics->set("_javascript_ObjectTypeCounts", createDictionaryFromHashMap(statisticsData._javascript_ObjectTypeCounts).get());
+size_t cacheStatisticsCount = statisticsData.webCoreCacheStatistics.size();
+Vector > cacheStatisticsVector(cacheStatisticsCount);
+for (size_t i = 0; i < cacheStatisticsCount; ++i)
+cacheStatisticsVector[i] = createDictionaryFromHashMap(statisticsData.webCoreCacheStatistics[i]);
+statistics->set("WebCoreCacheStatistics", ImmutableArray::adopt(cacheStatisticsVector).get());
+
callback->performCallbackWithReturnValue(statistics.get());
}
Modified: branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp (98128 => 98129)
--- branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2011-10-21 19:54:55 UTC (rev 98128)
+++ branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2011-10-21 19:56:10 UTC (rev 98129)
@@ -827,6 +827,82 @@
map.set(it->first, it->second);
}
+static void getWebCoreMemoryCac
[webkit-changes] [98130] trunk/LayoutTests
Title: [98130] trunk/LayoutTests Revision 98130 Author jchaffr...@webkit.org Date 2011-10-21 12:56:23 -0700 (Fri, 21 Oct 2011) Log Message Fix r98125 by having duplicate entries for Win Debug. * platform/chromium/test_expectations.txt: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/test_expectations.txt Diff Modified: trunk/LayoutTests/ChangeLog (98129 => 98130) --- trunk/LayoutTests/ChangeLog 2011-10-21 19:56:10 UTC (rev 98129) +++ trunk/LayoutTests/ChangeLog 2011-10-21 19:56:23 UTC (rev 98130) @@ -1,5 +1,11 @@ 2011-10-21 Julien Chaffraix +Fix r98125 by having duplicate entries for Win Debug. + +* platform/chromium/test_expectations.txt: + +2011-10-21 Julien Chaffraix + Unreviewed gardening. * platform/chromium/test_expectations.txt: The test is now also failing on debug on XP. Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (98129 => 98130) --- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 19:56:10 UTC (rev 98129) +++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 19:56:23 UTC (rev 98130) @@ -626,7 +626,7 @@ BUGWK60107 SLOW LINUX WIN DEBUG : inspector/console/console-clear.html = PASS BUGWK60109 WIN : inspector/elements/edit-dom-actions.html = PASS TEXT -BUGWK60109 SLOW LINUX WIN DEBUG : inspector/elements/edit-dom-actions.html = PASS +BUGWK60109 SLOW LINUX DEBUG : inspector/elements/edit-dom-actions.html = PASS // - // Other ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98128] branches/safari-534.52-branch/Source
Title: [98128] branches/safari-534.52-branch/Source
Revision 98128
Author lforsch...@apple.com
Date 2011-10-21 12:54:55 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r94298.
Modified Paths
branches/safari-534.52-branch/Source/_javascript_Core/ChangeLog
branches/safari-534.52-branch/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def
branches/safari-534.52-branch/Source/WebKit2/ChangeLog
branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.cpp
branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.h
branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.cpp
branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp
Diff
Modified: branches/safari-534.52-branch/Source/_javascript_Core/ChangeLog (98127 => 98128)
--- branches/safari-534.52-branch/Source/_javascript_Core/ChangeLog 2011-10-21 19:53:06 UTC (rev 98127)
+++ branches/safari-534.52-branch/Source/_javascript_Core/ChangeLog 2011-10-21 19:54:55 UTC (rev 98128)
@@ -1,3 +1,15 @@
+2011-10-21 Lucas Forschler
+
+Merge 94298
+
+2011-09-01 Ada Chan
+
+Export fastMallocStatistics and Heap::objectTypeCounts for https://bugs.webkit.org/show_bug.cgi?id=67160.
+
+Reviewed by Darin Adler.
+
+* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+
2011-09-06 Mark Rowe
Merge r94251.
Modified: branches/safari-534.52-branch/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (98127 => 98128)
--- branches/safari-534.52-branch/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-10-21 19:53:06 UTC (rev 98127)
+++ branches/safari-534.52-branch/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-10-21 19:54:55 UTC (rev 98128)
@@ -163,6 +163,7 @@
?fastMalloc@WTF@@YAPAXI@Z
?fastMallocMatchFailed@Internal@WTF@@YAXPAX@Z
?fastMallocSize@WTF@@YAIPBX@Z
+?fastMallocStatistics@WTF@@YA?AUFastMallocStatistics@1@XZ
?fastRealloc@WTF@@YAPAXPAXI@Z
?fastStrDup@WTF@@YAPADPBD@Z
?fastZeroedMalloc@WTF@@YAPAXI@Z
@@ -254,6 +255,7 @@
?numberToString@WTF@@YAINQA_W@Z
?objectCount@Heap@JSC@@QAEIXZ
?objectProtoFuncToString@JSC@@YI_JPAVExecState@1@@Z
+?objectTypeCounts@Heap@JSC@@QAE?AV?$PassOwnPtr@V?$HashCountedSet@PBDU?$PtrHash@PBD@WTF@@U?$HashTraits@PBD@2@@WTF@@@WTF@@XZ
?parseDateFromNullTerminatedCharacters@WTF@@YANPBD@Z
?preventExtensions@JSObject@JSC@@UAEXAAVJSGlobalData@2@@Z
?profiler@Profiler@JSC@@SAPAV12@XZ
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98127 => 98128)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 19:53:06 UTC (rev 98127)
+++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 19:54:55 UTC (rev 98128)
@@ -1,5 +1,41 @@
2011-10-21 Lucas Forschler
+Merge 94298
+
+2011-09-01 Ada Chan
+
+Gather _javascript_, FastMalloc, icon, font, and glyph page statistics in WebProcess::getWebCoreStatistics().
+https://bugs.webkit.org/show_bug.cgi?id=67160
+
+Reviewed by Darin Adler.
+
+Encode and decode the data members in StatisticsData.
+* Shared/StatisticsData.cpp:
+(WebKit::StatisticsData::encode):
+(WebKit::StatisticsData::decode):
+(WebKit::StatisticsData::StatisticsData):
+
+Add three data members to StatisticsData:
+- statisticsNumbers: Map containing statistics values that are numbers, mapped by their names, such as
+_javascript_ObjectsCount, CachedFontDataCount, etc.
+- _javascript_ProtectedObjectTypeCounts
+- _javascript_ObjectTypeCounts
+* Shared/StatisticsData.h:
+
+Create a WK::Dictionary containing statistics values mapped by their names and return that dictionary
+in WebContext::didGetWebCoreStatistics().
+* UIProcess/WebContext.cpp:
+(WebKit::createDictionaryFromHashMap):
+(WebKit::WebContext::didGetWebCoreStatistics):
+
+Package _javascript_, FastMalloc, icon, font, and glyph page statistics into a StatisticsData object
+and send it to the UIProcess.
+* WebProcess/WebProcess.cpp:
+(WebKit::fromCountedSetToHashMap):
+(WebKit::WebProcess::getWebCoreStatistics):
+
+2011-10-21 Lucas Forschler
+
Merge 94115
2011-08-30 Ada Chan
Modified: branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.cpp (98127 => 98128)
--- branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.cpp 2011-10-21 19:53:06 UTC (rev 98127)
+++ branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.cpp 2011-10-21 19:54:55 UTC (rev 98128)
@@ -32,18 +32,25 @@
void StatisticsData::encode(CoreIPC::ArgumentEncoder* encoder) const
{
-// FIXME: To be
[webkit-changes] [98127] branches/chromium/912/Source/WebCore/html/HTMLKeygenElement.cpp
Title: [98127] branches/chromium/912/Source/WebCore/html/HTMLKeygenElement.cpp
Revision 98127
Author k...@chromium.org
Date 2011-10-21 12:53:06 -0700 (Fri, 21 Oct 2011)
Log Message
Hand merge of patch for bug 70617 from Gaurav Shah
Modified Paths
branches/chromium/912/Source/WebCore/html/HTMLKeygenElement.cpp
Diff
Modified: branches/chromium/912/Source/WebCore/html/HTMLKeygenElement.cpp (98126 => 98127)
--- branches/chromium/912/Source/WebCore/html/HTMLKeygenElement.cpp 2011-10-21 19:51:54 UTC (rev 98126)
+++ branches/chromium/912/Source/WebCore/html/HTMLKeygenElement.cpp 2011-10-21 19:53:06 UTC (rev 98127)
@@ -106,7 +106,7 @@
{
// Only RSA is supported at this time.
const AtomicString& keyType = fastGetAttribute(keytypeAttr);
-if (!keyType.isNull() || !equalIgnoringCase(keyType, "rsa"))
+if (!keyType.isNull() && !equalIgnoringCase(keyType, "rsa"))
return false;
String value = signedPublicKeyAndChallengeString(shadowSelect()->selectedIndex(), fastGetAttribute(challengeAttr), document()->baseURL());
if (value.isNull())
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98126] branches/safari-534.52-branch/Source/WebKit2
Title: [98126] branches/safari-534.52-branch/Source/WebKit2 Revision 98126 Author lforsch...@apple.com Date 2011-10-21 12:51:54 -0700 (Fri, 21 Oct 2011) Log Message Merged 94115. Modified Paths branches/safari-534.52-branch/Source/WebKit2/ChangeLog branches/safari-534.52-branch/Source/WebKit2/GNUmakefile.am branches/safari-534.52-branch/Source/WebKit2/Scripts/webkit2/messages.py branches/safari-534.52-branch/Source/WebKit2/UIProcess/API/C/WKContext.cpp branches/safari-534.52-branch/Source/WebKit2/UIProcess/API/C/WKContext.h branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.cpp branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.h branches/safari-534.52-branch/Source/WebKit2/UIProcess/WebContext.messages.in branches/safari-534.52-branch/Source/WebKit2/WebKit2.pro branches/safari-534.52-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.h branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.messages.in branches/safari-534.52-branch/Source/WebKit2/win/WebKit2.vcproj Added Paths branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.cpp branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.h Diff Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98125 => 98126) --- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 19:43:18 UTC (rev 98125) +++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 19:51:54 UTC (rev 98126) @@ -1,3 +1,47 @@ +2011-10-21 Lucas Forschler + +Merge 94115 + +2011-08-30 Ada Chan + +Laying some groundwork to fetch performance statistics from WebProcess. +https://bugs.webkit.org/show_bug.cgi?id=67160 + +Reviewed by Darin Adler. + +Add WKContextGetStatistics() which sends a message to WebProcess to fetch the performance statistics. +* UIProcess/API/C/WKContext.cpp: +(WKContextGetStatistics): +* UIProcess/API/C/WKContext.h: +* UIProcess/WebContext.cpp: +(WebKit::WebContext::~WebContext): +(WebKit::WebContext::getWebCoreStatistics): +(WebKit::WebContext::didGetWebCoreStatistics): +* UIProcess/WebContext.h: +* UIProcess/WebContext.messages.in: Add the DidGetWebCoreStatistics message that WebProcess can send when it has +the performance statistics ready. + +Add WebProcess::getWebCoreStatistics(). Currently it just sends back an empty StatisticsData object. +It will gather the performance statistics to store in the StatisticsData object in a future patch. +* WebProcess/WebProcess.cpp: +(WebKit::WebProcess::getWebCoreStatistics): +* WebProcess/WebProcess.h: +* WebProcess/WebProcess.messages.in: + +Add the skeleton for StatisticsData. +* Scripts/webkit2/messages.py: +* Shared/StatisticsData.cpp: Added. +(WebKit::StatisticsData::encode): +(WebKit::StatisticsData::decode): +(WebKit::StatisticsData::StatisticsData): +* Shared/StatisticsData.h: Added. + +Add StatisticsData.h/cpp to project. +* CMakeLists.txt: +* GNUmakefile.am: +* WebKit2.pro: +* WebKit2.xcodeproj/project.pbxproj: +* win/WebKit2.vcproj: 2011-09-15 Mark Rowe Merge r94818. Modified: branches/safari-534.52-branch/Source/WebKit2/GNUmakefile.am (98125 => 98126) --- branches/safari-534.52-branch/Source/WebKit2/GNUmakefile.am 2011-10-21 19:43:18 UTC (rev 98125) +++ branches/safari-534.52-branch/Source/WebKit2/GNUmakefile.am 2011-10-21 19:51:54 UTC (rev 98126) @@ -241,6 +241,8 @@ Source/WebKit2/Shared/SecurityOriginData.cpp \ Source/WebKit2/Shared/SessionState.cpp \ Source/WebKit2/Shared/SessionState.h \ + Source/WebKit2/Shared/StatisticsData.cpp \ + Source/WebKit2/Shared/StatisticsData.h \ Source/WebKit2/Shared/StringPairVector.h \ Source/WebKit2/Shared/TextCheckerState.h \ Source/WebKit2/Shared/UserMessageCoders.h \ Modified: branches/safari-534.52-branch/Source/WebKit2/Scripts/webkit2/messages.py (98125 => 98126) --- branches/safari-534.52-branch/Source/WebKit2/Scripts/webkit2/messages.py 2011-10-21 19:43:18 UTC (rev 98125) +++ branches/safari-534.52-branch/Source/WebKit2/Scripts/webkit2/messages.py 2011-10-21 19:51:54 UTC (rev 98126) @@ -269,6 +269,7 @@ 'WebKit::PluginProcessCreationParameters', 'WebKit::PrintInfo', 'WebKit::SecurityOriginData', +'WebKit::StatisticsData', 'WebKit::TextCheckerState', 'WebKit::WebNavigationDataStore', 'WebKit::WebOpenPanelParameters::Data', Copied: branches/safari-534.52-branch/Source/WebKit2/Shared/StatisticsData.cpp (from rev 94115, tr
[webkit-changes] [98125] trunk/LayoutTests
Title: [98125] trunk/LayoutTests Revision 98125 Author jchaffr...@webkit.org Date 2011-10-21 12:43:18 -0700 (Fri, 21 Oct 2011) Log Message Unreviewed gardening. * platform/chromium/test_expectations.txt: The test is now also failing on debug on XP. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/test_expectations.txt Diff Modified: trunk/LayoutTests/ChangeLog (98124 => 98125) --- trunk/LayoutTests/ChangeLog 2011-10-21 19:38:12 UTC (rev 98124) +++ trunk/LayoutTests/ChangeLog 2011-10-21 19:43:18 UTC (rev 98125) @@ -2,6 +2,12 @@ Unreviewed gardening. +* platform/chromium/test_expectations.txt: The test is now also failing on debug on XP. + +2011-10-21 Julien Chaffraix + +Unreviewed gardening. + * platform/chromium/test_expectations.txt: Mark call-base-resolution.html as crashing on snow-leopard. 2011-10-21 Rafael Weinstein Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (98124 => 98125) --- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 19:38:12 UTC (rev 98124) +++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 19:43:18 UTC (rev 98125) @@ -625,7 +625,7 @@ BUGWK60107 SLOW LINUX WIN DEBUG : inspector/console/console-tests.html = PASS BUGWK60107 SLOW LINUX WIN DEBUG : inspector/console/console-clear.html = PASS -BUGWK60109 WIN RELEASE : inspector/elements/edit-dom-actions.html = PASS TEXT +BUGWK60109 WIN : inspector/elements/edit-dom-actions.html = PASS TEXT BUGWK60109 SLOW LINUX WIN DEBUG : inspector/elements/edit-dom-actions.html = PASS // - ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98124] trunk/Source/WebCore
Title: [98124] trunk/Source/WebCore
Revision 98124
Author vse...@chromium.org
Date 2011-10-21 12:38:12 -0700 (Fri, 21 Oct 2011)
Log Message
Web Inspector: Advanced search results should be cleared on navigation.
https://bugs.webkit.org/show_bug.cgi?id=70627
Reviewed by Pavel Feldman.
* inspector/front-end/AdvancedSearchController.js:
(WebInspector.AdvancedSearchController):
(WebInspector.AdvancedSearchController.prototype._frameNavigated):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/AdvancedSearchController.js
Diff
Modified: trunk/Source/WebCore/ChangeLog (98123 => 98124)
--- trunk/Source/WebCore/ChangeLog 2011-10-21 19:36:46 UTC (rev 98123)
+++ trunk/Source/WebCore/ChangeLog 2011-10-21 19:38:12 UTC (rev 98124)
@@ -1,3 +1,14 @@
+2011-10-21 Vsevolod Vlasov
+
+Web Inspector: Advanced search results should be cleared on navigation.
+https://bugs.webkit.org/show_bug.cgi?id=70627
+
+Reviewed by Pavel Feldman.
+
+* inspector/front-end/AdvancedSearchController.js:
+(WebInspector.AdvancedSearchController):
+(WebInspector.AdvancedSearchController.prototype._frameNavigated):
+
2011-10-21 Rafael Weinstein
[MutationObservers] Implement WebKitMutationObserver.observe for childList changes
Modified: trunk/Source/WebCore/inspector/front-end/AdvancedSearchController.js (98123 => 98124)
--- trunk/Source/WebCore/inspector/front-end/AdvancedSearchController.js 2011-10-21 19:36:46 UTC (rev 98123)
+++ trunk/Source/WebCore/inspector/front-end/AdvancedSearchController.js 2011-10-21 19:38:12 UTC (rev 98124)
@@ -35,6 +35,8 @@
this._searchId = 0;
WebInspector.settings.advancedSearchConfig = WebInspector.settings.createSetting("advancedSearchConfig", new WebInspector.SearchConfig("", true, false));
+
+WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameNavigated, this._frameNavigated, this);
}
WebInspector.AdvancedSearchController.createShortcut = function()
@@ -54,6 +56,11 @@
}
},
+_frameNavigated: function()
+{
+this.resetSearch();
+},
+
/**
* @param {WebInspector.SearchScope} searchScope
*/
@@ -369,6 +376,9 @@
_onAction: function()
{
+if (!this.searchConfig.query || !this.searchConfig.query.length)
+return;
+
this._save();
this._controller.startSearch(this.searchConfig);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98123] trunk/Source/JavaScriptCore
Title: [98123] trunk/Source/_javascript_Core
Revision 98123
Author mhahnenb...@apple.com
Date 2011-10-21 12:36:46 -0700 (Fri, 21 Oct 2011)
Log Message
Add finalizer to JSObject
https://bugs.webkit.org/show_bug.cgi?id=70336
Reviewed by Darin Adler.
* heap/MarkedBlock.cpp:
(JSC::MarkedBlock::callDestructor): Skip the call to the destructor
if we're a JSFinalObject, since the finalizer takes care of things.
* runtime/JSCell.h:
(JSC::JSCell::~JSCell): Remove the GC validation due to a conflict with
future changes and the fact that we no longer always call the destructor, making
the information provided less useful.
* runtime/JSObject.cpp:
(JSC::JSObject::finalize): Add finalizer for JSObject.
(JSC::JSObject::allocatePropertyStorage): The first time we need to allocate out-of-line
property storage, we add a finalizer to ourself.
* runtime/JSObject.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/heap/MarkedBlock.cpp
trunk/Source/_javascript_Core/runtime/JSCell.h
trunk/Source/_javascript_Core/runtime/JSObject.cpp
trunk/Source/_javascript_Core/runtime/JSObject.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (98122 => 98123)
--- trunk/Source/_javascript_Core/ChangeLog 2011-10-21 19:33:56 UTC (rev 98122)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-10-21 19:36:46 UTC (rev 98123)
@@ -1,3 +1,23 @@
+2011-10-21 Mark Hahnenberg
+
+Add finalizer to JSObject
+https://bugs.webkit.org/show_bug.cgi?id=70336
+
+Reviewed by Darin Adler.
+
+* heap/MarkedBlock.cpp:
+(JSC::MarkedBlock::callDestructor): Skip the call to the destructor
+if we're a JSFinalObject, since the finalizer takes care of things.
+* runtime/JSCell.h:
+(JSC::JSCell::~JSCell): Remove the GC validation due to a conflict with
+future changes and the fact that we no longer always call the destructor, making
+the information provided less useful.
+* runtime/JSObject.cpp:
+(JSC::JSObject::finalize): Add finalizer for JSObject.
+(JSC::JSObject::allocatePropertyStorage): The first time we need to allocate out-of-line
+property storage, we add a finalizer to ourself.
+* runtime/JSObject.h:
+
2011-10-21 Simon Hausmann
Remove QtScript source code from WebKit.
Modified: trunk/Source/_javascript_Core/heap/MarkedBlock.cpp (98122 => 98123)
--- trunk/Source/_javascript_Core/heap/MarkedBlock.cpp 2011-10-21 19:33:56 UTC (rev 98122)
+++ trunk/Source/_javascript_Core/heap/MarkedBlock.cpp 2011-10-21 19:36:46 UTC (rev 98123)
@@ -70,9 +70,7 @@
#if ENABLE(SIMPLE_HEAP_PROFILING)
m_heap->m_destroyedTypeCounts.countVPtr(vptr);
#endif
-if (vptr == jsFinalObjectVPtr)
-reinterpret_cast(cell)->JSFinalObject::~JSFinalObject();
-else
+if (vptr != jsFinalObjectVPtr)
cell->~JSCell();
cell->zap();
Modified: trunk/Source/_javascript_Core/runtime/JSCell.h (98122 => 98123)
--- trunk/Source/_javascript_Core/runtime/JSCell.h 2011-10-21 19:33:56 UTC (rev 98122)
+++ trunk/Source/_javascript_Core/runtime/JSCell.h 2011-10-21 19:36:46 UTC (rev 98123)
@@ -177,9 +177,6 @@
inline JSCell::~JSCell()
{
-#if ENABLE(GC_VALIDATION)
-m_structure.clear();
-#endif
}
inline Structure* JSCell::structure() const
Modified: trunk/Source/_javascript_Core/runtime/JSObject.cpp (98122 => 98123)
--- trunk/Source/_javascript_Core/runtime/JSObject.cpp 2011-10-21 19:33:56 UTC (rev 98122)
+++ trunk/Source/_javascript_Core/runtime/JSObject.cpp 2011-10-21 19:36:46 UTC (rev 98123)
@@ -70,6 +70,11 @@
}
}
+void JSObject::finalize(JSCell* cell)
+{
+delete [] static_cast(cell)->m_propertyStorage.get();
+}
+
void JSObject::visitChildren(JSCell* cell, SlotVisitor& visitor)
{
JSObject* thisObject = static_cast(cell);
@@ -688,7 +693,9 @@
for (unsigned i = 0; i < oldSize; ++i)
newPropertyStorage[i] = oldPropertyStorage[i];
-if (!isUsingInlineStorage())
+if (isUsingInlineStorage())
+Heap::heap(this)->addFinalizer(this, &finalize);
+else
delete [] oldPropertyStorage;
m_propertyStorage.set(globalData, this, newPropertyStorage);
Modified: trunk/Source/_javascript_Core/runtime/JSObject.h (98122 => 98123)
--- trunk/Source/_javascript_Core/runtime/JSObject.h 2011-10-21 19:33:56 UTC (rev 98122)
+++ trunk/Source/_javascript_Core/runtime/JSObject.h 2011-10-21 19:36:46 UTC (rev 98123)
@@ -84,9 +84,7 @@
virtual UString className() const;
-// The inline virtual destructor cannot be the first virtual function declared
-// in the class as it results in the vtable being generated as a weak symbol
-virtual ~JSObject();
+static void finalize(JSCell*);
JSValue prototype() const;
void setPrototype(JSGlobalData&, JSValue prototype);
@@ -446,12 +444,6 @@
{
}
-inline JSObject::~JSObject()
-{
-if (!isUsingInlineStorage())
-
[webkit-changes] [98122] trunk/LayoutTests
Title: [98122] trunk/LayoutTests Revision 98122 Author jchaffr...@webkit.org Date 2011-10-21 12:33:56 -0700 (Fri, 21 Oct 2011) Log Message Unreviewed gardening. * platform/chromium/test_expectations.txt: Mark call-base-resolution.html as crashing on snow-leopard. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/test_expectations.txt Diff Modified: trunk/LayoutTests/ChangeLog (98121 => 98122) --- trunk/LayoutTests/ChangeLog 2011-10-21 19:19:56 UTC (rev 98121) +++ trunk/LayoutTests/ChangeLog 2011-10-21 19:33:56 UTC (rev 98122) @@ -1,3 +1,9 @@ +2011-10-21 Julien Chaffraix + +Unreviewed gardening. + +* platform/chromium/test_expectations.txt: Mark call-base-resolution.html as crashing on snow-leopard. + 2011-10-21 Rafael Weinstein [MutationObservers] Implement WebKitMutationObserver.observe for childList changes Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (98121 => 98122) --- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 19:19:56 UTC (rev 98121) +++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 19:33:56 UTC (rev 98122) @@ -3345,7 +3345,8 @@ BUGCR89331 WIN7 : plugins/mouse-click-plugin-clears-selection.html = PASS MISSING -BUGCR89474 : fast/js/call-base-resolution.html = PASS TEXT +BUGWK70630 SNOWLEOPARD : fast/js/call-base-resolution.html = PASS TEXT CRASH +BUGCR89474 LEOPARD WIN LINUX: fast/js/call-base-resolution.html = PASS TEXT BUGWK64675 LINUX WIN : svg/custom/zero-path-square-cap-rendering.svg = IMAGE+TEXT ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98120] trunk/LayoutTests
Title: [98120] trunk/LayoutTests Revision 98120 Author jchaffr...@webkit.org Date 2011-10-21 11:43:43 -0700 (Fri, 21 Oct 2011) Log Message Unreviewed gardening: rebaseline 2 tests (small color difference). * platform/chromium-linux-x86/fast/multicol: Added. * platform/chromium-linux-x86/fast/multicol/vertical-lr: Added. * platform/chromium-linux-x86/fast/multicol/vertical-lr/rules-with-border-before-expected.png: Added. * platform/chromium-linux-x86/fast/multicol/vertical-rl: Added. * platform/chromium-linux-x86/fast/multicol/vertical-rl/rules-with-border-before-expected.png: Added. * platform/chromium-linux/fast/multicol/vertical-lr/rules-with-border-before-expected.png: Added. * platform/chromium-linux/fast/multicol/vertical-rl/rules-with-border-before-expected.png: Added. Modified Paths trunk/LayoutTests/ChangeLog Added Paths trunk/LayoutTests/platform/chromium-linux/fast/multicol/vertical-lr/rules-with-border-before-expected.png trunk/LayoutTests/platform/chromium-linux/fast/multicol/vertical-rl/rules-with-border-before-expected.png trunk/LayoutTests/platform/chromium-linux-x86/fast/multicol/ trunk/LayoutTests/platform/chromium-linux-x86/fast/multicol/vertical-lr/ trunk/LayoutTests/platform/chromium-linux-x86/fast/multicol/vertical-lr/rules-with-border-before-expected.png trunk/LayoutTests/platform/chromium-linux-x86/fast/multicol/vertical-rl/ trunk/LayoutTests/platform/chromium-linux-x86/fast/multicol/vertical-rl/rules-with-border-before-expected.png Diff Modified: trunk/LayoutTests/ChangeLog (98119 => 98120) --- trunk/LayoutTests/ChangeLog 2011-10-21 18:31:56 UTC (rev 98119) +++ trunk/LayoutTests/ChangeLog 2011-10-21 18:43:43 UTC (rev 98120) @@ -1,3 +1,15 @@ +2011-10-21 Julien Chaffraix + +Unreviewed gardening: rebaseline 2 tests (small color difference). + +* platform/chromium-linux-x86/fast/multicol: Added. +* platform/chromium-linux-x86/fast/multicol/vertical-lr: Added. +* platform/chromium-linux-x86/fast/multicol/vertical-lr/rules-with-border-before-expected.png: Added. +* platform/chromium-linux-x86/fast/multicol/vertical-rl: Added. +* platform/chromium-linux-x86/fast/multicol/vertical-rl/rules-with-border-before-expected.png: Added. +* platform/chromium-linux/fast/multicol/vertical-lr/rules-with-border-before-expected.png: Added. +* platform/chromium-linux/fast/multicol/vertical-rl/rules-with-border-before-expected.png: Added. + 2011-10-21 Cary Clark Unreviewed gardening: second chunk of baselines for Chromium-Skia Added: trunk/LayoutTests/platform/chromium-linux/fast/multicol/vertical-lr/rules-with-border-before-expected.png (Binary files differ) Property changes on: trunk/LayoutTests/platform/chromium-linux/fast/multicol/vertical-lr/rules-with-border-before-expected.png ___ Added: svn:mime-type Added: trunk/LayoutTests/platform/chromium-linux/fast/multicol/vertical-rl/rules-with-border-before-expected.png (Binary files differ) Property changes on: trunk/LayoutTests/platform/chromium-linux/fast/multicol/vertical-rl/rules-with-border-before-expected.png ___ Added: svn:mime-type Added: trunk/LayoutTests/platform/chromium-linux-x86/fast/multicol/vertical-lr/rules-with-border-before-expected.png (Binary files differ) Property changes on: trunk/LayoutTests/platform/chromium-linux-x86/fast/multicol/vertical-lr/rules-with-border-before-expected.png ___ Added: svn:mime-type Added: trunk/LayoutTests/platform/chromium-linux-x86/fast/multicol/vertical-rl/rules-with-border-before-expected.png (Binary files differ) Property changes on: trunk/LayoutTests/platform/chromium-linux-x86/fast/multicol/vertical-rl/rules-with-border-before-expected.png ___ Added: svn:mime-type ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98118] trunk/WebKitLibraries
Title: [98118] trunk/WebKitLibraries Revision 98118 Author je...@apple.com Date 2011-10-21 11:20:58 -0700 (Fri, 21 Oct 2011) Log Message Focus rings are too thin in HiDPI in WebKit2 https://bugs.webkit.org/show_bug.cgi?id=70396 Rename wkSetPatternBaseCTM() to wkSetBaseCTM(). Reviewed by Beth Dakin. * win/include/WebKitSystemInterface/WebKitSystemInterface.h: * win/lib/WebKitSystemInterface.lib: Modified Paths trunk/WebKitLibraries/ChangeLog trunk/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h trunk/WebKitLibraries/win/lib/WebKitSystemInterface.lib Diff Modified: trunk/WebKitLibraries/ChangeLog (98117 => 98118) --- trunk/WebKitLibraries/ChangeLog 2011-10-21 18:13:04 UTC (rev 98117) +++ trunk/WebKitLibraries/ChangeLog 2011-10-21 18:20:58 UTC (rev 98118) @@ -1,3 +1,15 @@ +2011-10-21 Jeff Miller + +Focus rings are too thin in HiDPI in WebKit2 +https://bugs.webkit.org/show_bug.cgi?id=70396 + +Rename wkSetPatternBaseCTM() to wkSetBaseCTM(). + +Reviewed by Beth Dakin. + +* win/include/WebKitSystemInterface/WebKitSystemInterface.h: +* win/lib/WebKitSystemInterface.lib: + 2011-10-19 Beth Dakin Try to fix the Chromium build. Modified: trunk/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h (98117 => 98118) --- trunk/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h 2011-10-21 18:13:04 UTC (rev 98117) +++ trunk/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h 2011-10-21 18:20:58 UTC (rev 98118) @@ -81,7 +81,7 @@ void wkGetGlyphs(CGFontRef, const UChar[], CGGlyph[], size_t count); void wkSetUpFontCache(size_t s); -void wkSetPatternBaseCTM(CGContextRef, CGAffineTransform); +void wkSetBaseCTM(CGContextRef, CGAffineTransform); void wkSetPatternPhaseInUserSpace(CGContextRef, CGPoint phasePoint); CGAffineTransform wkGetUserToBaseCTM(CGContextRef); Modified: trunk/WebKitLibraries/win/lib/WebKitSystemInterface.lib (Binary files differ) ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98117] trunk
Title: [98117] trunk
Revision 98117
Author commit-qu...@webkit.org
Date 2011-10-21 11:13:04 -0700 (Fri, 21 Oct 2011)
Log Message
Unreviewed, rolling out r98079.
http://trac.webkit.org/changeset/98079
https://bugs.webkit.org/show_bug.cgi?id=70624
The extensions tests enabled are failing on the Chromium Win
Dbg bot (Requested by jchaffraix on #webkit).
Patch by Sheriff Bot on 2011-10-21
Source/WebCore:
* inspector/front-end/ExtensionAPI.js:
(buildExtensionAPIInjectedScript):
LayoutTests:
* http/tests/inspector/extensions-headers.html:
* http/tests/inspector/resources/extension-main.js:
():
* inspector/extensions/extensions-audits.html:
* inspector/extensions/extensions-console.html:
* inspector/extensions/extensions-resources.html:
* platform/chromium/inspector/extensions/extensions-api-expected.txt: Removed.
* platform/chromium/inspector/extensions/extensions-eval-expected.txt: Removed.
* platform/chromium/test_expectations.txt:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/inspector/extensions-headers.html
trunk/LayoutTests/http/tests/inspector/resources/extension-main.js
trunk/LayoutTests/inspector/extensions/extensions-audits.html
trunk/LayoutTests/inspector/extensions/extensions-console.html
trunk/LayoutTests/inspector/extensions/extensions-resources.html
trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/ExtensionAPI.js
Removed Paths
trunk/LayoutTests/platform/chromium/inspector/extensions/extensions-api-expected.txt
trunk/LayoutTests/platform/chromium/inspector/extensions/extensions-eval-expected.txt
Diff
Modified: trunk/LayoutTests/ChangeLog (98116 => 98117)
--- trunk/LayoutTests/ChangeLog 2011-10-21 18:12:31 UTC (rev 98116)
+++ trunk/LayoutTests/ChangeLog 2011-10-21 18:13:04 UTC (rev 98117)
@@ -1,3 +1,22 @@
+2011-10-21 Sheriff Bot
+
+Unreviewed, rolling out r98079.
+http://trac.webkit.org/changeset/98079
+https://bugs.webkit.org/show_bug.cgi?id=70624
+
+The extensions tests enabled are failing on the Chromium Win
+Dbg bot (Requested by jchaffraix on #webkit).
+
+* http/tests/inspector/extensions-headers.html:
+* http/tests/inspector/resources/extension-main.js:
+():
+* inspector/extensions/extensions-audits.html:
+* inspector/extensions/extensions-console.html:
+* inspector/extensions/extensions-resources.html:
+* platform/chromium/inspector/extensions/extensions-api-expected.txt: Removed.
+* platform/chromium/inspector/extensions/extensions-eval-expected.txt: Removed.
+* platform/chromium/test_expectations.txt:
+
2011-10-21 Dan Bernstein
Column rules positioned incorrectly in vertical-rl block with horizontal border or padding
Modified: trunk/LayoutTests/http/tests/inspector/extensions-headers.html (98116 => 98117)
--- trunk/LayoutTests/http/tests/inspector/extensions-headers.html 2011-10-21 18:12:31 UTC (rev 98116)
+++ trunk/LayoutTests/http/tests/inspector/extensions-headers.html 2011-10-21 18:13:04 UTC (rev 98117)
@@ -6,13 +6,13 @@
function extension_testAddHeaders(nextTest)
{
-webInspector.network.addRequestHeaders({
+webInspector.resources.addRequestHeaders({
"x-webinspector-extension": "test",
"user-agent": "Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 6.0)"
});
function cleanUpHeaders()
{
-webInspector.network.addRequestHeaders({
+webInspector.resources.addRequestHeaders({
"x-webinspector-extension": null,
"user-agent": null
});
Modified: trunk/LayoutTests/http/tests/inspector/resources/extension-main.js (98116 => 98117)
--- trunk/LayoutTests/http/tests/inspector/resources/extension-main.js 2011-10-21 18:12:31 UTC (rev 98116)
+++ trunk/LayoutTests/http/tests/inspector/resources/extension-main.js 2011-10-21 18:13:04 UTC (rev 98117)
@@ -50,9 +50,7 @@
channel.port1.start();
if (callback)
channel.port1.addEventListener("message", callbackWrapper, false);
-webInspector.inspectedWindow.eval("", function() {
-top.postMessage({ _expression_: _expression_ }, [ channel.port2 ], "*");
-});
+top.postMessage({ _expression_: _expression_ }, [ channel.port2 ], "*");
}
function output(message)
Modified: trunk/LayoutTests/inspector/extensions/extensions-audits.html (98116 => 98117)
--- trunk/LayoutTests/inspector/extensions/extensions-audits.html 2011-10-21 18:12:31 UTC (rev 98116)
+++ trunk/LayoutTests/inspector/extensions/extensions-audits.html 2011-10-21 18:13:04 UTC (rev 98117)
@@ -20,7 +20,7 @@
var nestedNode = node.addChild("... and a snippet");
nestedNode.expanded = true;
nestedNode.addChild(results.createSnippet("function rand()\n{\nreturn 4;\n}"));
-nestedNode.addChild(results.createResourceLink("file:///path/to/error.html", 10));
+nestedNode.addCh
[webkit-changes] [98115] trunk
Title: [98115] trunk
Revision 98115
Author m...@apple.com
Date 2011-10-21 11:03:16 -0700 (Fri, 21 Oct 2011)
Log Message
Column rules positioned incorrectly in vertical-rl block with horizontal border or padding
https://bugs.webkit.org/show_bug.cgi?id=70622
Reviewed by Beth Dakin.
Source/WebCore:
Tests: fast/multicol/vertical-lr/rules-with-border-before.html
fast/multicol/vertical-rl/rules-with-border-before.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintColumnRules): Changed to use the physical left border and padding for the
left edge of the horizontal column rule.
LayoutTests:
* fast/multicol/vertical-lr/rules-with-border-before-expected.png: Added.
* fast/multicol/vertical-lr/rules-with-border-before-expected.txt: Added.
* fast/multicol/vertical-lr/rules-with-border-before.html: Added.
* fast/multicol/vertical-rl/rules-with-border-before-expected.png: Added.
* fast/multicol/vertical-rl/rules-with-border-before-expected.txt: Added.
* fast/multicol/vertical-rl/rules-with-border-before.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBlock.cpp
Added Paths
trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before-expected.png
trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before-expected.txt
trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before.html
trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before-expected.png
trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before-expected.txt
trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before.html
Diff
Modified: trunk/LayoutTests/ChangeLog (98114 => 98115)
--- trunk/LayoutTests/ChangeLog 2011-10-21 17:55:50 UTC (rev 98114)
+++ trunk/LayoutTests/ChangeLog 2011-10-21 18:03:16 UTC (rev 98115)
@@ -1,3 +1,17 @@
+2011-10-21 Dan Bernstein
+
+Column rules positioned incorrectly in vertical-rl block with horizontal border or padding
+https://bugs.webkit.org/show_bug.cgi?id=70622
+
+Reviewed by Beth Dakin.
+
+* fast/multicol/vertical-lr/rules-with-border-before-expected.png: Added.
+* fast/multicol/vertical-lr/rules-with-border-before-expected.txt: Added.
+* fast/multicol/vertical-lr/rules-with-border-before.html: Added.
+* fast/multicol/vertical-rl/rules-with-border-before-expected.png: Added.
+* fast/multicol/vertical-rl/rules-with-border-before-expected.txt: Added.
+* fast/multicol/vertical-rl/rules-with-border-before.html: Added.
+
2011-10-21 Elliot Poger
re-enable layout tests against chromium-mac-snowleopard (Skia) baselines
Added: trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before-expected.png
(Binary files differ)
Property changes on: trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before-expected.png
___
Added: svn:mime-type
Added: trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before-expected.txt (0 => 98115)
--- trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before-expected.txt 2011-10-21 18:03:16 UTC (rev 98115)
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+RenderBody {BODY} at (8,8) size 784x584
+layer at (8,8) size 150x100
+ RenderBlock {DIV} at (0,0) size 150x100 [border: (50px solid #FF)]
+RenderBlock {DIV} at (50,0) size 200x25
+layer at (8,108) size 150x100
+ RenderBlock {DIV} at (0,100) size 150x100 [border: (50px solid #FF) none]
+RenderBlock {DIV} at (0,0) size 200x25
Added: trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before.html (0 => 98115)
--- trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/vertical-lr/rules-with-border-before.html 2011-10-21 18:03:16 UTC (rev 98115)
@@ -0,0 +1,16 @@
+
+div.test {
+-webkit-writing-mode: vertical-lr;
+-webkit-columns: 2;
+width: 100px;
+-webkit-column-rule-style: solid;
+-webkit-column-rule-width: 50px;
+-webkit-column-rule-color: orange;
+-webkit-column-gap: 50px;
+height: 100px;
+}
+
+div.test div { width: 200px; }
+
+
+
Added: trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before-expected.png
(Binary files differ)
Property changes on: trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before-expected.png
___
Added: svn:mime-type
Added: trunk/LayoutTests/fast/multicol/vertical-rl/rules-with-border-before-expected.txt (0 => 98115)
--- trunk/LayoutTests/fast/multico
[webkit-changes] [98114] trunk/Source/WebKit/qt
Title: [98114] trunk/Source/WebKit/qt
Revision 98114
Author commit-qu...@webkit.org
Date 2011-10-21 10:55:50 -0700 (Fri, 21 Oct 2011)
Log Message
[Qt] WebKit build does not respect QMAKE_MAC_SDK variable.
https://bugs.webkit.org/show_bug.cgi?id=70596
Instead of only relying on DARWIN_MAJOR_VERSION we also
check QMAKE_MAC_SDK. In case QMAKE_MAC_SDK is not defined
we are still falling back to DARWIN_MAJOR_VERSION.
Patch by Andy Shaw
Patch by Zeno Albisser on 2011-10-21
Reviewed by Noam Rosenthal.
* QtWebKit.pro:
Modified Paths
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/QtWebKit.pro
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (98113 => 98114)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-21 17:46:34 UTC (rev 98113)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-21 17:55:50 UTC (rev 98114)
@@ -1,3 +1,18 @@
+2011-10-21 Zeno Albisser
+
+[Qt] WebKit build does not respect QMAKE_MAC_SDK variable.
+https://bugs.webkit.org/show_bug.cgi?id=70596
+
+Instead of only relying on DARWIN_MAJOR_VERSION we also
+check QMAKE_MAC_SDK. In case QMAKE_MAC_SDK is not defined
+we are still falling back to DARWIN_MAJOR_VERSION.
+
+Patch by Andy Shaw
+
+Reviewed by Noam Rosenthal.
+
+* QtWebKit.pro:
+
2011-10-21 Csaba Osztrogonác
[Qt][WK2] Typo fix.
Modified: trunk/Source/WebKit/qt/QtWebKit.pro (98113 => 98114)
--- trunk/Source/WebKit/qt/QtWebKit.pro 2011-10-21 17:46:34 UTC (rev 98113)
+++ trunk/Source/WebKit/qt/QtWebKit.pro 2011-10-21 17:55:50 UTC (rev 98114)
@@ -191,12 +191,12 @@
# We can know the Mac OS version by using the Darwin major version
DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
-equals(DARWIN_MAJOR_VERSION, "11") {
+equals(DARWIN_MAJOR_VERSION, "9") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.5.sdk") {
+LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a
+} else: equals(DARWIN_MAJOR_VERSION, "10") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.6.sdk") {
+LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
+} else: equals(DARWIN_MAJOR_VERSION, "11") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.7.sdk") {
LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
-} else:equals(DARWIN_MAJOR_VERSION, "10") {
-LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
-} else:equals(DARWIN_MAJOR_VERSION, "9") {
-LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a
}
}
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98113] trunk/Source/WebKit2
Title: [98113] trunk/Source/WebKit2
Revision 98113
Author ander...@apple.com
Date 2011-10-21 10:46:34 -0700 (Fri, 21 Oct 2011)
Log Message
Flash of white when loading a page after a web process crash
https://bugs.webkit.org/show_bug.cgi?id=70615
Reviewed by Darin Adler.
* UIProcess/API/mac/WKView.mm:
(-[WKView _processDidCrash]):
(-[WKView _didRelaunchProcess]):
Remove calls to setNeedsDisplay here.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::processDidCrash):
Call setNeedsDisplay, but only if calling out to the loader client didn't relaunch the web process.
* WebProcess/WebPage/DrawingArea.h:
(WebKit::DrawingArea::setPaintingEnabled):
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::DrawingAreaImpl):
(WebKit::DrawingAreaImpl::setNeedsDisplay):
(WebKit::DrawingAreaImpl::scroll):
(WebKit::DrawingAreaImpl::setPaintingEnabled):
* WebProcess/WebPage/DrawingAreaImpl.h:
Add a way to disable painting completely for a drawing area.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
Disable painting while setting up the web page, otherwise we'll get paint requests when we set the
active state of the web page.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h
trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98112 => 98113)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 17:41:38 UTC (rev 98112)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 17:46:34 UTC (rev 98113)
@@ -1,3 +1,35 @@
+2011-10-21 Anders Carlsson
+
+Flash of white when loading a page after a web process crash
+https://bugs.webkit.org/show_bug.cgi?id=70615
+
+
+Reviewed by Darin Adler.
+
+* UIProcess/API/mac/WKView.mm:
+(-[WKView _processDidCrash]):
+(-[WKView _didRelaunchProcess]):
+Remove calls to setNeedsDisplay here.
+
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::processDidCrash):
+Call setNeedsDisplay, but only if calling out to the loader client didn't relaunch the web process.
+
+* WebProcess/WebPage/DrawingArea.h:
+(WebKit::DrawingArea::setPaintingEnabled):
+* WebProcess/WebPage/DrawingAreaImpl.cpp:
+(WebKit::DrawingAreaImpl::DrawingAreaImpl):
+(WebKit::DrawingAreaImpl::setNeedsDisplay):
+(WebKit::DrawingAreaImpl::scroll):
+(WebKit::DrawingAreaImpl::setPaintingEnabled):
+* WebProcess/WebPage/DrawingAreaImpl.h:
+Add a way to disable painting completely for a drawing area.
+
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::WebPage):
+Disable painting while setting up the web page, otherwise we'll get paint requests when we set the
+active state of the web page.
+
2011-10-21 Csaba Osztrogonác
[Qt][WK2] Buildfix for newer Qt5. Remove duplicated defines.
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (98112 => 98113)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-10-21 17:41:38 UTC (rev 98112)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-10-21 17:46:34 UTC (rev 98113)
@@ -2062,7 +2062,6 @@
- (void)_processDidCrash
{
-[self setNeedsDisplay:YES];
[self _updateRemoteAccessibilityRegistration:NO];
}
@@ -2073,7 +2072,6 @@
- (void)_didRelaunchProcess
{
-[self setNeedsDisplay:YES];
}
- (void)_setCursor:(NSCursor *)cursor
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (98112 => 98113)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-10-21 17:41:38 UTC (rev 98112)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-10-21 17:46:34 UTC (rev 98113)
@@ -3027,6 +3027,14 @@
m_pageClient->processDidCrash();
m_loaderClient.processDidCrash(this);
+if (!m_isValid) {
+// If the call out to the loader client didn't cause the web process to be relaunched,
+// we'll call setNeedsDisplay on the view so that we won't have the old contents showing.
+// If the call did cause the web process to be relaunched, we'll keep the old page contents showing
+// until the new web process has painted its contents.
+setViewNeedsDisplay(IntRect(IntPoint(), viewSize()));
+}
+
// Can't expect DidReceiveEvent notifications from a crashed web process.
m_keyEventQueue.clear();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (98112 => 98113)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2011-10-21 17:41:38 UTC (rev 98112)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2011-10-21 17:46:34 UTC (rev 98113)
@@ -74,6 +74,8 @@
virtual void didUninstallPageOverlay() { }
virtual void setPageOverla
[webkit-changes] [98112] trunk/Source/WebCore
Title: [98112] trunk/Source/WebCore
Revision 98112
Author simon.fra...@apple.com
Date 2011-10-21 10:41:38 -0700 (Fri, 21 Oct 2011)
Log Message
Fix Windows build.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::hasAnyAdditionalCompositedLayers):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (98111 => 98112)
--- trunk/Source/WebCore/ChangeLog 2011-10-21 17:39:37 UTC (rev 98111)
+++ trunk/Source/WebCore/ChangeLog 2011-10-21 17:41:38 UTC (rev 98112)
@@ -1,3 +1,10 @@
+2011-10-21 Simon Fraser
+
+Fix Windows build.
+
+* rendering/RenderLayerCompositor.cpp:
+(WebCore::RenderLayerCompositor::hasAnyAdditionalCompositedLayers):
+
2011-10-21 Devdatta Deshpande
[Gtk] mousemove event always has metaKey == true
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (98111 => 98112)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-10-21 17:39:37 UTC (rev 98111)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-10-21 17:41:38 UTC (rev 98112)
@@ -244,7 +244,7 @@
bool RenderLayerCompositor::hasAnyAdditionalCompositedLayers(const RenderLayer* rootLayer) const
{
-return m_compositedLayerCount > rootLayer->isComposited();
+return m_compositedLayerCount > (rootLayer->isComposited() ? 1 : 0);
}
void RenderLayerCompositor::updateCompositingLayers(CompositingUpdateType updateType, RenderLayer* updateRoot)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98111] trunk/LayoutTests
Title: [98111] trunk/LayoutTests Revision 98111 Author commit-qu...@webkit.org Date 2011-10-21 10:39:37 -0700 (Fri, 21 Oct 2011) Log Message re-enable layout tests against chromium-mac-snowleopard (Skia) baselines https://bugs.webkit.org/show_bug.cgi?id=70612 Patch by Elliot Poger on 2011-10-21 Reviewed by Adam Barth. * platform/chromium-mac-snowleopard/fast/dom/call-a-constructor-as-a-function-expected.txt: Removed. * platform/chromium-mac-snowleopard/fast/dom/error-to-string-stack-overflow-expected.txt: Removed. * platform/chromium-mac-snowleopard/fast/parser/entity-end-script-tag-expected.txt: Removed. * platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.png: Added. * platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.txt: Added. * platform/chromium-mac/fast/multicol/vertical-rl/rule-style-expected.png: Added. * platform/chromium-mac/fast/repaint/continuation-after-outline-expected.png: * platform/chromium/test_expectations.txt: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/test_expectations.txt trunk/LayoutTests/platform/chromium-mac/fast/repaint/continuation-after-outline-expected.png Added Paths trunk/LayoutTests/platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.png trunk/LayoutTests/platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.txt trunk/LayoutTests/platform/chromium-mac/fast/multicol/vertical-rl/rule-style-expected.png Removed Paths trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/dom/call-a-constructor-as-a-function-expected.txt trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/dom/error-to-string-stack-overflow-expected.txt trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/parser/entity-end-script-tag-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (98110 => 98111) --- trunk/LayoutTests/ChangeLog 2011-10-21 17:39:06 UTC (rev 98110) +++ trunk/LayoutTests/ChangeLog 2011-10-21 17:39:37 UTC (rev 98111) @@ -1,3 +1,19 @@ +2011-10-21 Elliot Poger + +re-enable layout tests against chromium-mac-snowleopard (Skia) baselines +https://bugs.webkit.org/show_bug.cgi?id=70612 + +Reviewed by Adam Barth. + +* platform/chromium-mac-snowleopard/fast/dom/call-a-constructor-as-a-function-expected.txt: Removed. +* platform/chromium-mac-snowleopard/fast/dom/error-to-string-stack-overflow-expected.txt: Removed. +* platform/chromium-mac-snowleopard/fast/parser/entity-end-script-tag-expected.txt: Removed. +* platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.png: Added. +* platform/chromium-mac/fast/multicol/flipped-blocks-border-after-expected.txt: Added. +* platform/chromium-mac/fast/multicol/vertical-rl/rule-style-expected.png: Added. +* platform/chromium-mac/fast/repaint/continuation-after-outline-expected.png: +* platform/chromium/test_expectations.txt: + 2011-10-21 Devdatta Deshpande [Gtk] mousemove event always has metaKey == true Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (98110 => 98111) --- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 17:39:06 UTC (rev 98110) +++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-21 17:39:37 UTC (rev 98111) @@ -3601,7 +3601,7 @@ BUGWK68437 LEOPARD CPU : printing/return-from-printing-mode.html = IMAGE // Temporarily allowing many failures for Mac10.5 with Skia graphics. -// epoger promises to remove these expectations by 10 October 2011. +// epoger promises to remove these expectations by 27 October 2011. BUGWK68270 LEOPARD CPU GPU : animations = PASS FAIL BUGWK68270 LEOPARD CPU GPU : css1 = PASS FAIL BUGWK68270 LEOPARD CPU GPU : css2.1 = PASS FAIL @@ -3629,26 +3629,6 @@ // BUGCR79855 SNOWLEOPARD DEBUG : fast/css/only-child-pseudo-class.html = PASS TEXT // BUGDPRANKE SNOWLEOPARD DEBUG : fast/css/only-of-type-pseudo-class.html = PASS TEXT -// Temporarily allowing many failures for Mac10.6 with Skia graphics, while we work out kinks. -// epoger promises to remove these expectations by 10 October 2011. -BUGWK69279 SNOWLEOPARD CPU GPU : animations = PASS FAIL -BUGWK69279 SNOWLEOPARD GPU : compositing = PASS FAIL -BUGWK69279 SNOWLEOPARD CPU GPU : css1 = PASS FAIL -BUGWK69279 SNOWLEOPARD CPU GPU : css2.1 = PASS FAIL -BUGWK69279 SNOWLEOPARD CPU GPU : css3 = PASS FAIL -BUGWK69279 SNOWLEOPARD CPU GPU : editing = PASS FAIL -BUGWK69279 SNOWLEOPARD CPU GPU : fast = PASS FAIL -BUGWK69279 SNOWLEOPARD CPU GPU : fonts = PASS FAIL -BUGWK69279 SNOWLEOPARD CPU GPU : http = PASS FAIL -BUGWK69279 SNOWLEOPARD CPU GPU : media = PASS FAIL -BUGWK69279 SNOWLEOPARD CPU GPU : platform = PASS FAIL -BUGWK69279 SNOWLEOPARD CPU GPU : plugins = PASS FAIL -BUGWK69279 SNOWLEOPARD CPU GPU : scrollbars = PASS FAIL -BUGWK69279 SNOWLEOPARD CPU GPU : svg = PASS FAIL -BUGWK69279 SNOWLEOPARD CPU GPU : tables = PASS FAIL -BUGWK69279 SNOWLEO
[webkit-changes] [98110] branches/chromium/912/Source/WebCore/inspector/front-end/ ScriptsPanel.js
Title: [98110] branches/chromium/912/Source/WebCore/inspector/front-end/ScriptsPanel.js
Revision 98110
Author vse...@chromium.org
Date 2011-10-21 10:39:06 -0700 (Fri, 21 Oct 2011)
Log Message
Merge 9 - Web Inspector: ScriptsPanel's should use similar logic to decide whether it could show an anchor location and actually showing it.
https://bugs.webkit.org/show_bug.cgi?id=70322
Reviewed by Pavel Feldman.
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype.canShowAnchorLocation):
(WebInspector.ScriptsPanel.prototype._showSourceLine):
BUG=101006
TBR=vse...@chromium.org
Review URL: http://codereview.chromium.org/8373002
Modified Paths
branches/chromium/912/Source/WebCore/inspector/front-end/ScriptsPanel.js
Diff
Modified: branches/chromium/912/Source/WebCore/inspector/front-end/ScriptsPanel.js (98109 => 98110)
--- branches/chromium/912/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-10-21 17:32:39 UTC (rev 98109)
+++ branches/chromium/912/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-10-21 17:39:06 UTC (rev 98110)
@@ -632,7 +632,7 @@
canShowAnchorLocation: function(anchor)
{
-return this._debuggerEnabled && WebInspector.debuggerModel.scriptsForURL(anchor.href).length;
+return this._debuggerEnabled && anchor.uiSourceCode;
},
showAnchorLocation: function(anchor)
@@ -643,7 +643,8 @@
_showSourceLine: function(uiSourceCode, lineNumber)
{
var sourceFrame = this._showSourceFrameAndAddToHistory(uiSourceCode);
-sourceFrame.highlightLine(lineNumber);
+if (lineNumber)
+sourceFrame.highlightLine(lineNumber);
},
_showSourceFrameAndAddToHistory: function(uiSourceCode)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98108] trunk
Title: [98108] trunk
Revision 98108
Author commit-qu...@webkit.org
Date 2011-10-21 10:28:07 -0700 (Fri, 21 Oct 2011)
Log Message
[Gtk] mousemove event always has metaKey == true
https://bugs.webkit.org/show_bug.cgi?id=35299
Patch by Devdatta Deshpande on 2011-10-21
Reviewed by Martin Robinson.
Source/WebCore:
GDK_MOD2_MASK doesn't always mean meta so we can't use it to identify
the meta key state. Use GDK_META_MASK instead.
Test: platform/gtk/fast/events/event-sender-metakey.html
* platform/gtk/PlatformMouseEventGtk.cpp:
(WebCore::PlatformMouseEvent::PlatformMouseEvent):
Tools:
* DumpRenderTree/gtk/EventSender.cpp:
(gdkModifierFromJSValue): GDK_META_MASK is used to represent metaKey for platform GTK mouse and
keyboard events. So making it in sync with WebCore files.
(mouseMoveToCallback): Sending modifier keys state for mouse move event.
LayoutTests:
For testing state of metaKey for mouse and keyboard events generated
using evnetSender object.
* platform/gtk/fast/events/event-sender-metakey-expected.txt: Added.
* platform/gtk/fast/events/event-sender-metakey.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/gtk/EventSender.cpp
Added Paths
trunk/LayoutTests/platform/gtk/fast/events/event-sender-metakey-expected.txt
trunk/LayoutTests/platform/gtk/fast/events/event-sender-metakey.html
Diff
Modified: trunk/LayoutTests/ChangeLog (98107 => 98108)
--- trunk/LayoutTests/ChangeLog 2011-10-21 17:06:00 UTC (rev 98107)
+++ trunk/LayoutTests/ChangeLog 2011-10-21 17:28:07 UTC (rev 98108)
@@ -1,3 +1,16 @@
+2011-10-21 Devdatta Deshpande
+
+[Gtk] mousemove event always has metaKey == true
+https://bugs.webkit.org/show_bug.cgi?id=35299
+
+Reviewed by Martin Robinson.
+
+For testing state of metaKey for mouse and keyboard events generated
+using evnetSender object.
+
+* platform/gtk/fast/events/event-sender-metakey-expected.txt: Added.
+* platform/gtk/fast/events/event-sender-metakey.html: Added.
+
2011-10-21 Cary Clark
Unreviewed gardening: first chunk of rebaselines for Chromium-Skia
Added: trunk/LayoutTests/platform/gtk/fast/events/event-sender-metakey-expected.txt (0 => 98108)
--- trunk/LayoutTests/platform/gtk/fast/events/event-sender-metakey-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/fast/events/event-sender-metakey-expected.txt 2011-10-21 17:28:07 UTC (rev 98108)
@@ -0,0 +1,2 @@
+PASS
+
Added: trunk/LayoutTests/platform/gtk/fast/events/event-sender-metakey.html (0 => 98108)
--- trunk/LayoutTests/platform/gtk/fast/events/event-sender-metakey.html (rev 0)
+++ trunk/LayoutTests/platform/gtk/fast/events/event-sender-metakey.html 2011-10-21 17:28:07 UTC (rev 98108)
@@ -0,0 +1,42 @@
+
+
+
+
+
+if (window.layoutTestController)
+layoutTestController.dumpAsText();
+
+var metaKey = false;
+var failed = false;
+function handleMetakey(e) {
+if (true == failed)
+return;
+if (e.metaKey != metaKey)
+failed = true;
+}
+var test = document.getElementById("test");
+test.addEventListener('mousemove', handleMetakey, false);
+test.addEventListener('mousedown', handleMetakey, false);
+test.addEventListener('mouseup', handleMetakey, false);
+test.addEventListener('keydown', handleMetakey, false);
+
+test.focus();
+
+
+// Events with metakey as false
+eventSender.mouseMoveTo(test.offsetLeft, test.offsetTop);
+eventSender.mouseDown();
+eventSender.mouseUp();
+eventSender.keyDown('a');
+
+// Events with metakey as true
+metaKey = true;
+eventSender.mouseMoveTo(test.offsetLeft, test.offsetTop, ["metaKey"]);
+eventSender.mouseDown(1, ["metaKey"]);
+eventSender.mouseUp(1, ["metaKey"]);
+eventSender.keyDown('a', ["metaKey"]);
+
+var resultDiv = document.getElementById("result");
+resultDiv.innerHTML = failed ? "FAIL" : "PASS";
+
+
Modified: trunk/Source/WebCore/ChangeLog (98107 => 98108)
--- trunk/Source/WebCore/ChangeLog 2011-10-21 17:06:00 UTC (rev 98107)
+++ trunk/Source/WebCore/ChangeLog 2011-10-21 17:28:07 UTC (rev 98108)
@@ -1,3 +1,18 @@
+2011-10-21 Devdatta Deshpande
+
+[Gtk] mousemove event always has metaKey == true
+https://bugs.webkit.org/show_bug.cgi?id=35299
+
+Reviewed by Martin Robinson.
+
+GDK_MOD2_MASK doesn't always mean meta so we can't use it to identify
+the meta key state. Use GDK_META_MASK instead.
+
+Test: platform/gtk/fast/events/event-sender-metakey.html
+
+* platform/gtk/PlatformMouseEventGtk.cpp:
+(WebCore::PlatformMouseEvent::PlatformMouseEvent):
+
2011-10-21 Andreas Kling
Style and Link elements' sheet() should return CSSStyleSheet.
Modified: trunk/Source/WebCore/platform/gtk/Pl
[webkit-changes] [98107] branches/chromium/912
Title: [98107] branches/chromium/912
Revision 98107
Author vse...@chromium.org
Date 2011-10-21 10:06:00 -0700 (Fri, 21 Oct 2011)
Log Message
Merge 97702 - Web Inspector: Search in resource crashes when there is no resource with given url.
https://bugs.webkit.org/show_bug.cgi?id=69767
Reviewed by Pavel Feldman.
Source/WebCore:
Test: http/tests/inspector/search/search-in-non-existing-resource.html
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::searchInResource):
LayoutTests:
* http/tests/inspector/search/search-in-non-existing-resource-expected.txt: Added.
* http/tests/inspector/search/search-in-non-existing-resource.html: Added.
BUG=101005
TBR=vse...@chromium.org
Review URL: http://codereview.chromium.org/8370003
Modified Paths
branches/chromium/912/Source/WebCore/inspector/InspectorPageAgent.cpp
Added Paths
branches/chromium/912/LayoutTests/http/tests/inspector/search/search-in-non-existing-resource-expected.txt
branches/chromium/912/LayoutTests/http/tests/inspector/search/search-in-non-existing-resource.html
Diff
Copied: branches/chromium/912/LayoutTests/http/tests/inspector/search/search-in-non-existing-resource-expected.txt (from rev 97702, trunk/LayoutTests/http/tests/inspector/search/search-in-non-existing-resource-expected.txt) (0 => 98107)
--- branches/chromium/912/LayoutTests/http/tests/inspector/search/search-in-non-existing-resource-expected.txt (rev 0)
+++ branches/chromium/912/LayoutTests/http/tests/inspector/search/search-in-non-existing-resource-expected.txt 2011-10-21 17:06:00 UTC (rev 98107)
@@ -0,0 +1,6 @@
+Tests single resource search in inspector page agent with non existing resource url does not cause a crash.
+
+Bug 69767
+Search matches:
+
+
Copied: branches/chromium/912/LayoutTests/http/tests/inspector/search/search-in-non-existing-resource.html (from rev 97702, trunk/LayoutTests/http/tests/inspector/search/search-in-non-existing-resource.html) (0 => 98107)
--- branches/chromium/912/LayoutTests/http/tests/inspector/search/search-in-non-existing-resource.html (rev 0)
+++ branches/chromium/912/LayoutTests/http/tests/inspector/search/search-in-non-existing-resource.html 2011-10-21 17:06:00 UTC (rev 98107)
@@ -0,0 +1,34 @@
+
+
+
+function test()
+{
+// This file should not match search query.
+var text = "searchTest" + "UniqueString";
+InspectorTest.runAfterResourcesAreFinished(["search.js"], step2);
+
+function step2()
+{
+var resource = WebInspector.resourceForURL("http://127.0.0.1:8000/inspector/search/resources/search.js");
+var url = ""
+PageAgent.searchInResource(resource.frameId, url, text, step3);
+}
+
+function step3(error, searchMatches)
+{
+InspectorTest.dumpSearchMatches(searchMatches);
+InspectorTest.completeTest();
+}
+}
+
+
+
+Tests single resource search in inspector page agent with non existing resource url does not cause a crash.
+
+
+
+
+
Modified: branches/chromium/912/Source/WebCore/inspector/InspectorPageAgent.cpp (98106 => 98107)
--- branches/chromium/912/Source/WebCore/inspector/InspectorPageAgent.cpp 2011-10-21 17:04:39 UTC (rev 98106)
+++ branches/chromium/912/Source/WebCore/inspector/InspectorPageAgent.cpp 2011-10-21 17:06:00 UTC (rev 98107)
@@ -503,7 +503,8 @@
if (!success) {
CachedResource* resource = cachedResource(frame, kurl);
-success = textContentForCachedResource(resource, &content);
+if (resource)
+success = textContentForCachedResource(resource, &content);
}
if (!success)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98106] trunk/Source/WebCore
Title: [98106] trunk/Source/WebCore
Revision 98106
Author commit-qu...@webkit.org
Date 2011-10-21 10:04:39 -0700 (Fri, 21 Oct 2011)
Log Message
Style and Link elements' sheet() should return CSSStyleSheet.
https://bugs.webkit.org/show_bug.cgi?id=70608
Patch by Andreas Kling on 2011-10-21
Reviewed by Antti Koivisto.
Return a CSSStyleSheet* instead of a StyleSheet* in these functions
since we know they are always CSSStyleSheets.
Also remove some now-unnecessary isCSSStyleSheet() checks.
* dom/StyleElement.h:
(WebCore::StyleElement::sheet):
* html/HTMLLinkElement.cpp:
* html/HTMLLinkElement.h:
(WebCore::HTMLLinkElement::sheet):
* page/PageSerializer.cpp:
(WebCore::PageSerializer::serializeFrame):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/StyleElement.h
trunk/Source/WebCore/html/HTMLLinkElement.cpp
trunk/Source/WebCore/html/HTMLLinkElement.h
trunk/Source/WebCore/page/PageSerializer.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (98105 => 98106)
--- trunk/Source/WebCore/ChangeLog 2011-10-21 16:58:58 UTC (rev 98105)
+++ trunk/Source/WebCore/ChangeLog 2011-10-21 17:04:39 UTC (rev 98106)
@@ -1,3 +1,22 @@
+2011-10-21 Andreas Kling
+
+Style and Link elements' sheet() should return CSSStyleSheet.
+https://bugs.webkit.org/show_bug.cgi?id=70608
+
+Reviewed by Antti Koivisto.
+
+Return a CSSStyleSheet* instead of a StyleSheet* in these functions
+since we know they are always CSSStyleSheets.
+Also remove some now-unnecessary isCSSStyleSheet() checks.
+
+* dom/StyleElement.h:
+(WebCore::StyleElement::sheet):
+* html/HTMLLinkElement.cpp:
+* html/HTMLLinkElement.h:
+(WebCore::HTMLLinkElement::sheet):
+* page/PageSerializer.cpp:
+(WebCore::PageSerializer::serializeFrame):
+
2011-10-21 Vsevolod Vlasov
Web Inspector: Advanced search is working very slowly and does not show searching progress.
Modified: trunk/Source/WebCore/dom/StyleElement.h (98105 => 98106)
--- trunk/Source/WebCore/dom/StyleElement.h 2011-10-21 16:58:58 UTC (rev 98105)
+++ trunk/Source/WebCore/dom/StyleElement.h 2011-10-21 17:04:39 UTC (rev 98106)
@@ -37,7 +37,7 @@
virtual const AtomicString& type() const = 0;
virtual const AtomicString& media() const = 0;
-StyleSheet* sheet() const { return m_sheet.get(); }
+CSSStyleSheet* sheet() const { return m_sheet.get(); }
bool isLoading() const;
bool sheetLoaded(Document*);
Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (98105 => 98106)
--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2011-10-21 16:58:58 UTC (rev 98105)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2011-10-21 17:04:39 UTC (rev 98106)
@@ -119,11 +119,6 @@
}
}
-StyleSheet* HTMLLinkElement::sheet() const
-{
-return m_sheet.get();
-}
-
void HTMLLinkElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == relAttr) {
Modified: trunk/Source/WebCore/html/HTMLLinkElement.h (98105 => 98106)
--- trunk/Source/WebCore/html/HTMLLinkElement.h 2011-10-21 16:58:58 UTC (rev 98105)
+++ trunk/Source/WebCore/html/HTMLLinkElement.h 2011-10-21 17:04:39 UTC (rev 98106)
@@ -51,7 +51,7 @@
String type() const;
-StyleSheet* sheet() const;
+CSSStyleSheet* sheet() const { return m_sheet.get(); }
// FIXME: This should be renamed isStyleSheetLoading as this is only used for stylesheets.
bool isLoading() const;
Modified: trunk/Source/WebCore/page/PageSerializer.cpp (98105 => 98106)
--- trunk/Source/WebCore/page/PageSerializer.cpp 2011-10-21 16:58:58 UTC (rev 98105)
+++ trunk/Source/WebCore/page/PageSerializer.cpp 2011-10-21 17:04:39 UTC (rev 98106)
@@ -234,17 +234,15 @@
addImageToResources(cachedImage, imageElement->renderer(), url);
} else if (element->hasTagName(HTMLNames::linkTag)) {
HTMLLinkElement* linkElement = static_cast(element);
-StyleSheet* sheet = linkElement->sheet();
-if (sheet && sheet->isCSSStyleSheet()) {
+if (CSSStyleSheet* sheet = linkElement->sheet()) {
KURL url = ""
-serializeCSSStyleSheet(static_cast(sheet), url);
+serializeCSSStyleSheet(sheet, url);
ASSERT(m_resourceURLs.contains(url));
}
} else if (element->hasTagName(HTMLNames::styleTag)) {
HTMLStyleElement* styleElement = static_cast(element);
-StyleSheet* sheet = styleElement->sheet();
-if (sheet && sheet->isCSSStyleSheet())
-serializeCSSStyleSheet(static_cast(sheet), KURL());
+if (CSSStyleSheet* sheet = styleElement->sheet())
+serializeCSSStyleSheet(sheet, KURL());
}
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98105] trunk/Source/WebCore
Title: [98105] trunk/Source/WebCore Revision 98105 Author vse...@chromium.org Date 2011-10-21 09:58:58 -0700 (Fri, 21 Oct 2011) Log Message Web Inspector: Advanced search is working very slowly and does not show searching progress. https://bugs.webkit.org/show_bug.cgi?id=70611 Search implementation changed so that we do not start searching in the next file unless the previous one was already searched. This allows to interrupt search. Not all search matches are added on UI by default now, only first 20 for each file. Search progress information and search stop button were added to drawer status bar. Reviewed by Pavel Feldman. * English.lproj/localizedStrings.js: * inspector/ContentSearchUtils.cpp: (WebCore::ContentSearchUtils::getRegularExpressionMatchesByLines): (WebCore::ContentSearchUtils::countRegularExpressionMatches): * inspector/front-end/AdvancedSearchController.js: (WebInspector.AdvancedSearchController.prototype._onSearchResult): (WebInspector.AdvancedSearchController.prototype._onSearchFinished): (WebInspector.AdvancedSearchController.prototype.startSearch): (WebInspector.AdvancedSearchController.prototype.resetSearch): (WebInspector.AdvancedSearchController.prototype.stopSearch): (WebInspector.SearchView): (WebInspector.SearchView.prototype.get statusBarItems): (WebInspector.SearchView.prototype.get counterElement): (WebInspector.SearchView.prototype.set resultsPane): (WebInspector.SearchView.prototype.searchStarted): (WebInspector.SearchView.prototype._updateSearchResultsMessage): (WebInspector.SearchView.prototype._updateSearchProgress): (WebInspector.SearchView.prototype.resetResults): (WebInspector.SearchView.prototype._resetCounters): (WebInspector.SearchView.prototype.nothingFound): (WebInspector.SearchView.prototype.addSearchResult): (WebInspector.SearchView.prototype.searchFinished): (WebInspector.SearchView.prototype._searchStopButtonPressed): (WebInspector.SearchResultsPane): (WebInspector.FileBasedSearchResultsPane): (WebInspector.FileBasedSearchResultsPane.prototype.addSearchResult): (WebInspector.FileBasedSearchResultsPane.prototype._fileTreeElementExpanded): (WebInspector.FileBasedSearchResultsPane.prototype._appendSearchMatches): (WebInspector.FileBasedSearchResultsPane.prototype._appendShowMoreMatchesElement): (WebInspector.FileBasedSearchResultsPane.prototype._showMoreMatchesElementSelected): (WebInspector.FileBasedSearchResultsPane.prototype._addFileTreeElement): (WebInspector.FileBasedSearchResultsPane.prototype._regexMatchRanges): * inspector/front-end/Drawer.js: (WebInspector.Drawer.prototype.hide): * inspector/front-end/Images/statusbarButtonGlyphs.png: * inspector/front-end/ScriptsSearchScope.js: (WebInspector.ScriptsSearchScope): (WebInspector.ScriptsSearchScope.prototype.performSearch.filterOutContentScripts): (WebInspector.ScriptsSearchScope.prototype.performSearch.continueSearch): (WebInspector.ScriptsSearchScope.prototype.performSearch.searchCallbackWrapper): (WebInspector.ScriptsSearchScope.prototype.performSearch): (WebInspector.ScriptsSearchScope.prototype.stopSearch): * inspector/front-end/TimelinePanel.js: (WebInspector.TimelinePanel.prototype._registerShortcuts): * inspector/front-end/inspector.css: (#drawer-status-bar .search-status-bar-item): (#drawer-status-bar .search-status-bar-message): (#drawer-status-bar .search-status-bar-progress): (#drawer-status-bar .search-status-bar-stop-button-item): (#drawer-status-bar .search-status-bar-stop-button .glyph): (#drawer-status-bar .search-results-status-bar-message): (.search-view .search-results): (#search-results-pane-file-based .search-results-outline-disclosure): (#search-results-pane-file-based .search-result): (#search-results-pane-file-based .search-result:hover): (#search-results-pane-file-based .show-more-matches): (#search-results-pane-file-based .show-more-matches:hover): (#search-results-pane-file-based .search-match:hover): * inspector/front-end/utilities.js: (): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/English.lproj/localizedStrings.js trunk/Source/WebCore/inspector/ContentSearchUtils.cpp trunk/Source/WebCore/inspector/front-end/AdvancedSearchController.js trunk/Source/WebCore/inspector/front-end/Drawer.js trunk/Source/WebCore/inspector/front-end/Images/statusbarButtonGlyphs.png trunk/Source/WebCore/inspector/front-end/ScriptsSearchScope.js trunk/Source/WebCore/inspector/front-end/TimelinePanel.js trunk/Source/WebCore/inspector/front-end/inspector.css trunk/Source/WebCore/inspector/front-end/utilities.js Diff Modified: trunk/Source/WebCore/ChangeLog (98104 => 98105) --- trunk/Source/WebCore/ChangeLog 2011-10-21 16:42:19 UTC (rev 98104) +++ trunk/Source/WebCore/ChangeLog 2011-10-21 16:58:58 UTC (rev 98105) @@ -1,3 +1,76 @@ +2011-10-21 Vsevolod Vlasov + +Web Inspector: Advanced search is working very slowly and does not show searching progress. +https://bugs.webkit.org/show_bug.cgi?id=70611 + +Search implementation changed so that
[webkit-changes] [98104] trunk/Source
Title: [98104] trunk/Source
Revision 98104
Author z...@google.com
Date 2011-10-21 09:42:19 -0700 (Fri, 21 Oct 2011)
Log Message
Implement mechanism to enable privileged webgl extensions
https://bugs.webkit.org/show_bug.cgi?id=70538
Reviewed by Darin Fisher.
Source/WebCore:
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::allowPrivilegedExtensions): check page/Settings flag.
* page/Settings.cpp: Add the flag.
(WebCore::Settings::Settings):
(WebCore::Settings::setPrivilegedWebGLExtensionsEnabled):
* page/Settings.h: Ditto.
(WebCore::Settings::privilegedWebGLExtensionsEnabled):
Source/WebKit/chromium:
* public/WebSettings.h: Add the flag.
* src/WebSettingsImpl.cpp: Ditto.
(WebKit::WebSettingsImpl::setPrivilegedWebGLExtensionsEnabled):
* src/WebSettingsImpl.h: Ditto.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
trunk/Source/WebCore/page/Settings.cpp
trunk/Source/WebCore/page/Settings.h
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/WebSettings.h
trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp
trunk/Source/WebKit/chromium/src/WebSettingsImpl.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (98103 => 98104)
--- trunk/Source/WebCore/ChangeLog 2011-10-21 15:56:25 UTC (rev 98103)
+++ trunk/Source/WebCore/ChangeLog 2011-10-21 16:42:19 UTC (rev 98104)
@@ -1,3 +1,18 @@
+2011-10-20 Zhenyao Mo
+
+Implement mechanism to enable privileged webgl extensions
+https://bugs.webkit.org/show_bug.cgi?id=70538
+
+Reviewed by Darin Fisher.
+
+* html/canvas/WebGLRenderingContext.cpp:
+(WebCore::WebGLRenderingContext::allowPrivilegedExtensions): check page/Settings flag.
+* page/Settings.cpp: Add the flag.
+(WebCore::Settings::Settings):
+(WebCore::Settings::setPrivilegedWebGLExtensionsEnabled):
+* page/Settings.h: Ditto.
+(WebCore::Settings::privilegedWebGLExtensionsEnabled):
+
2011-10-20 Pavel Podivilov
Web Inspector: first line in file is not highlighted.
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (98103 => 98104)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2011-10-21 15:56:25 UTC (rev 98103)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2011-10-21 16:42:19 UTC (rev 98104)
@@ -477,7 +477,9 @@
bool WebGLRenderingContext::allowPrivilegedExtensions() const
{
-// FIXME: implement this function.
+Page* p = canvas()->document()->page();
+if (p && p->settings())
+return p->settings()->privilegedWebGLExtensionsEnabled();
return false;
}
Modified: trunk/Source/WebCore/page/Settings.cpp (98103 => 98104)
--- trunk/Source/WebCore/page/Settings.cpp 2011-10-21 15:56:25 UTC (rev 98103)
+++ trunk/Source/WebCore/page/Settings.cpp 2011-10-21 16:42:19 UTC (rev 98104)
@@ -185,6 +185,7 @@
, m_experimentalNotificationsEnabled(false)
, m_webGLEnabled(false)
, m_openGLMultisamplingEnabled(true)
+, m_privilegedWebGLExtensionsEnabled(false)
, m_webAudioEnabled(false)
, m_acceleratedCanvas2dEnabled(false)
, m_legacyAcceleratedCanvas2dEnabled(false)
@@ -790,6 +791,11 @@
m_openGLMultisamplingEnabled = enabled;
}
+void Settings::setPrivilegedWebGLExtensionsEnabled(bool enabled)
+{
+m_privilegedWebGLExtensionsEnabled = enabled;
+}
+
void Settings::setAccelerated2dCanvasEnabled(bool enabled)
{
m_acceleratedCanvas2dEnabled = enabled;
Modified: trunk/Source/WebCore/page/Settings.h (98103 => 98104)
--- trunk/Source/WebCore/page/Settings.h 2011-10-21 15:56:25 UTC (rev 98103)
+++ trunk/Source/WebCore/page/Settings.h 2011-10-21 16:42:19 UTC (rev 98104)
@@ -342,6 +342,9 @@
void setOpenGLMultisamplingEnabled(bool);
bool openGLMultisamplingEnabled() const { return m_openGLMultisamplingEnabled; }
+void setPrivilegedWebGLExtensionsEnabled(bool);
+bool privilegedWebGLExtensionsEnabled() const { return m_privilegedWebGLExtensionsEnabled; }
+
void setAccelerated2dCanvasEnabled(bool);
bool accelerated2dCanvasEnabled() const { return m_acceleratedCanvas2dEnabled; }
@@ -565,6 +568,7 @@
bool m_experimentalNotificationsEnabled : 1;
bool m_webGLEnabled : 1;
bool m_openGLMultisamplingEnabled : 1;
+bool m_privilegedWebGLExtensionsEnabled : 1;
bool m_webAudioEnabled : 1;
bool m_acceleratedCanvas2dEnabled : 1;
bool m_legacyAcceleratedCanvas2dEnabled : 1;
Modified: trunk/Source/WebKit/chromium/ChangeLog (98103 => 98104)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-21 15:56:25 UTC (rev 98103)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-21 16:42:19 UTC (rev 98104)
@@ -1,3 +1,15 @@
+2011-10-20 Zhenyao Mo
+
+Implement mechanism to enable privileged webgl extensions
+https://bugs.webkit.org/show_bug.cgi?id=70538
+
+Reviewed by Darin Fisher.
+
+
[webkit-changes] [98103] trunk/Source/WebCore
Title: [98103] trunk/Source/WebCore
Revision 98103
Author podivi...@chromium.org
Date 2011-10-21 08:56:25 -0700 (Fri, 21 Oct 2011)
Log Message
Web Inspector: first line in file is not highlighted.
https://bugs.webkit.org/show_bug.cgi?id=70504
Reviewed by Pavel Feldman.
* inspector/front-end/SourceFrame.js:
(WebInspector.SourceFrame.prototype._initializeTextViewer):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/SourceFrame.js
Diff
Modified: trunk/Source/WebCore/ChangeLog (98102 => 98103)
--- trunk/Source/WebCore/ChangeLog 2011-10-21 15:43:03 UTC (rev 98102)
+++ trunk/Source/WebCore/ChangeLog 2011-10-21 15:56:25 UTC (rev 98103)
@@ -1,3 +1,13 @@
+2011-10-20 Pavel Podivilov
+
+Web Inspector: first line in file is not highlighted.
+https://bugs.webkit.org/show_bug.cgi?id=70504
+
+Reviewed by Pavel Feldman.
+
+* inspector/front-end/SourceFrame.js:
+(WebInspector.SourceFrame.prototype._initializeTextViewer):
+
2011-10-21 Andreas Kling
Simplify CSSStyleRule::setSelectorText().
Modified: trunk/Source/WebCore/inspector/front-end/SourceFrame.js (98102 => 98103)
--- trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2011-10-21 15:43:03 UTC (rev 98102)
+++ trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2011-10-21 15:56:25 UTC (rev 98103)
@@ -310,7 +310,7 @@
if (typeof this._executionLineNumber === "number")
this.setExecutionLine(this._executionLineNumber);
-if (this._lineToHighlight) {
+if (typeof this._lineToHighlight === "number") {
this.highlightLine(this._lineToHighlight);
delete this._lineToHighlight;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98102] trunk/Source/WebCore
Title: [98102] trunk/Source/WebCore
Revision 98102
Author andreas.kl...@nokia.com
Date 2011-10-21 08:43:03 -0700 (Fri, 21 Oct 2011)
Log Message
Simplify CSSStyleRule::setSelectorText().
https://bugs.webkit.org/show_bug.cgi?id=70607
Reviewed by Antti Koivisto.
Remove unnecessary isCSSStyleSheet() check and redundant Document finding
logic (CSSStyleSheet::document() will return the owner node's Document just
like this code would.)
* css/CSSStyleRule.cpp:
(WebCore::CSSStyleRule::setSelectorText):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSStyleRule.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (98101 => 98102)
--- trunk/Source/WebCore/ChangeLog 2011-10-21 15:15:03 UTC (rev 98101)
+++ trunk/Source/WebCore/ChangeLog 2011-10-21 15:43:03 UTC (rev 98102)
@@ -1,3 +1,17 @@
+2011-10-21 Andreas Kling
+
+Simplify CSSStyleRule::setSelectorText().
+https://bugs.webkit.org/show_bug.cgi?id=70607
+
+Reviewed by Antti Koivisto.
+
+Remove unnecessary isCSSStyleSheet() check and redundant Document finding
+logic (CSSStyleSheet::document() will return the owner node's Document just
+like this code would.)
+
+* css/CSSStyleRule.cpp:
+(WebCore::CSSStyleRule::setSelectorText):
+
2011-10-21 Alejandro G. Castro
[cairo] Forward declaration of GraphicsContextState uses class instead of struct
Modified: trunk/Source/WebCore/css/CSSStyleRule.cpp (98101 => 98102)
--- trunk/Source/WebCore/css/CSSStyleRule.cpp 2011-10-21 15:15:03 UTC (rev 98101)
+++ trunk/Source/WebCore/css/CSSStyleRule.cpp 2011-10-21 15:43:03 UTC (rev 98102)
@@ -57,13 +57,10 @@
void CSSStyleRule::setSelectorText(const String& selectorText)
{
Document* doc = 0;
-StyleSheet* ownerStyleSheet = m_style->parentStyleSheet();
-if (ownerStyleSheet) {
-if (ownerStyleSheet->isCSSStyleSheet())
-doc = static_cast(ownerStyleSheet)->document();
-if (!doc)
-doc = ownerStyleSheet->ownerNode() ? ownerStyleSheet->ownerNode()->document() : 0;
-}
+
+if (CSSStyleSheet* styleSheet = m_style->parentStyleSheet())
+doc = styleSheet->document();
+
if (!doc)
doc = m_style->node() ? m_style->node()->document() : 0;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98100] trunk/LayoutTests
Title: [98100] trunk/LayoutTests Revision 98100 Author ph...@webkit.org Date 2011-10-21 07:33:09 -0700 (Fri, 21 Oct 2011) Log Message Unreviewed, skip failing a11y test in GTK. * platform/gtk/Skipped: Skip accessibility/menu-list-sends-change-notification.html Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/gtk/Skipped Diff Modified: trunk/LayoutTests/ChangeLog (98099 => 98100) --- trunk/LayoutTests/ChangeLog 2011-10-21 14:16:17 UTC (rev 98099) +++ trunk/LayoutTests/ChangeLog 2011-10-21 14:33:09 UTC (rev 98100) @@ -1,5 +1,11 @@ 2011-10-21 Philippe Normand +Unreviewed, skip failing a11y test in GTK. + +* platform/gtk/Skipped: Skip accessibility/menu-list-sends-change-notification.html + +2011-10-21 Philippe Normand + Unreviewed, GTK baselines for 3 new tests. * platform/gtk/fast/css/clip-text-in-scaled-div-expected.txt: Added. Modified: trunk/LayoutTests/platform/gtk/Skipped (98099 => 98100) --- trunk/LayoutTests/platform/gtk/Skipped 2011-10-21 14:16:17 UTC (rev 98099) +++ trunk/LayoutTests/platform/gtk/Skipped 2011-10-21 14:33:09 UTC (rev 98100) @@ -1649,3 +1649,7 @@ # https://bugs.webkit.org/show_bug.cgi?id=70485 fast/events/drag-selects-image.html + +# https://bugs.webkit.org/show_bug.cgi?id=70606 +# Missing DRT AccessibilityController::addNotificationListener implementation +accessibility/menu-list-sends-change-notification.html ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98099] trunk/LayoutTests
Title: [98099] trunk/LayoutTests
Revision 98099
Author ph...@webkit.org
Date 2011-10-21 07:16:17 -0700 (Fri, 21 Oct 2011)
Log Message
Unreviewed, GTK baselines for 3 new tests.
* platform/gtk/fast/css/clip-text-in-scaled-div-expected.txt: Added.
* platform/gtk/fast/repaint/region-painting-via-layout-expected.txt: Added.
* platform/gtk/fast/selectors/visited-descendant-expected.txt: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
Added Paths
trunk/LayoutTests/platform/gtk/fast/css/clip-text-in-scaled-div-expected.txt
trunk/LayoutTests/platform/gtk/fast/repaint/region-painting-via-layout-expected.txt
trunk/LayoutTests/platform/gtk/fast/selectors/visited-descendant-expected.txt
Diff
Modified: trunk/LayoutTests/ChangeLog (98098 => 98099)
--- trunk/LayoutTests/ChangeLog 2011-10-21 13:47:58 UTC (rev 98098)
+++ trunk/LayoutTests/ChangeLog 2011-10-21 14:16:17 UTC (rev 98099)
@@ -1,3 +1,11 @@
+2011-10-21 Philippe Normand
+
+Unreviewed, GTK baselines for 3 new tests.
+
+* platform/gtk/fast/css/clip-text-in-scaled-div-expected.txt: Added.
+* platform/gtk/fast/repaint/region-painting-via-layout-expected.txt: Added.
+* platform/gtk/fast/selectors/visited-descendant-expected.txt: Added.
+
2011-10-21 Cary Clark
Unreviewed gardening: rebaselining to account for focus ring changes in
Added: trunk/LayoutTests/platform/gtk/fast/css/clip-text-in-scaled-div-expected.txt (0 => 98099)
--- trunk/LayoutTests/platform/gtk/fast/css/clip-text-in-scaled-div-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/fast/css/clip-text-in-scaled-div-expected.txt 2011-10-21 14:16:17 UTC (rev 98099)
@@ -0,0 +1,11 @@
+layer at (0,0) size 1576x584
+ RenderView at (0,0) size 800x584
+layer at (0,0) size 800x584
+ RenderBlock {HTML} at (0,0) size 800x584
+RenderBody {BODY} at (8,8) size 784x568
+layer at (8,8) size 784x19
+ RenderBlock {DIV} at (0,0) size 784x19
+RenderInline {SPAN} at (0,0) size 219x19 [bgcolor=#FF]
+ RenderText {#text} at (0,0) size 219x19
+text run at (0,0) width 219: "This text should be nice and sharp."
+RenderText {#text} at (0,0) size 0x0
Added: trunk/LayoutTests/platform/gtk/fast/repaint/region-painting-via-layout-expected.txt (0 => 98099)
--- trunk/LayoutTests/platform/gtk/fast/repaint/region-painting-via-layout-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/fast/repaint/region-painting-via-layout-expected.txt 2011-10-21 14:16:17 UTC (rev 98099)
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+RenderBody {BODY} at (8,8) size 784x584
+ RenderRegion {DIV} at (0,0) size 786x182 [bgcolor=#FF] [border: (1px solid #00)]
+Flow Threads
+ Thread with flow-name 'flow1'
+layer at (0,0) size 784x1180 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
+ RenderFlowThread at (0,0) size 784x1180
+layer at (0,0) size 784x1200 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
+ RenderBlock (relative positioned) {DIV} at (0,0) size 784x1200
+RenderBlock {DIV} at (0,1000) size 784x200
+ RenderBlock {DIV} at (0,0) size 784x200 [bgcolor=#008000]
+ Regions for flow 'flow1'
+RenderRegion {DIV} #region1
+RenderRegion {DIV} #region2
Added: trunk/LayoutTests/platform/gtk/fast/selectors/visited-descendant-expected.txt (0 => 98099)
--- trunk/LayoutTests/platform/gtk/fast/selectors/visited-descendant-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/fast/selectors/visited-descendant-expected.txt 2011-10-21 14:16:17 UTC (rev 98099)
@@ -0,0 +1,61 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+RenderBody {BODY} at (8,8) size 784x576
+ RenderBlock {P} at (0,0) size 784x19
+RenderText {#text} at (0,0) size 760x19
+ text run at (0,0) width 760: "Test that visited style matches to the topmost link in a decendant selector. The link should be green, with red underlining."
+ RenderBlock {P} at (0,35) size 784x19
+RenderInline {A} at (0,0) size 30x19 [color=#FF]
+ RenderInline {SPAN} at (0,0) size 30x19 [color=#008000]
+RenderText {#text} at (0,0) size 30x19
+ text run at (0,0) width 30: "Link"
+RenderText {#text} at (0,0) size 0x0
+ RenderBlock {P} at (0,70) size 784x19
+RenderText {#text} at (0,0) size 727x19
+ text run at (0,0) width 727: "Test that visited style matches to the topmost link in a child selector. The link should be green, with red underlining."
+ RenderBlock {P} at (0,105) size 784x19
+RenderInline {A} at (0,0) size 30x19 [color=#FF]
+ RenderInline {SPAN} at (0,
[webkit-changes] [98098] trunk/Tools
Title: [98098] trunk/Tools
Revision 98098
Author carlo...@webkit.org
Date 2011-10-21 06:47:58 -0700 (Fri, 21 Oct 2011)
Log Message
watchlist: Add a new entry for WebKit2 GTK+ public API
https://bugs.webkit.org/show_bug.cgi?id=70601
Reviewed by Philippe Normand.
Subscribe myself to WebKit2 GTK+ API patches. Also add a message
for patches that might include new API that points to the WebKit2
GTK+ API guidelines.
* Scripts/webkitpy/common/config/watchlist:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/watchlist
Diff
Modified: trunk/Tools/ChangeLog (98097 => 98098)
--- trunk/Tools/ChangeLog 2011-10-21 13:36:22 UTC (rev 98097)
+++ trunk/Tools/ChangeLog 2011-10-21 13:47:58 UTC (rev 98098)
@@ -1,3 +1,16 @@
+2011-10-21 Carlos Garcia Campos
+
+watchlist: Add a new entry for WebKit2 GTK+ public API
+https://bugs.webkit.org/show_bug.cgi?id=70601
+
+Reviewed by Philippe Normand.
+
+Subscribe myself to WebKit2 GTK+ API patches. Also add a message
+for patches that might include new API that points to the WebKit2
+GTK+ API guidelines.
+
+* Scripts/webkitpy/common/config/watchlist:
+
2011-10-21 Simon Hausmann
Remove QtScript source code from WebKit.
Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (98097 => 98098)
--- trunk/Tools/Scripts/webkitpy/common/config/watchlist 2011-10-21 13:36:22 UTC (rev 98097)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist 2011-10-21 13:47:58 UTC (rev 98098)
@@ -78,6 +78,9 @@
"StyleChecker": {
"filename": r"Tools/Scripts/webkitpy/style/",
},
+"GtkWebKit2PublicAPI": {
+"filename": r"Source/WebKit2/UIProcess/API/gtk/",
+},
},
"CC_RULES": {
# Note: All email addresses listed must be registered with bugzilla.
@@ -98,9 +101,13 @@
"SecurityCritical": [ "aba...@webkit.org" ],
"webkitpy": [ "aba...@webkit.org", "o...@chromium.org" ],
"TestFailures": [ "aba...@webkit.org", "dglaz...@chromium.org" ],
+"GtkWebKit2PublicAPI": [ "cgar...@igalia.com", ],
},
"MESSAGE_RULES": {
"ChromiumPublicApi": [ "Please wait for approval from fi...@chromium.org before submitting "
"because this patch contains changes to the Chromium public API.", ],
+"GtkWebKit2PublicAPI": [ "Thanks for the patch. If this patch contains new public API "
+ "please make sure it follows the guidelines for new WebKit2 GTK+ API. "
+ "See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API", ],
},
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98096] trunk/Source/WebCore
Title: [98096] trunk/Source/WebCore
Revision 98096
Author a...@webkit.org
Date 2011-10-21 05:43:45 -0700 (Fri, 21 Oct 2011)
Log Message
2011-10-21 Alejandro G. Castro
[cairo] Forward declaration of GraphicsContextState uses class instead of struct
https://bugs.webkit.org/show_bug.cgi?id=70522
The type is a struct not a class, replace the definition in the
forward declaration.
Reviewed by Martin Robinson.
* platform/graphics/cairo/PlatformContextCairo.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (98095 => 98096)
--- trunk/Source/WebCore/ChangeLog 2011-10-21 12:39:08 UTC (rev 98095)
+++ trunk/Source/WebCore/ChangeLog 2011-10-21 12:43:45 UTC (rev 98096)
@@ -1,3 +1,15 @@
+2011-10-21 Alejandro G. Castro
+
+[cairo] Forward declaration of GraphicsContextState uses class instead of struct
+https://bugs.webkit.org/show_bug.cgi?id=70522
+
+The type is a struct not a class, replace the definition in the
+forward declaration.
+
+Reviewed by Martin Robinson.
+
+* platform/graphics/cairo/PlatformContextCairo.h:
+
2011-10-20 Andrey Kosyakov
Web Inspector: make extension tests pass on chromium
Modified: trunk/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h (98095 => 98096)
--- trunk/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h 2011-10-21 12:39:08 UTC (rev 98095)
+++ trunk/Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h 2011-10-21 12:43:45 UTC (rev 98096)
@@ -32,7 +32,7 @@
namespace WebCore {
-class GraphicsContextState;
+struct GraphicsContextState;
// Much like PlatformContextSkia in the Skia port, this class holds information that
// would normally be private to GraphicsContext, except that we want to allow access
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98095] trunk/Source/WebKit/chromium
Title: [98095] trunk/Source/WebKit/chromium
Revision 98095
Author yu...@chromium.org
Date 2011-10-21 05:39:08 -0700 (Fri, 21 Oct 2011)
Log Message
[Chromium] Web Inspector: remove debugger support for out-of-process dedicated workers
https://bugs.webkit.org/show_bug.cgi?id=70602
Now that Chromium uses in-process dedicated workers, remove support for out-of-process
dedicated workers debugger.
Reviewed by Pavel Feldman.
* public/WebWorker.h:
* src/WebWorkerClientImpl.cpp:
(WebKit::WebWorkerClientImpl::connectToInspector):
(WebKit::WebWorkerClientImpl::disconnectFromInspector):
(WebKit::WebWorkerClientImpl::WebWorkerClientImpl):
* src/WebWorkerClientImpl.h:
* src/WebWorkerImpl.cpp:
* src/WebWorkerImpl.h:
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/WebWorker.h
trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp
trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h
trunk/Source/WebKit/chromium/src/WebWorkerImpl.cpp
trunk/Source/WebKit/chromium/src/WebWorkerImpl.h
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (98094 => 98095)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-21 12:02:58 UTC (rev 98094)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-21 12:39:08 UTC (rev 98095)
@@ -1,3 +1,22 @@
+2011-10-21 Yury Semikhatsky
+
+[Chromium] Web Inspector: remove debugger support for out-of-process dedicated workers
+https://bugs.webkit.org/show_bug.cgi?id=70602
+
+Now that Chromium uses in-process dedicated workers, remove support for out-of-process
+dedicated workers debugger.
+
+Reviewed by Pavel Feldman.
+
+* public/WebWorker.h:
+* src/WebWorkerClientImpl.cpp:
+(WebKit::WebWorkerClientImpl::connectToInspector):
+(WebKit::WebWorkerClientImpl::disconnectFromInspector):
+(WebKit::WebWorkerClientImpl::WebWorkerClientImpl):
+* src/WebWorkerClientImpl.h:
+* src/WebWorkerImpl.cpp:
+* src/WebWorkerImpl.h:
+
2011-10-20 Sheriff Bot
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/public/WebWorker.h (98094 => 98095)
--- trunk/Source/WebKit/chromium/public/WebWorker.h 2011-10-21 12:02:58 UTC (rev 98094)
+++ trunk/Source/WebKit/chromium/public/WebWorker.h 2011-10-21 12:39:08 UTC (rev 98095)
@@ -55,10 +55,6 @@
const WebMessagePortChannelArray&) = 0;
virtual void workerObjectDestroyed() = 0;
virtual void clientDestroyed() = 0;
-
-virtual void attachDevTools() { }
-virtual void detachDevTools() { }
-virtual void dispatchDevToolsMessage(const WebString&) { }
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (98094 => 98095)
--- trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2011-10-21 12:02:58 UTC (rev 98094)
+++ trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2011-10-21 12:39:08 UTC (rev 98095)
@@ -118,13 +118,10 @@
void WebWorkerClientImpl::connectToInspector(PageInspector* inspector)
{
m_proxy->connectToInspector(inspector);
-ASSERT(!m_pageInspector);
-m_pageInspector = inspector;
}
void WebWorkerClientImpl::disconnectFromInspector()
{
-m_pageInspector = 0;
m_proxy->disconnectFromInspector();
}
@@ -212,12 +209,6 @@
return !webView->permissionClient() || webView->permissionClient()->allowDatabase(m_webFrame, name, displayName, estimatedSize);
}
-void WebWorkerClientImpl::dispatchDevToolsMessage(const WebString& message)
-{
-if (m_pageInspector)
-m_pageInspector->dispatchMessageFromWorker(message);
-}
-
WebView* WebWorkerClientImpl::view() const
{
return m_webFrame->view();
@@ -227,8 +218,6 @@
: m_proxy(new WorkerMessagingProxy(worker))
, m_scriptExecutionContext(worker->scriptExecutionContext())
, m_webFrame(webFrame)
-, m_pageInspector(0)
-
{
}
Modified: trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h (98094 => 98095)
--- trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h 2011-10-21 12:02:58 UTC (rev 98094)
+++ trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h 2011-10-21 12:39:08 UTC (rev 98095)
@@ -105,8 +105,6 @@
virtual void openFileSystem(WebFileSystem::Type, long long size, bool create,
WebFileSystemCallbacks*);
-virtual void dispatchDevToolsMessage(const WebString&);
-
// WebCommentWorkerBase methods:
virtual NewWebCommonWorkerClient* newCommonClient() { return this; }
virtual WebView* view() const;
@@ -119,7 +117,6 @@
// Guard against context from being destroyed before a worker exits.
RefPtr m_scriptExecutionContext;
WebFrameImpl* m_webFrame;
-WebCore::WorkerContextProxy::PageInspector* m_pageInspector;
};
} // namespace WebKit;
Modified: trunk/Source/WebKit/chromium/src/WebWorkerImpl.cpp (98094 => 98095)
--- trunk/Source/WebKit/chromium/src/WebWorkerImpl.cpp 2011-10-21 12:02:58 UTC (rev 98094)
+++ trunk/Sour
[webkit-changes] [98094] trunk/LayoutTests
Title: [98094] trunk/LayoutTests Revision 98094 Author zol...@webkit.org Date 2011-10-21 05:02:58 -0700 (Fri, 21 Oct 2011) Log Message [Qt] fast/events/touch/page-scaled-touch-gesture-click.html is failing https://bugs.webkit.org/show_bug.cgi?id=70593 It was introduced in r97988. Skip it. * platform/qt/Skipped: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/qt/Skipped Diff Modified: trunk/LayoutTests/ChangeLog (98093 => 98094) --- trunk/LayoutTests/ChangeLog 2011-10-21 10:26:05 UTC (rev 98093) +++ trunk/LayoutTests/ChangeLog 2011-10-21 12:02:58 UTC (rev 98094) @@ -1,3 +1,12 @@ +2011-10-21 Zoltan Horvath + +[Qt] fast/events/touch/page-scaled-touch-gesture-click.html is failing +https://bugs.webkit.org/show_bug.cgi?id=70593 + +It was introduced in r97988. Skip it. + +* platform/qt/Skipped: + 2011-10-21 Andrey Kosyakov [Qt] 2 inspector/extensions tests times out on Mac and linux after r97850 Modified: trunk/LayoutTests/platform/qt/Skipped (98093 => 98094) --- trunk/LayoutTests/platform/qt/Skipped 2011-10-21 10:26:05 UTC (rev 98093) +++ trunk/LayoutTests/platform/qt/Skipped 2011-10-21 12:02:58 UTC (rev 98094) @@ -2464,3 +2464,8 @@ # https://bugs.webkit.org/show_bug.cgi?id=70414 inspector/extensions/extensions-events.html inspector/extensions/extensions-network.html + +# fast/events/touch/page-scaled-touch-gesture-click.html is failing +# Introduced in r97988. Failure: "Gesture manager is not implemented." +# https://bugs.webkit.org/show_bug.cgi?id=70593 +fast/events/touch/page-scaled-touch-gesture-click.html ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98092] trunk/Source/WebKit/qt
Title: [98092] trunk/Source/WebKit/qt
Revision 98092
Author o...@webkit.org
Date 2011-10-21 02:15:26 -0700 (Fri, 21 Oct 2011)
Log Message
[Qt][WK2] Typo fix.
* tests/util.h:
Modified Paths
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/tests/util.h
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (98091 => 98092)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-21 09:11:26 UTC (rev 98091)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-21 09:15:26 UTC (rev 98092)
@@ -1,5 +1,11 @@
2011-10-21 Csaba Osztrogonác
+[Qt][WK2] Typo fix.
+
+* tests/util.h:
+
+2011-10-21 Csaba Osztrogonác
+
[Qt][WK2] Buildfix for newer Qt5. Remove duplicated defines.
Reviewed by Simon Hausmann.
Modified: trunk/Source/WebKit/qt/tests/util.h (98091 => 98092)
--- trunk/Source/WebKit/qt/tests/util.h 2011-10-21 09:11:26 UTC (rev 98091)
+++ trunk/Source/WebKit/qt/tests/util.h 2011-10-21 09:15:26 UTC (rev 98092)
@@ -49,7 +49,7 @@
return timeoutSpy.isEmpty();
}
-#if QT_VERSION <= QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
// Will try to wait for the condition while allowing event processing
#define QTRY_VERIFY(__expr) \
do { \
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98091] trunk
Title: [98091] trunk Revision 98091 Author commit-qu...@webkit.org Date 2011-10-21 02:11:26 -0700 (Fri, 21 Oct 2011) Log Message bytecompiler sometimes generates incorrect bytecode for put_by_id https://bugs.webkit.org/show_bug.cgi?id=70403 Patch by Zheng Liu on 2011-10-21 Reviewed by Filip Pizlo. * bytecompiler/NodesCodegen.cpp: (JSC::AssignDotNode::emitBytecode): (JSC::AssignBracketNode::emitBytecode): Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp Added Paths trunk/LayoutTests/fast/js/codegen-assign-nontemporary-as-rexp-expected.txt trunk/LayoutTests/fast/js/codegen-assign-nontemporary-as-rexp.html trunk/LayoutTests/fast/js/script-tests/codegen-assign-nontemporary-as-rexp.js Diff Added: trunk/LayoutTests/fast/js/codegen-assign-nontemporary-as-rexp-expected.txt (0 => 98091) --- trunk/LayoutTests/fast/js/codegen-assign-nontemporary-as-rexp-expected.txt (rev 0) +++ trunk/LayoutTests/fast/js/codegen-assign-nontemporary-as-rexp-expected.txt 2011-10-21 09:11:26 UTC (rev 98091) @@ -0,0 +1,11 @@ +Tests whether bytecode codegen properly handles assignment as righthand _expression_. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +PASS assign_as_rexp_1() is 'PASS' +PASS assign_as_rexp_2() is 'PASS' +PASS successfullyParsed is true + +TEST COMPLETE + Added: trunk/LayoutTests/fast/js/codegen-assign-nontemporary-as-rexp.html (0 => 98091) --- trunk/LayoutTests/fast/js/codegen-assign-nontemporary-as-rexp.html (rev 0) +++ trunk/LayoutTests/fast/js/codegen-assign-nontemporary-as-rexp.html 2011-10-21 09:11:26 UTC (rev 98091) @@ -0,0 +1,10 @@ + + + +
[webkit-changes] [98090] trunk/Source
Title: [98090] trunk/Source
Revision 98090
Author o...@webkit.org
Date 2011-10-21 02:08:48 -0700 (Fri, 21 Oct 2011)
Log Message
[Qt][WK2] Buildfix for newer Qt5. Remove duplicated defines.
Reviewed by Simon Hausmann.
Source/WebKit/qt:
* tests/util.h:
Source/WebKit2:
* UIProcess/API/qt/tests/util.h:
Modified Paths
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/tests/util.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (98089 => 98090)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-21 09:00:56 UTC (rev 98089)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-21 09:08:48 UTC (rev 98090)
@@ -1,3 +1,11 @@
+2011-10-21 Csaba Osztrogonác
+
+[Qt][WK2] Buildfix for newer Qt5. Remove duplicated defines.
+
+Reviewed by Simon Hausmann.
+
+* tests/util.h:
+
2011-10-21 Sheriff Bot
Unreviewed, rolling out r98085.
Modified: trunk/Source/WebKit/qt/tests/util.h (98089 => 98090)
--- trunk/Source/WebKit/qt/tests/util.h 2011-10-21 09:00:56 UTC (rev 98089)
+++ trunk/Source/WebKit/qt/tests/util.h 2011-10-21 09:08:48 UTC (rev 98090)
@@ -49,6 +49,7 @@
return timeoutSpy.isEmpty();
}
+#if QT_VERSION <= QT_VERSION_CHECK(5, 0, 0)
// Will try to wait for the condition while allowing event processing
#define QTRY_VERIFY(__expr) \
do { \
@@ -76,3 +77,4 @@
} \
QCOMPARE(__expr, __expected); \
} while(0)
+#endif
Modified: trunk/Source/WebKit2/ChangeLog (98089 => 98090)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 09:00:56 UTC (rev 98089)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 09:08:48 UTC (rev 98090)
@@ -1,3 +1,11 @@
+2011-10-21 Csaba Osztrogonác
+
+[Qt][WK2] Buildfix for newer Qt5. Remove duplicated defines.
+
+Reviewed by Simon Hausmann.
+
+* UIProcess/API/qt/tests/util.h:
+
2011-10-21 Carlos Garcia Campos
Unreviewed. Fix WebKit2 GTK+ build after r98081.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h (98089 => 98090)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2011-10-21 09:00:56 UTC (rev 98089)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2011-10-21 09:08:48 UTC (rev 98090)
@@ -28,31 +28,3 @@
void addQtWebProcessToPath();
bool waitForSignal(QObject*, const char* signal, int timeout = 1);
-
-// Will try to wait for the condition while allowing event processing
-#define QTRY_VERIFY(__expr) \
-do { \
-const int __step = 50; \
-const int __timeout = 5000; \
-if (!(__expr)) { \
-QTest::qWait(0); \
-} \
-for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \
-QTest::qWait(__step); \
-} \
-QVERIFY(__expr); \
-} while(0)
-
-// Will try to wait for the condition while allowing event processing
-#define QTRY_COMPARE(__expr, __expected) \
-do { \
-const int __step = 50; \
-const int __timeout = 5000; \
-if ((__expr) != (__expected)) { \
-QTest::qWait(0); \
-} \
-for (int __i = 0; __i < __timeout && ((__expr) != (__expected)); __i+=__step) { \
-QTest::qWait(__step); \
-} \
-QCOMPARE(__expr, __expected); \
-} while(0)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98089] trunk/Source/WebKit2
Title: [98089] trunk/Source/WebKit2 Revision 98089 Author carlo...@webkit.org Date 2011-10-21 02:00:56 -0700 (Fri, 21 Oct 2011) Log Message 2011-10-21 Carlos Garcia Campos Unreviewed. Fix WebKit2 GTK+ build after r98081. * UIProcess/API/gtk/WebKitWebView.h: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h Diff Modified: trunk/Source/WebKit2/ChangeLog (98088 => 98089) --- trunk/Source/WebKit2/ChangeLog 2011-10-21 08:55:00 UTC (rev 98088) +++ trunk/Source/WebKit2/ChangeLog 2011-10-21 09:00:56 UTC (rev 98089) @@ -1,3 +1,9 @@ +2011-10-21 Carlos Garcia Campos + +Unreviewed. Fix WebKit2 GTK+ build after r98081. + +* UIProcess/API/gtk/WebKitWebView.h: + 2011-10-21 Sheriff Bot Unreviewed, rolling out r98085. Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (98088 => 98089) --- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 08:55:00 UTC (rev 98088) +++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 09:00:56 UTC (rev 98089) @@ -106,7 +106,7 @@ webkit_web_view_go_back (WebKitWebView *web_view); WEBKIT_API gboolean -webkit_web_view_can_go_back (WebKitWebView *web_view) +webkit_web_view_can_go_back (WebKitWebView *web_view); WEBKIT_API void webkit_web_view_go_forward (WebKitWebView *web_view); ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98088] trunk/Source
Title: [98088] trunk/Source
Revision 98088
Author commit-qu...@webkit.org
Date 2011-10-21 01:55:00 -0700 (Fri, 21 Oct 2011)
Log Message
Unreviewed, rolling out r98085.
http://trac.webkit.org/changeset/98085
https://bugs.webkit.org/show_bug.cgi?id=70589
It broke the build (Requested by Ossy on #webkit).
Patch by Sheriff Bot on 2011-10-21
Source/WebKit/qt:
* tests/util.h:
Source/WebKit2:
* UIProcess/API/qt/tests/util.h:
Modified Paths
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/tests/util.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (98087 => 98088)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-21 08:49:35 UTC (rev 98087)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-21 08:55:00 UTC (rev 98088)
@@ -1,3 +1,13 @@
+2011-10-21 Sheriff Bot
+
+Unreviewed, rolling out r98085.
+http://trac.webkit.org/changeset/98085
+https://bugs.webkit.org/show_bug.cgi?id=70589
+
+It broke the build (Requested by Ossy on #webkit).
+
+* tests/util.h:
+
2011-10-21 Csaba Osztrogonác
[Qt][WK2] Unreviewed buildfix for newer Qt5. Remove duplicated defines.
Modified: trunk/Source/WebKit/qt/tests/util.h (98087 => 98088)
--- trunk/Source/WebKit/qt/tests/util.h 2011-10-21 08:49:35 UTC (rev 98087)
+++ trunk/Source/WebKit/qt/tests/util.h 2011-10-21 08:55:00 UTC (rev 98088)
@@ -48,3 +48,31 @@
loop.exec();
return timeoutSpy.isEmpty();
}
+
+// Will try to wait for the condition while allowing event processing
+#define QTRY_VERIFY(__expr) \
+do { \
+const int __step = 50; \
+const int __timeout = 5000; \
+if (!(__expr)) { \
+QTest::qWait(0); \
+} \
+for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \
+QTest::qWait(__step); \
+} \
+QVERIFY(__expr); \
+} while(0)
+
+// Will try to wait for the condition while allowing event processing
+#define QTRY_COMPARE(__expr, __expected) \
+do { \
+const int __step = 50; \
+const int __timeout = 5000; \
+if ((__expr) != (__expected)) { \
+QTest::qWait(0); \
+} \
+for (int __i = 0; __i < __timeout && ((__expr) != (__expected)); __i+=__step) { \
+QTest::qWait(__step); \
+} \
+QCOMPARE(__expr, __expected); \
+} while(0)
Modified: trunk/Source/WebKit2/ChangeLog (98087 => 98088)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 08:49:35 UTC (rev 98087)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 08:55:00 UTC (rev 98088)
@@ -1,3 +1,13 @@
+2011-10-21 Sheriff Bot
+
+Unreviewed, rolling out r98085.
+http://trac.webkit.org/changeset/98085
+https://bugs.webkit.org/show_bug.cgi?id=70589
+
+It broke the build (Requested by Ossy on #webkit).
+
+* UIProcess/API/qt/tests/util.h:
+
2011-10-21 Carlos Garcia Campos
[GTK] Fix API documentation comment for webkit_web_view_get_estimated_load_progress()
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h (98087 => 98088)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2011-10-21 08:49:35 UTC (rev 98087)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2011-10-21 08:55:00 UTC (rev 98088)
@@ -28,3 +28,31 @@
void addQtWebProcessToPath();
bool waitForSignal(QObject*, const char* signal, int timeout = 1);
+
+// Will try to wait for the condition while allowing event processing
+#define QTRY_VERIFY(__expr) \
+do { \
+const int __step = 50; \
+const int __timeout = 5000; \
+if (!(__expr)) { \
+QTest::qWait(0); \
+} \
+for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \
+QTest::qWait(__step); \
+} \
+QVERIFY(__expr); \
+} while(0)
+
+// Will try to wait for the condition while allowing event processing
+#define QTRY_COMPARE(__expr, __expected) \
+do { \
+const int __step = 50; \
+const int __timeout = 5000; \
+if ((__expr) != (__expected)) { \
+QTest::qWait(0); \
+} \
+for (int __i = 0; __i < __timeout && ((__expr) != (__expected)); __i+=__step) { \
+QTest::qWait(__step); \
+} \
+QCOMPARE(__expr, __expected); \
+} while(0)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98087] trunk/LayoutTests
Title: [98087] trunk/LayoutTests
Revision 98087
Author ca...@chromium.org
Date 2011-10-21 01:49:35 -0700 (Fri, 21 Oct 2011)
Log Message
[Qt] 2 inspector/extensions tests times out on Mac and linux after r97850
https://bugs.webkit.org/show_bug.cgi?id=70414
Unreviewed. Skipped inspector/extensions/extensions-{events,network}.html
* platform/qt/Skipped:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/qt/Skipped
Diff
Modified: trunk/LayoutTests/ChangeLog (98086 => 98087)
--- trunk/LayoutTests/ChangeLog 2011-10-21 08:44:49 UTC (rev 98086)
+++ trunk/LayoutTests/ChangeLog 2011-10-21 08:49:35 UTC (rev 98087)
@@ -1,3 +1,12 @@
+2011-10-21 Andrey Kosyakov
+
+[Qt] 2 inspector/extensions tests times out on Mac and linux after r97850
+https://bugs.webkit.org/show_bug.cgi?id=70414
+
+Unreviewed. Skipped inspector/extensions/extensions-{events,network}.html
+
+* platform/qt/Skipped:
+
2011-10-03 Kent Tamura
Add tests to check behavior of border attribute with a large number or an invalid value.
Modified: trunk/LayoutTests/platform/qt/Skipped (98086 => 98087)
--- trunk/LayoutTests/platform/qt/Skipped 2011-10-21 08:44:49 UTC (rev 98086)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-10-21 08:49:35 UTC (rev 98087)
@@ -2460,3 +2460,7 @@
# REGRESSION(r97881): It broke fast/dom/error-to-string-stack-overflow.html
# https://bugs.webkit.org/show_bug.cgi?id=70476
fast/dom/error-to-string-stack-overflow.html
+
+# https://bugs.webkit.org/show_bug.cgi?id=70414
+inspector/extensions/extensions-events.html
+inspector/extensions/extensions-network.html
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98086] trunk/Source/WebKit2
Title: [98086] trunk/Source/WebKit2 Revision 98086 Author carlo...@webkit.org Date 2011-10-21 01:44:49 -0700 (Fri, 21 Oct 2011) Log Message [GTK] Fix API documentation comment for webkit_web_view_get_estimated_load_progress() https://bugs.webkit.org/show_bug.cgi?id=70587 Reviewed by Philippe Normand. It's should start with /** to be recognized as API documentation. * UIProcess/API/gtk/WebKitWebView.cpp: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (98085 => 98086) --- trunk/Source/WebKit2/ChangeLog 2011-10-21 08:40:06 UTC (rev 98085) +++ trunk/Source/WebKit2/ChangeLog 2011-10-21 08:44:49 UTC (rev 98086) @@ -1,3 +1,14 @@ +2011-10-21 Carlos Garcia Campos + +[GTK] Fix API documentation comment for webkit_web_view_get_estimated_load_progress() +https://bugs.webkit.org/show_bug.cgi?id=70587 + +Reviewed by Philippe Normand. + +It's should start with /** to be recognized as API documentation. + +* UIProcess/API/gtk/WebKitWebView.cpp: + 2011-10-21 Csaba Osztrogonác [Qt][WK2] Unreviewed buildfix for newer Qt5. Remove duplicated defines. Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (98085 => 98086) --- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 08:40:06 UTC (rev 98085) +++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 08:44:49 UTC (rev 98086) @@ -435,7 +435,7 @@ WKPageSetCustomTextEncodingName(toAPI(page), wkEncodingName.get()); } -/* +/** * webkit_web_view_get_estimated_load_progress: * @web_view: a #WebKitWebView * ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98085] trunk/Source
Title: [98085] trunk/Source
Revision 98085
Author o...@webkit.org
Date 2011-10-21 01:40:06 -0700 (Fri, 21 Oct 2011)
Log Message
[Qt][WK2] Unreviewed buildfix for newer Qt5. Remove duplicated defines.
Source/WebKit/qt:
* tests/util.h:
(waitForSignal):
Source/WebKit2:
* UIProcess/API/qt/tests/util.h:
Modified Paths
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/tests/util.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (98084 => 98085)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-21 08:32:01 UTC (rev 98084)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-21 08:40:06 UTC (rev 98085)
@@ -1,3 +1,10 @@
+2011-10-21 Csaba Osztrogonác
+
+[Qt][WK2] Unreviewed buildfix for newer Qt5. Remove duplicated defines.
+
+* tests/util.h:
+(waitForSignal):
+
2011-10-20 Carol Szabo
Tiled Backing Store does not regenerate tiles when it should
Modified: trunk/Source/WebKit/qt/tests/util.h (98084 => 98085)
--- trunk/Source/WebKit/qt/tests/util.h 2011-10-21 08:32:01 UTC (rev 98084)
+++ trunk/Source/WebKit/qt/tests/util.h 2011-10-21 08:40:06 UTC (rev 98085)
@@ -48,31 +48,3 @@
loop.exec();
return timeoutSpy.isEmpty();
}
-
-// Will try to wait for the condition while allowing event processing
-#define QTRY_VERIFY(__expr) \
-do { \
-const int __step = 50; \
-const int __timeout = 5000; \
-if (!(__expr)) { \
-QTest::qWait(0); \
-} \
-for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \
-QTest::qWait(__step); \
-} \
-QVERIFY(__expr); \
-} while(0)
-
-// Will try to wait for the condition while allowing event processing
-#define QTRY_COMPARE(__expr, __expected) \
-do { \
-const int __step = 50; \
-const int __timeout = 5000; \
-if ((__expr) != (__expected)) { \
-QTest::qWait(0); \
-} \
-for (int __i = 0; __i < __timeout && ((__expr) != (__expected)); __i+=__step) { \
-QTest::qWait(__step); \
-} \
-QCOMPARE(__expr, __expected); \
-} while(0)
Modified: trunk/Source/WebKit2/ChangeLog (98084 => 98085)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 08:32:01 UTC (rev 98084)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 08:40:06 UTC (rev 98085)
@@ -1,3 +1,9 @@
+2011-10-21 Csaba Osztrogonác
+
+[Qt][WK2] Unreviewed buildfix for newer Qt5. Remove duplicated defines.
+
+* UIProcess/API/qt/tests/util.h:
+
2011-10-21 Carlos Garcia Campos
[GTK] Add can_go_back/forward methods to WebKit2 GTK+ API
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h (98084 => 98085)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2011-10-21 08:32:01 UTC (rev 98084)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2011-10-21 08:40:06 UTC (rev 98085)
@@ -28,31 +28,3 @@
void addQtWebProcessToPath();
bool waitForSignal(QObject*, const char* signal, int timeout = 1);
-
-// Will try to wait for the condition while allowing event processing
-#define QTRY_VERIFY(__expr) \
-do { \
-const int __step = 50; \
-const int __timeout = 5000; \
-if (!(__expr)) { \
-QTest::qWait(0); \
-} \
-for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \
-QTest::qWait(__step); \
-} \
-QVERIFY(__expr); \
-} while(0)
-
-// Will try to wait for the condition while allowing event processing
-#define QTRY_COMPARE(__expr, __expected) \
-do { \
-const int __step = 50; \
-const int __timeout = 5000; \
-if ((__expr) != (__expected)) { \
-QTest::qWait(0); \
-} \
-for (int __i = 0; __i < __timeout && ((__expr) != (__expected)); __i+=__step) { \
-QTest::qWait(__step); \
-} \
-QCOMPARE(__expr, __expected); \
-} while(0)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98084] trunk/Source/WebKit/efl
Title: [98084] trunk/Source/WebKit/efl
Revision 98084
Author commit-qu...@webkit.org
Date 2011-10-21 01:32:01 -0700 (Fri, 21 Oct 2011)
Log Message
[EFL] ewk_view_mode_get uses dedicated macros instead of standard NULL checking.
https://bugs.webkit.org/show_bug.cgi?id=65680
Patch by Grzegorz Czajkowski on 2011-10-21
Reviewed by Ryosuke Niwa.
Generally API methods using macros NULL checking in WebKit-EFL.
The macros ensure that code is smaller, version of view object
is checked and error message is displayed if NULL is passed.
* ewk/ewk_view.cpp:
(ewk_view_mode_get):
Modified Paths
trunk/Source/WebKit/efl/ChangeLog
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (98083 => 98084)
--- trunk/Source/WebKit/efl/ChangeLog 2011-10-21 08:24:08 UTC (rev 98083)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-10-21 08:32:01 UTC (rev 98084)
@@ -1,3 +1,17 @@
+2011-10-21 Grzegorz Czajkowski
+
+[EFL] ewk_view_mode_get uses dedicated macros instead of standard NULL checking.
+https://bugs.webkit.org/show_bug.cgi?id=65680
+
+Reviewed by Ryosuke Niwa.
+
+Generally API methods using macros NULL checking in WebKit-EFL.
+The macros ensure that code is smaller, version of view object
+is checked and error message is displayed if NULL is passed.
+
+* ewk/ewk_view.cpp:
+(ewk_view_mode_get):
+
2011-10-19 Rafael Antognolli
[EFL] Fix typos on ewk_view and ewk_js.
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (98083 => 98084)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2011-10-21 08:24:08 UTC (rev 98083)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2011-10-21 08:32:01 UTC (rev 98084)
@@ -3788,14 +3788,9 @@
Ewk_View_Mode ewk_view_mode_get(const Evas_Object* ewkView)
{
Ewk_View_Mode mode = EWK_VIEW_MODE_WINDOWED;
+EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, mode);
+EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, mode);
-EWK_VIEW_SD_GET(ewkView, sd);
-if (!sd)
-return mode;
-EWK_VIEW_PRIV_GET(sd, priv);
-if (!priv)
-return mode;
-
switch (priv->page->viewMode()) {
case WebCore::Page::ViewModeFloating:
mode = EWK_VIEW_MODE_FLOATING;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98083] trunk/LayoutTests
Title: [98083] trunk/LayoutTests Revision 98083 Author tk...@chromium.org Date 2011-10-21 01:24:08 -0700 (Fri, 21 Oct 2011) Log Message Add tests to check behavior of border attribute with a large number or an invalid value. https://bugs.webkit.org/show_bug.cgi?id=69055 Reviewed by Daniel Bates. r96290 changed the behavior of integer parsing so that large number strings which can not be represented in 32 bit integers makes an error. However, border attribute behavior wasn't changed by r96290 because its default value is 0 and parseHTMLNonNegativeInteger() had set 0 in a case of overflow. * fast/dom/HTMLImageElement/image-with-invalid-border-expected.html: Added. * fast/dom/HTMLImageElement/image-with-invalid-border.html: Added. * fast/dom/HTMLInputElement/input-with-invalid-border-expected.html: Added. * fast/dom/HTMLInputElement/input-with-invalid-border.html: Added. * fast/dom/HTMLObjectElement/object-with-invalid-border-expected.html: Added. * fast/dom/HTMLObjectElement/object-with-invalid-border.html: Added. Modified Paths trunk/LayoutTests/ChangeLog Added Paths trunk/LayoutTests/fast/dom/HTMLImageElement/image-with-invalid-border-expected.html trunk/LayoutTests/fast/dom/HTMLImageElement/image-with-invalid-border.html trunk/LayoutTests/fast/dom/HTMLInputElement/input-with-invalid-border-expected.html trunk/LayoutTests/fast/dom/HTMLInputElement/input-with-invalid-border.html trunk/LayoutTests/fast/dom/HTMLObjectElement/object-with-invalid-border-expected.html trunk/LayoutTests/fast/dom/HTMLObjectElement/object-with-invalid-border.html Diff Modified: trunk/LayoutTests/ChangeLog (98082 => 98083) --- trunk/LayoutTests/ChangeLog 2011-10-21 08:19:03 UTC (rev 98082) +++ trunk/LayoutTests/ChangeLog 2011-10-21 08:24:08 UTC (rev 98083) @@ -1,3 +1,23 @@ +2011-10-03 Kent Tamura + +Add tests to check behavior of border attribute with a large number or an invalid value. +https://bugs.webkit.org/show_bug.cgi?id=69055 + +Reviewed by Daniel Bates. + +r96290 changed the behavior of integer parsing so that large +number strings which can not be represented in 32 bit integers +makes an error. However, border attribute behavior wasn't changed +by r96290 because its default value is 0 and +parseHTMLNonNegativeInteger() had set 0 in a case of overflow. + +* fast/dom/HTMLImageElement/image-with-invalid-border-expected.html: Added. +* fast/dom/HTMLImageElement/image-with-invalid-border.html: Added. +* fast/dom/HTMLInputElement/input-with-invalid-border-expected.html: Added. +* fast/dom/HTMLInputElement/input-with-invalid-border.html: Added. +* fast/dom/HTMLObjectElement/object-with-invalid-border-expected.html: Added. +* fast/dom/HTMLObjectElement/object-with-invalid-border.html: Added. + 2011-10-20 Andrey Kosyakov Web Inspector: make extension tests pass on chromium Added: trunk/LayoutTests/fast/dom/HTMLImageElement/image-with-invalid-border-expected.html (0 => 98083) --- trunk/LayoutTests/fast/dom/HTMLImageElement/image-with-invalid-border-expected.html (rev 0) +++ trunk/LayoutTests/fast/dom/HTMLImageElement/image-with-invalid-border-expected.html 2011-10-21 08:24:08 UTC (rev 98083) @@ -0,0 +1,6 @@ + + +Img elements with invalid border attribute should have the same appearance as an img element without border attribute. + Property changes on: trunk/LayoutTests/fast/dom/HTMLImageElement/image-with-invalid-border-expected.html ___ Added: svn:eol-style Added: trunk/LayoutTests/fast/dom/HTMLImageElement/image-with-invalid-border.html (0 => 98083) --- trunk/LayoutTests/fast/dom/HTMLImageElement/image-with-invalid-border.html (rev 0) +++ trunk/LayoutTests/fast/dom/HTMLImageElement/image-with-invalid-border.html 2011-10-21 08:24:08 UTC (rev 98083) @@ -0,0 +1,6 @@ + + +Img elements with invalid border attribute should have the same appearance as an img element without border attribute. + + + Property changes on: trunk/LayoutTests/fast/dom/HTMLImageElement/image-with-invalid-border.html ___ Added: svn:eol-style Added: trunk/LayoutTests/fast/dom/HTMLInputElement/input-with-invalid-border-expected.html (0 => 98083) --- trunk/LayoutTests/fast/dom/HTMLInputElement/input-with-invalid-border-expected.html (rev 0) +++ trunk/LayoutTests/fast/dom/HTMLInputElement/input-with-invalid-border-expected.html 2011-10-21 08:24:08 UTC (rev 98083) @@ -0,0 +1,6 @@ + + +Image input elements with invalid border attribute should have the same appearance as an image input element without border attribute. + + + Property changes on: trunk/LayoutTests/fast/dom/HTMLInputElement/input-with-invalid-border-expected.html ___ Added: svn:eol-s
[webkit-changes] [98082] trunk/Source/JavaScriptCore
Title: [98082] trunk/Source/_javascript_Core
Revision 98082
Author fpi...@apple.com
Date 2011-10-21 01:19:03 -0700 (Fri, 21 Oct 2011)
Log Message
DFG should not try to predict argument types by looking at the values of
argument registers at the time of compilation
https://bugs.webkit.org/show_bug.cgi?id=70578
Reviewed by Oliver Hunt.
* bytecode/CodeBlock.cpp:
* dfg/DFGDriver.cpp:
(JSC::DFG::compile):
(JSC::DFG::tryCompile):
(JSC::DFG::tryCompileFunction):
* dfg/DFGDriver.h:
(JSC::DFG::tryCompileFunction):
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::predictArgumentTypes):
* dfg/DFGGraph.h:
* runtime/Executable.cpp:
(JSC::FunctionExecutable::compileOptimizedForCall):
(JSC::FunctionExecutable::compileOptimizedForConstruct):
(JSC::FunctionExecutable::compileForCallInternal):
(JSC::FunctionExecutable::compileForConstructInternal):
* runtime/Executable.h:
(JSC::FunctionExecutable::compileForCall):
(JSC::FunctionExecutable::compileForConstruct):
(JSC::FunctionExecutable::compileFor):
(JSC::FunctionExecutable::compileOptimizedFor):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp
trunk/Source/_javascript_Core/dfg/DFGDriver.cpp
trunk/Source/_javascript_Core/dfg/DFGDriver.h
trunk/Source/_javascript_Core/dfg/DFGGraph.cpp
trunk/Source/_javascript_Core/dfg/DFGGraph.h
trunk/Source/_javascript_Core/runtime/Executable.cpp
trunk/Source/_javascript_Core/runtime/Executable.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (98081 => 98082)
--- trunk/Source/_javascript_Core/ChangeLog 2011-10-21 08:17:03 UTC (rev 98081)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-10-21 08:19:03 UTC (rev 98082)
@@ -1,5 +1,34 @@
2011-10-20 Filip Pizlo
+DFG should not try to predict argument types by looking at the values of
+argument registers at the time of compilation
+https://bugs.webkit.org/show_bug.cgi?id=70578
+
+Reviewed by Oliver Hunt.
+
+* bytecode/CodeBlock.cpp:
+* dfg/DFGDriver.cpp:
+(JSC::DFG::compile):
+(JSC::DFG::tryCompile):
+(JSC::DFG::tryCompileFunction):
+* dfg/DFGDriver.h:
+(JSC::DFG::tryCompileFunction):
+* dfg/DFGGraph.cpp:
+(JSC::DFG::Graph::predictArgumentTypes):
+* dfg/DFGGraph.h:
+* runtime/Executable.cpp:
+(JSC::FunctionExecutable::compileOptimizedForCall):
+(JSC::FunctionExecutable::compileOptimizedForConstruct):
+(JSC::FunctionExecutable::compileForCallInternal):
+(JSC::FunctionExecutable::compileForConstructInternal):
+* runtime/Executable.h:
+(JSC::FunctionExecutable::compileForCall):
+(JSC::FunctionExecutable::compileForConstruct):
+(JSC::FunctionExecutable::compileFor):
+(JSC::FunctionExecutable::compileOptimizedFor):
+
+2011-10-20 Filip Pizlo
+
DFG call optimization handling will fail if the call had been unlinked due
to the callee being optimized
https://bugs.webkit.org/show_bug.cgi?id=70468
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (98081 => 98082)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2011-10-21 08:17:03 UTC (rev 98081)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2011-10-21 08:19:03 UTC (rev 98082)
@@ -1827,16 +1827,6 @@
}
#if ENABLE(JIT)
-// FIXME: Implement OSR. If compileOptimized() is called from somewhere other than the
-// epilogue, do OSR from the old code block to the new one.
-
-// FIXME: After doing successful optimized compilation, reset the profiling counter to -1, so
-// that the next execution of the old code block will jump straight into compileOptimized()
-// and perform OSR.
-
-// FIXME: Ensure that a call to compileOptimized() just does OSR (and resets the counter to -1)
-// if the code had already been compiled.
-
CodeBlock* ProgramCodeBlock::replacement()
{
return &static_cast(ownerExecutable())->generatedBytecode();
Modified: trunk/Source/_javascript_Core/dfg/DFGDriver.cpp (98081 => 98082)
--- trunk/Source/_javascript_Core/dfg/DFGDriver.cpp 2011-10-21 08:17:03 UTC (rev 98081)
+++ trunk/Source/_javascript_Core/dfg/DFGDriver.cpp 2011-10-21 08:19:03 UTC (rev 98082)
@@ -35,7 +35,7 @@
namespace JSC { namespace DFG {
enum CompileMode { CompileFunction, CompileOther };
-inline bool compile(CompileMode compileMode, ExecState* exec, ExecState* calleeArgsExec, CodeBlock* codeBlock, JITCode& jitCode, MacroAssemblerCodePtr* jitCodeWithArityCheck)
+inline bool compile(CompileMode compileMode, ExecState* exec, CodeBlock* codeBlock, JITCode& jitCode, MacroAssemblerCodePtr* jitCodeWithArityCheck)
{
JSGlobalData* globalData = &exec->globalData();
Graph dfg;
@@ -43,7 +43,7 @@
return false;
if (compileMode == CompileFunction)
-dfg.predictArgumentTypes(calleeArgsExec, codeBlock);
+dfg.predictArgumentTypes(codeBlock);
propagate(dfg, globalData, codeBlock);
@@ -64,12 +6
[webkit-changes] [98081] trunk/Source/WebKit2
Title: [98081] trunk/Source/WebKit2
Revision 98081
Author carlo...@webkit.org
Date 2011-10-21 01:17:03 -0700 (Fri, 21 Oct 2011)
Log Message
[GTK] Add can_go_back/forward methods to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=69823
Reviewed by Martin Robinson.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_go_back):
(webkit_web_view_can_go_back):
(webkit_web_view_go_forward):
(webkit_web_view_can_go_forward):
* UIProcess/API/gtk/WebKitWebView.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98080 => 98081)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 08:09:05 UTC (rev 98080)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 08:17:03 UTC (rev 98081)
@@ -1,5 +1,19 @@
2011-10-21 Carlos Garcia Campos
+[GTK] Add can_go_back/forward methods to WebKit2 GTK+ API
+https://bugs.webkit.org/show_bug.cgi?id=69823
+
+Reviewed by Martin Robinson.
+
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkit_web_view_go_back):
+(webkit_web_view_can_go_back):
+(webkit_web_view_go_forward):
+(webkit_web_view_can_go_forward):
+* UIProcess/API/gtk/WebKitWebView.h:
+
+2011-10-21 Carlos Garcia Campos
+
[GTK] Add webkit_web_view_stop_loading() to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=69610
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (98080 => 98081)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 08:09:05 UTC (rev 98080)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 08:17:03 UTC (rev 98081)
@@ -345,11 +345,25 @@
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
-WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
-WKPageGoBack(toAPI(page));
+WKPageGoBack(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView;
}
/**
+ * webkit_web_view_can_go_back:
+ * @web_view: a #WebKitWebView
+ *
+ * Determines whether @web_view has a previous history item.
+ *
+ * Returns: %TRUE if able to move back or %FALSE otherwise.
+ */
+gboolean webkit_web_view_can_go_back(WebKitWebView* webView)
+{
+g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
+
+return WKPageCanGoBack(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView;
+}
+
+/**
* webkit_web_view_go_forward:
* @web_view: a #WebKitWebView
*
@@ -361,11 +375,25 @@
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
-WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
-WKPageGoForward(toAPI(page));
+WKPageGoForward(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView;
}
/**
+ * webkit_web_view_can_go_forward:
+ * @web_view: a #WebKitWebView
+ *
+ * Determines whether @web_view has a next history item.
+ *
+ * Returns: %TRUE if able to move forward or %FALSE otherwise.
+ */
+gboolean webkit_web_view_can_go_forward(WebKitWebView* webView)
+{
+g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
+
+return WKPageCanGoForward(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView;
+}
+
+/**
* webkit_web_view_get_custom_charset:
* @web_view: a #WebKitWebView
*
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (98080 => 98081)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 08:09:05 UTC (rev 98080)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 08:17:03 UTC (rev 98081)
@@ -105,9 +105,15 @@
WEBKIT_API void
webkit_web_view_go_back (WebKitWebView *web_view);
+WEBKIT_API gboolean
+webkit_web_view_can_go_back (WebKitWebView *web_view)
+
WEBKIT_API void
webkit_web_view_go_forward (WebKitWebView *web_view);
+WEBKIT_API gboolean
+webkit_web_view_can_go_forward (WebKitWebView *web_view);
+
WEBKIT_API const gchar *
webkit_web_view_get_custom_charset (WebKitWebView *web_view);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [98080] trunk/Source/WebKit2
Title: [98080] trunk/Source/WebKit2
Revision 98080
Author carlo...@webkit.org
Date 2011-10-21 01:09:05 -0700 (Fri, 21 Oct 2011)
Log Message
[GTK] Add webkit_web_view_stop_loading() to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=69610
Reviewed by Martin Robinson.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_stop_loading):
* UIProcess/API/gtk/WebKitWebView.h:
* UIProcess/API/gtk/tests/LoadTrackingTest.cpp:
(provisionalLoadFailedCallback):
(loadFailedCallback):
* UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp:
(LoadStopTrackingTest::loadCommitted):
(LoadStopTrackingTest::loadFailed):
(LoadStopTrackingTest::loadFinished):
(testLoadCancelled):
(serverCallback):
(beforeAll):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98079 => 98080)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 07:51:42 UTC (rev 98079)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 08:09:05 UTC (rev 98080)
@@ -1,3 +1,24 @@
+2011-10-21 Carlos Garcia Campos
+
+[GTK] Add webkit_web_view_stop_loading() to WebKit2 GTK+ API
+https://bugs.webkit.org/show_bug.cgi?id=69610
+
+Reviewed by Martin Robinson.
+
+* UIProcess/API/gtk/WebKitWebView.cpp:
+(webkit_web_view_stop_loading):
+* UIProcess/API/gtk/WebKitWebView.h:
+* UIProcess/API/gtk/tests/LoadTrackingTest.cpp:
+(provisionalLoadFailedCallback):
+(loadFailedCallback):
+* UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp:
+(LoadStopTrackingTest::loadCommitted):
+(LoadStopTrackingTest::loadFailed):
+(LoadStopTrackingTest::loadFinished):
+(testLoadCancelled):
+(serverCallback):
+(beforeAll):
+
2011-10-20 Jesus Sanchez-Palencia
[Qt][WK2] qweberror* should follow the new file and class naming rules
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (98079 => 98080)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 07:51:42 UTC (rev 98079)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 08:09:05 UTC (rev 98080)
@@ -315,6 +315,25 @@
}
/**
+ * webkit_web_view_stop_loading:
+ * @web_view: a #WebKitWebView
+ *
+ * Stops any ongoing loading operation in @web_view.
+ * This method does nothing if no content is being loaded.
+ * If there is a loading operation in progress, it will be cancelled and
+ * #WebKitWebLoaderClient::provisional-load-failed or
+ * #WebKitWebLoaderClient::load-failed will be emitted on the current
+ * #WebKitWebLoaderClient with %WEBKIT_NETWORK_ERROR_CANCELLED error.
+ * See also webkit_web_view_get_loader_client().
+ */
+void webkit_web_view_stop_loading(WebKitWebView* webView)
+{
+g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
+
+WKPageStopLoading(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView;
+}
+
+/**
* webkit_web_view_go_back:
* @web_view: a #WebKitWebView
*
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (98079 => 98080)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 07:51:42 UTC (rev 98079)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 08:09:05 UTC (rev 98080)
@@ -94,6 +94,9 @@
const gchar *unreachable_uri);
WEBKIT_API void
+webkit_web_view_stop_loading(WebKitWebView *web_view);
+
+WEBKIT_API void
webkit_web_view_reload (WebKitWebView *web_view);
WEBKIT_API void
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp (98079 => 98080)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp 2011-10-21 07:51:42 UTC (rev 98079)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp 2011-10-21 08:09:05 UTC (rev 98080)
@@ -36,6 +36,7 @@
static gboolean provisionalLoadFailedCallback(WebKitWebLoaderClient* client, WebKitWebView*, const gchar* failingURI, GError* error, LoadTrackingTest* test)
{
+g_assert(error);
test->provisionalLoadFailed(client, failingURI, error);
return TRUE;
}
@@ -54,6 +55,7 @@
static gboolean loadFailedCallback(WebKitWebLoaderClient* client, WebKitWebView*, const gchar* failingURI, GError* error, LoadTrackingTest* test)
{
+g_assert(error);
test->loadFailed(client, failingURI, error);
return TRUE;
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp (98079 => 98080)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp 2011-10-21 07:51:42 UTC (rev 98079)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp 2011-10-21 08:09:05
[webkit-changes] [98079] trunk
Title: [98079] trunk
Revision 98079
Author ca...@chromium.org
Date 2011-10-21 00:51:42 -0700 (Fri, 21 Oct 2011)
Log Message
Web Inspector: make extension tests pass on chromium
https://bugs.webkit.org/show_bug.cgi?id=70334
Reviewed by Pavel Feldman.
LayoutTests:
* http/tests/inspector/extensions-headers.html:
* http/tests/inspector/resources/extension-main.js:
():
* inspector/extensions/extensions-audits.html:
* inspector/extensions/extensions-console.html:
* inspector/extensions/extensions-resources.html:
* platform/chromium/inspector/extensions/extensions-api-expected.txt: Added.
* platform/chromium/inspector/extensions/extensions-eval-expected.txt: Added.
* platform/chromium/test_expectations.txt:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/inspector/extensions-headers.html
trunk/LayoutTests/http/tests/inspector/resources/extension-main.js
trunk/LayoutTests/inspector/extensions/extensions-audits.html
trunk/LayoutTests/inspector/extensions/extensions-console.html
trunk/LayoutTests/inspector/extensions/extensions-resources.html
trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/ExtensionAPI.js
Added Paths
trunk/LayoutTests/platform/chromium/inspector/extensions/extensions-api-expected.txt
trunk/LayoutTests/platform/chromium/inspector/extensions/extensions-eval-expected.txt
Diff
Modified: trunk/LayoutTests/ChangeLog (98078 => 98079)
--- trunk/LayoutTests/ChangeLog 2011-10-21 07:19:31 UTC (rev 98078)
+++ trunk/LayoutTests/ChangeLog 2011-10-21 07:51:42 UTC (rev 98079)
@@ -1,3 +1,20 @@
+2011-10-20 Andrey Kosyakov
+
+Web Inspector: make extension tests pass on chromium
+https://bugs.webkit.org/show_bug.cgi?id=70334
+
+Reviewed by Pavel Feldman.
+
+* http/tests/inspector/extensions-headers.html:
+* http/tests/inspector/resources/extension-main.js:
+():
+* inspector/extensions/extensions-audits.html:
+* inspector/extensions/extensions-console.html:
+* inspector/extensions/extensions-resources.html:
+* platform/chromium/inspector/extensions/extensions-api-expected.txt: Added.
+* platform/chromium/inspector/extensions/extensions-eval-expected.txt: Added.
+* platform/chromium/test_expectations.txt:
+
2011-10-21 Yuzo Fujishima
[chromium] Test expectation change: fast/canvas/webgl/WebGLContextEvent.html now passes.
Modified: trunk/LayoutTests/http/tests/inspector/extensions-headers.html (98078 => 98079)
--- trunk/LayoutTests/http/tests/inspector/extensions-headers.html 2011-10-21 07:19:31 UTC (rev 98078)
+++ trunk/LayoutTests/http/tests/inspector/extensions-headers.html 2011-10-21 07:51:42 UTC (rev 98079)
@@ -6,13 +6,13 @@
function extension_testAddHeaders(nextTest)
{
-webInspector.resources.addRequestHeaders({
+webInspector.network.addRequestHeaders({
"x-webinspector-extension": "test",
"user-agent": "Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 6.0)"
});
function cleanUpHeaders()
{
-webInspector.resources.addRequestHeaders({
+webInspector.network.addRequestHeaders({
"x-webinspector-extension": null,
"user-agent": null
});
Modified: trunk/LayoutTests/http/tests/inspector/resources/extension-main.js (98078 => 98079)
--- trunk/LayoutTests/http/tests/inspector/resources/extension-main.js 2011-10-21 07:19:31 UTC (rev 98078)
+++ trunk/LayoutTests/http/tests/inspector/resources/extension-main.js 2011-10-21 07:51:42 UTC (rev 98079)
@@ -50,7 +50,9 @@
channel.port1.start();
if (callback)
channel.port1.addEventListener("message", callbackWrapper, false);
-top.postMessage({ _expression_: _expression_ }, [ channel.port2 ], "*");
+webInspector.inspectedWindow.eval("", function() {
+top.postMessage({ _expression_: _expression_ }, [ channel.port2 ], "*");
+});
}
function output(message)
Modified: trunk/LayoutTests/inspector/extensions/extensions-audits.html (98078 => 98079)
--- trunk/LayoutTests/inspector/extensions/extensions-audits.html 2011-10-21 07:19:31 UTC (rev 98078)
+++ trunk/LayoutTests/inspector/extensions/extensions-audits.html 2011-10-21 07:51:42 UTC (rev 98079)
@@ -20,7 +20,7 @@
var nestedNode = node.addChild("... and a snippet");
nestedNode.expanded = true;
nestedNode.addChild(results.createSnippet("function rand()\n{\nreturn 4;\n}"));
-nestedNode.addChild(results.createResourceLink('file:///path/to/error.html', 10));
+nestedNode.addChild(results.createResourceLink("file:///path/to/error.html", 10));
results.addResult("Rule with details subtree (1)", "This rule has a lot of details", results.Severity.Warning, node);
// Audit normally terminates when number of added rule results is equal to
@@ -35,7 +35,7 @@
}
function onStartAuditDisabledCategory(results
