[webkit-changes] [95402] trunk/LayoutTests
Title: [95402] trunk/LayoutTests Revision 95402 Author k...@chromium.org Date 2011-09-18 23:50:06 -0700 (Sun, 18 Sep 2011) Log Message Rebaseline navigator test for chromium-win-vista. https://bugs.webkit.org/show_bug.cgi?id=68334 Unreviewed. Rebaseline for navigator-detached-no-crash. * platform/chromium-win-vista/fast/dom/navigator-detached-no-crash-expected.txt: Added. Modified Paths trunk/LayoutTests/ChangeLog Added Paths trunk/LayoutTests/platform/chromium-win-vista/fast/dom/navigator-detached-no-crash-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (95401 => 95402) --- trunk/LayoutTests/ChangeLog 2011-09-19 05:34:39 UTC (rev 95401) +++ trunk/LayoutTests/ChangeLog 2011-09-19 06:50:06 UTC (rev 95402) @@ -1,3 +1,12 @@ +2011-09-18 James Kozianski k...@chromium.org + +Rebaseline navigator test for chromium-win-vista. +https://bugs.webkit.org/show_bug.cgi?id=68334 + +Unreviewed. Rebaseline for navigator-detached-no-crash. + +* platform/chromium-win-vista/fast/dom/navigator-detached-no-crash-expected.txt: Added. + 2011-09-18 Dan Bernstein m...@apple.com rdar://problem/7860281 Decomposed text is displayed incorrectly when Verdana is specified Added: trunk/LayoutTests/platform/chromium-win-vista/fast/dom/navigator-detached-no-crash-expected.txt (0 => 95402) --- trunk/LayoutTests/platform/chromium-win-vista/fast/dom/navigator-detached-no-crash-expected.txt (rev 0) +++ trunk/LayoutTests/platform/chromium-win-vista/fast/dom/navigator-detached-no-crash-expected.txt 2011-09-19 06:50:06 UTC (rev 95402) @@ -0,0 +1,21 @@ + +This tests that the navigator object of a deleted frame is disconnected properly. Accessing fields or methods shouldn't crash the browser. + Check Navigator +navigator.appCodeName is OK +navigator.appName is OK +navigator.appVersion is OK +navigator.cookieEnabled is OK +navigator.getStorageUpdates() is OK +navigator.javaEnabled() is OK +navigator.language is OK +navigator.mimeTypes is OK +navigator.onLine is OK +navigator.platform is OK +navigator.plugins is OK +navigator.product is OK +navigator.productSub is OK +navigator.registerProtocolHandler() threw err TypeError: Not enough arguments +navigator.userAgent is OK +navigator.vendor is OK +navigator.vendorSub is OK + ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95403] trunk/Source
Title: [95403] trunk/Source Revision 95403 Author carlo...@webkit.org Date 2011-09-19 00:31:19 -0700 (Mon, 19 Sep 2011) Log Message [GTK] Fix distcheck build https://bugs.webkit.org/show_bug.cgi?id=68241 Reviewed by Martin Robinson. Source/_javascript_Core: * GNUmakefile.list.am: Source/WebCore: * GNUmakefile.list.am: Source/WebKit2: * GNUmakefile.am: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/GNUmakefile.list.am trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/GNUmakefile.list.am trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/GNUmakefile.am Diff Modified: trunk/Source/_javascript_Core/ChangeLog (95402 => 95403) --- trunk/Source/_javascript_Core/ChangeLog 2011-09-19 06:50:06 UTC (rev 95402) +++ trunk/Source/_javascript_Core/ChangeLog 2011-09-19 07:31:19 UTC (rev 95403) @@ -1,3 +1,12 @@ +2011-09-19 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Fix distcheck build +https://bugs.webkit.org/show_bug.cgi?id=68241 + +Reviewed by Martin Robinson. + +* GNUmakefile.list.am: + 2011-09-18 Dan Bernstein m...@apple.com Removed ProfilerServer. Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (95402 => 95403) --- trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-09-19 06:50:06 UTC (rev 95402) +++ trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-09-19 07:31:19 UTC (rev 95403) @@ -91,6 +91,7 @@ Source/_javascript_Core/bytecode/Opcode.h \ Source/_javascript_Core/bytecode/PredictedType.cpp \ Source/_javascript_Core/bytecode/PredictedType.h \ + Source/_javascript_Core/bytecode/PredictionTracker.h \ Source/_javascript_Core/bytecode/SamplingTool.cpp \ Source/_javascript_Core/bytecode/SamplingTool.h \ Source/_javascript_Core/bytecode/StructureStubInfo.cpp \ @@ -106,6 +107,8 @@ Source/_javascript_Core/dfg/DFGAliasTracker.h \ Source/_javascript_Core/dfg/DFGByteCodeParser.cpp \ Source/_javascript_Core/dfg/DFGByteCodeParser.h \ + Source/_javascript_Core/dfg/DFGCapabilities.cpp \ + Source/_javascript_Core/dfg/DFGCapabilities.h \ Source/_javascript_Core/dfg/DFGDriver.cpp \ Source/_javascript_Core/dfg/DFGDriver.h \ Source/_javascript_Core/dfg/DFGFPRInfo.h \ @@ -120,6 +123,8 @@ Source/_javascript_Core/dfg/DFGNode.h \ Source/_javascript_Core/dfg/DFGOperations.cpp \ Source/_javascript_Core/dfg/DFGOperations.h \ + Source/_javascript_Core/dfg/DFGOSREntry.cpp \ + Source/_javascript_Core/dfg/DFGOSREntry.h \ Source/_javascript_Core/dfg/DFGPropagator.cpp \ Source/_javascript_Core/dfg/DFGPropagator.h \ Source/_javascript_Core/dfg/DFGRegisterBank.h \ @@ -156,6 +161,7 @@ Source/_javascript_Core/heap/VTableSpectrum.cpp \ Source/_javascript_Core/heap/VTableSpectrum.h \ Source/_javascript_Core/heap/Weak.h \ + Source/_javascript_Core/heap/WeakReferenceHarvester.h \ Source/_javascript_Core/heap/WriteBarrierSupport.cpp \ Source/_javascript_Core/heap/WriteBarrierSupport.h \ Source/_javascript_Core/config.h \ @@ -210,6 +216,7 @@ Source/_javascript_Core/interpreter/RegisterFile.h \ Source/_javascript_Core/interpreter/Register.h \ Source/_javascript_Core/_javascript_CorePrefix.h \ + Source/_javascript_Core/jit/CompactJITCodeMap.h \ Source/_javascript_Core/jit/ExecutableAllocator.cpp \ Source/_javascript_Core/jit/ExecutableAllocator.h \ Source/_javascript_Core/jit/JITArithmetic32_64.cpp \ Modified: trunk/Source/WebCore/ChangeLog (95402 => 95403) --- trunk/Source/WebCore/ChangeLog 2011-09-19 06:50:06 UTC (rev 95402) +++ trunk/Source/WebCore/ChangeLog 2011-09-19 07:31:19 UTC (rev 95403) @@ -1,3 +1,12 @@ +2011-09-19 Carlos Garcia Campos cgar...@igalia.com + +[GTK] Fix distcheck build +https://bugs.webkit.org/show_bug.cgi?id=68241 + +Reviewed by Martin Robinson. + +* GNUmakefile.list.am: + 2011-09-18 Ilya Tikhonovsky loi...@chromium.org Web Inspector: chromium-win: Save timeline data does nothing. Modified: trunk/Source/WebCore/GNUmakefile.list.am (95402 => 95403) --- trunk/Source/WebCore/GNUmakefile.list.am 2011-09-19 06:50:06 UTC (rev 95402) +++ trunk/Source/WebCore/GNUmakefile.list.am 2011-09-19 07:31:19 UTC (rev 95403) @@ -898,15 +898,12 @@ Source/WebCore/bridge/jni/jsc/JavaMethodJSC.h \ Source/WebCore/bridge/jsc/BridgeJSC.cpp \ Source/WebCore/bridge/jsc/BridgeJSC.h \ - Source/WebCore/bridge/npapi.h \ Source/WebCore/bridge/NP_jsobject.cpp \ Source/WebCore/bridge/NP_jsobject.h \ Source/WebCore/bridge/npruntime.cpp \ - Source/WebCore/bridge/npruntime.h \ Source/WebCore/bridge/npruntime_impl.h \ Source/WebCore/bridge/npruntime_internal.h \ Source/WebCore/bridge/npruntime_priv.h \ - Source/WebCore/bridge/nptypes.h \ Source/WebCore/bridge/runtime_array.cpp \ Source/WebCore/bridge/runtime_array.h \ Source/WebCore/bridge/runtime_method.cpp \ @@ -2892,6 +2889,9 @@ Source/WebCore/platform/Widget.cpp \ Source/WebCore/platform/Widget.h \
[webkit-changes] [95404] trunk
Title: [95404] trunk Revision 95404 Author loi...@chromium.org Date 2011-09-19 00:36:12 -0700 (Mon, 19 Sep 2011) Log Message 2011-09-18 Ilya Tikhonovsky loi...@chromium.org Web Inspector: requestAnimationFrame callbacks don't show up in the timeline panel. https://bugs.webkit.org/show_bug.cgi?id=67986 Reviewed by Pavel Feldman. Test: inspector/timeline/timeline-animation-frame.html WebCore: * English.lproj/localizedStrings.js: * bindings/v8/V8Proxy.cpp: (WebCore::V8Proxy::callFunction): (WebCore::V8Proxy::callFunctionWithoutFrame): (WebCore::V8Proxy::instrumentedCallFunction): * bindings/v8/V8Proxy.h: * bindings/v8/custom/V8CustomVoidCallback.cpp: (WebCore::invokeCallback): * dom/ScriptedAnimationController.cpp: (WebCore::ScriptedAnimationController::registerCallback): (WebCore::ScriptedAnimationController::cancelCallback): (WebCore::ScriptedAnimationController::serviceScriptedAnimations): * inspector/InspectorInstrumentation.cpp: (WebCore::InspectorInstrumentation::didRegisterAnimationFrameCallbackImpl): (WebCore::InspectorInstrumentation::didCancelAnimationFrameCallbackImpl): (WebCore::InspectorInstrumentation::willFireAnimationFrameEventImpl): (WebCore::InspectorInstrumentation::didFireAnimationFrameEventImpl): * inspector/InspectorInstrumentation.h: (WebCore::InspectorInstrumentation::willCallFunction): (WebCore::InspectorInstrumentation::didRegisterAnimationFrameCallback): (WebCore::InspectorInstrumentation::didCancelAnimationFrameCallback): (WebCore::InspectorInstrumentation::willFireAnimationFrameEvent): (WebCore::InspectorInstrumentation::didFireAnimationFrameEvent): * inspector/InspectorTimelineAgent.cpp: (WebCore::InspectorTimelineAgent::didRegisterAnimationFrameCallback): (WebCore::InspectorTimelineAgent::didCancelAnimationFrameCallback): (WebCore::InspectorTimelineAgent::willFireAnimationFrameEvent): (WebCore::InspectorTimelineAgent::didFireAnimationFrameEvent): * inspector/InspectorTimelineAgent.h: * inspector/TimelineRecordFactory.cpp: (WebCore::TimelineRecordFactory::createAnimationFrameCallbackData): * inspector/TimelineRecordFactory.h: * inspector/front-end/TimelineAgent.js: * inspector/front-end/TimelinePanel.js: (WebInspector.TimelinePanel): (WebInspector.TimelinePanel.prototype.get _recordStyles): (WebInspector.TimelinePanel.prototype._innerAddRecordToTimeline): (WebInspector.TimelinePanel.prototype._clearPanel): (WebInspector.TimelinePanel.FormattedRecord): (WebInspector.TimelinePanel.FormattedRecord.prototype._generatePopupContent): (WebInspector.TimelinePanel.FormattedRecord.prototype._getRecordDetails): LayoutTests: * inspector/timeline/timeline-animation-frame-expected.txt: Added. * inspector/timeline/timeline-animation-frame.html: Added. * inspector/timeline/timeline-enum-stability-expected.txt: * platform/chromium/inspector/timeline/timeline-enum-stability-expected.txt: * platform/qt/Skipped: inspector/timeline/timeline-animation-frame.html was added to the skip list. * inspector/timeline/timeline-test.js: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/inspector/timeline/timeline-enum-stability-expected.txt trunk/LayoutTests/inspector/timeline/timeline-test.js trunk/LayoutTests/platform/qt/Skipped trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/English.lproj/localizedStrings.js trunk/Source/WebCore/bindings/v8/V8Proxy.cpp trunk/Source/WebCore/bindings/v8/V8Proxy.h trunk/Source/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp trunk/Source/WebCore/dom/ScriptedAnimationController.cpp trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp trunk/Source/WebCore/inspector/InspectorInstrumentation.h trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp trunk/Source/WebCore/inspector/InspectorTimelineAgent.h trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp trunk/Source/WebCore/inspector/TimelineRecordFactory.h trunk/Source/WebCore/inspector/front-end/TimelineAgent.js trunk/Source/WebCore/inspector/front-end/TimelinePanel.js Added Paths trunk/LayoutTests/inspector/timeline/timeline-animation-frame-expected.txt trunk/LayoutTests/inspector/timeline/timeline-animation-frame.html trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-animation-frame-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (95403 => 95404) --- trunk/LayoutTests/ChangeLog 2011-09-19 07:31:19 UTC (rev 95403) +++ trunk/LayoutTests/ChangeLog 2011-09-19 07:36:12 UTC (rev 95404) @@ -1,3 +1,17 @@ +2011-09-18 Ilya Tikhonovsky loi...@chromium.org + +Web Inspector: requestAnimationFrame callbacks don't show up in the timeline
[webkit-changes] [95405] trunk/Source/WebKit/chromium
Title: [95405] trunk/Source/WebKit/chromium Revision 95405 Author loi...@chromium.org Date 2011-09-19 01:17:43 -0700 (Mon, 19 Sep 2011) Log Message Web Inspector: extend timeline coverage. https://bugs.webkit.org/show_bug.cgi?id=68260 Another place with js function call from native. Reviewed by Pavel Feldman. * src/WebDevToolsFrontendImpl.cpp: (WebKit::WebDevToolsFrontendImpl::dispatchOnInspectorFrontend): Modified Paths trunk/Source/WebKit/chromium/ChangeLog trunk/Source/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp Diff Modified: trunk/Source/WebKit/chromium/ChangeLog (95404 => 95405) --- trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 07:36:12 UTC (rev 95404) +++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 08:17:43 UTC (rev 95405) @@ -1,3 +1,15 @@ +2011-09-19 Ilya Tikhonovsky loi...@chromium.org + +Web Inspector: extend timeline coverage. +https://bugs.webkit.org/show_bug.cgi?id=68260 + +Another place with js function call from native. + +Reviewed by Pavel Feldman. + +* src/WebDevToolsFrontendImpl.cpp: +(WebKit::WebDevToolsFrontendImpl::dispatchOnInspectorFrontend): + 2011-09-17 Mihai Parparita mih...@chromium.org FrameLoaderClient BackForwardList-related methods are unsued @@ -318,7 +330,6 @@ Sigh. Missed this one. * features.gypi: - 2011-09-15 Adam Barth aba...@webkit.org Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE) Modified: trunk/Source/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp (95404 => 95405) --- trunk/Source/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp 2011-09-19 07:36:12 UTC (rev 95404) +++ trunk/Source/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp 2011-09-19 08:17:43 UTC (rev 95405) @@ -123,7 +123,7 @@ args.append(ToV8String(message)); v8::TryCatch tryCatch; tryCatch.SetVerbose(true); -function-Call(inspectorBackend, args.size(), args.data()); +V8Proxy::instrumentedCallFunction(frame-frame()-page(), function, inspectorBackend, args.size(), args.data()); } void WebDevToolsFrontendImpl::frontendLoaded() ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95406] trunk/Source/WebCore
Title: [95406] trunk/Source/WebCore
Revision 95406
Author commit-qu...@webkit.org
Date 2011-09-19 02:19:33 -0700 (Mon, 19 Sep 2011)
Log Message
Re-name LayerChromium border functions to reflect that
they are only for debug use.
https://bugs.webkit.org/show_bug.cgi?id=68212
Patch by Shawn Singh shawnsi...@chromium.org on 2011-09-19
Reviewed by James Robinson.
Code cleanup towards unit testing.
* platform/graphics/chromium/GraphicsLayerChromium.cpp:
(WebCore::GraphicsLayerChromium::clearBackgroundColor):
(WebCore::GraphicsLayerChromium::setDebugBackgroundColor):
(WebCore::GraphicsLayerChromium::setDebugBorder):
(WebCore::GraphicsLayerChromium::updateLayerBackgroundColor):
(WebCore::GraphicsLayerChromium::setupContentsLayer):
* platform/graphics/chromium/LayerChromium.cpp:
(WebCore::LayerChromium::setDebugBorderColor):
(WebCore::LayerChromium::setDebugBorderWidth):
* platform/graphics/chromium/LayerChromium.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp
trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (95405 => 95406)
--- trunk/Source/WebCore/ChangeLog 2011-09-19 08:17:43 UTC (rev 95405)
+++ trunk/Source/WebCore/ChangeLog 2011-09-19 09:19:33 UTC (rev 95406)
@@ -1,3 +1,24 @@
+2011-09-19 Shawn Singh shawnsi...@chromium.org
+
+Re-name LayerChromium border functions to reflect that
+they are only for debug use.
+https://bugs.webkit.org/show_bug.cgi?id=68212
+
+Reviewed by James Robinson.
+
+Code cleanup towards unit testing.
+
+* platform/graphics/chromium/GraphicsLayerChromium.cpp:
+(WebCore::GraphicsLayerChromium::clearBackgroundColor):
+(WebCore::GraphicsLayerChromium::setDebugBackgroundColor):
+(WebCore::GraphicsLayerChromium::setDebugBorder):
+(WebCore::GraphicsLayerChromium::updateLayerBackgroundColor):
+(WebCore::GraphicsLayerChromium::setupContentsLayer):
+* platform/graphics/chromium/LayerChromium.cpp:
+(WebCore::LayerChromium::setDebugBorderColor):
+(WebCore::LayerChromium::setDebugBorderWidth):
+* platform/graphics/chromium/LayerChromium.h:
+
2011-09-18 Ilya Tikhonovsky loi...@chromium.org
Web Inspector: requestAnimationFrame callbacks don't show up in the timeline panel.
Modified: trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp (95405 => 95406)
--- trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp 2011-09-19 08:17:43 UTC (rev 95405)
+++ trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp 2011-09-19 09:19:33 UTC (rev 95406)
@@ -63,26 +63,6 @@
namespace WebCore {
-static void setLayerBorderColor(LayerChromium layer, const Color color)
-{
-layer.setBorderColor(color);
-}
-
-static void clearBorderColor(LayerChromium layer)
-{
-layer.setBorderColor(static_castRGBA32(0));
-}
-
-static void setLayerBackgroundColor(LayerChromium layer, const Color color)
-{
-layer.setBackgroundColor(color);
-}
-
-static void clearLayerBackgroundColor(LayerChromium layer)
-{
-layer.setBackgroundColor(static_castRGBA32(0));
-}
-
PassOwnPtrGraphicsLayer GraphicsLayer::create(GraphicsLayerClient* client)
{
return adoptPtr(new GraphicsLayerChromium(client));
@@ -271,7 +251,7 @@
return;
GraphicsLayer::clearBackgroundColor();
-clearLayerBackgroundColor(*m_contentsLayer);
+m_contentsLayer-setBackgroundColor(static_castRGBA32(0));
}
void GraphicsLayerChromium::setContentsOpaque(bool opaque)
@@ -449,19 +429,19 @@
void GraphicsLayerChromium::setDebugBackgroundColor(const Color color)
{
if (color.isValid())
-setLayerBackgroundColor(*m_layer, color);
+m_layer-setBackgroundColor(color);
else
-clearLayerBackgroundColor(*m_layer);
+m_layer-setBackgroundColor(static_castRGBA32(0));
}
void GraphicsLayerChromium::setDebugBorder(const Color color, float borderWidth)
{
if (color.isValid()) {
-setLayerBorderColor(*m_layer, color);
-m_layer-setBorderWidth(borderWidth);
+m_layer-setDebugBorderColor(color);
+m_layer-setDebugBorderWidth(borderWidth);
} else {
-clearBorderColor(*m_layer);
-m_layer-setBorderWidth(0);
+m_layer-setDebugBorderColor(static_castRGBA32(0));
+m_layer-setDebugBorderWidth(0);
}
}
@@ -631,9 +611,9 @@
// We never create the contents layer just for background color yet.
if (m_backgroundColorSet)
-setLayerBackgroundColor(*m_contentsLayer, m_backgroundColor);
+m_contentsLayer-setBackgroundColor(m_backgroundColor);
else
-clearLayerBackgroundColor(*m_contentsLayer);
+m_contentsLayer-setBackgroundColor(static_castRGBA32(0));
}
void
[webkit-changes] [95407] trunk/LayoutTests
Title: [95407] trunk/LayoutTests Revision 95407 Author rga...@webkit.org Date 2011-09-19 05:48:48 -0700 (Mon, 19 Sep 2011) Log Message [Qt] [ARMv5] fast/events/media-element-focus-tab.html fast/spatial-navigation/snav-media-elements.html fail https://bugs.webkit.org/show_bug.cgi?id=68341 Patch by Kristóf Kosztyó kkris...@inf.u-szeged.hu on 2011-09-19 * platform/qt-arm/Skipped: Skip the failing tests Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/qt-arm/Skipped Diff Modified: trunk/LayoutTests/ChangeLog (95406 => 95407) --- trunk/LayoutTests/ChangeLog 2011-09-19 09:19:33 UTC (rev 95406) +++ trunk/LayoutTests/ChangeLog 2011-09-19 12:48:48 UTC (rev 95407) @@ -1,3 +1,10 @@ +2011-09-19 Kristóf Kosztyó kkris...@inf.u-szeged.hu + +[Qt] [ARMv5] fast/events/media-element-focus-tab.html fast/spatial-navigation/snav-media-elements.html fail +https://bugs.webkit.org/show_bug.cgi?id=68341 + +* platform/qt-arm/Skipped: Skip the failing tests + 2011-09-18 Ilya Tikhonovsky loi...@chromium.org Web Inspector: requestAnimationFrame callbacks don't show up in the timeline panel. Modified: trunk/LayoutTests/platform/qt-arm/Skipped (95406 => 95407) --- trunk/LayoutTests/platform/qt-arm/Skipped 2011-09-19 09:19:33 UTC (rev 95406) +++ trunk/LayoutTests/platform/qt-arm/Skipped 2011-09-19 12:48:48 UTC (rev 95407) @@ -105,3 +105,8 @@ # https://bugs.webkit.org/show_bug.cgi?id=68151 inspector/timeline/timeline-animation-frame.html inspector/timeline/timeline-enum-stability.html + +# [Qt] [ARMv5] fast/events/media-element-focus-tab.html fast/spatial-navigation/snav-media-elements.html fail +# https://bugs.webkit.org/show_bug.cgi?id=68341 +fast/events/media-element-focus-tab.html +fast/spatial-navigation/snav-media-elements.html \ No newline at end of file ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95408] trunk/LayoutTests
Title: [95408] trunk/LayoutTests Revision 95408 Author o...@webkit.org Date 2011-09-19 06:04:23 -0700 (Mon, 19 Sep 2011) Log Message [Qt] Unreviewed gardening. * platform/qt-arm/fast/dom/Window/window-property-descriptors-expected.txt: Updated. * platform/qt-mac/Skipped: Skip new failing tests to paint the bot green. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/qt-arm/fast/dom/Window/window-property-descriptors-expected.txt trunk/LayoutTests/platform/qt-mac/Skipped Diff Modified: trunk/LayoutTests/ChangeLog (95407 => 95408) --- trunk/LayoutTests/ChangeLog 2011-09-19 12:48:48 UTC (rev 95407) +++ trunk/LayoutTests/ChangeLog 2011-09-19 13:04:23 UTC (rev 95408) @@ -1,3 +1,10 @@ +2011-09-19 Csaba Osztrogonác o...@webkit.org + +[Qt] Unreviewed gardening. + +* platform/qt-arm/fast/dom/Window/window-property-descriptors-expected.txt: Updated. +* platform/qt-mac/Skipped: Skip new failing tests to paint the bot green. + 2011-09-19 Kristóf Kosztyó kkris...@inf.u-szeged.hu [Qt] [ARMv5] fast/events/media-element-focus-tab.html fast/spatial-navigation/snav-media-elements.html fail Modified: trunk/LayoutTests/platform/qt-arm/fast/dom/Window/window-property-descriptors-expected.txt (95407 => 95408) --- trunk/LayoutTests/platform/qt-arm/fast/dom/Window/window-property-descriptors-expected.txt 2011-09-19 12:48:48 UTC (rev 95407) +++ trunk/LayoutTests/platform/qt-arm/fast/dom/Window/window-property-descriptors-expected.txt 2011-09-19 13:04:23 UTC (rev 95408) @@ -547,6 +547,7 @@ PASS Object.getOwnPropertyDescriptor(window, 'valueOf') is undefined. PASS Object.getOwnPropertyDescriptor(window, 'webkitConvertPointFromNodeToPage') is undefined. PASS Object.getOwnPropertyDescriptor(window, 'webkitConvertPointFromPageToNode') is undefined. +PASS Object.getOwnPropertyDescriptor(window, 'webkitPostMessage') is undefined. PASS successfullyParsed is true TEST COMPLETE Modified: trunk/LayoutTests/platform/qt-mac/Skipped (95407 => 95408) --- trunk/LayoutTests/platform/qt-mac/Skipped 2011-09-19 12:48:48 UTC (rev 95407) +++ trunk/LayoutTests/platform/qt-mac/Skipped 2011-09-19 13:04:23 UTC (rev 95408) @@ -5097,3 +5097,17 @@ fast/lists/list-marker-before-content-table.html fast/runin/runin-generated-before-content.html svg/custom/simple-text-double-shadow.svg + +# new failing tests +fast/borders/border-image-massive-scale.html +fast/borders/border-image-scrambled.html +fast/clip/overflow-border-radius-combinations.html +fast/clip/overflow-border-radius-composited.html +fast/clip/overflow-border-radius-transformed.html +fast/parser/innerhtml-with-prefixed-elements.xhtml +fast/ruby/float-overhang-from-ruby-text.html +fast/ruby/overhang-horizontal-no-overlap1.html +fast/ruby/overhang-horizontal-no-overlap2.html +fast/ruby/overhang-vertical-no-overlap1.html +fast/ruby/overhang-vertical-no-overlap2.html +plugins/destroy-during-npp-new-object-with-fallback-content.html ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95410] trunk
Title: [95410] trunk
Revision 95410
Author loi...@chromium.org
Date 2011-09-19 06:32:24 -0700 (Mon, 19 Sep 2011)
Log Message
Web Inspector: didMarkDOMContentEvent() should send event of MarkDOMContent type.
https://bugs.webkit.org/show_bug.cgi?id=67528
Reviewed by Pavel Feldman.
Source/WebCore:
Tests: inspector/timeline/timeline-dom-content-loaded-event.html
inspector/timeline/timeline-load-event.html
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::didMarkDOMContentEvent):
LayoutTests:
* inspector/timeline/timeline-animation-frame.html:
* inspector/timeline/timeline-dom-content-loaded-event-expected.txt: Added.
* inspector/timeline/timeline-dom-content-loaded-event.html: Added.
* inspector/timeline/timeline-load-event-expected.txt: Added.
* inspector/timeline/timeline-load-event.html: Added.
* inspector/timeline/timeline-test.js:
(initialize_Timeline.InspectorTest.waitForRecordType.addRecord):
(initialize_Timeline.InspectorTest.waitForRecordType):
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/inspector/timeline/timeline-animation-frame.html
trunk/LayoutTests/inspector/timeline/timeline-test.js
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp
Added Paths
trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt
trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event.html
trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt
trunk/LayoutTests/inspector/timeline/timeline-load-event.html
Diff
Modified: trunk/LayoutTests/ChangeLog (95409 => 95410)
--- trunk/LayoutTests/ChangeLog 2011-09-19 13:04:30 UTC (rev 95409)
+++ trunk/LayoutTests/ChangeLog 2011-09-19 13:32:24 UTC (rev 95410)
@@ -1,3 +1,19 @@
+2011-09-19 Ilya Tikhonovsky loi...@chromium.org
+
+Web Inspector: didMarkDOMContentEvent() should send event of MarkDOMContent type.
+https://bugs.webkit.org/show_bug.cgi?id=67528
+
+Reviewed by Pavel Feldman.
+
+* inspector/timeline/timeline-animation-frame.html:
+* inspector/timeline/timeline-dom-content-loaded-event-expected.txt: Added.
+* inspector/timeline/timeline-dom-content-loaded-event.html: Added.
+* inspector/timeline/timeline-load-event-expected.txt: Added.
+* inspector/timeline/timeline-load-event.html: Added.
+* inspector/timeline/timeline-test.js:
+(initialize_Timeline.InspectorTest.waitForRecordType.addRecord):
+(initialize_Timeline.InspectorTest.waitForRecordType):
+
2011-09-19 Csaba Osztrogonác o...@webkit.org
[Qt] Unreviewed gardening.
Modified: trunk/LayoutTests/inspector/timeline/timeline-animation-frame.html (95409 => 95410)
--- trunk/LayoutTests/inspector/timeline/timeline-animation-frame.html 2011-09-19 13:04:30 UTC (rev 95409)
+++ trunk/LayoutTests/inspector/timeline/timeline-animation-frame.html 2011-09-19 13:32:24 UTC (rev 95410)
@@ -23,18 +23,10 @@
InspectorTest.evaluateInPage(performActions());
});
-WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.EventTypes.TimelineEventRecorded, function(event) {
-addRecord(event.data);
-});
+InspectorTest.waitForRecordType(CancelAnimationFrameCallback, finish);
-function addRecord(record)
+function finish()
{
-if (record.type !== WebInspector.TimelineAgent.RecordType[CancelAnimationFrameCallback]) {
-for (var i = 0; record.children i record.children.length; ++i)
-addRecord(record.children[i]);
-return ;
-}
-
InspectorTest.printTimelineRecords(RegisterAnimationFrameCallback);
InspectorTest.printTimelineRecords(FireAnimationFrameEvent);
InspectorTest.printTimelineRecords(CancelAnimationFrameCallback);
Added: trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt (0 => 95410)
--- trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt 2011-09-19 13:32:24 UTC (rev 95410)
@@ -0,0 +1,12 @@
+Tests the DOM content loaded event.
+
+MarkDOMContent Properties:
+{
+startTime : number
+data : {
+}
+type : MarkDOMContent
+usedHeapSize : number
+totalHeapSize : number
+}
+
Property changes on: trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt
___
Added: svn:eol-style
Added: trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event.html (0 => 95410)
--- trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event.html (rev 0)
+++ trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event.html 2011-09-19 13:32:24 UTC (rev 95410)
@@ -0,0 +1,29 @@
+html
+head
+script src=""
[webkit-changes] [95411] trunk/LayoutTests
Title: [95411] trunk/LayoutTests
Revision 95411
Author loi...@chromium.org
Date 2011-09-19 06:33:23 -0700 (Mon, 19 Sep 2011)
Log Message
Web Inspector: extend UI perf tests coverage. Elements Panel.
https://bugs.webkit.org/show_bug.cgi?id=68263
Reviewed by Pavel Feldman.
* inspector/performance/resources/show-panel-elements.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
Added Paths
trunk/LayoutTests/inspector/performance/resources/show-panel-elements.html
Diff
Modified: trunk/LayoutTests/ChangeLog (95410 => 95411)
--- trunk/LayoutTests/ChangeLog 2011-09-19 13:32:24 UTC (rev 95410)
+++ trunk/LayoutTests/ChangeLog 2011-09-19 13:33:23 UTC (rev 95411)
@@ -1,5 +1,14 @@
2011-09-19 Ilya Tikhonovsky loi...@chromium.org
+Web Inspector: extend UI perf tests coverage. Elements Panel.
+https://bugs.webkit.org/show_bug.cgi?id=68263
+
+Reviewed by Pavel Feldman.
+
+* inspector/performance/resources/show-panel-elements.html: Added.
+
+2011-09-19 Ilya Tikhonovsky loi...@chromium.org
+
Web Inspector: didMarkDOMContentEvent() should send event of MarkDOMContent type.
https://bugs.webkit.org/show_bug.cgi?id=67528
Added: trunk/LayoutTests/inspector/performance/resources/show-panel-elements.html (0 => 95411)
--- trunk/LayoutTests/inspector/performance/resources/show-panel-elements.html (rev 0)
+++ trunk/LayoutTests/inspector/performance/resources/show-panel-elements.html 2011-09-19 13:33:23 UTC (rev 95411)
@@ -0,0 +1,37 @@
+html
+head
+script src=""
+script src=""
+script
+
+function test()
+{
+WebInspector.showPanel(audits);
+
+function test(timer)
+{
+WebInspector.showPanel(audits);
+var timerCookie = timer.start(show-elements-panel);
+WebInspector.showPanel(elements);
+timer.finish(timerCookie);
+timer.done();
+}
+
+InspectorTest.runPerformanceTest(test, 5000);
+}
+
+/script
+/head
+
+body _onload_=runTest()
+
+div/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/div
+div/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/div
+div/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/div
+div/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/div
+div/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/div
+div/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/divdiv/div
+
+/body
+/body
+/html
Property changes on: trunk/LayoutTests/inspector/performance/resources/show-panel-elements.html
___
Added: svn:eol-style
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95413] trunk/Source/WebCore
Title: [95413] trunk/Source/WebCore
Revision 95413
Author ademar.r...@openbossa.org
Date 2011-09-19 07:23:29 -0700 (Mon, 19 Sep 2011)
Log Message
Unreviewed: dos2unix on bindings/js/JSExceptionBase.h
Visual Studio is choking on this file when generating packages for
Qt-4.8 on Windows:
Source\WebCore\Bindings\js\JSExceptionBase.h:
error C4335: Mac file format detected: please convert the source file
to either DOS or UNIX format
Since from all .cpp or .h files shared by all ports this is the only
one with CRLF line terminations, I'm assuming this was a mistake.
* bindings/js/JSExceptionBase.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/js/JSExceptionBase.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (95412 => 95413)
--- trunk/Source/WebCore/ChangeLog 2011-09-19 14:09:37 UTC (rev 95412)
+++ trunk/Source/WebCore/ChangeLog 2011-09-19 14:23:29 UTC (rev 95413)
@@ -1,3 +1,21 @@
+2011-09-19 Ademar de Souza Reis Jr. ademar.r...@openbossa.org
+
+Unreviewed: dos2unix on bindings/js/JSExceptionBase.h
+
+Visual Studio is choking on this file when generating packages for
+Qt-4.8 on Windows:
+
+
+Source\WebCore\Bindings\js\JSExceptionBase.h:
+error C4335: Mac file format detected: please convert the source file
+to either DOS or UNIX format
+
+
+Since from all .cpp or .h files shared by all ports this is the only
+one with CRLF line terminations, I'm assuming this was a mistake.
+
+* bindings/js/JSExceptionBase.h:
+
2011-09-19 Ilya Tikhonovsky loi...@chromium.org
Web Inspector: didMarkDOMContentEvent() should send event of MarkDOMContent type.
Modified: trunk/Source/WebCore/bindings/js/JSExceptionBase.h (95412 => 95413)
--- trunk/Source/WebCore/bindings/js/JSExceptionBase.h 2011-09-19 14:09:37 UTC (rev 95412)
+++ trunk/Source/WebCore/bindings/js/JSExceptionBase.h 2011-09-19 14:23:29 UTC (rev 95413)
@@ -1,43 +1,43 @@
-/*
- * Copyright (C) 2009 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. ``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
- * 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.
- */
-
-#ifndef JSExceptionBase_h
-#define JSExceptionBase_h
-
-namespace JSC {
-
-class JSValue;
-
-} // namespace JSC
-
-namespace WebCore {
-
-class ExceptionBase;
-
-ExceptionBase* toExceptionBase(JSC::JSValue);
-
-} // namespace WebCore
-
-#endif // JSExceptionBase_h
+/*
+ * Copyright (C) 2009 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. ``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
+ * 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.
+ */
+
+#ifndef
[webkit-changes] [95414] trunk/LayoutTests
Title: [95414] trunk/LayoutTests Revision 95414 Author kbal...@webkit.org Date 2011-09-19 07:45:37 -0700 (Mon, 19 Sep 2011) Log Message Unreviewed Qt gardening. https://bugs.webkit.org/show_bug.cgi?id=68360 Patch by Zsolt Fehér fehe...@inf.u-szeged.hu on 2011-09-19 * platform/qt/Skipped: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/qt/Skipped Diff Modified: trunk/LayoutTests/ChangeLog (95413 => 95414) --- trunk/LayoutTests/ChangeLog 2011-09-19 14:23:29 UTC (rev 95413) +++ trunk/LayoutTests/ChangeLog 2011-09-19 14:45:37 UTC (rev 95414) @@ -1,3 +1,10 @@ +2011-09-19 Zsolt Fehér fehe...@inf.u-szeged.hu + +Unreviewed Qt gardening. +https://bugs.webkit.org/show_bug.cgi?id=68360 + +* platform/qt/Skipped: + 2011-09-19 Balazs Kelemen kbal...@webkit.org [Qt][WK2] Add some pixel baselines. Modified: trunk/LayoutTests/platform/qt/Skipped (95413 => 95414) --- trunk/LayoutTests/platform/qt/Skipped 2011-09-19 14:23:29 UTC (rev 95413) +++ trunk/LayoutTests/platform/qt/Skipped 2011-09-19 14:45:37 UTC (rev 95414) @@ -2434,3 +2434,8 @@ # Fails on non-Chromium bots # https://bugs.webkit.org/show_bug.cgi?id=68278 http/tests/history/back-with-fragment-change.php + +# Tests failed after r95410 +# https://bugs.webkit.org/show_bug.cgi?id=68360 +inspector/timeline/timeline-dom-content-loaded-event.html +inspector/timeline/timeline-load-event.html ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95415] trunk/LayoutTests
Title: [95415] trunk/LayoutTests
Revision 95415
Author loi...@chromium.org
Date 2011-09-19 08:15:49 -0700 (Mon, 19 Sep 2011)
Log Message
Unreviewed fix for flaky tests.
* inspector/timeline/timeline-dom-content-loaded-event-expected.txt:
* inspector/timeline/timeline-dom-content-loaded-event.html:
* inspector/timeline/timeline-load-event-expected.txt:
* inspector/timeline/timeline-load-event.html:
* platform/qt/Skipped:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt
trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event.html
trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt
trunk/LayoutTests/inspector/timeline/timeline-load-event.html
trunk/LayoutTests/platform/qt/Skipped
Diff
Modified: trunk/LayoutTests/ChangeLog (95414 => 95415)
--- trunk/LayoutTests/ChangeLog 2011-09-19 14:45:37 UTC (rev 95414)
+++ trunk/LayoutTests/ChangeLog 2011-09-19 15:15:49 UTC (rev 95415)
@@ -1,3 +1,13 @@
+2011-09-19 Ilya Tikhonovsky loi...@chromium.org
+
+Unreviewed fix for flaky tests.
+
+* inspector/timeline/timeline-dom-content-loaded-event-expected.txt:
+* inspector/timeline/timeline-dom-content-loaded-event.html:
+* inspector/timeline/timeline-load-event-expected.txt:
+* inspector/timeline/timeline-load-event.html:
+* platform/qt/Skipped:
+
2011-09-19 Zsolt Fehér fehe...@inf.u-szeged.hu
Unreviewed Qt gardening.
Modified: trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt (95414 => 95415)
--- trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt 2011-09-19 14:45:37 UTC (rev 95414)
+++ trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt 2011-09-19 15:15:49 UTC (rev 95415)
@@ -9,4 +9,5 @@
usedHeapSize : number
totalHeapSize : number
}
+Page reloaded.
Modified: trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event.html (95414 => 95415)
--- trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event.html 2011-09-19 14:45:37 UTC (rev 95414)
+++ trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event.html 2011-09-19 15:15:49 UTC (rev 95415)
@@ -7,14 +7,22 @@
function test()
{
WebInspector.showPanel(timeline);
+finishCalled = 0;
-InspectorTest.startTimeline(function() { InspectorTest.reloadPage(); });
-InspectorTest.waitForRecordType(MarkDOMContent, finish);
-function finish()
+InspectorTest.startTimeline(function() { InspectorTest.reloadPage(finish); });
+InspectorTest.waitForRecordType(MarkDOMContent, contentEvent);
+
+function contentEvent()
{
InspectorTest.printTimelineRecords(MarkDOMContent);
-InspectorTest.completeTest();
+InspectorTest.stopTimeline(finish);
}
+
+function finish()
+{
+if (++finishCalled === 2)
+InspectorTest.completeTest();
+}
}
/script
Modified: trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt (95414 => 95415)
--- trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt 2011-09-19 14:45:37 UTC (rev 95414)
+++ trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt 2011-09-19 15:15:49 UTC (rev 95415)
@@ -9,4 +9,5 @@
usedHeapSize : number
totalHeapSize : number
}
+Page reloaded.
Modified: trunk/LayoutTests/inspector/timeline/timeline-load-event.html (95414 => 95415)
--- trunk/LayoutTests/inspector/timeline/timeline-load-event.html 2011-09-19 14:45:37 UTC (rev 95414)
+++ trunk/LayoutTests/inspector/timeline/timeline-load-event.html 2011-09-19 15:15:49 UTC (rev 95415)
@@ -7,14 +7,22 @@
function test()
{
WebInspector.showPanel(timeline);
+finishCalled = 0;
-InspectorTest.startTimeline(function() { InspectorTest.reloadPage(); });
-InspectorTest.waitForRecordType(MarkLoad, finish);
-function finish()
+InspectorTest.startTimeline(function() { InspectorTest.reloadPage(finish); });
+InspectorTest.waitForRecordType(MarkLoad, contentEvent);
+
+function contentEvent()
{
InspectorTest.printTimelineRecords(MarkLoad);
-InspectorTest.completeTest();
+InspectorTest.stopTimeline(finish);
}
+
+function finish()
+{
+if (++finishCalled === 2)
+InspectorTest.completeTest();
+}
}
/script
Modified: trunk/LayoutTests/platform/qt/Skipped (95414 => 95415)
--- trunk/LayoutTests/platform/qt/Skipped 2011-09-19 14:45:37 UTC (rev 95414)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-09-19 15:15:49 UTC (rev 95415)
@@ -2434,8 +2434,3 @@
# Fails on non-Chromium bots
# https://bugs.webkit.org/show_bug.cgi?id=68278
http/tests/history/back-with-fragment-change.php
-
-# Tests failed after r95410
-# https://bugs.webkit.org/show_bug.cgi?id=68360
-inspector/timeline/timeline-dom-content-loaded-event.html
[webkit-changes] [95416] trunk/Source/WebKit/chromium
Title: [95416] trunk/Source/WebKit/chromium
Revision 95416
Author commit-qu...@webkit.org
Date 2011-09-19 09:07:22 -0700 (Mon, 19 Sep 2011)
Log Message
Unreviewed. Rolled DEPS.
Patch by Sheriff Bot webkit.review@gmail.com on 2011-09-19
* DEPS:
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/DEPS
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (95415 => 95416)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 15:15:49 UTC (rev 95415)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 16:07:22 UTC (rev 95416)
@@ -1,3 +1,9 @@
+2011-09-19 Sheriff Bot webkit.review@gmail.com
+
+Unreviewed. Rolled DEPS.
+
+* DEPS:
+
2011-09-19 Ilya Tikhonovsky loi...@chromium.org
Web Inspector: extend timeline coverage.
Modified: trunk/Source/WebKit/chromium/DEPS (95415 => 95416)
--- trunk/Source/WebKit/chromium/DEPS 2011-09-19 15:15:49 UTC (rev 95415)
+++ trunk/Source/WebKit/chromium/DEPS 2011-09-19 16:07:22 UTC (rev 95416)
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '100742'
+ 'chromium_rev': '101644'
}
deps = {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95417] trunk/Source
Title: [95417] trunk/Source
Revision 95417
Author commit-qu...@webkit.org
Date 2011-09-19 09:22:01 -0700 (Mon, 19 Sep 2011)
Log Message
[GTK] Fix distcheck build
https://bugs.webkit.org/show_bug.cgi?id=68346
Patch by Carlos Garcia Campos cgar...@igalia.com on 2011-09-19
Reviewed by Philippe Normand.
Source/_javascript_Core:
* GNUmakefile.list.am:
Source/WebKit/gtk:
* tests/testmimehandling.c: Remove ogg tests, since the behavious
has changed in libsoup (https://bugzilla.gnome.org/show_bug.cgi?id=648846#c8)
(server_callback):
(mime_type_policy_decision_requested_cb):
(main):
* webkit/webkitwebplugin.cpp: Fix introspection annotation.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/GNUmakefile.list.am
trunk/Source/WebKit/gtk/ChangeLog
trunk/Source/WebKit/gtk/tests/testmimehandling.c
trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95416 => 95417)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-19 16:07:22 UTC (rev 95416)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-19 16:22:01 UTC (rev 95417)
@@ -1,6 +1,15 @@
2011-09-19 Carlos Garcia Campos cgar...@igalia.com
[GTK] Fix distcheck build
+https://bugs.webkit.org/show_bug.cgi?id=68346
+
+Reviewed by Philippe Normand.
+
+* GNUmakefile.list.am:
+
+2011-09-19 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Fix distcheck build
https://bugs.webkit.org/show_bug.cgi?id=68241
Reviewed by Martin Robinson.
Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (95416 => 95417)
--- trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-09-19 16:07:22 UTC (rev 95416)
+++ trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-09-19 16:22:01 UTC (rev 95417)
@@ -104,7 +104,6 @@
Source/_javascript_Core/bytecompiler/LabelScope.h \
Source/_javascript_Core/bytecompiler/NodesCodegen.cpp \
Source/_javascript_Core/bytecompiler/RegisterID.h \
- Source/_javascript_Core/dfg/DFGAliasTracker.h \
Source/_javascript_Core/dfg/DFGByteCodeParser.cpp \
Source/_javascript_Core/dfg/DFGByteCodeParser.h \
Source/_javascript_Core/dfg/DFGCapabilities.cpp \
@@ -116,6 +115,7 @@
Source/_javascript_Core/dfg/DFGGPRInfo.h \
Source/_javascript_Core/dfg/DFGGraph.cpp \
Source/_javascript_Core/dfg/DFGGraph.h \
+ Source/_javascript_Core/dfg/DFGIntrinsic.h \
Source/_javascript_Core/dfg/DFGJITCodeGenerator.cpp \
Source/_javascript_Core/dfg/DFGJITCodeGenerator.h \
Source/_javascript_Core/dfg/DFGJITCompiler.cpp \
Modified: trunk/Source/WebKit/gtk/ChangeLog (95416 => 95417)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-09-19 16:07:22 UTC (rev 95416)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-09-19 16:22:01 UTC (rev 95417)
@@ -1,3 +1,17 @@
+2011-09-19 Carlos Garcia Campos cgar...@igalia.com
+
+[GTK] Fix distcheck build
+https://bugs.webkit.org/show_bug.cgi?id=68346
+
+Reviewed by Philippe Normand.
+
+* tests/testmimehandling.c: Remove ogg tests, since the behavious
+has changed in libsoup (https://bugzilla.gnome.org/show_bug.cgi?id=648846#c8)
+(server_callback):
+(mime_type_policy_decision_requested_cb):
+(main):
+* webkit/webkitwebplugin.cpp: Fix introspection annotation.
+
2011-09-17 Mihai Parparita mih...@chromium.org
FrameLoaderClient BackForwardList-related methods are unsued
Modified: trunk/Source/WebKit/gtk/tests/testmimehandling.c (95416 => 95417)
--- trunk/Source/WebKit/gtk/tests/testmimehandling.c 2011-09-19 16:07:22 UTC (rev 95416)
+++ trunk/Source/WebKit/gtk/tests/testmimehandling.c 2011-09-19 16:22:01 UTC (rev 95417)
@@ -76,15 +76,6 @@
g_assert(!error);
soup_message_body_append(msg-response_body, SOUP_MEMORY_TAKE, contents, length);
-} else if (g_str_equal(path, /ogg)) {
-char* contents;
-gsize length;
-GError* error = NULL;
-
-g_file_get_contents(test.ogg, contents, length, error);
-g_assert(!error);
-
-soup_message_body_append(msg-response_body, SOUP_MEMORY_TAKE, contents, length);
}
soup_message_body_complete(msg-response_body);
@@ -124,9 +115,6 @@
g_assert_cmpstr(mime_type, ==, text/plain);
g_assert(webkit_web_view_can_show_mime_type(view, mime_type));
-} else if (g_str_equal(type, ogg)) {
-g_assert_cmpstr(mime_type, ==, audio/x-vorbis+ogg);
-g_assert(webkit_web_view_can_show_mime_type(view, mime_type));
}
g_free(type);
@@ -209,11 +197,9 @@
g_test_add_data_func(/webkit/mime/remote-PDF, pdf, testRemoteMimeType);
g_test_add_data_func(/webkit/mime/remote-HTML, html, testRemoteMimeType);
g_test_add_data_func(/webkit/mime/remote-TEXT, text, testRemoteMimeType);
-g_test_add_data_func(/webkit/mime/remote-OGG, ogg, testRemoteMimeType);
g_test_add_data_func(/webkit/mime/local-PDF, pdf, testLocalMimeType);
[webkit-changes] [95418] trunk/LayoutTests
Title: [95418] trunk/LayoutTests Revision 95418 Author loi...@chromium.org Date 2011-09-19 09:26:28 -0700 (Mon, 19 Sep 2011) Log Message Unreviewed skip inspector/timeline/timeline-animation-frame.html on win platform. * platform/win/Skipped: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/win/Skipped Diff Modified: trunk/LayoutTests/ChangeLog (95417 => 95418) --- trunk/LayoutTests/ChangeLog 2011-09-19 16:22:01 UTC (rev 95417) +++ trunk/LayoutTests/ChangeLog 2011-09-19 16:26:28 UTC (rev 95418) @@ -1,5 +1,11 @@ 2011-09-19 Ilya Tikhonovsky loi...@chromium.org +Unreviewed skip inspector/timeline/timeline-animation-frame.html on win platform. + +* platform/win/Skipped: + +2011-09-19 Ilya Tikhonovsky loi...@chromium.org + Unreviewed fix for flaky tests. * inspector/timeline/timeline-dom-content-loaded-event-expected.txt: Modified: trunk/LayoutTests/platform/win/Skipped (95417 => 95418) --- trunk/LayoutTests/platform/win/Skipped 2011-09-19 16:22:01 UTC (rev 95417) +++ trunk/LayoutTests/platform/win/Skipped 2011-09-19 16:26:28 UTC (rev 95418) @@ -1246,6 +1246,7 @@ # Request ENABLE(REQUEST_ANIMATION_FRAME) support fast/animation +inspector/timeline/timeline-animation-frame.html # This port doesn't support v8 i18n extension. fast/js/i18n-bindings-locale.html ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95419] branches/chromium/874/Source/WebCore
Title: [95419] branches/chromium/874/Source/WebCore
Revision 95419
Author infe...@chromium.org
Date 2011-09-19 09:33:47 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 94608 - MediaElementAudioSourceNode destruction triggers ASSERTS
https://bugs.webkit.org/show_bug.cgi?id=67665
BUG=94186
Review URL: http://codereview.chromium.org/7947001
Modified Paths
branches/chromium/874/Source/WebCore/html/HTMLMediaElement.cpp
branches/chromium/874/Source/WebCore/webaudio/AudioContext.cpp
branches/chromium/874/Source/WebCore/webaudio/AudioContext.h
Diff
Modified: branches/chromium/874/Source/WebCore/html/HTMLMediaElement.cpp (95418 => 95419)
--- branches/chromium/874/Source/WebCore/html/HTMLMediaElement.cpp 2011-09-19 16:26:28 UTC (rev 95418)
+++ branches/chromium/874/Source/WebCore/html/HTMLMediaElement.cpp 2011-09-19 16:33:47 UTC (rev 95419)
@@ -2976,7 +2976,6 @@
#if ENABLE(WEB_AUDIO)
void HTMLMediaElement::setAudioSourceNode(MediaElementAudioSourceNode* sourceNode)
{
-ASSERT(!m_audioSourceNode);
m_audioSourceNode = sourceNode;
}
Modified: branches/chromium/874/Source/WebCore/webaudio/AudioContext.cpp (95418 => 95419)
--- branches/chromium/874/Source/WebCore/webaudio/AudioContext.cpp 2011-09-19 16:26:28 UTC (rev 95418)
+++ branches/chromium/874/Source/WebCore/webaudio/AudioContext.cpp 2011-09-19 16:33:47 UTC (rev 95419)
@@ -257,10 +257,25 @@
return m_hrtfDatabaseLoader-isLoaded();
}
+void AudioContext::uninitializeDispatch(void* userData)
+{
+AudioContext* context = reinterpret_castAudioContext*(userData);
+ASSERT(context);
+if (!context)
+return;
+
+context-uninitialize();
+}
+
void AudioContext::stop()
{
m_document = 0; // document is going away
-uninitialize();
+
+// Don't call uninitialize() immediately here because the ScriptExecutionContext is in the middle
+// of dealing with all of its ActiveDOMObjects at this point. uninitialize() can de-reference other
+// ActiveDOMObjects so let's schedule uninitialize() to be called later.
+// FIXME: see if there's a more direct way to handle this issue.
+callOnMainThread(uninitializeDispatch, this);
}
Document* AudioContext::document() const
Modified: branches/chromium/874/Source/WebCore/webaudio/AudioContext.h (95418 => 95419)
--- branches/chromium/874/Source/WebCore/webaudio/AudioContext.h 2011-09-19 16:26:28 UTC (rev 95418)
+++ branches/chromium/874/Source/WebCore/webaudio/AudioContext.h 2011-09-19 16:33:47 UTC (rev 95419)
@@ -231,6 +231,7 @@
void lazyInitialize();
void uninitialize();
+static void uninitializeDispatch(void* userData);
void scheduleNodeDeletion();
static void deleteMarkedNodesDispatch(void* userData);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95420] branches/chromium/874/Source/WebCore/bindings/ScriptControllerBase. cpp
Title: [95420] branches/chromium/874/Source/WebCore/bindings/ScriptControllerBase.cpp
Revision 95420
Author infe...@chromium.org
Date 2011-09-19 09:35:44 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 94820 - REGRESSION (r66874): Missing RefPtr in ScriptController
BUG=95669
Review URL: http://codereview.chromium.org/7946004
Modified Paths
branches/chromium/874/Source/WebCore/bindings/ScriptControllerBase.cpp
Diff
Modified: branches/chromium/874/Source/WebCore/bindings/ScriptControllerBase.cpp (95419 => 95420)
--- branches/chromium/874/Source/WebCore/bindings/ScriptControllerBase.cpp 2011-09-19 16:33:47 UTC (rev 95419)
+++ branches/chromium/874/Source/WebCore/bindings/ScriptControllerBase.cpp 2011-09-19 16:35:44 UTC (rev 95420)
@@ -67,6 +67,8 @@
bool wasInExecuteScript = m_inExecuteScript;
m_inExecuteScript = true;
+RefPtrFrame protect(m_frame); // Script execution can destroy the frame, and thus the ScriptController.
+
ScriptValue result = evaluate(sourceCode);
if (!wasInExecuteScript) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95421] branches/chromium/874
Title: [95421] branches/chromium/874 Revision 95421 Author infe...@chromium.org Date 2011-09-19 09:38:24 -0700 (Mon, 19 Sep 2011) Log Message Merge 95306 BUG=96665 Review URL: http://codereview.chromium.org/7948001 Modified Paths branches/chromium/874/LayoutTests/html5lib/resources/webkit02.dat branches/chromium/874/Source/WebCore/html/parser/HTMLTreeBuilder.cpp Diff Modified: branches/chromium/874/LayoutTests/html5lib/resources/webkit02.dat (95420 => 95421) --- branches/chromium/874/LayoutTests/html5lib/resources/webkit02.dat 2011-09-19 16:35:44 UTC (rev 95420) +++ branches/chromium/874/LayoutTests/html5lib/resources/webkit02.dat 2011-09-19 16:38:24 UTC (rev 95421) @@ -102,3 +102,25 @@ | body | legend | test + +#data +bemdcellpostfieldpostfieldpostfieldpostfieldmissing_glyphmissing_glyphmissing_glyphmissing_glyphhkernaside/b/em +#errors +#document-fragment +div +#document +| b +| em +| dcell +| postfield +| postfield +| postfield +| postfield +| missing_glyph +| missing_glyph +| missing_glyph +| missing_glyph +| hkern +| aside +| em +| b Modified: branches/chromium/874/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (95420 => 95421) --- branches/chromium/874/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2011-09-19 16:35:44 UTC (rev 95420) +++ branches/chromium/874/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2011-09-19 16:38:24 UTC (rev 95421) @@ -1665,7 +1665,7 @@ if (lastNode == furthestBlock) bookmark.moveToAfter(nodeEntry); // 6.6 -if (Element* parent = lastNode-element()-parentElement()) +if (ContainerNode* parent = lastNode-element()-parentNode()) parent-parserRemoveChild(lastNode-element()); node-element()-parserAddChild(lastNode-element()); if (lastNode-element()-parentElement()-attached() !lastNode-element()-attached()) @@ -1675,7 +1675,7 @@ } // 7 const AtomicString commonAncestorTag = commonAncestor-localName(); -if (Element* parent = lastNode-element()-parentElement()) +if (ContainerNode* parent = lastNode-element()-parentNode()) parent-parserRemoveChild(lastNode-element()); // FIXME: If this moves to HTMLConstructionSite, this check should use // causesFosterParenting(tagName) instead. ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95422] trunk/Source/WebKit/chromium
Title: [95422] trunk/Source/WebKit/chromium
Revision 95422
Author commit-qu...@webkit.org
Date 2011-09-19 09:40:53 -0700 (Mon, 19 Sep 2011)
Log Message
Unreviewed, rolling out r95416.
http://trac.webkit.org/changeset/95416
https://bugs.webkit.org/show_bug.cgi?id=68367
Broke chromium-mac (Requested by beverloo on #webkit).
Patch by Sheriff Bot webkit.review@gmail.com on 2011-09-19
* DEPS:
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/DEPS
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (95421 => 95422)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 16:38:24 UTC (rev 95421)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 16:40:53 UTC (rev 95422)
@@ -1,5 +1,15 @@
2011-09-19 Sheriff Bot webkit.review@gmail.com
+Unreviewed, rolling out r95416.
+http://trac.webkit.org/changeset/95416
+https://bugs.webkit.org/show_bug.cgi?id=68367
+
+Broke chromium-mac (Requested by beverloo on #webkit).
+
+* DEPS:
+
+2011-09-19 Sheriff Bot webkit.review@gmail.com
+
Unreviewed. Rolled DEPS.
* DEPS:
Modified: trunk/Source/WebKit/chromium/DEPS (95421 => 95422)
--- trunk/Source/WebKit/chromium/DEPS 2011-09-19 16:38:24 UTC (rev 95421)
+++ trunk/Source/WebKit/chromium/DEPS 2011-09-19 16:40:53 UTC (rev 95422)
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '101644'
+ 'chromium_rev': '100742'
}
deps = {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95423] branches/chromium/874
Title: [95423] branches/chromium/874
Revision 95423
Author infe...@chromium.org
Date 2011-09-19 09:42:09 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 95074
BUG=96444
Review URL: http://codereview.chromium.org/7945004
Modified Paths
branches/chromium/874/Source/WebCore/rendering/RenderScrollbar.cpp
Added Paths
branches/chromium/874/LayoutTests/scrollbars/scrollbar-part-created-with-no-parent-crash-expected.txt
branches/chromium/874/LayoutTests/scrollbars/scrollbar-part-created-with-no-parent-crash.html
Diff
Copied: branches/chromium/874/LayoutTests/scrollbars/scrollbar-part-created-with-no-parent-crash-expected.txt (from rev 95074, trunk/LayoutTests/scrollbars/scrollbar-part-created-with-no-parent-crash-expected.txt) (0 => 95423)
--- branches/chromium/874/LayoutTests/scrollbars/scrollbar-part-created-with-no-parent-crash-expected.txt (rev 0)
+++ branches/chromium/874/LayoutTests/scrollbars/scrollbar-part-created-with-no-parent-crash-expected.txt 2011-09-19 16:42:09 UTC (rev 95423)
@@ -0,0 +1,2 @@
+Test passes if it does not crash.
+PASS
Copied: branches/chromium/874/LayoutTests/scrollbars/scrollbar-part-created-with-no-parent-crash.html (from rev 95074, trunk/LayoutTests/scrollbars/scrollbar-part-created-with-no-parent-crash.html) (0 => 95423)
--- branches/chromium/874/LayoutTests/scrollbars/scrollbar-part-created-with-no-parent-crash.html (rev 0)
+++ branches/chromium/874/LayoutTests/scrollbars/scrollbar-part-created-with-no-parent-crash.html 2011-09-19 16:42:09 UTC (rev 95423)
@@ -0,0 +1,53 @@
+html
+Test passes if it does not crash.
+style
+body
+{
+margin: 0;
+}
+::-webkit-scrollbar {
+-webkit-logical-height: 65536;
+-webkit-border-image: url(does_not_exist) 0 2 0 2;
+}
+
+.inner:not(table) {
+padding: 400px;
+}
+/style
+script
+if (window.layoutTestController)
+layoutTestController.dumpAsText();
+
+function showScroller()
+{
+var scroller = document.createElement('div');
+scroller.className = 'scroller';
+
+var contents = document.createElement('div')
+contents.className = 'inner';
+scroller.appendChild(contents);
+
+document.getElementById('container').appendChild(scroller);
+}
+
+function hideScroller()
+{
+var scroller = document.getElementById('container').querySelectorAll('.scroller')[0];
+scroller.parentNode.removeChild(scroller);
+}
+
+function doTest()
+{
+if (window.eventSender) {
+eventSender.mouseMoveTo(50, 40);
+eventSender.mouseMoveTo(50, 55);
+eventSender.mouseMoveTo(50, 0);
+}
+}
+
+window.addEventListener('load', doTest, false);
+/script
+div id=container _onmouseover_=showScroller() _onmouseout_=hideScroller()
+pPASS/p
+/div
+/html
\ No newline at end of file
Modified: branches/chromium/874/Source/WebCore/rendering/RenderScrollbar.cpp (95422 => 95423)
--- branches/chromium/874/Source/WebCore/rendering/RenderScrollbar.cpp 2011-09-19 16:40:53 UTC (rev 95422)
+++ branches/chromium/874/Source/WebCore/rendering/RenderScrollbar.cpp 2011-09-19 16:42:09 UTC (rev 95423)
@@ -64,7 +64,15 @@
RenderScrollbar::~RenderScrollbar()
{
-ASSERT(m_parts.isEmpty());
+if (!m_parts.isEmpty()) {
+// When a scrollbar is detached from its parent (causing all parts removal) and
+// ready to be destroyed, its destruction can be delayed because of RefPtr
+// maintained in other classes such as EventHandler (m_lastScrollbarUnderMouse).
+// Meanwhile, we can have a call to updateScrollbarPart which recreates the
+// scrollbar part. So, we need to destroy these parts since we don't want them
+// to call on a destroyed scrollbar. See webkit bug 68009.
+updateScrollbarParts(true);
+}
}
RenderBox* RenderScrollbar::owningRenderer() const
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95424] branches/chromium/874/Source/WebCore
Title: [95424] branches/chromium/874/Source/WebCore
Revision 95424
Author infe...@chromium.org
Date 2011-09-19 09:43:43 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 95093
BUG=96170
Review URL: http://codereview.chromium.org/7945005
Modified Paths
branches/chromium/874/Source/WebCore/inspector/InspectorInstrumentation.cpp
branches/chromium/874/Source/WebCore/inspector/InspectorInstrumentation.h
branches/chromium/874/Source/WebCore/inspector/InspectorPageAgent.cpp
branches/chromium/874/Source/WebCore/inspector/InspectorPageAgent.h
branches/chromium/874/Source/WebCore/page/Frame.cpp
Diff
Modified: branches/chromium/874/Source/WebCore/inspector/InspectorInstrumentation.cpp (95423 => 95424)
--- branches/chromium/874/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-09-19 16:42:09 UTC (rev 95423)
+++ branches/chromium/874/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-09-19 16:43:43 UTC (rev 95424)
@@ -660,12 +660,6 @@
pageAgent-frameNavigated(loader);
}
-void InspectorInstrumentation::frameDestroyedImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
-{
-if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents-inspectorPageAgent())
-inspectorPageAgent-frameDestroyed(frame);
-}
-
void InspectorInstrumentation::loaderDetachedFromFrameImpl(InstrumentingAgents* instrumentingAgents, DocumentLoader* loader)
{
if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents-inspectorPageAgent())
Modified: branches/chromium/874/Source/WebCore/inspector/InspectorInstrumentation.h (95423 => 95424)
--- branches/chromium/874/Source/WebCore/inspector/InspectorInstrumentation.h 2011-09-19 16:42:09 UTC (rev 95423)
+++ branches/chromium/874/Source/WebCore/inspector/InspectorInstrumentation.h 2011-09-19 16:43:43 UTC (rev 95424)
@@ -142,7 +142,6 @@
static void loadEventFired(Frame*, const KURL);
static void frameDetachedFromParent(Frame*);
static void didCommitLoad(Frame*, DocumentLoader*);
-static void frameDestroyed(Frame*);
static void loaderDetachedFromFrame(Frame*, DocumentLoader*);
static InspectorInstrumentationCookie willWriteHTML(Document*, unsigned int length, unsigned int startLine);
@@ -272,7 +271,6 @@
static void loadEventFiredImpl(InstrumentingAgents*, Frame*, const KURL);
static void frameDetachedFromParentImpl(InstrumentingAgents*, Frame*);
static void didCommitLoadImpl(InstrumentingAgents*, Page*, DocumentLoader*);
-static void frameDestroyedImpl(InstrumentingAgents*, Frame*);
static void loaderDetachedFromFrameImpl(InstrumentingAgents*, DocumentLoader*);
static InspectorInstrumentationCookie willWriteHTMLImpl(InstrumentingAgents*, unsigned int length, unsigned int startLine);
@@ -897,14 +895,6 @@
#endif
}
-inline void InspectorInstrumentation::frameDestroyed(Frame* frame)
-{
-#if ENABLE(INSPECTOR)
-if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
-frameDestroyedImpl(instrumentingAgents, frame);
-#endif
-}
-
inline void InspectorInstrumentation::loaderDetachedFromFrame(Frame* frame, DocumentLoader* loader)
{
#if ENABLE(INSPECTOR)
Modified: branches/chromium/874/Source/WebCore/inspector/InspectorPageAgent.cpp (95423 => 95424)
--- branches/chromium/874/Source/WebCore/inspector/InspectorPageAgent.cpp 2011-09-19 16:42:09 UTC (rev 95423)
+++ branches/chromium/874/Source/WebCore/inspector/InspectorPageAgent.cpp 2011-09-19 16:43:43 UTC (rev 95424)
@@ -558,7 +558,12 @@
void InspectorPageAgent::frameDetached(Frame* frame)
{
-m_frontend-frameDetached(frameId(frame));
+HashMapFrame*, String::iterator iterator = m_frameToIdentifier.find(frame);
+if (iterator != m_frameToIdentifier.end()) {
+m_frontend-frameDetached(iterator-second);
+m_identifierToFrame.remove(iterator-second);
+m_frameToIdentifier.remove(iterator);
+}
}
Frame* InspectorPageAgent::mainFrame()
@@ -596,15 +601,6 @@
return identifier;
}
-void InspectorPageAgent::frameDestroyed(Frame* frame)
-{
-HashMapFrame*, String::iterator iterator = m_frameToIdentifier.find(frame);
-if (iterator != m_frameToIdentifier.end()) {
-m_identifierToFrame.remove(iterator-second);
-m_frameToIdentifier.remove(iterator);
-}
-}
-
void InspectorPageAgent::loaderDetachedFromFrame(DocumentLoader* loader)
{
HashMapDocumentLoader*, String::iterator iterator = m_loaderToIdentifier.find(loader);
Modified: branches/chromium/874/Source/WebCore/inspector/InspectorPageAgent.h (95423 => 95424)
--- branches/chromium/874/Source/WebCore/inspector/InspectorPageAgent.h 2011-09-19 16:42:09 UTC (rev 95423)
+++ branches/chromium/874/Source/WebCore/inspector/InspectorPageAgent.h 2011-09-19 16:43:43 UTC (rev 95424)
@@ -102,7 +102,6 @@
void loadEventFired();
void frameNavigated(DocumentLoader*);
void frameDetached(Frame*);
-void frameDestroyed(Frame*);
void
[webkit-changes] [95425] branches/chromium/874
Title: [95425] branches/chromium/874
Revision 95425
Author infe...@chromium.org
Date 2011-09-19 09:47:32 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 95204
BUG=95761
Review URL: http://codereview.chromium.org/7950001
Modified Paths
branches/chromium/874/Source/WebCore/html/HTMLEmbedElement.cpp
branches/chromium/874/Source/WebCore/html/HTMLObjectElement.cpp
Added Paths
branches/chromium/874/LayoutTests/plugins/destroy-during-npp-new-object-with-fallback-content-expected.txt
branches/chromium/874/LayoutTests/plugins/destroy-during-npp-new-object-with-fallback-content.html
Diff
Copied: branches/chromium/874/LayoutTests/plugins/destroy-during-npp-new-object-with-fallback-content-expected.txt (from rev 95204, trunk/LayoutTests/plugins/destroy-during-npp-new-object-with-fallback-content-expected.txt) (0 => 95425)
--- branches/chromium/874/LayoutTests/plugins/destroy-during-npp-new-object-with-fallback-content-expected.txt (rev 0)
+++ branches/chromium/874/LayoutTests/plugins/destroy-during-npp-new-object-with-fallback-content-expected.txt 2011-09-19 16:47:32 UTC (rev 95425)
@@ -0,0 +1 @@
+SUCCESS
Copied: branches/chromium/874/LayoutTests/plugins/destroy-during-npp-new-object-with-fallback-content.html (from rev 95204, trunk/LayoutTests/plugins/destroy-during-npp-new-object-with-fallback-content.html) (0 => 95425)
--- branches/chromium/874/LayoutTests/plugins/destroy-during-npp-new-object-with-fallback-content.html (rev 0)
+++ branches/chromium/874/LayoutTests/plugins/destroy-during-npp-new-object-with-fallback-content.html 2011-09-19 16:47:32 UTC (rev 95425)
@@ -0,0 +1,42 @@
+html
+head
+script type=text/_javascript_
+if (window.layoutTestController) {
+layoutTestController.dumpAsText();
+layoutTestController.setCanOpenWindows();
+layoutTestController.waitUntilDone();
+}
+
+var newWindow = window.open(data:text/html,Hello world!)
+
+function tryCloseWindow(w) {
+if (!w)
+return;
+
+w.close();
+
+function doneIfClosed() {
+if (w.closed) {
+if (window.layoutTestController)
+layoutTestController.notifyDone();
+return;
+}
+setTimeout(doneIfClosed, 1);
+};
+doneIfClosed();
+}
+
+window._onload_ = function() {
+tryCloseWindow(newWindow);
+
+var testPlugin = document.getElementById('testPlugin');
+if (!testPlugin || !testPlugin.parentNode)
+document.documentElement.appendChild(document.createTextNode(SUCCESS));
+}
+/script
+/head
+body
+pThis tests a plug-in that removes itself from the document during NPP_New. It passes if it does not crash during removal (a href="" or when a window is next closed (a href=""
+object id=testPlugin type=application/x-webkit-test-netscape width=200 height=200 cleardocumentduringnewfallback content/object
+/body
+/html
Modified: branches/chromium/874/Source/WebCore/html/HTMLEmbedElement.cpp (95424 => 95425)
--- branches/chromium/874/Source/WebCore/html/HTMLEmbedElement.cpp 2011-09-19 16:43:43 UTC (rev 95424)
+++ branches/chromium/874/Source/WebCore/html/HTMLEmbedElement.cpp 2011-09-19 16:47:32 UTC (rev 95425)
@@ -178,6 +178,7 @@
return;
}
+RefPtrHTMLEmbedElement protect(this); // Loading the plugin might remove us from the document.
SubframeLoader* loader = document()-frame()-loader()-subframeLoader();
// FIXME: beforeLoad could have detached the renderer! Just like in the object case above.
loader-requestObject(this, m_url, getAttribute(nameAttr), m_serviceType, paramNames, paramValues);
Modified: branches/chromium/874/Source/WebCore/html/HTMLObjectElement.cpp (95424 => 95425)
--- branches/chromium/874/Source/WebCore/html/HTMLObjectElement.cpp 2011-09-19 16:43:43 UTC (rev 95424)
+++ branches/chromium/874/Source/WebCore/html/HTMLObjectElement.cpp 2011-09-19 16:47:32 UTC (rev 95425)
@@ -327,6 +327,7 @@
if (!renderer())
return;
+RefPtrHTMLObjectElement protect(this); // Loading the plugin might remove us from the document.
SubframeLoader* loader = document()-frame()-loader()-subframeLoader();
bool success = beforeLoadAllowedLoad hasValidClassId() loader-requestObject(this, url, getAttribute(nameAttr), serviceType, paramNames, paramValues);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95426] branches/chromium/874/Source/WebCore/rendering/ RenderObjectChildList.cpp
Title: [95426] branches/chromium/874/Source/WebCore/rendering/RenderObjectChildList.cpp
Revision 95426
Author infe...@chromium.org
Date 2011-09-19 09:49:29 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 94857
BUG=95672
Review URL: http://codereview.chromium.org/7946005
Modified Paths
branches/chromium/874/Source/WebCore/rendering/RenderObjectChildList.cpp
Diff
Modified: branches/chromium/874/Source/WebCore/rendering/RenderObjectChildList.cpp (95425 => 95426)
--- branches/chromium/874/Source/WebCore/rendering/RenderObjectChildList.cpp 2011-09-19 16:47:32 UTC (rev 95425)
+++ branches/chromium/874/Source/WebCore/rendering/RenderObjectChildList.cpp 2011-09-19 16:49:29 UTC (rev 95426)
@@ -299,8 +299,13 @@
do {
// Skip list markers and generated run-ins
first = first-firstChild();
-while (first (first-isListMarker() || (first-isRenderInline() first-isRunIn() first-isAnonymous(
+while (first first-isListMarker()) {
+if (first-parent() != owner first-parent()-isAnonymousBlock())
+first = first-parent();
first = first-nextSibling();
+}
+while (first first-isRenderInline() first-isRunIn())
+first = first-nextSibling();
} while (first first-isAnonymous() first-style()-styleType() == NOPSEUDO);
if (!first)
@@ -321,7 +326,7 @@
// We still need to skip any list markers that could exist before the run-in.
while (first first-isListMarker())
first = first-nextSibling();
-if (first first-style()-styleType() == BEFORE first-isRenderInline() first-isRunIn() first-isAnonymous())
+if (first first-style()-styleType() == BEFORE first-isRenderInline() first-isRunIn())
return first;
}
return 0;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95427] branches/chromium/874
Title: [95427] branches/chromium/874
Revision 95427
Author infe...@chromium.org
Date 2011-09-19 09:52:24 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 95301
BUG=95072
Review URL: http://codereview.chromium.org/7947002
Modified Paths
branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp
branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.h
Added Paths
branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash-expected.txt
branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash.html
Diff
Copied: branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash-expected.txt (from rev 95301, trunk/LayoutTests/svg/text/text-style-recalc-crash-expected.txt) (0 => 95427)
--- branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash-expected.txt (rev 0)
+++ branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash-expected.txt 2011-09-19 16:52:24 UTC (rev 95427)
@@ -0,0 +1,3 @@
+Test passes if it does not crash.
+PASS
+
Copied: branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash.html (from rev 95301, trunk/LayoutTests/svg/text/text-style-recalc-crash.html) (0 => 95427)
--- branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash.html (rev 0)
+++ branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash.html 2011-09-19 16:52:24 UTC (rev 95427)
@@ -0,0 +1,23 @@
+!DOCTYPE html
+html
+Test passes if it does not crash.
+svg viewBox=0 0 1 1
+font-face font-family=A
+font-face-src
+font-face-uri xlink:href=""
+/font-face-src
+/font-face
+g font-family=A
+textPASS/text
+script
+if (window.layoutTestController)
+layoutTestController.dumpAsText();
+
+document.execCommand(SelectAll);
+/script
+g
+text/text
+/g
+/g
+/svg
+/html
Modified: branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp (95426 => 95427)
--- branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp 2011-09-19 16:49:29 UTC (rev 95426)
+++ branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp 2011-09-19 16:52:24 UTC (rev 95427)
@@ -87,8 +87,6 @@
// The text metrics may be influenced by style changes.
if (RenderSVGText* textRenderer = RenderSVGText::locateRenderSVGTextAncestor(this))
textRenderer-setNeedsPositioningValuesUpdate();
-
-updateScaledFont();
}
const RenderStyle* newStyle = style();
@@ -223,6 +221,19 @@
return createVisiblePosition(offset + closestDistanceBox-start(), offset 0 ? VP_UPSTREAM_IF_POSSIBLE : DOWNSTREAM);
}
+void RenderSVGInlineText::setStyle(PassRefPtrRenderStyle style)
+{
+RenderText::setStyle(style);
+
+// The cached scaledFont needs to be updated on every style set call. It
+// is not similar to m_style which can get derived from parent's style and
+// hence will get automatically updated on ancestor's style change. This is
+// required, otherwise we will maintain stale font list in cached scaledFont
+// when custom fonts are retired on Document::recalcStyle. See webkit bug
+// https://bugs.webkit.org/show_bug.cgi?id=68060.
+updateScaledFont();
+}
+
void RenderSVGInlineText::updateScaledFont()
{
computeNewScaledFontForStyle(this, style(), m_scalingFactor, m_scaledFont);
Modified: branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.h (95426 => 95427)
--- branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.h 2011-09-19 16:49:29 UTC (rev 95426)
+++ branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.h 2011-09-19 16:52:24 UTC (rev 95427)
@@ -49,6 +49,8 @@
virtual const char* renderName() const { return RenderSVGInlineText; }
virtual void willBeDestroyed();
+
+virtual void setStyle(PassRefPtrRenderStyle);
virtual void styleDidChange(StyleDifference, const RenderStyle*);
// FIXME: We need objectBoundingBox for DRT results and filters at the moment.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95428] branches/chromium/874/Source/WebCore/rendering
Title: [95428] branches/chromium/874/Source/WebCore/rendering
Revision 95428
Author infe...@chromium.org
Date 2011-09-19 09:54:50 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 94991
BUG=94810
Review URL: http://codereview.chromium.org/7943004
Modified Paths
branches/chromium/874/Source/WebCore/rendering/RenderRubyText.cpp
branches/chromium/874/Source/WebCore/rendering/RenderRubyText.h
Diff
Modified: branches/chromium/874/Source/WebCore/rendering/RenderRubyText.cpp (95427 => 95428)
--- branches/chromium/874/Source/WebCore/rendering/RenderRubyText.cpp 2011-09-19 16:52:24 UTC (rev 95427)
+++ branches/chromium/874/Source/WebCore/rendering/RenderRubyText.cpp 2011-09-19 16:54:50 UTC (rev 95428)
@@ -81,4 +81,9 @@
logicalWidth -= inset;
}
+bool RenderRubyText::avoidsFloats() const
+{
+return true;
+}
+
} // namespace WebCore
Modified: branches/chromium/874/Source/WebCore/rendering/RenderRubyText.h (95427 => 95428)
--- branches/chromium/874/Source/WebCore/rendering/RenderRubyText.h 2011-09-19 16:52:24 UTC (rev 95427)
+++ branches/chromium/874/Source/WebCore/rendering/RenderRubyText.h 2011-09-19 16:54:50 UTC (rev 95428)
@@ -47,6 +47,8 @@
virtual bool isChildAllowed(RenderObject*, RenderStyle*) const;
private:
+virtual bool avoidsFloats() const;
+
virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const;
virtual void adjustInlineDirectionLineBounds(int expansionOpportunityCount, float logicalLeft, float logicalWidth) const;
};
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95429] branches/chromium/874/Source/WebCore
Title: [95429] branches/chromium/874/Source/WebCore
Revision 95429
Author infe...@chromium.org
Date 2011-09-19 09:58:20 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 94905
BUG=1092
Review URL: http://codereview.chromium.org/7942002
Modified Paths
branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp
branches/chromium/874/Source/WebCore/svg/SVGDocumentExtensions.cpp
branches/chromium/874/Source/WebCore/svg/SVGDocumentExtensions.h
branches/chromium/874/Source/WebCore/svg/SVGStyledElement.cpp
branches/chromium/874/Source/WebCore/svg/SVGStyledElement.h
branches/chromium/874/Source/WebCore/svg/SVGUseElement.cpp
Property Changed
branches/chromium/874/Source/WebCore/svg/SVGDocumentExtensions.cpp
branches/chromium/874/Source/WebCore/svg/SVGDocumentExtensions.h
branches/chromium/874/Source/WebCore/svg/SVGStyledElement.cpp
branches/chromium/874/Source/WebCore/svg/SVGStyledElement.h
Diff
Modified: branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (95428 => 95429)
--- branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2011-09-19 16:54:50 UTC (rev 95428)
+++ branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2011-09-19 16:58:20 UTC (rev 95429)
@@ -168,7 +168,7 @@
const SVGDocumentExtensions::SVGPendingElements::const_iterator end = clients-end();
for (SVGDocumentExtensions::SVGPendingElements::const_iterator it = clients-begin(); it != end; ++it) {
ASSERT((*it)-hasPendingResources());
-(*it)-setHasPendingResources(false);
+(*it)-clearHasPendingResourcesIfPossible();
RenderObject* renderer = (*it)-renderer();
if (!renderer)
continue;
Modified: branches/chromium/874/Source/WebCore/svg/SVGDocumentExtensions.cpp (95428 => 95429)
--- branches/chromium/874/Source/WebCore/svg/SVGDocumentExtensions.cpp 2011-09-19 16:54:50 UTC (rev 95428)
+++ branches/chromium/874/Source/WebCore/svg/SVGDocumentExtensions.cpp 2011-09-19 16:58:20 UTC (rev 95429)
@@ -227,7 +227,7 @@
m_pendingResources.add(id, set);
}
-element-setHasPendingResources(true);
+element-setHasPendingResources();
}
bool SVGDocumentExtensions::hasPendingResources(const AtomicString id) const
@@ -238,6 +238,24 @@
return m_pendingResources.contains(id);
}
+bool SVGDocumentExtensions::isElementInPendingResources(SVGStyledElement* element) const
+{
+ASSERT(element);
+
+if (m_pendingResources.isEmpty())
+return false;
+
+HashMapAtomicString, SVGPendingElements*::const_iterator end = m_pendingResources.end();
+for (HashMapAtomicString, SVGPendingElements*::const_iterator it = m_pendingResources.begin(); it != end; ++it) {
+SVGPendingElements* elements = it-second;
+ASSERT(elements);
+
+if (elements-contains(element))
+return true;
+}
+return false;
+}
+
void SVGDocumentExtensions::removeElementFromPendingResources(SVGStyledElement* element)
{
ASSERT(element);
@@ -245,8 +263,6 @@
if (m_pendingResources.isEmpty() || !element-hasPendingResources())
return;
-element-setHasPendingResources(false);
-
VectorAtomicString toBeRemoved;
HashMapAtomicString, SVGPendingElements*::iterator end = m_pendingResources.end();
for (HashMapAtomicString, SVGPendingElements*::iterator it = m_pendingResources.begin(); it != end; ++it) {
@@ -259,6 +275,8 @@
toBeRemoved.append(it-first);
}
+element-clearHasPendingResourcesIfPossible();
+
if (toBeRemoved.isEmpty())
return;
Property changes on: branches/chromium/874/Source/WebCore/svg/SVGDocumentExtensions.cpp
___
Added: svn:executable
Modified: branches/chromium/874/Source/WebCore/svg/SVGDocumentExtensions.h (95428 => 95429)
--- branches/chromium/874/Source/WebCore/svg/SVGDocumentExtensions.h 2011-09-19 16:54:50 UTC (rev 95428)
+++ branches/chromium/874/Source/WebCore/svg/SVGDocumentExtensions.h 2011-09-19 16:58:20 UTC (rev 95429)
@@ -81,6 +81,7 @@
// For instance, dynamically build gradients / patterns / clippers...
void addPendingResource(const AtomicString id, SVGStyledElement*);
bool hasPendingResources(const AtomicString id) const;
+bool isElementInPendingResources(SVGStyledElement*) const;
void removeElementFromPendingResources(SVGStyledElement*);
PassOwnPtrSVGPendingElements removePendingResource(const AtomicString id);
};
Property changes on: branches/chromium/874/Source/WebCore/svg/SVGDocumentExtensions.h
___
Added: svn:executable
Modified: branches/chromium/874/Source/WebCore/svg/SVGStyledElement.cpp (95428 => 95429)
--- branches/chromium/874/Source/WebCore/svg/SVGStyledElement.cpp 2011-09-19 16:54:50 UTC (rev 95428)
+++ branches/chromium/874/Source/WebCore/svg/SVGStyledElement.cpp 2011-09-19
[webkit-changes] [95430] branches/chromium/874/Source/WebCore/rendering
Title: [95430] branches/chromium/874/Source/WebCore/rendering
Revision 95430
Author infe...@chromium.org
Date 2011-09-19 10:02:57 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 95054
BUG=92226
Modified Paths
branches/chromium/874/Source/WebCore/rendering/CounterNode.cpp
branches/chromium/874/Source/WebCore/rendering/RenderCounter.cpp
Diff
Modified: branches/chromium/874/Source/WebCore/rendering/CounterNode.cpp (95429 => 95430)
--- branches/chromium/874/Source/WebCore/rendering/CounterNode.cpp 2011-09-19 16:58:20 UTC (rev 95429)
+++ branches/chromium/874/Source/WebCore/rendering/CounterNode.cpp 2011-09-19 17:02:57 UTC (rev 95430)
@@ -238,7 +238,10 @@
ASSERT(!newChild-m_parent);
ASSERT(!newChild-m_previousSibling);
ASSERT(!newChild-m_nextSibling);
-ASSERT(!refChild || refChild-m_parent == this);
+// If the refChild is not our child we can not complete the request. This hardens against bugs in RenderCounter.
+// When renderers are reparented it may request that we insert counter nodes improperly.
+if (refChild refChild-m_parent != this)
+return;
if (newChild-m_hasResetType) {
while (m_lastChild != refChild)
@@ -274,32 +277,43 @@
next-recount();
return;
}
+// If the new child is the last in the sibling list we must set the parent's lastChild.
+if (!newChild-m_nextSibling)
+m_lastChild = newChild;
// The code below handles the case when a formerly root increment counter is loosing its root position
// and therefore its children become next siblings.
CounterNode* last = newChild-m_lastChild;
CounterNode* first = newChild-m_firstChild;
-newChild-m_nextSibling = first;
-first-m_previousSibling = newChild;
-// The case when the original next sibling of the inserted node becomes a child of
-// one of the former children of the inserted node is not handled as it is believed
-// to be impossible since:
-// 1. if the increment counter node lost it's root position as a result of another
-//counter node being created, it will be inserted as the last child so next is null.
-// 2. if the increment counter node lost it's root position as a result of a renderer being
-//inserted into the document's render tree, all its former children counters are attached
-//to children of the inserted renderer and hence cannot be in scope for counter nodes
-//attached to renderers that were already in the document's render tree.
-last-m_nextSibling = next;
-if (next)
-next-m_previousSibling = last;
-else
-m_lastChild = last;
-for (next = first; ; next = next-m_nextSibling) {
-next-m_parent = this;
-if (last == next)
-break;
+if (first) {
+ASSERT(last);
+newChild-m_nextSibling = first;
+if (m_lastChild == newChild)
+m_lastChild = last;
+
+first-m_previousSibling = newChild;
+
+// The case when the original next sibling of the inserted node becomes a child of
+// one of the former children of the inserted node is not handled as it is believed
+// to be impossible since:
+// 1. if the increment counter node lost it's root position as a result of another
+//counter node being created, it will be inserted as the last child so next is null.
+// 2. if the increment counter node lost it's root position as a result of a renderer being
+//inserted into the document's render tree, all its former children counters are attached
+//to children of the inserted renderer and hence cannot be in scope for counter nodes
+//attached to renderers that were already in the document's render tree.
+last-m_nextSibling = next;
+if (next) {
+ASSERT(next-m_previousSibling == newChild);
+next-m_previousSibling = last;
+} else
+m_lastChild = last;
+for (next = first; ; next = next-m_nextSibling) {
+next-m_parent = this;
+if (last == next)
+break;
+}
}
newChild-m_firstChild = 0;
newChild-m_lastChild = 0;
Modified: branches/chromium/874/Source/WebCore/rendering/RenderCounter.cpp (95429 => 95430)
--- branches/chromium/874/Source/WebCore/rendering/RenderCounter.cpp 2011-09-19 16:58:20 UTC (rev 95429)
+++ branches/chromium/874/Source/WebCore/rendering/RenderCounter.cpp 2011-09-19 17:02:57 UTC (rev 95430)
@@ -323,7 +323,11 @@
// We are not a reset node or the previous reset must be on an ancestor of our owner renderer
// hence we must be a child of that reset counter.
parent = currentCounter;
-ASSERT(previousSibling-parent() == currentCounter);
+// In some cases renders can be reparented (ex. nodes inside a table but not in a column
[webkit-changes] [95431] branches/chromium/874/Source/WebCore/accessibility/ AccessibilityRenderObject.cpp
Title: [95431] branches/chromium/874/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
Revision 95431
Author infe...@chromium.org
Date 2011-09-19 10:05:26 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 94864
BUG=84885
Review URL: http://codereview.chromium.org/7948002
Modified Paths
branches/chromium/874/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
Diff
Modified: branches/chromium/874/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (95430 => 95431)
--- branches/chromium/874/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2011-09-19 17:02:57 UTC (rev 95430)
+++ branches/chromium/874/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2011-09-19 17:05:26 UTC (rev 95431)
@@ -305,8 +305,12 @@
// Case 2: Anonymous block parent of the end of a continuation - skip all the way to before
// the parent of the start, since everything in between will be linked up via the continuation.
-else if (m_renderer-isAnonymousBlock() firstChildIsInlineContinuation(m_renderer))
-previousSibling = startOfContinuations(m_renderer-firstChild())-parent()-previousSibling();
+else if (m_renderer-isAnonymousBlock() firstChildIsInlineContinuation(m_renderer)) {
+RenderObject* firstParent = startOfContinuations(m_renderer-firstChild())-parent();
+while (firstChildIsInlineContinuation(firstParent))
+firstParent = startOfContinuations(firstParent-firstChild())-parent();
+previousSibling = firstParent-previousSibling();
+}
// Case 3: The node has an actual previous sibling
else if (RenderObject* ps = m_renderer-previousSibling())
@@ -343,8 +347,12 @@
// Case 2: Anonymous block parent of the start of a continuation - skip all the way to
// after the parent of the end, since everything in between will be linked up via the continuation.
-else if (m_renderer-isAnonymousBlock() lastChildHasContinuation(m_renderer))
-nextSibling = endOfContinuations(m_renderer-lastChild())-parent()-nextSibling();
+else if (m_renderer-isAnonymousBlock() lastChildHasContinuation(m_renderer)) {
+RenderObject* lastParent = endOfContinuations(m_renderer-lastChild())-parent();
+while (lastChildHasContinuation(lastParent))
+lastParent = endOfContinuations(lastParent-lastChild())-parent();
+nextSibling = lastParent-nextSibling();
+}
// Case 3: node has an actual next sibling
else if (RenderObject* ns = m_renderer-nextSibling())
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95432] branches/chromium/874/Source/WebCore/accessibility
Title: [95432] branches/chromium/874/Source/WebCore/accessibility
Revision 95432
Author infe...@chromium.org
Date 2011-09-19 10:07:18 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 94716
BUG=84160
Review URL: http://codereview.chromium.org/7944004
Modified Paths
branches/chromium/874/Source/WebCore/accessibility/AccessibilityObject.h
branches/chromium/874/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
Diff
Modified: branches/chromium/874/Source/WebCore/accessibility/AccessibilityObject.h (95431 => 95432)
--- branches/chromium/874/Source/WebCore/accessibility/AccessibilityObject.h 2011-09-19 17:05:26 UTC (rev 95431)
+++ branches/chromium/874/Source/WebCore/accessibility/AccessibilityObject.h 2011-09-19 17:07:18 UTC (rev 95432)
@@ -550,6 +550,8 @@
virtual bool canHaveChildren() const { return true; }
virtual bool hasChildren() const { return m_haveChildren; }
virtual void updateChildrenIfNecessary();
+virtual void clearChildren();
+
virtual void selectedChildren(AccessibilityChildrenVector) { }
virtual void visibleChildren(AccessibilityChildrenVector) { }
virtual void tabChildren(AccessibilityChildrenVector) { }
@@ -670,7 +672,6 @@
mutable bool m_haveChildren;
AccessibilityRole m_role;
-virtual void clearChildren();
virtual bool isDetached() const { return true; }
#if PLATFORM(GTK)
Modified: branches/chromium/874/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (95431 => 95432)
--- branches/chromium/874/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2011-09-19 17:05:26 UTC (rev 95431)
+++ branches/chromium/874/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2011-09-19 17:07:18 UTC (rev 95432)
@@ -1710,7 +1710,7 @@
// aria-hidden hides this object and any children
AccessibilityObject* object = parentObject();
while (object) {
-if (object-isAccessibilityRenderObject() equalIgnoringCase(static_castAccessibilityRenderObject*(object)-getAttribute(aria_hiddenAttr), true))
+if (equalIgnoringCase(object-getAttribute(aria_hiddenAttr), true))
return true;
object = object-parentObject();
}
@@ -3382,7 +3382,7 @@
if (!parent-isAccessibilityRenderObject())
continue;
-AccessibilityRenderObject* axParent = static_castAccessibilityRenderObject*(parent);
+AccessibilityRenderObject* axParent = toAccessibilityRenderObject(parent);
// Send the children changed notification on the first accessibility render object ancestor.
if (!sentChildrenChanged) {
@@ -3464,7 +3464,12 @@
// add all unignored acc children
for (RefPtrAccessibilityObject obj = firstChild(); obj; obj = obj-nextSibling()) {
if (obj-accessibilityIsIgnored()) {
-obj-updateChildrenIfNecessary();
+
+// If the parent is asking for this child's children, then either it's the first time (and clearing is a no-op),
+// or its visibility has changed. In the latter case, this child may have a stale child cached.
+// This can prevent aria-hidden changes from working correctly. Hence, whenever a parent is getting children, ensure data is not stale.
+obj-clearChildren();
+
AccessibilityChildrenVector children = obj-children();
unsigned length = children.size();
for (unsigned i = 0; i length; ++i)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95433] branches/chromium/874/Source/WebCore/css/CSSPrimitiveValue.cpp
Title: [95433] branches/chromium/874/Source/WebCore/css/CSSPrimitiveValue.cpp
Revision 95433
Author infe...@chromium.org
Date 2011-09-19 10:09:07 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 95071 - Fix cssText property of counter-valued CSSPrimitiveValue and avoid uninitialized read
BUG=60653
Review URL: http://codereview.chromium.org/7941005
Modified Paths
branches/chromium/874/Source/WebCore/css/CSSPrimitiveValue.cpp
Diff
Modified: branches/chromium/874/Source/WebCore/css/CSSPrimitiveValue.cpp (95432 => 95433)
--- branches/chromium/874/Source/WebCore/css/CSSPrimitiveValue.cpp 2011-09-19 17:07:18 UTC (rev 95432)
+++ branches/chromium/874/Source/WebCore/css/CSSPrimitiveValue.cpp 2011-09-19 17:09:07 UTC (rev 95433)
@@ -772,12 +772,22 @@
text += m_value.string;
text += );
break;
-case CSS_COUNTER:
-text = counter(;
-text += String::number(m_value.num);
+case CSS_COUNTER: {
+String separator = m_value.counter-separator();
+text = separator.isEmpty() ? counter( : counters(;
+text += m_value.counter-identifier();
+if (!separator.isEmpty()) {
+text += , ;
+text += quoteCSSStringIfNeeded(separator);
+}
+const char* listStyleName = getValueName(m_value.counter-listStyleNumber() + CSSValueDisc);
+if (listStyleName) {
+text += , ;
+text += listStyleName;
+}
text += );
-// FIXME: Add list-style and separator
break;
+}
case CSS_RECT: {
DEFINE_STATIC_LOCAL(const String, rectParen, (rect());
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95434] branches/chromium/874/Source/WebCore/webaudio/ OfflineAudioDestinationNode.cpp
Title: [95434] branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp
Revision 95434
Author infe...@chromium.org
Date 2011-09-19 10:12:14 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 94984
BUG=96150
Review URL: http://codereview.chromium.org/7944005
Modified Paths
branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp
Diff
Modified: branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp (95433 => 95434)
--- branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp 2011-09-19 17:09:07 UTC (rev 95433)
+++ branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp 2011-09-19 17:12:14 UTC (rev 95434)
@@ -52,6 +52,9 @@
OfflineAudioDestinationNode::~OfflineAudioDestinationNode()
{
+if (m_renderThread)
+waitForThreadCompletion(m_renderThread, 0);
+
uninitialize();
}
@@ -143,6 +146,8 @@
}
// Our work is done. Let the AudioContext know.
+// See corresponding deref() call in notifyCompleteDispatch().
+ref();
callOnMainThread(notifyCompleteDispatch, this);
}
@@ -154,6 +159,7 @@
return;
destinationNode-notifyComplete();
+destinationNode-deref();
}
void OfflineAudioDestinationNode::notifyComplete()
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95435] branches/chromium/874/Source/WebCore/webaudio/ OfflineAudioDestinationNode.cpp
Title: [95435] branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp
Revision 95435
Author infe...@chromium.org
Date 2011-09-19 10:13:05 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 95124
BUG=96150
Review URL: http://codereview.chromium.org/7945008
Modified Paths
branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp
Diff
Modified: branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp (95434 => 95435)
--- branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp 2011-09-19 17:12:14 UTC (rev 95434)
+++ branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp 2011-09-19 17:13:05 UTC (rev 95435)
@@ -43,6 +43,7 @@
OfflineAudioDestinationNode::OfflineAudioDestinationNode(AudioContext* context, AudioBuffer* renderTarget)
: AudioDestinationNode(context, renderTarget-sampleRate())
, m_renderTarget(renderTarget)
+, m_renderThread(0)
, m_startedRendering(false)
{
m_renderBus = adoptPtr(new AudioBus(renderTarget-numberOfChannels(), renderQuantumSize));
@@ -52,9 +53,6 @@
OfflineAudioDestinationNode::~OfflineAudioDestinationNode()
{
-if (m_renderThread)
-waitForThreadCompletion(m_renderThread, 0);
-
uninitialize();
}
@@ -83,6 +81,7 @@
if (!m_startedRendering) {
m_startedRendering = true;
+ref(); // See corresponding deref() call in notifyCompleteDispatch().
m_renderThread = createThread(OfflineAudioDestinationNode::renderEntry, this, offline renderer);
}
}
@@ -146,8 +145,6 @@
}
// Our work is done. Let the AudioContext know.
-// See corresponding deref() call in notifyCompleteDispatch().
-ref();
callOnMainThread(notifyCompleteDispatch, this);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95436] trunk/Source/WebKit2
Title: [95436] trunk/Source/WebKit2 Revision 95436 Author caio.olive...@openbossa.org Date 2011-09-19 10:14:19 -0700 (Mon, 19 Sep 2011) Log Message [Qt] [WK2] Implement popup menus in QDesktopWebView using QComboBox https://bugs.webkit.org/show_bug.cgi?id=67938 Reviewed by Andreas Kling. Implement a WebPopupMenuProxy that uses QtWebComboBox (a QComboBox subclass we have for WK1). Then use this WebPopupMenuProxy in QDesktopWebView. The implementation explicitly avoids running a nested mainloop. * UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::showPopupMenu): Since we don't run a nested mainloop, we need to keep the client pointer to call valueChangedForPopupMenu(). * UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp: Added. (WebKit::WebPopupMenuProxyQtDesktop::WebPopupMenuProxyQtDesktop): (WebKit::WebPopupMenuProxyQtDesktop::~WebPopupMenuProxyQtDesktop): (WebKit::WebPopupMenuProxyQtDesktop::showPopupMenu): (WebKit::WebPopupMenuProxyQtDesktop::hidePopupMenu): (WebKit::WebPopupMenuProxyQtDesktop::setSelectedIndex): (WebKit::WebPopupMenuProxyQtDesktop::onPopupMenuHidden): (WebKit::WebPopupMenuProxyQtDesktop::populate): * UIProcess/qt/WebPopupMenuProxyQtDesktop.h: Added. (WebKit::WebPopupMenuProxyQtDesktop::create): * UIProcess/qt/qdesktopwebpageproxy.cpp: (QDesktopWebPageProxy::createPopupMenuProxy): * UIProcess/qt/qdesktopwebpageproxy.h: * WebKit2.pro: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.h trunk/Source/WebKit2/WebKit2.pro Added Paths trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.h Diff Modified: trunk/Source/WebKit2/ChangeLog (95435 => 95436) --- trunk/Source/WebKit2/ChangeLog 2011-09-19 17:13:05 UTC (rev 95435) +++ trunk/Source/WebKit2/ChangeLog 2011-09-19 17:14:19 UTC (rev 95436) @@ -1,3 +1,34 @@ +2011-09-14 Caio Marcelo de Oliveira Filho caio.olive...@openbossa.org + +[Qt] [WK2] Implement popup menus in QDesktopWebView using QComboBox +https://bugs.webkit.org/show_bug.cgi?id=67938 + +Reviewed by Andreas Kling. + +Implement a WebPopupMenuProxy that uses QtWebComboBox (a QComboBox subclass we +have for WK1). Then use this WebPopupMenuProxy in QDesktopWebView. The implementation +explicitly avoids running a nested mainloop. + +* UIProcess/WebPageProxy.cpp: +(WebKit::WebPageProxy::showPopupMenu): +Since we don't run a nested mainloop, we need to keep the client pointer to call +valueChangedForPopupMenu(). + +* UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp: Added. +(WebKit::WebPopupMenuProxyQtDesktop::WebPopupMenuProxyQtDesktop): +(WebKit::WebPopupMenuProxyQtDesktop::~WebPopupMenuProxyQtDesktop): +(WebKit::WebPopupMenuProxyQtDesktop::showPopupMenu): +(WebKit::WebPopupMenuProxyQtDesktop::hidePopupMenu): +(WebKit::WebPopupMenuProxyQtDesktop::setSelectedIndex): +(WebKit::WebPopupMenuProxyQtDesktop::onPopupMenuHidden): +(WebKit::WebPopupMenuProxyQtDesktop::populate): +* UIProcess/qt/WebPopupMenuProxyQtDesktop.h: Added. +(WebKit::WebPopupMenuProxyQtDesktop::create): +* UIProcess/qt/qdesktopwebpageproxy.cpp: +(QDesktopWebPageProxy::createPopupMenuProxy): +* UIProcess/qt/qdesktopwebpageproxy.h: +* WebKit2.pro: + 2011-09-19 Carlos Garcia Campos cgar...@igalia.com [GTK] Fix distcheck build Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (95435 => 95436) --- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-09-19 17:13:05 UTC (rev 95435) +++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-09-19 17:14:19 UTC (rev 95436) @@ -2309,7 +2309,11 @@ RefPtrWebPopupMenuProxy protectedActivePopupMenu = m_activePopupMenu; protectedActivePopupMenu-showPopupMenu(rect, static_castTextDirection(textDirection), m_pageScaleFactor, items, data, selectedIndex); + +// Since Qt doesn't use a nested mainloop the show the popup and get the answer, we need to keep the client pointer valid. +#if !PLATFORM(QT) protectedActivePopupMenu-invalidate(); +#endif protectedActivePopupMenu = 0; } Added: trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp (0 => 95436) --- trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp (rev 0) +++ trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp 2011-09-19 17:14:19 UTC (rev 95436) @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). + * + * 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
[webkit-changes] [95437] trunk/Source/WebCore
Title: [95437] trunk/Source/WebCore Revision 95437 Author lean...@webkit.org Date 2011-09-19 10:18:07 -0700 (Mon, 19 Sep 2011) Log Message Unreviewed: ScrollbarThemeMock.cpp is already referenced in the global CMakeLists.txt. * CMakeListsEfl.txt: Remove reference to platform/mock/ScrollbarThemeMock.cpp. * CMakeListsWinCE.txt: Ditto. Modified Paths trunk/Source/WebCore/CMakeListsEfl.txt trunk/Source/WebCore/CMakeListsWinCE.txt trunk/Source/WebCore/ChangeLog Diff Modified: trunk/Source/WebCore/CMakeListsEfl.txt (95436 => 95437) --- trunk/Source/WebCore/CMakeListsEfl.txt 2011-09-19 17:14:19 UTC (rev 95436) +++ trunk/Source/WebCore/CMakeListsEfl.txt 2011-09-19 17:18:07 UTC (rev 95437) @@ -69,7 +69,6 @@ platform/image-decoders/jpeg/JPEGImageDecoder.cpp platform/image-decoders/png/PNGImageDecoder.cpp platform/image-decoders/webp/WEBPImageDecoder.cpp - platform/mock/ScrollbarThemeMock.cpp platform/posix/FileSystemPOSIX.cpp platform/text/efl/TextBreakIteratorInternalICUEfl.cpp plugins/PluginDataNone.cpp Modified: trunk/Source/WebCore/CMakeListsWinCE.txt (95436 => 95437) --- trunk/Source/WebCore/CMakeListsWinCE.txt 2011-09-19 17:14:19 UTC (rev 95436) +++ trunk/Source/WebCore/CMakeListsWinCE.txt 2011-09-19 17:18:07 UTC (rev 95437) @@ -46,8 +46,6 @@ platform/image-decoders/png/PNGImageDecoder.cpp platform/image-decoders/webp/WEBPImageDecoder.cpp -platform/mock/ScrollbarThemeMock.cpp - platform/win/BitmapInfo.cpp platform/win/ClipboardUtilitiesWin.cpp platform/win/ClipboardWin.cpp Modified: trunk/Source/WebCore/ChangeLog (95436 => 95437) --- trunk/Source/WebCore/ChangeLog 2011-09-19 17:14:19 UTC (rev 95436) +++ trunk/Source/WebCore/ChangeLog 2011-09-19 17:18:07 UTC (rev 95437) @@ -1,3 +1,11 @@ +2011-09-19 Leandro Pereira lean...@profusion.mobi + +Unreviewed: ScrollbarThemeMock.cpp is already referenced in the +global CMakeLists.txt. + +* CMakeListsEfl.txt: Remove reference to platform/mock/ScrollbarThemeMock.cpp. +* CMakeListsWinCE.txt: Ditto. + 2011-09-19 Ademar de Souza Reis Jr. ademar.r...@openbossa.org Unreviewed: dos2unix on bindings/js/JSExceptionBase.h ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95438] trunk/LayoutTests
Title: [95438] trunk/LayoutTests Revision 95438 Author dslo...@google.com Date 2011-09-19 10:34:53 -0700 (Mon, 19 Sep 2011) Log Message [Chromium] Rebaseline expectations due to r95402. * platform/chromium-win-vista/fast/dom/navigator-detached-no-crash-expected.txt: Removed. Modified Paths trunk/LayoutTests/ChangeLog Removed Paths trunk/LayoutTests/platform/chromium-win-vista/fast/dom/navigator-detached-no-crash-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (95437 => 95438) --- trunk/LayoutTests/ChangeLog 2011-09-19 17:18:07 UTC (rev 95437) +++ trunk/LayoutTests/ChangeLog 2011-09-19 17:34:53 UTC (rev 95438) @@ -1,3 +1,9 @@ +2011-09-19 Dmitry Lomov dslo...@google.com + + [Chromium] Rebaseline expectations due to r95402. + +* platform/chromium-win-vista/fast/dom/navigator-detached-no-crash-expected.txt: Removed. + 2011-09-19 Ilya Tikhonovsky loi...@chromium.org Unreviewed skip inspector/timeline/timeline-animation-frame.html on win platform. Deleted: trunk/LayoutTests/platform/chromium-win-vista/fast/dom/navigator-detached-no-crash-expected.txt (95437 => 95438) --- trunk/LayoutTests/platform/chromium-win-vista/fast/dom/navigator-detached-no-crash-expected.txt 2011-09-19 17:18:07 UTC (rev 95437) +++ trunk/LayoutTests/platform/chromium-win-vista/fast/dom/navigator-detached-no-crash-expected.txt 2011-09-19 17:34:53 UTC (rev 95438) @@ -1,21 +0,0 @@ - -This tests that the navigator object of a deleted frame is disconnected properly. Accessing fields or methods shouldn't crash the browser. - Check Navigator -navigator.appCodeName is OK -navigator.appName is OK -navigator.appVersion is OK -navigator.cookieEnabled is OK -navigator.getStorageUpdates() is OK -navigator.javaEnabled() is OK -navigator.language is OK -navigator.mimeTypes is OK -navigator.onLine is OK -navigator.platform is OK -navigator.plugins is OK -navigator.product is OK -navigator.productSub is OK -navigator.registerProtocolHandler() threw err TypeError: Not enough arguments -navigator.userAgent is OK -navigator.vendor is OK -navigator.vendorSub is OK - ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95439] trunk/Source/JavaScriptCore
Title: [95439] trunk/Source/_javascript_Core
Revision 95439
Author oli...@apple.com
Date 2011-09-19 10:41:51 -0700 (Mon, 19 Sep 2011)
Log Message
Remove bump allocator
https://bugs.webkit.org/show_bug.cgi?id=68370
Reviewed by Sam Weinig.
Can't do anything with this allocator currently, and it's
increasing the complexity of the GC code. Slight progression
on SunSpider, slight regression (undoing the original progression)
in V8.
* heap/Heap.cpp:
(JSC::Heap::collect):
* heap/Heap.h:
* heap/NewSpace.cpp:
(JSC::NewSpace::NewSpace):
* heap/NewSpace.h:
(JSC::NewSpace::allocate):
* runtime/JSObject.cpp:
(JSC::JSObject::allocatePropertyStorage):
* runtime/JSObject.h:
(JSC::JSObject::~JSObject):
(JSC::JSObject::visitChildrenDirect):
* runtime/StorageBarrier.h:
(JSC::StorageBarrier::set):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/heap/Heap.cpp
trunk/Source/_javascript_Core/heap/Heap.h
trunk/Source/_javascript_Core/heap/NewSpace.cpp
trunk/Source/_javascript_Core/heap/NewSpace.h
trunk/Source/_javascript_Core/runtime/JSObject.cpp
trunk/Source/_javascript_Core/runtime/JSObject.h
trunk/Source/_javascript_Core/runtime/StorageBarrier.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95438 => 95439)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-19 17:34:53 UTC (rev 95438)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-19 17:41:51 UTC (rev 95439)
@@ -1,3 +1,30 @@
+2011-09-19 Oliver Hunt oli...@apple.com
+
+Remove bump allocator
+https://bugs.webkit.org/show_bug.cgi?id=68370
+
+Reviewed by Sam Weinig.
+
+Can't do anything with this allocator currently, and it's
+increasing the complexity of the GC code. Slight progression
+on SunSpider, slight regression (undoing the original progression)
+in V8.
+
+* heap/Heap.cpp:
+(JSC::Heap::collect):
+* heap/Heap.h:
+* heap/NewSpace.cpp:
+(JSC::NewSpace::NewSpace):
+* heap/NewSpace.h:
+(JSC::NewSpace::allocate):
+* runtime/JSObject.cpp:
+(JSC::JSObject::allocatePropertyStorage):
+* runtime/JSObject.h:
+(JSC::JSObject::~JSObject):
+(JSC::JSObject::visitChildrenDirect):
+* runtime/StorageBarrier.h:
+(JSC::StorageBarrier::set):
+
2011-09-19 Carlos Garcia Campos cgar...@igalia.com
[GTK] Fix distcheck build
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (95438 => 95439)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2011-09-19 17:34:53 UTC (rev 95438)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2011-09-19 17:41:51 UTC (rev 95439)
@@ -692,7 +692,6 @@
// new bytes allocated) proportion, and seems to work well in benchmarks.
size_t proportionalBytes = 2 * size();
m_newSpace.setHighWaterMark(max(proportionalBytes, m_minBytesPerCycle));
-m_newSpace.resetPropertyStorageNursery();
_javascript_CORE_GC_END();
(*m_activityCallback)();
Modified: trunk/Source/_javascript_Core/heap/Heap.h (95438 => 95439)
--- trunk/Source/_javascript_Core/heap/Heap.h 2011-09-19 17:34:53 UTC (rev 95438)
+++ trunk/Source/_javascript_Core/heap/Heap.h 2011-09-19 17:41:51 UTC (rev 95439)
@@ -91,9 +91,6 @@
void notifyIsSafeToCollect() { m_isSafeToCollect = true; }
void collectAllGarbage();
-inline void* allocatePropertyStorage(size_t);
-inline bool inPropertyStorageNursery(void*);
-
void reportExtraMemoryCost(size_t cost);
void protect(JSValue);
@@ -362,22 +359,6 @@
return allocate(sizeClass);
}
-inline void* Heap::allocatePropertyStorage(size_t bytes)
-{
-ASSERT(!(bytes % sizeof(JSValue)));
-if (bytes = NewSpace::PropertyStorageNurserySize)
-return 0;
-if (void* result = m_newSpace.allocatePropertyStorage(bytes))
-return result;
-collect(DoNotSweep);
-return m_newSpace.allocatePropertyStorage(bytes);
-}
-
-inline bool Heap::inPropertyStorageNursery(void* ptr)
-{
-return m_newSpace.inPropertyStorageNursery(ptr);
-}
-
} // namespace JSC
#endif // Heap_h
Modified: trunk/Source/_javascript_Core/heap/NewSpace.cpp (95438 => 95439)
--- trunk/Source/_javascript_Core/heap/NewSpace.cpp 2011-09-19 17:34:53 UTC (rev 95438)
+++ trunk/Source/_javascript_Core/heap/NewSpace.cpp 2011-09-19 17:41:51 UTC (rev 95439)
@@ -32,9 +32,7 @@
class Structure;
NewSpace::NewSpace(Heap* heap)
-: m_propertyStorageNursery(static_castchar*(fastMalloc(PropertyStorageNurserySize)))
-, m_propertyStorageAllocationPoint(m_propertyStorageNursery)
-, m_waterMark(0)
+: m_waterMark(0)
, m_highWaterMark(0)
, m_heap(heap)
{
Modified: trunk/Source/_javascript_Core/heap/NewSpace.h (95438 => 95439)
--- trunk/Source/_javascript_Core/heap/NewSpace.h 2011-09-19 17:34:53 UTC (rev 95438)
+++ trunk/Source/_javascript_Core/heap/NewSpace.h 2011-09-19 17:41:51
[webkit-changes] [95440] trunk
Title: [95440] trunk Revision 95440 Author jber...@webkit.org Date 2011-09-19 11:00:45 -0700 (Mon, 19 Sep 2011) Log Message Sites that use history pushState or replaceState are recorded in history in Private Browsing mode. https://bugs.webkit.org/show_bug.cgi?id=68208 Reviewed by Brady Eidson. Source/WebCore: Test: TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback. Add the privateBrowsingEnabled check that is used in other places in HistoryController before calling addVisitedLink and FrameLoaderClient::updateGlobalHistory. * loader/HistoryController.cpp: (WebCore::HistoryController::pushState): (WebCore::HistoryController::replaceState): Tools: Add a test that the WKContextDidNavigateWithNavigationDataCallback (which is invoked by updateGlobalHistory) is not called in Private Browsing when the page does history.pushState. * TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp: Added. (TestWebKitAPI::didNavigateWithNavigationData): This is a context history client callback, so it should not be called when in Private Browsing. Add a call to FAIL(). (TestWebKitAPI::didSameDocumentNavigationForFrame): This is a page load client callback that happens after the didNavigateWithNavigationData callback. End the test. (TestWebKitAPI::TEST): Enable Private Browsing and load a page that uses history.pushState. * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Add PrivateBrowsingPushStateNoHistoryCallback.cpp and push-state.html. * TestWebKitAPI/Tests/WebKit2/push-state.html: Added. Ditto. * TestWebKitAPI/win/TestWebKitAPI.vcproj: Ditto. * TestWebKitAPI/win/copy-resources.cmd: Ditto. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/HistoryController.cpp trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj trunk/Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj trunk/Tools/TestWebKitAPI/win/copy-resources.cmd Added Paths trunk/Tools/TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp trunk/Tools/TestWebKitAPI/Tests/WebKit2/push-state.html Diff Modified: trunk/Source/WebCore/ChangeLog (95439 => 95440) --- trunk/Source/WebCore/ChangeLog 2011-09-19 17:41:51 UTC (rev 95439) +++ trunk/Source/WebCore/ChangeLog 2011-09-19 18:00:45 UTC (rev 95440) @@ -1,3 +1,20 @@ +2011-09-19 Jessie Berlin jber...@apple.com + +Sites that use history pushState or replaceState are recorded in history in Private Browsing +mode. +https://bugs.webkit.org/show_bug.cgi?id=68208 + +Reviewed by Brady Eidson. + +Test: TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback. + +Add the privateBrowsingEnabled check that is used in other places in HistoryController +before calling addVisitedLink and FrameLoaderClient::updateGlobalHistory. + +* loader/HistoryController.cpp: +(WebCore::HistoryController::pushState): +(WebCore::HistoryController::replaceState): + 2011-09-19 Leandro Pereira lean...@profusion.mobi Unreviewed: ScrollbarThemeMock.cpp is already referenced in the Modified: trunk/Source/WebCore/loader/HistoryController.cpp (95439 => 95440) --- trunk/Source/WebCore/loader/HistoryController.cpp 2011-09-19 17:41:51 UTC (rev 95439) +++ trunk/Source/WebCore/loader/HistoryController.cpp 2011-09-19 18:00:45 UTC (rev 95440) @@ -830,6 +830,10 @@ page-backForward()-addItem(topItem.release()); +Settings* settings = m_frame-settings(); +if (!settings || settings-privateBrowsingEnabled()) +return; + addVisitedLink(page, KURL(ParsedURLString, urlString)); m_frame-loader()-client()-updateGlobalHistory(); @@ -845,6 +849,10 @@ m_currentItem-setTitle(title); m_currentItem-setStateObject(stateObject); +Settings* settings = m_frame-settings(); +if (!settings || settings-privateBrowsingEnabled()) +return; + ASSERT(m_frame-page()); addVisitedLink(m_frame-page(), KURL(ParsedURLString, urlString)); m_frame-loader()-client()-updateGlobalHistory(); Modified: trunk/Tools/ChangeLog (95439 => 95440) --- trunk/Tools/ChangeLog 2011-09-19 17:41:51 UTC (rev 95439) +++ trunk/Tools/ChangeLog 2011-09-19 18:00:45 UTC (rev 95440) @@ -1,3 +1,33 @@ +2011-09-19 Jessie Berlin jber...@apple.com + +Sites that use history pushState or replaceState are recorded in history in Private Browsing +mode. +https://bugs.webkit.org/show_bug.cgi?id=68208 + +Reviewed by Brady Eidson. + +Add a test that the WKContextDidNavigateWithNavigationDataCallback (which is invoked by +updateGlobalHistory) is not called in Private Browsing when the page does history.pushState. + +* TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp: Added. +(TestWebKitAPI::didNavigateWithNavigationData): +This is a context history client callback, so it should not be called when in Private +
[webkit-changes] [95441] trunk/Tools
Title: [95441] trunk/Tools
Revision 95441
Author commit-qu...@webkit.org
Date 2011-09-19 11:03:06 -0700 (Mon, 19 Sep 2011)
Log Message
Buildbot marks a nrwt bot red when tests are missing results
https://bugs.webkit.org/show_bug.cgi?id=64812
Patch by Kristóf Kosztyó kkris...@inf.u-szeged.hu on 2011-09-19
Reviewed by Ryosuke Niwa.
* Scripts/webkitpy/layout_tests/controllers/manager.py:
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py
Diff
Modified: trunk/Tools/ChangeLog (95440 => 95441)
--- trunk/Tools/ChangeLog 2011-09-19 18:00:45 UTC (rev 95440)
+++ trunk/Tools/ChangeLog 2011-09-19 18:03:06 UTC (rev 95441)
@@ -1,3 +1,13 @@
+2011-09-19 Kristóf Kosztyó kkris...@inf.u-szeged.hu
+
+Buildbot marks a nrwt bot red when tests are missing results
+https://bugs.webkit.org/show_bug.cgi?id=64812
+
+Reviewed by Ryosuke Niwa.
+
+* Scripts/webkitpy/layout_tests/controllers/manager.py:
+* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+
2011-09-19 Jessie Berlin jber...@apple.com
Sites that use history pushState or replaceState are recorded in history in Private Browsing
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (95440 => 95441)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2011-09-19 18:00:45 UTC (rev 95440)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2011-09-19 18:03:06 UTC (rev 95441)
@@ -147,6 +147,9 @@
if result_type != retry_result_type:
actual.append(keywords[retry_result_type])
num_flaky += 1
+# FIXME: break MISSING results into a different category
+elif 'MISSING' in actual:
+num_flaky += 1
else:
num_regressions += 1
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (95440 => 95441)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2011-09-19 18:00:45 UTC (rev 95440)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2011-09-19 18:03:06 UTC (rev 95441)
@@ -715,7 +715,7 @@
tests_included=True, filesystem=fs, new_results=True)
file_list = fs.written_files.keys()
file_list.remove('/tmp/layout-test-results/tests_run0.txt')
-self.assertEquals(res, 2)
+self.assertEquals(res, 0)
self.assertFalse(out.empty())
self.assertEqual(len(file_list), 4)
self.assertBaselines(file_list, /failures/unexpected/missing_text, [.txt], err)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95442] trunk/LayoutTests
Title: [95442] trunk/LayoutTests Revision 95442 Author dslo...@google.com Date 2011-09-19 11:12:08 -0700 (Mon, 19 Sep 2011) Log Message [Chromium] Rebaseline expectations and file WK68372. * platform/chromium/test_expectations.txt: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/chromium/test_expectations.txt Diff Modified: trunk/LayoutTests/ChangeLog (95441 => 95442) --- trunk/LayoutTests/ChangeLog 2011-09-19 18:03:06 UTC (rev 95441) +++ trunk/LayoutTests/ChangeLog 2011-09-19 18:12:08 UTC (rev 95442) @@ -1,5 +1,11 @@ 2011-09-19 Dmitry Lomov dslo...@google.com +[Chromium] Rebaseline expectations and file WK68372. + +* platform/chromium/test_expectations.txt: + +2011-09-19 Dmitry Lomov dslo...@google.com + [Chromium] Rebaseline expectations due to r95402. * platform/chromium-win-vista/fast/dom/navigator-detached-no-crash-expected.txt: Removed. Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (95441 => 95442) --- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-09-19 18:03:06 UTC (rev 95441) +++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-09-19 18:12:08 UTC (rev 95442) @@ -3756,3 +3756,4 @@ // Crashes or timeouts once in a while but never fails BUG_KEISHI LINUX : media/video-controls-visible-audio-only.html = PASS TIMEOUT CRASH +BUGWK68372 SNOWLEOPARD : svg/animations/svglength-animation-px-to-exs.html = PASS CRASH ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95443] trunk/Source/WebKit/gtk/po
Title: [95443] trunk/Source/WebKit/gtk/po
Revision 95443
Author commit-qu...@webkit.org
Date 2011-09-19 11:16:24 -0700 (Mon, 19 Sep 2011)
Log Message
Fix paths used by update-po, and avoid changing directory
unnecessarily.
[GTK] make update-po is b0rked
https://bugs.webkit.org/show_bug.cgi?id=68352
Patch by Gustavo Noronha Silva g...@gnome.org on 2011-09-19
Reviewed by Martin Robinson.
* GNUmakefile.am:
Modified Paths
trunk/Source/WebKit/gtk/po/ChangeLog
trunk/Source/WebKit/gtk/po/GNUmakefile.am
Diff
Modified: trunk/Source/WebKit/gtk/po/ChangeLog (95442 => 95443)
--- trunk/Source/WebKit/gtk/po/ChangeLog 2011-09-19 18:12:08 UTC (rev 95442)
+++ trunk/Source/WebKit/gtk/po/ChangeLog 2011-09-19 18:16:24 UTC (rev 95443)
@@ -1,3 +1,15 @@
+2011-09-19 Gustavo Noronha Silva g...@gnome.org
+
+Fix paths used by update-po, and avoid changing directory
+unnecessarily.
+
+[GTK] make update-po is b0rked
+https://bugs.webkit.org/show_bug.cgi?id=68352
+
+Reviewed by Martin Robinson.
+
+* GNUmakefile.am:
+
2011-08-31 Yuri Chornoivan yurc...@ukr.net
Ukrainian translation for WebKitGTK+
Modified: trunk/Source/WebKit/gtk/po/GNUmakefile.am (95442 => 95443)
--- trunk/Source/WebKit/gtk/po/GNUmakefile.am 2011-09-19 18:12:08 UTC (rev 95442)
+++ trunk/Source/WebKit/gtk/po/GNUmakefile.am 2011-09-19 18:16:24 UTC (rev 95443)
@@ -99,10 +99,8 @@
@for pofile in $(POFILES); do \
lang=`echo $$pofile | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
if test -f $(srcdir)/Source/WebKit/gtk/po/$${lang}.po; then \
- test $(srcdir) = . cdcmd= || cdcmd=cd $(srcdir)/Source/WebKit/gtk/po ; \
- echo $${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
- pushd $(srcdir)/Source/WebKit/gtk/po $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
- popd; \
+ echo $${cdcmd}$(MSGMERGE_UPDATE) $(top_srcdir)/Source/WebKit/gtk/po/$${lang}.po $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot; \
+ $(MSGMERGE_UPDATE) $(top_srcdir)/Source/WebKit/gtk/po/$${lang}.po $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot; \
else \
$(MAKE) $${lang}.po-create; \
fi; \
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95444] trunk
Title: [95444] trunk
Revision 95444
Author commit-qu...@webkit.org
Date 2011-09-19 11:18:56 -0700 (Mon, 19 Sep 2011)
Log Message
GTK DRT leaks memory while comparing history items
https://bugs.webkit.org/show_bug.cgi?id=68086
Source/WebKit/gtk:
Patch by Leandro Pereira lean...@profusion.mobi on 2011-09-19
Reviewed by Martin Robinson.
webkit_web_history_item_get_target() function returns a g_strdup()'d
string, so it should return gchar* instead of const gchar*.
* webkit/webkitwebhistoryitem.cpp:
(webkit_web_history_item_get_target): Change return type to gchar*.
* webkit/webkitwebhistoryitemprivate.h: Ditto.
Tools:
Patch by Leandro Pereira lean...@profusion.mobi on 2011-09-19
Reviewed by Martin Robinson.
webkit_web_history_item_get_target() returns a g_strdup()'d string,
so memory must be freed before compareHistoryItems() returns.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(compareHistoryItems): Use GOwnPtr to manage memory automatically.
Modified Paths
trunk/Source/WebKit/gtk/ChangeLog
trunk/Source/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
trunk/Source/WebKit/gtk/webkit/webkitwebhistoryitemprivate.h
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (95443 => 95444)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-09-19 18:16:24 UTC (rev 95443)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-09-19 18:18:56 UTC (rev 95444)
@@ -1,3 +1,17 @@
+2011-09-19 Leandro Pereira lean...@profusion.mobi
+
+GTK DRT leaks memory while comparing history items
+https://bugs.webkit.org/show_bug.cgi?id=68086
+
+Reviewed by Martin Robinson.
+
+webkit_web_history_item_get_target() function returns a g_strdup()'d
+string, so it should return gchar* instead of const gchar*.
+
+* webkit/webkitwebhistoryitem.cpp:
+(webkit_web_history_item_get_target): Change return type to gchar*.
+* webkit/webkitwebhistoryitemprivate.h: Ditto.
+
2011-09-19 Carlos Garcia Campos cgar...@igalia.com
[GTK] Fix distcheck build
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebhistoryitem.cpp (95443 => 95444)
--- trunk/Source/WebKit/gtk/webkit/webkitwebhistoryitem.cpp 2011-09-19 18:16:24 UTC (rev 95443)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebhistoryitem.cpp 2011-09-19 18:18:56 UTC (rev 95444)
@@ -459,7 +459,7 @@
/* private methods */
-const gchar* webkit_web_history_item_get_target(WebKitWebHistoryItem* webHistoryItem)
+gchar* webkit_web_history_item_get_target(WebKitWebHistoryItem* webHistoryItem)
{
g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebhistoryitemprivate.h (95443 => 95444)
--- trunk/Source/WebKit/gtk/webkit/webkitwebhistoryitemprivate.h 2011-09-19 18:16:24 UTC (rev 95443)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebhistoryitemprivate.h 2011-09-19 18:18:56 UTC (rev 95444)
@@ -38,7 +38,7 @@
WebKitWebHistoryItem* webkit_web_history_item_new_with_core_item(PassRefPtrWebCore::HistoryItem);
-WEBKIT_API const gchar* webkit_web_history_item_get_target(WebKitWebHistoryItem*);
+WEBKIT_API gchar* webkit_web_history_item_get_target(WebKitWebHistoryItem*);
WEBKIT_API gboolean webkit_web_history_item_is_target_item(WebKitWebHistoryItem*);
Modified: trunk/Tools/ChangeLog (95443 => 95444)
--- trunk/Tools/ChangeLog 2011-09-19 18:16:24 UTC (rev 95443)
+++ trunk/Tools/ChangeLog 2011-09-19 18:18:56 UTC (rev 95444)
@@ -1,3 +1,16 @@
+2011-09-19 Leandro Pereira lean...@profusion.mobi
+
+GTK DRT leaks memory while comparing history items
+https://bugs.webkit.org/show_bug.cgi?id=68086
+
+Reviewed by Martin Robinson.
+
+webkit_web_history_item_get_target() returns a g_strdup()'d string,
+so memory must be freed before compareHistoryItems() returns.
+
+* DumpRenderTree/gtk/DumpRenderTree.cpp:
+(compareHistoryItems): Use GOwnPtr to manage memory automatically.
+
2011-09-19 Kristóf Kosztyó kkris...@inf.u-szeged.hu
Buildbot marks a nrwt bot red when tests are missing results
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (95443 => 95444)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2011-09-19 18:16:24 UTC (rev 95443)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2011-09-19 18:18:56 UTC (rev 95444)
@@ -64,7 +64,7 @@
extern C {
// This API is not yet public.
-extern const gchar* webkit_web_history_item_get_target(WebKitWebHistoryItem*);
+extern gchar* webkit_web_history_item_get_target(WebKitWebHistoryItem*);
extern gboolean webkit_web_history_item_is_target_item(WebKitWebHistoryItem*);
extern GList* webkit_web_history_item_get_children(WebKitWebHistoryItem*);
extern void webkit_web_settings_add_extra_plugin_directory(WebKitWebView* view, const gchar* directory);
@@ -290,8 +290,9 @@
static gint compareHistoryItems(gpointer* item1, gpointer* item2)
{
-return
[webkit-changes] [95445] trunk/Source/WebCore
Title: [95445] trunk/Source/WebCore
Revision 95445
Author carycl...@google.com
Date 2011-09-19 11:27:34 -0700 (Mon, 19 Sep 2011)
Log Message
Move fontDataForCombiningCharacterSequence to fix Skia on Mac build
https://bugs.webkit.org/show_bug.cgi?id=68358
Reviewed by Dan Bernstein.
No new tests.
* platform/graphics/mac/FontMac.mm:
* platform/graphics/mac/FontComplexTextMac.cpp:
(WebCore::Font::fontDataForCombiningCharacterSequence):
This moves the implementation from FontMac.mm to
FontComplexTextMac.cpp, so it is visible to the Skia on Mac
platform as well.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/mac/FontComplexTextMac.cpp
trunk/Source/WebCore/platform/graphics/mac/FontMac.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (95444 => 95445)
--- trunk/Source/WebCore/ChangeLog 2011-09-19 18:18:56 UTC (rev 95444)
+++ trunk/Source/WebCore/ChangeLog 2011-09-19 18:27:34 UTC (rev 95445)
@@ -1,3 +1,19 @@
+2011-09-19 Cary Clark carycl...@google.com
+
+Move fontDataForCombiningCharacterSequence to fix Skia on Mac build
+https://bugs.webkit.org/show_bug.cgi?id=68358
+
+Reviewed by Dan Bernstein.
+
+No new tests.
+
+* platform/graphics/mac/FontMac.mm:
+* platform/graphics/mac/FontComplexTextMac.cpp:
+(WebCore::Font::fontDataForCombiningCharacterSequence):
+This moves the implementation from FontMac.mm to
+FontComplexTextMac.cpp, so it is visible to the Skia on Mac
+platform as well.
+
2011-09-19 Jessie Berlin jber...@apple.com
Sites that use history pushState or replaceState are recorded in history in Private Browsing
Modified: trunk/Source/WebCore/platform/graphics/mac/FontComplexTextMac.cpp (95444 => 95445)
--- trunk/Source/WebCore/platform/graphics/mac/FontComplexTextMac.cpp 2011-09-19 18:18:56 UTC (rev 95444)
+++ trunk/Source/WebCore/platform/graphics/mac/FontComplexTextMac.cpp 2011-09-19 18:27:34 UTC (rev 95445)
@@ -125,4 +125,38 @@
return controller.offsetForPosition(x, includePartialGlyphs);
}
+const SimpleFontData* Font::fontDataForCombiningCharacterSequence(const UChar* characters, size_t length, FontDataVariant variant) const
+{
+UChar32 baseCharacter;
+size_t baseCharacterLength = 0;
+U16_NEXT(characters, baseCharacterLength, length, baseCharacter);
+
+GlyphData baseCharacterGlyphData = glyphDataForCharacter(baseCharacter, false, variant);
+
+if (length == baseCharacterLength)
+return baseCharacterGlyphData.glyph ? baseCharacterGlyphData.fontData : 0;
+
+bool triedBaseCharacterFontData = false;
+
+unsigned i = 0;
+for (const FontData* fontData = fontDataAt(0); fontData; fontData = fontDataAt(++i)) {
+const SimpleFontData* simpleFontData = fontData-fontDataForCharacter(baseCharacter);
+if (variant != NormalVariant) {
+if (const SimpleFontData* variantFontData = simpleFontData-variantFontData(m_fontDescription, variant))
+simpleFontData = variantFontData;
+}
+
+if (simpleFontData == baseCharacterGlyphData.fontData)
+triedBaseCharacterFontData = true;
+
+if (simpleFontData-canRenderCombiningCharacterSequence(characters, length))
+return simpleFontData;
+}
+
+if (!triedBaseCharacterFontData baseCharacterGlyphData.fontData baseCharacterGlyphData.fontData-canRenderCombiningCharacterSequence(characters, length))
+return baseCharacterGlyphData.fontData;
+
+return 0;
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/mac/FontMac.mm (95444 => 95445)
--- trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2011-09-19 18:18:56 UTC (rev 95444)
+++ trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2011-09-19 18:27:34 UTC (rev 95445)
@@ -249,38 +249,4 @@
CGContextSetShouldSmoothFonts(cgContext, originalShouldUseFontSmoothing);
}
-const SimpleFontData* Font::fontDataForCombiningCharacterSequence(const UChar* characters, size_t length, FontDataVariant variant) const
-{
-UChar32 baseCharacter;
-size_t baseCharacterLength = 0;
-U16_NEXT(characters, baseCharacterLength, length, baseCharacter);
-
-GlyphData baseCharacterGlyphData = glyphDataForCharacter(baseCharacter, false, variant);
-
-if (length == baseCharacterLength)
-return baseCharacterGlyphData.glyph ? baseCharacterGlyphData.fontData : 0;
-
-bool triedBaseCharacterFontData = false;
-
-unsigned i = 0;
-for (const FontData* fontData = fontDataAt(0); fontData; fontData = fontDataAt(++i)) {
-const SimpleFontData* simpleFontData = fontData-fontDataForCharacter(baseCharacter);
-if (variant != NormalVariant) {
-if (const SimpleFontData* variantFontData = simpleFontData-variantFontData(m_fontDescription, variant))
-simpleFontData = variantFontData;
-}
-
-if (simpleFontData == baseCharacterGlyphData.fontData)
-
[webkit-changes] [95446] trunk/Tools
Title: [95446] trunk/Tools Revision 95446 Author alexis.men...@openbossa.org Date 2011-09-19 11:29:27 -0700 (Mon, 19 Sep 2011) Log Message Style checker should not check public Qt WK2 API for parameter_name. https://bugs.webkit.org/show_bug.cgi?id=68359 Reviewed by Andreas Kling. The public Qt WK2 APIs have different rules than WebKit for parameters of methods in h files. Add an exception in the style checker to disable the check. Also added the test for it. * Scripts/webkitpy/style/checker.py: * Scripts/webkitpy/style/checker_unittest.py: Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/style/checker.py trunk/Tools/Scripts/webkitpy/style/checker_unittest.py Diff Modified: trunk/Tools/ChangeLog (95445 => 95446) --- trunk/Tools/ChangeLog 2011-09-19 18:27:34 UTC (rev 95445) +++ trunk/Tools/ChangeLog 2011-09-19 18:29:27 UTC (rev 95446) @@ -1,3 +1,16 @@ +2011-09-19 Alexis Menard alexis.men...@openbossa.org + +Style checker should not check public Qt WK2 API for parameter_name. +https://bugs.webkit.org/show_bug.cgi?id=68359 + +Reviewed by Andreas Kling. + +The public Qt WK2 APIs have different rules than WebKit for parameters of methods in h files. +Add an exception in the style checker to disable the check. Also added the test for it. + +* Scripts/webkitpy/style/checker.py: +* Scripts/webkitpy/style/checker_unittest.py: + 2011-09-19 Leandro Pereira lean...@profusion.mobi GTK DRT leaks memory while comparing history items Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (95445 => 95446) --- trunk/Tools/Scripts/webkitpy/style/checker.py 2011-09-19 18:27:34 UTC (rev 95445) +++ trunk/Tools/Scripts/webkitpy/style/checker.py 2011-09-19 18:29:27 UTC (rev 95446) @@ -144,6 +144,12 @@ ([# Qt's MiniBrowser has no config.h Tools/MiniBrowser/qt], [-build/include]), + +([# The Qt APIs use Qt/QML naming style, which includes + # naming parameters in h files. + Source/WebKit2/UIProcess/API/qt], + [-readability/parameter_name]), + ([# The GTK+ APIs use GTK+ naming style, which includes # lower-cased, underscore-separated values, whitespace before # parens for function calls, and always having variable names. Modified: trunk/Tools/Scripts/webkitpy/style/checker_unittest.py (95445 => 95446) --- trunk/Tools/Scripts/webkitpy/style/checker_unittest.py 2011-09-19 18:27:34 UTC (rev 95445) +++ trunk/Tools/Scripts/webkitpy/style/checker_unittest.py 2011-09-19 18:29:27 UTC (rev 95446) @@ -257,6 +257,9 @@ assertNoCheck(Tools/MiniBrowser/qt/UrlLoader.cpp, build/include) +assertNoCheck(Source/WebKit2/UIProcess/API/qt, +readability/parameter_name) + assertNoCheck(Source/WebCore/ForwardingHeaders/debugger/Debugger.h, build/header_guard) ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95447] trunk/Source/JavaScriptCore
Title: [95447] trunk/Source/_javascript_Core
Revision 95447
Author oli...@apple.com
Date 2011-09-19 11:30:07 -0700 (Mon, 19 Sep 2011)
Log Message
Remove direct property slot pointers from the instruction stream
https://bugs.webkit.org/show_bug.cgi?id=68373
Reviewed by Gavin Barraclough.
Use an indirect load to access prototype properties rather than directly
storing the property address in the instruction stream. This should allow
further optimisations in future, and also provides a 0.5% win to sunspider.
* dfg/DFGRepatch.cpp:
(JSC::DFG::generateProtoChainAccessStub):
* jit/JITPropertyAccess.cpp:
(JSC::JIT::compileGetDirectOffset):
* jit/JITPropertyAccess32_64.cpp:
(JSC::JIT::compileGetDirectOffset):
* runtime/JSObject.h:
(JSC::JSObject::addressOfPropertyStorage):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGRepatch.cpp
trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp
trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp
trunk/Source/_javascript_Core/runtime/JSObject.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95446 => 95447)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-19 18:29:27 UTC (rev 95446)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-19 18:30:07 UTC (rev 95447)
@@ -1,5 +1,25 @@
2011-09-19 Oliver Hunt oli...@apple.com
+Remove direct property slot pointers from the instruction stream
+https://bugs.webkit.org/show_bug.cgi?id=68373
+
+Reviewed by Gavin Barraclough.
+
+Use an indirect load to access prototype properties rather than directly
+storing the property address in the instruction stream. This should allow
+further optimisations in future, and also provides a 0.5% win to sunspider.
+
+* dfg/DFGRepatch.cpp:
+(JSC::DFG::generateProtoChainAccessStub):
+* jit/JITPropertyAccess.cpp:
+(JSC::JIT::compileGetDirectOffset):
+* jit/JITPropertyAccess32_64.cpp:
+(JSC::JIT::compileGetDirectOffset):
+* runtime/JSObject.h:
+(JSC::JSObject::addressOfPropertyStorage):
+
+2011-09-19 Oliver Hunt oli...@apple.com
+
Remove bump allocator
https://bugs.webkit.org/show_bug.cgi?id=68370
Modified: trunk/Source/_javascript_Core/dfg/DFGRepatch.cpp (95446 => 95447)
--- trunk/Source/_javascript_Core/dfg/DFGRepatch.cpp 2011-09-19 18:29:27 UTC (rev 95446)
+++ trunk/Source/_javascript_Core/dfg/DFGRepatch.cpp 2011-09-19 18:30:07 UTC (rev 95447)
@@ -124,8 +124,9 @@
currStructure = it-get();
}
-stubJit.loadPtr(protoObject-addressOfPropertyAtOffset(offset), resultGPR);
-
+stubJit.loadPtr(protoObject-addressOfPropertyStorage(), resultGPR);
+stubJit.loadPtr(MacroAssembler::Address(resultGPR, offset * sizeof(WriteBarrierUnknown)), resultGPR);
+
MacroAssembler::Jump success, fail;
emitRestoreScratch(stubJit, needToRestoreScratch, scratchGPR, success, fail, failureCases);
Modified: trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp (95446 => 95447)
--- trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp 2011-09-19 18:29:27 UTC (rev 95446)
+++ trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp 2011-09-19 18:30:07 UTC (rev 95447)
@@ -499,7 +499,8 @@
void JIT::compileGetDirectOffset(JSObject* base, RegisterID result, size_t cachedOffset)
{
-loadPtr(static_castvoid*(base-m_propertyStorage[cachedOffset]), result);
+loadPtr(base-addressOfPropertyStorage(), result);
+loadPtr(Address(result, cachedOffset * sizeof(WriteBarrierUnknown)), result);
}
void JIT::privateCompilePutByIdTransition(StructureStubInfo* stubInfo, Structure* oldStructure, Structure* newStructure, size_t cachedOffset, StructureChain* chain, ReturnAddressPtr returnAddress, bool direct)
Modified: trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp (95446 => 95447)
--- trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp 2011-09-19 18:29:27 UTC (rev 95446)
+++ trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp 2011-09-19 18:30:07 UTC (rev 95447)
@@ -458,8 +458,9 @@
void JIT::compileGetDirectOffset(JSObject* base, RegisterID resultTag, RegisterID resultPayload, size_t cachedOffset)
{
-load32(reinterpret_castchar*(base-m_propertyStorage[cachedOffset]) + OBJECT_OFFSETOF(JSValue, u.asBits.payload), resultPayload);
-load32(reinterpret_castchar*(base-m_propertyStorage[cachedOffset]) + OBJECT_OFFSETOF(JSValue, u.asBits.tag), resultTag);
+loadPtr(base-addressOfPropertyStorage(), resultTag);
+load32(Address(resultTag, cachedOffset * sizeof(WriteBarrierUnknown) + OBJECT_OFFSETOF(JSValue, u.asBits.payload)), result);
+load32(Address(resultTag, cachedOffset * sizeof(WriteBarrierUnknown) + OBJECT_OFFSETOF(JSValue, u.asBits.tag)), resultTag);
}
void JIT::privateCompilePutByIdTransition(StructureStubInfo* stubInfo, Structure* oldStructure, Structure* newStructure, size_t cachedOffset,
[webkit-changes] [95450] trunk/Source/JavaScriptCore
Title: [95450] trunk/Source/_javascript_Core Revision 95450 Author oli...@apple.com Date 2011-09-19 11:54:33 -0700 (Mon, 19 Sep 2011) Log Message Rename NewSpace to MarkedSpace https://bugs.webkit.org/show_bug.cgi?id=68375 Reviewed by Gavin Barraclough. Rename NewSpace to a more accurate name, and update all uses. This patch doesn't rename the files themselves as that will just make the patch appear bigger than it is. * _javascript_Core.exp: * _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def: * heap/Heap.cpp: (JSC::CountFunctor::TakeIfEmpty::TakeIfEmpty): (JSC::CountFunctor::TakeIfEmpty::operator()): (JSC::Heap::Heap): (JSC::Heap::reportExtraMemoryCostSlowCase): (JSC::Heap::tryAllocate): (JSC::Heap::allocateSlowCase): (JSC::Heap::collect): (JSC::Heap::canonicalizeBlocks): (JSC::Heap::resetAllocator): (JSC::Heap::isValidAllocation): (JSC::Heap::shrink): * heap/Heap.h: (JSC::Heap::markedSpace): (JSC::Heap::sizeClassFor): (JSC::Heap::allocate): * heap/NewSpace.cpp: (JSC::MarkedSpace::MarkedSpace): (JSC::MarkedSpace::addBlock): (JSC::MarkedSpace::removeBlock): (JSC::MarkedSpace::resetAllocator): (JSC::MarkedSpace::canonicalizeBlocks): * heap/NewSpace.h: (JSC::MarkedSpace::waterMark): (JSC::MarkedSpace::highWaterMark): (JSC::MarkedSpace::setHighWaterMark): (JSC::MarkedSpace::sizeClassFor): (JSC::MarkedSpace::allocate): (JSC::MarkedSpace::forEachBlock): (JSC::MarkedSpace::SizeClass::SizeClass): (JSC::MarkedSpace::SizeClass::resetAllocator): (JSC::MarkedSpace::SizeClass::canonicalizeBlock): * jit/JITInlineMethods.h: (JSC::JIT::emitAllocateBasicJSObject): 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/heap/Heap.cpp trunk/Source/_javascript_Core/heap/Heap.h trunk/Source/_javascript_Core/heap/NewSpace.cpp trunk/Source/_javascript_Core/heap/NewSpace.h trunk/Source/_javascript_Core/jit/JITInlineMethods.h Diff Modified: trunk/Source/_javascript_Core/ChangeLog (95449 => 95450) --- trunk/Source/_javascript_Core/ChangeLog 2011-09-19 18:45:47 UTC (rev 95449) +++ trunk/Source/_javascript_Core/ChangeLog 2011-09-19 18:54:33 UTC (rev 95450) @@ -1,3 +1,51 @@ +2011-09-19 Oliver Hunt oli...@apple.com + +Rename NewSpace to MarkedSpace +https://bugs.webkit.org/show_bug.cgi?id=68375 + +Reviewed by Gavin Barraclough. + +Rename NewSpace to a more accurate name, and update all uses. +This patch doesn't rename the files themselves as that will +just make the patch appear bigger than it is. + +* _javascript_Core.exp: +* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def: +* heap/Heap.cpp: +(JSC::CountFunctor::TakeIfEmpty::TakeIfEmpty): +(JSC::CountFunctor::TakeIfEmpty::operator()): +(JSC::Heap::Heap): +(JSC::Heap::reportExtraMemoryCostSlowCase): +(JSC::Heap::tryAllocate): +(JSC::Heap::allocateSlowCase): +(JSC::Heap::collect): +(JSC::Heap::canonicalizeBlocks): +(JSC::Heap::resetAllocator): +(JSC::Heap::isValidAllocation): +(JSC::Heap::shrink): +* heap/Heap.h: +(JSC::Heap::markedSpace): +(JSC::Heap::sizeClassFor): +(JSC::Heap::allocate): +* heap/NewSpace.cpp: +(JSC::MarkedSpace::MarkedSpace): +(JSC::MarkedSpace::addBlock): +(JSC::MarkedSpace::removeBlock): +(JSC::MarkedSpace::resetAllocator): +(JSC::MarkedSpace::canonicalizeBlocks): +* heap/NewSpace.h: +(JSC::MarkedSpace::waterMark): +(JSC::MarkedSpace::highWaterMark): +(JSC::MarkedSpace::setHighWaterMark): +(JSC::MarkedSpace::sizeClassFor): +(JSC::MarkedSpace::allocate): +(JSC::MarkedSpace::forEachBlock): +(JSC::MarkedSpace::SizeClass::SizeClass): +(JSC::MarkedSpace::SizeClass::resetAllocator): +(JSC::MarkedSpace::SizeClass::canonicalizeBlock): +* jit/JITInlineMethods.h: +(JSC::JIT::emitAllocateBasicJSObject): + 2011-09-19 Peter Rybin peter.ry...@gmail.com TextPosition refactoring: Merge ZeroBasedNumber and OneBasedNumber classes Modified: trunk/Source/_javascript_Core/_javascript_Core.exp (95449 => 95450) --- trunk/Source/_javascript_Core/_javascript_Core.exp 2011-09-19 18:45:47 UTC (rev 95449) +++ trunk/Source/_javascript_Core/_javascript_Core.exp 2011-09-19 18:54:33 UTC (rev 95450) @@ -233,7 +233,7 @@ __ZN3JSC41constructFunctionSkippingEvalEnabledCheckEPNS_9ExecStateEPNS_14JSGlobalObjectERKNS_7ArgListERKNS_10IdentifierERKNS_7UStringEi __ZN3JSC4Heap11objectCountEv __ZN3JSC4Heap16activityCallbackEv -__ZN3JSC4Heap16allocateSlowCaseERNS_8NewSpace9SizeClassE +__ZN3JSC4Heap16allocateSlowCaseERNS_11MarkedSpace9SizeClassE __ZN3JSC4Heap16objectTypeCountsEv __ZN3JSC4Heap17collectAllGarbageEv
[webkit-changes] [95451] trunk
Title: [95451] trunk
Revision 95451
Author commit-qu...@webkit.org
Date 2011-09-19 11:59:21 -0700 (Mon, 19 Sep 2011)
Log Message
Fix xssauditor bypass with unterminated closing tag by making the HTMLSourceTracker
and the HTMLParser interact more closely with each other. HTMLParser should be
setting the end range for the token itself to account for buffering that the
HTMLSourceTracker can't know about, but there are a lot of paths that would need
updating. First step is to cover this one path.
https://bugs.webkit.org/show_bug.cgi?id=68281
Patch by Tom Sepez tse...@chromium.org on 2011-09-19
Reviewed by Adam Barth.
Source/WebCore:
Test: http/tests/security/xssAuditor/script-tag-with-invalid-closing-tag.html
* html/parser/HTMLSourceTracker.cpp:
(WebCore::HTMLSourceTracker::end):
* html/parser/HTMLTokenizer.cpp:
(WebCore::HTMLTokenizer::nextToken):
LayoutTests:
* http/tests/security/xssAuditor/resources/echo-intertag.pl:
* http/tests/security/xssAuditor/script-tag-with-invalid-closing-tag-expected.txt: Added.
* http/tests/security/xssAuditor/script-tag-with-invalid-closing-tag.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/parser/HTMLSourceTracker.cpp
trunk/Source/WebCore/html/parser/HTMLTokenizer.cpp
Added Paths
trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-invalid-closing-tag-expected.txt
trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-invalid-closing-tag.html
Diff
Modified: trunk/LayoutTests/ChangeLog (95450 => 95451)
--- trunk/LayoutTests/ChangeLog 2011-09-19 18:54:33 UTC (rev 95450)
+++ trunk/LayoutTests/ChangeLog 2011-09-19 18:59:21 UTC (rev 95451)
@@ -1,3 +1,18 @@
+2011-09-19 Tom Sepez tse...@chromium.org
+
+Fix xssauditor bypass with unterminated closing tag by making the HTMLSourceTracker
+and the HTMLParser interact more closely with each other. HTMLParser should be
+setting the end range for the token itself to account for buffering that the
+HTMLSourceTracker can't know about, but there are a lot of paths that would need
+updating. First step is to cover this one path.
+https://bugs.webkit.org/show_bug.cgi?id=68281
+
+Reviewed by Adam Barth.
+
+* http/tests/security/xssAuditor/resources/echo-intertag.pl:
+* http/tests/security/xssAuditor/script-tag-with-invalid-closing-tag-expected.txt: Added.
+* http/tests/security/xssAuditor/script-tag-with-invalid-closing-tag.html: Added.
+
2011-09-19 Dmitry Lomov dslo...@google.com
[Chromium] Rebaseline expectations and file WK68372.
Modified: trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl (95450 => 95451)
--- trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl 2011-09-19 18:54:33 UTC (rev 95450)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl 2011-09-19 18:59:21 UTC (rev 95451)
@@ -32,6 +32,9 @@
}
print body\n;
print $cgi-param('q');
+if ($cgi-param('clutter')) {
+print $cgi-param('clutter');
+}
if ($cgi-param('notifyDone')) {
print script\n;
print if (window.layoutTestController)\n;
Added: trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-invalid-closing-tag-expected.txt (0 => 95451)
--- trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-invalid-closing-tag-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-invalid-closing-tag-expected.txt 2011-09-19 18:59:21 UTC (rev 95451)
@@ -0,0 +1,3 @@
+CONSOLE MESSAGE: line 1: Refused to execute a _javascript_ script. Source code of script found within request.
+
+
Added: trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-invalid-closing-tag.html (0 => 95451)
--- trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-invalid-closing-tag.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-invalid-closing-tag.html 2011-09-19 18:59:21 UTC (rev 95451)
@@ -0,0 +1,15 @@
+!DOCTYPE html
+html
+head
+script
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.setXSSAuditorEnabled(true);
+}
+/script
+/head
+body
+iframe src=""
+/iframe
+/body
+/html
Modified: trunk/Source/WebCore/ChangeLog (95450 => 95451)
--- trunk/Source/WebCore/ChangeLog 2011-09-19 18:54:33 UTC (rev 95450)
+++ trunk/Source/WebCore/ChangeLog 2011-09-19 18:59:21 UTC (rev 95451)
@@ -1,3 +1,21 @@
+2011-09-19 Tom Sepez tse...@chromium.org
+
+Fix xssauditor bypass with unterminated closing tag by making the HTMLSourceTracker
+and the HTMLParser interact more closely with each other. HTMLParser should be
+setting the end range for the token itself to account for buffering that the
+HTMLSourceTracker can't know
[webkit-changes] [95452] trunk/Source
Title: [95452] trunk/Source
Revision 95452
Author commit-qu...@webkit.org
Date 2011-09-19 12:13:04 -0700 (Mon, 19 Sep 2011)
Log Message
[chromium] Gesture recognizer fires taptype only every other touch
down/up sequence https://bugs.webkit.org/show_bug.cgi?id=68368
Patch by Robert Kroeger rjkro...@chromium.org on 2011-09-19
Reviewed by Adam Barth.
Source/WebCore:
The addition of doubletap detection to the gesture recognizer missed some of the
outgoing edges in the recognizer state machine. This change simplifies the logic
and handles all outgoing edges.
* platform/chromium/GestureRecognizerChromium.cpp:
(WebCore::GestureRecognizerChromium::GestureRecognizerChromium):
(WebCore::GestureRecognizerChromium::isInSecondClickTimeWindow):
(WebCore::GestureRecognizerChromium::updateValues):
(WebCore::GestureRecognizerChromium::touchDown):
(WebCore::GestureRecognizerChromium::click):
* platform/chromium/GestureRecognizerChromium.h:
Source/WebKit/chromium:
The addition of doubletap detection to the gesture recognizer missed some of the
outgoing edges in the recognizer state machine. Thsi change simplifies the logic
and handles all outgoing edges.
* tests/InnerGestureRecognizerTest.cpp:
Additional tests added to ensure that all edges in the state
machine are accounted for.
(BuildablePlatformTouchEvent::BuildablePlatformTouchEvent):
(SimulateAndTestFirstClick):
(TEST_F):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/chromium/GestureRecognizerChromium.cpp
trunk/Source/WebCore/platform/chromium/GestureRecognizerChromium.h
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/tests/InnerGestureRecognizerTest.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (95451 => 95452)
--- trunk/Source/WebCore/ChangeLog 2011-09-19 18:59:21 UTC (rev 95451)
+++ trunk/Source/WebCore/ChangeLog 2011-09-19 19:13:04 UTC (rev 95452)
@@ -1,3 +1,22 @@
+2011-09-19 Robert Kroeger rjkro...@chromium.org
+
+[chromium] Gesture recognizer fires taptype only every other touch
+down/up sequence https://bugs.webkit.org/show_bug.cgi?id=68368
+
+Reviewed by Adam Barth.
+
+The addition of doubletap detection to the gesture recognizer missed some of the
+outgoing edges in the recognizer state machine. This change simplifies the logic
+and handles all outgoing edges.
+
+* platform/chromium/GestureRecognizerChromium.cpp:
+(WebCore::GestureRecognizerChromium::GestureRecognizerChromium):
+(WebCore::GestureRecognizerChromium::isInSecondClickTimeWindow):
+(WebCore::GestureRecognizerChromium::updateValues):
+(WebCore::GestureRecognizerChromium::touchDown):
+(WebCore::GestureRecognizerChromium::click):
+* platform/chromium/GestureRecognizerChromium.h:
+
2011-09-19 Tom Sepez tse...@chromium.org
Fix xssauditor bypass with unterminated closing tag by making the HTMLSourceTracker
Modified: trunk/Source/WebCore/platform/chromium/GestureRecognizerChromium.cpp (95451 => 95452)
--- trunk/Source/WebCore/platform/chromium/GestureRecognizerChromium.cpp 2011-09-19 18:59:21 UTC (rev 95451)
+++ trunk/Source/WebCore/platform/chromium/GestureRecognizerChromium.cpp 2011-09-19 19:13:04 UTC (rev 95452)
@@ -36,6 +36,7 @@
// FIXME: Make these configurable programmatically.
static const double maximumTouchDownDurationInSecondsForClick = 0.8;
static const double minimumTouchDownDurationInSecondsForClick = 0.01;
+static const double maximumSecondsBetweenDoubleClick = 0.7;
static const int maximumTouchMoveInPixelsForClick = 20;
GestureRecognizerChromium::GestureRecognizerChromium()
@@ -62,12 +63,6 @@
addEdgeFunction(Scroll, FirstFinger, Moved, false, GestureRecognizerChromium::inScroll);
addEdgeFunction(Scroll, FirstFinger, Released, false, GestureRecognizerChromium::scrollEnd);
addEdgeFunction(Scroll, FirstFinger, Cancelled, false, GestureRecognizerChromium::scrollEnd);
-
-addEdgeFunction(FirstClickReceived, FirstFinger, Pressed, false, GestureRecognizerChromium::touchDown);
-addEdgeFunction(PendingDoubleClick, FirstFinger, Cancelled, false, GestureRecognizerChromium::noGesture);
-addEdgeFunction(PendingDoubleClick, FirstFinger, Released, false, GestureRecognizerChromium::doubleClick);
-addEdgeFunction(PendingDoubleClick, FirstFinger, Moved, false, GestureRecognizerChromium::maybeDoubleClick);
-addEdgeFunction(PendingDoubleClick, FirstFinger, Stationary, false, GestureRecognizerChromium::maybeDoubleClick);
}
void GestureRecognizerChromium::reset()
@@ -95,7 +90,7 @@
bool GestureRecognizerChromium::isInSecondClickTimeWindow()
{
double duration(m_lastTouchTime - m_lastClickTime);
-return duration = minimumTouchDownDurationInSecondsForClick duration maximumTouchDownDurationInSecondsForClick;
+return duration maximumSecondsBetweenDoubleClick;
}
bool GestureRecognizerChromium::isInsideManhattanSquare(const PlatformTouchPoint point)
@@
[webkit-changes] [95454] trunk/Source/WebKit/chromium
Title: [95454] trunk/Source/WebKit/chromium
Revision 95454
Author joc...@chromium.org
Date 2011-09-19 12:19:47 -0700 (Mon, 19 Sep 2011)
Log Message
[chromium] Disable clang when building chromium in WebKit
https://bugs.webkit.org/show_bug.cgi?id=68343
Reviewed by Adam Barth.
* DEPS:
* gyp_webkit:
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/DEPS
trunk/Source/WebKit/chromium/gyp_webkit
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (95453 => 95454)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 19:14:53 UTC (rev 95453)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 19:19:47 UTC (rev 95454)
@@ -1,3 +1,13 @@
+2011-09-19 Jochen Eisinger joc...@chromium.org
+
+[chromium] Disable clang when building chromium in WebKit
+https://bugs.webkit.org/show_bug.cgi?id=68343
+
+Reviewed by Adam Barth.
+
+* DEPS:
+* gyp_webkit:
+
2011-09-19 Robert Kroeger rjkro...@chromium.org
[chromium] Gesture recognizer fires taptype only every other touch
Modified: trunk/Source/WebKit/chromium/DEPS (95453 => 95454)
--- trunk/Source/WebKit/chromium/DEPS 2011-09-19 19:14:53 UTC (rev 95453)
+++ trunk/Source/WebKit/chromium/DEPS 2011-09-19 19:19:47 UTC (rev 95454)
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '100742'
+ 'chromium_rev': '101494'
}
deps = {
Modified: trunk/Source/WebKit/chromium/gyp_webkit (95453 => 95454)
--- trunk/Source/WebKit/chromium/gyp_webkit 2011-09-19 19:14:53 UTC (rev 95453)
+++ trunk/Source/WebKit/chromium/gyp_webkit 2011-09-19 19:19:47 UTC (rev 95454)
@@ -104,6 +104,9 @@
'-Dv8_use_snapshot=false',
'-Dmsvs_use_common_release=0',
+ # Temporarily disable clang plugins. http://crbug.com/97043
+ '-Dclang_use_chrome_plugins=0',
+
# gyp hack: otherwise gyp assumes its in chromium's src/ dir.
'--depth=./',
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95455] trunk/Source/JavaScriptCore
Title: [95455] trunk/Source/_javascript_Core
Revision 95455
Author oli...@apple.com
Date 2011-09-19 12:33:21 -0700 (Mon, 19 Sep 2011)
Log Message
Build fix.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95454 => 95455)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-19 19:19:47 UTC (rev 95454)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-19 19:33:21 UTC (rev 95455)
@@ -1,5 +1,12 @@
2011-09-19 Oliver Hunt oli...@apple.com
+Build fix.
+
+* jit/JITPropertyAccess32_64.cpp:
+(JSC::JIT::compileGetDirectOffset):
+
+2011-09-19 Oliver Hunt oli...@apple.com
+
Rename NewSpace.{h,cpp} to MarkedSpace.{h,cpp}
https://bugs.webkit.org/show_bug.cgi?id=68376
Modified: trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp (95454 => 95455)
--- trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp 2011-09-19 19:19:47 UTC (rev 95454)
+++ trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp 2011-09-19 19:33:21 UTC (rev 95455)
@@ -459,7 +459,7 @@
void JIT::compileGetDirectOffset(JSObject* base, RegisterID resultTag, RegisterID resultPayload, size_t cachedOffset)
{
loadPtr(base-addressOfPropertyStorage(), resultTag);
-load32(Address(resultTag, cachedOffset * sizeof(WriteBarrierUnknown) + OBJECT_OFFSETOF(JSValue, u.asBits.payload)), result);
+load32(Address(resultTag, cachedOffset * sizeof(WriteBarrierUnknown) + OBJECT_OFFSETOF(JSValue, u.asBits.payload)), resultPayload);
load32(Address(resultTag, cachedOffset * sizeof(WriteBarrierUnknown) + OBJECT_OFFSETOF(JSValue, u.asBits.tag)), resultTag);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95456] trunk/Source/WebKit/chromium
Title: [95456] trunk/Source/WebKit/chromium Revision 95456 Author joc...@chromium.org Date 2011-09-19 12:38:32 -0700 (Mon, 19 Sep 2011) Log Message Unreviewed, build fix It's not enough to disable clang plugins. * gyp_webkit: Modified Paths trunk/Source/WebKit/chromium/ChangeLog trunk/Source/WebKit/chromium/gyp_webkit Diff Modified: trunk/Source/WebKit/chromium/ChangeLog (95455 => 95456) --- trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 19:33:21 UTC (rev 95455) +++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 19:38:32 UTC (rev 95456) @@ -1,5 +1,13 @@ 2011-09-19 Jochen Eisinger joc...@chromium.org +Unreviewed, build fix + +It's not enough to disable clang plugins. + +* gyp_webkit: + +2011-09-19 Jochen Eisinger joc...@chromium.org + [chromium] Disable clang when building chromium in WebKit https://bugs.webkit.org/show_bug.cgi?id=68343 Modified: trunk/Source/WebKit/chromium/gyp_webkit (95455 => 95456) --- trunk/Source/WebKit/chromium/gyp_webkit 2011-09-19 19:33:21 UTC (rev 95455) +++ trunk/Source/WebKit/chromium/gyp_webkit 2011-09-19 19:38:32 UTC (rev 95456) @@ -105,6 +105,7 @@ '-Dmsvs_use_common_release=0', # Temporarily disable clang plugins. http://crbug.com/97043 + '-Dclang=0', '-Dclang_use_chrome_plugins=0', # gyp hack: otherwise gyp assumes its in chromium's src/ dir. ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95457] trunk/Source/WebKit/chromium
Title: [95457] trunk/Source/WebKit/chromium
Revision 95457
Author a...@chromium.org
Date 2011-09-19 12:44:18 -0700 (Mon, 19 Sep 2011)
Log Message
r95385 broke Chromium. Fix it.
https://bugs.webkit.org/show_bug.cgi?id=68378
Unreviewed, build fix.
* src/FrameLoaderClientImpl.cpp:
(WebKit::FrameLoaderClientImpl::didCreateScriptContext):
(WebKit::FrameLoaderClientImpl::willReleaseScriptContext):
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (95456 => 95457)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 19:38:32 UTC (rev 95456)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 19:44:18 UTC (rev 95457)
@@ -1,3 +1,14 @@
+2011-09-19 Aaron Boodman a...@chromium.org
+
+r95385 broke Chromium. Fix it.
+https://bugs.webkit.org/show_bug.cgi?id=68378
+
+Unreviewed, build fix.
+
+* src/FrameLoaderClientImpl.cpp:
+(WebKit::FrameLoaderClientImpl::didCreateScriptContext):
+(WebKit::FrameLoaderClientImpl::willReleaseScriptContext):
+
2011-09-19 Jochen Eisinger joc...@chromium.org
Unreviewed, build fix
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (95456 => 95457)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2011-09-19 19:38:32 UTC (rev 95456)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2011-09-19 19:44:18 UTC (rev 95457)
@@ -143,14 +143,26 @@
#if USE(V8)
void FrameLoaderClientImpl::didCreateScriptContext(v8::Handlev8::Context context, int worldId)
{
-if (m_webFrame-client())
+if (m_webFrame-client()) {
+// FIXME: Remove these once Chromium is updated to use the new version of didCreateScriptContext().
+if (worldId)
+m_webFrame-client()-didCreateScriptContext(m_webFrame);
+else
+m_webFrame-client()-didCreateIsolatedScriptContext(m_webFrame, worldId, context);
+
m_webFrame-client()-didCreateScriptContext(m_webFrame, context, worldId);
+}
}
void FrameLoaderClientImpl::willReleaseScriptContext(v8::Handlev8::Context context, int worldId)
{
-if (m_webFrame-client())
+if (m_webFrame-client()) {
+// FIXME: Remove this once Chromium is updated to use willReleaseScriptContext().
+if (worldId)
+m_webFrame-client()-didDestroyScriptContext(m_webFrame);
+
m_webFrame-client()-willReleaseScriptContext(m_webFrame, context, worldId);
+}
}
#endif
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95458] trunk/Source/WebKit/mac
Title: [95458] trunk/Source/WebKit/mac
Revision 95458
Author ander...@apple.com
Date 2011-09-19 12:46:42 -0700 (Mon, 19 Sep 2011)
Log Message
Remove calls to -[WebView _usesDocumentViews]
https://bugs.webkit.org/show_bug.cgi?id=68377
Reviewed by Adam Roben.
Remove checks and begin assuming that -[WebView _usesDocumentViews] always
returns true, since viewless WebKit1 has been abandoned.
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::windowResizerRect):
(WebChromeClient::invalidateContentsAndWindow):
(WebChromeClient::screenToWindow):
(WebChromeClient::windowToScreen):
(WebChromeClient::platformPageClient):
(WebChromeClient::scrollRectIntoView):
(WebChromeClient::print):
* WebView/WebDataSource.mm:
(-[WebDataSource _receivedData:]):
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
trunk/Source/WebKit/mac/WebView/WebDataSource.mm
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (95457 => 95458)
--- trunk/Source/WebKit/mac/ChangeLog 2011-09-19 19:44:18 UTC (rev 95457)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-09-19 19:46:42 UTC (rev 95458)
@@ -1,3 +1,24 @@
+2011-09-19 Anders Carlsson ander...@apple.com
+
+Remove calls to -[WebView _usesDocumentViews]
+https://bugs.webkit.org/show_bug.cgi?id=68377
+
+Reviewed by Adam Roben.
+
+Remove checks and begin assuming that -[WebView _usesDocumentViews] always
+returns true, since viewless WebKit1 has been abandoned.
+
+* WebCoreSupport/WebChromeClient.mm:
+(WebChromeClient::windowResizerRect):
+(WebChromeClient::invalidateContentsAndWindow):
+(WebChromeClient::screenToWindow):
+(WebChromeClient::windowToScreen):
+(WebChromeClient::platformPageClient):
+(WebChromeClient::scrollRectIntoView):
+(WebChromeClient::print):
+* WebView/WebDataSource.mm:
+(-[WebDataSource _receivedData:]):
+
2011-09-19 Dan Bernstein m...@apple.com
WebKit part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (95457 => 95458)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2011-09-19 19:44:18 UTC (rev 95457)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2011-09-19 19:46:42 UTC (rev 95458)
@@ -543,10 +543,7 @@
IntRect WebChromeClient::windowResizerRect() const
{
-NSRect rect = [[m_webView window] _growBoxRect];
-if ([m_webView _usesDocumentViews])
-return enclosingIntRect(rect);
-return enclosingIntRect([m_webView convertRect:rect fromView:nil]);
+return enclosingIntRect([[m_webView window] _growBoxRect]);
}
void WebChromeClient::invalidateWindow(const IntRect, bool immediate)
@@ -559,15 +556,6 @@
void WebChromeClient::invalidateContentsAndWindow(const IntRect rect, bool immediate)
{
-if ([m_webView _usesDocumentViews])
-return;
-
-[m_webView setNeedsDisplayInRect:rect];
-
-if (immediate) {
-[[m_webView window] displayIfNeeded];
-[[m_webView window] flushWindowIfNeeded];
-}
}
void WebChromeClient::invalidateContentsForSlowScroll(const IntRect rect, bool immediate)
@@ -581,27 +569,17 @@
IntPoint WebChromeClient::screenToWindow(const IntPoint p) const
{
-if ([m_webView _usesDocumentViews])
-return p;
-NSPoint windowCoord = [[m_webView window] convertScreenToBase:p];
-return IntPoint([m_webView convertPoint:windowCoord fromView:nil]);
+return p;
}
IntRect WebChromeClient::windowToScreen(const IntRect r) const
{
-if ([m_webView _usesDocumentViews])
-return r;
-NSRect tempRect = r;
-tempRect = [m_webView convertRect:tempRect toView:nil];
-tempRect.origin = [[m_webView window] convertBaseToScreen:tempRect.origin];
-return enclosingIntRect(tempRect);
+return r;
}
PlatformPageClient WebChromeClient::platformPageClient() const
{
-if ([m_webView _usesDocumentViews])
-return 0;
-return m_webView;
+return 0;
}
void WebChromeClient::contentsSizeChanged(Frame*, const IntSize) const
@@ -612,8 +590,7 @@
{
// FIXME: This scrolling behavior should be under the control of the embedding client,
// perhaps in a delegate method, rather than something WebKit does unconditionally.
-NSView *coordinateView = [m_webView _usesDocumentViews]
-? (NSView *)[[[m_webView mainFrame] frameView] documentView] : m_webView;
+NSView *coordinateView = [[[m_webView mainFrame] frameView] documentView];
NSRect rect = r;
for (NSView *view = m_webView; view; view = [view superview]) {
if ([view isKindOfClass:[NSClipView class]]) {
@@ -653,7 +630,7 @@
WebFrame *webFrame = kit(frame);
if ([[m_webView UIDelegate] respondsToSelector:@selector(webView:printFrame:)])
CallUIDelegate(m_webView, @selector(webView:printFrame:), webFrame);
-else if
[webkit-changes] [95459] trunk/Source/WebKit/mac
Title: [95459] trunk/Source/WebKit/mac
Revision 95459
Author ander...@apple.com
Date 2011-09-19 13:07:46 -0700 (Mon, 19 Sep 2011)
Log Message
Remove calls to -[WebView _usesDocumentViews] from WebFrameLoaderClient.mm
https://bugs.webkit.org/show_bug.cgi?id=68379
Reviewed by Adam Roben.
Remove checks and begin assuming that -[WebView _usesDocumentViews] always
returns true, since viewless WebKit1 has been abandoned.
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::hasHTMLView):
(WebFrameLoaderClient::dispatchDidCommitLoad):
(WebFrameLoaderClient::transitionToCommittedForNewPage):
(WebFrameLoaderClient::createFrame):
* WebView/WebFrame.mm:
(-[WebFrame _updateBackgroundAndUpdatesWhileOffscreen]):
(-[WebFrame _hasSelection]):
(-[WebFrame _clearSelection]):
(-[WebFrame _shouldFlattenCompositingLayers:]):
(-[WebFrame _dragSourceEndedAt:operation:]):
(-[WebFrame frameView]):
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
trunk/Source/WebKit/mac/WebView/WebFrame.mm
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (95458 => 95459)
--- trunk/Source/WebKit/mac/ChangeLog 2011-09-19 19:46:42 UTC (rev 95458)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-09-19 20:07:46 UTC (rev 95459)
@@ -1,5 +1,28 @@
2011-09-19 Anders Carlsson ander...@apple.com
+Remove calls to -[WebView _usesDocumentViews] from WebFrameLoaderClient.mm
+https://bugs.webkit.org/show_bug.cgi?id=68379
+
+Reviewed by Adam Roben.
+
+Remove checks and begin assuming that -[WebView _usesDocumentViews] always
+returns true, since viewless WebKit1 has been abandoned.
+
+* WebCoreSupport/WebFrameLoaderClient.mm:
+(WebFrameLoaderClient::hasHTMLView):
+(WebFrameLoaderClient::dispatchDidCommitLoad):
+(WebFrameLoaderClient::transitionToCommittedForNewPage):
+(WebFrameLoaderClient::createFrame):
+* WebView/WebFrame.mm:
+(-[WebFrame _updateBackgroundAndUpdatesWhileOffscreen]):
+(-[WebFrame _hasSelection]):
+(-[WebFrame _clearSelection]):
+(-[WebFrame _shouldFlattenCompositingLayers:]):
+(-[WebFrame _dragSourceEndedAt:operation:]):
+(-[WebFrame frameView]):
+
+2011-09-19 Anders Carlsson ander...@apple.com
+
Remove calls to -[WebView _usesDocumentViews]
https://bugs.webkit.org/show_bug.cgi?id=68377
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (95458 => 95459)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2011-09-19 19:46:42 UTC (rev 95458)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2011-09-19 20:07:46 UTC (rev 95459)
@@ -233,11 +233,6 @@
bool WebFrameLoaderClient::hasHTMLView() const
{
-if (![getWebView(m_webFrame.get()) _usesDocumentViews]) {
-// FIXME (Viewless): For now we just assume that all frames have an HTML view
-return true;
-}
-
NSView WebDocumentView *view = [m_webFrame-_private-webFrameView documentView];
return [view isKindOfClass:[WebHTMLView class]];
}
@@ -658,7 +653,7 @@
void WebFrameLoaderClient::dispatchDidCommitLoad()
{
// Tell the client we've committed this URL.
-ASSERT([m_webFrame-_private-webFrameView documentView] != nil || ![getWebView(m_webFrame.get()) _usesDocumentViews]);
+ASSERT([m_webFrame-_private-webFrameView documentView] != nil);
WebView *webView = getWebView(m_webFrame.get());
[webView _didCommitLoadForFrame:m_webFrame.get()];
@@ -1233,31 +1228,24 @@
{
WebView *webView = getWebView(m_webFrame.get());
WebDataSource *dataSource = [m_webFrame.get() _dataSource];
-bool usesDocumentViews = [webView _usesDocumentViews];
-if (usesDocumentViews) {
-// FIXME (Viewless): I assume we want the equivalent of this optimization for viewless mode too.
-bool willProduceHTMLView = [m_webFrame-_private-webFrameView _viewClassForMIMEType:[dataSource _responseMIMEType]] == [WebHTMLView class];
-bool canSkipCreation = core(m_webFrame.get())-loader()-stateMachine()-committingFirstRealLoad() willProduceHTMLView;
-if (canSkipCreation) {
-[[m_webFrame-_private-webFrameView documentView] setDataSource:dataSource];
-return;
-}
-
-// Don't suppress scrollbars before the view creation if we're making the view for a non-HTML view.
-if (!willProduceHTMLView)
-[[m_webFrame-_private-webFrameView _scrollView] setScrollBarsSuppressed:NO repaintOnUnsuppress:NO];
+bool willProduceHTMLView = [m_webFrame-_private-webFrameView _viewClassForMIMEType:[dataSource _responseMIMEType]] == [WebHTMLView class];
+bool canSkipCreation = core(m_webFrame.get())-loader()-stateMachine()-committingFirstRealLoad() willProduceHTMLView;
+if (canSkipCreation) {
+[[m_webFrame-_private-webFrameView documentView] setDataSource:dataSource];
+
[webkit-changes] [95460] branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp
Title: [95460] branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp Revision 95460 Author aba...@webkit.org Date 2011-09-19 13:09:39 -0700 (Mon, 19 Sep 2011) Log Message Manual merge of 94902 to 874 branch. Modified Paths branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp Diff Modified: branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp (95459 => 95460) --- branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp 2011-09-19 20:07:46 UTC (rev 95459) +++ branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp 2011-09-19 20:09:39 UTC (rev 95460) @@ -2539,11 +2539,6 @@ // Make sure we send the Origin header. addHTTPOriginIfNeeded(request, String()); - -// Always try UTF-8. If that fails, try frame encoding (if any) and then the default. -// For a newly opened frame with an empty URL, encoding() should not be used, because this methods asks decoder, which uses ISO-8859-1. -Settings* settings = m_frame-settings(); -request.setResponseContentDispositionEncodingFallbackArray(UTF-8, activeDocumentLoader()-writer()-deprecatedFrameEncoding(), settings ? settings-defaultTextEncodingName() : String()); } void FrameLoader::addHTTPOriginIfNeeded(ResourceRequest request, const String origin) ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95462] trunk
Title: [95462] trunk
Revision 95462
Author infe...@chromium.org
Date 2011-09-19 13:20:13 -0700 (Mon, 19 Sep 2011)
Log Message
Source/WebCore: Issues with merging ruby bases.
https://bugs.webkit.org/show_bug.cgi?id=67240
Reviewed by James Robinson.
1) Change fromBeforeChild to beforeChild to match
webkit rendering naming conventions.
2) Add assert to verify ruby base is indeed emptied
after collecting all children in a single base.
3) Fix condition in mergeBlockChildren to bail out only
when we have no children and there is no work to merge
children to toBase.
Test: fast/ruby/ruby-overhang-crash.html
* rendering/RenderRubyBase.cpp:
(WebCore::RenderRubyBase::moveChildren):
(WebCore::RenderRubyBase::moveInlineChildren):
(WebCore::RenderRubyBase::moveBlockChildren):
(WebCore::RenderRubyBase::mergeBlockChildren):
* rendering/RenderRubyBase.h:
* rendering/RenderRubyRun.cpp:
(WebCore::RenderRubyRun::removeChild):
LayoutTests: Issues with merging ruby bases.
https://bugs.webkit.org/show_bug.cgi?id=67240
Reviewed by James Robinson.
ASSERTION FAILED: !needsLayout() in RenderRubyRun::getOverhang.
* fast/ruby/ruby-overhang-crash-expected.txt: Added.
* fast/ruby/ruby-overhang-crash.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderRubyBase.cpp
trunk/Source/WebCore/rendering/RenderRubyBase.h
trunk/Source/WebCore/rendering/RenderRubyRun.cpp
Added Paths
trunk/LayoutTests/fast/ruby/ruby-overhang-crash-expected.txt
trunk/LayoutTests/fast/ruby/ruby-overhang-crash.html
Diff
Modified: trunk/LayoutTests/ChangeLog (95461 => 95462)
--- trunk/LayoutTests/ChangeLog 2011-09-19 20:17:53 UTC (rev 95461)
+++ trunk/LayoutTests/ChangeLog 2011-09-19 20:20:13 UTC (rev 95462)
@@ -1,3 +1,15 @@
+2011-09-19 Abhishek Arya infe...@chromium.org
+
+Issues with merging ruby bases.
+https://bugs.webkit.org/show_bug.cgi?id=67240
+
+Reviewed by James Robinson.
+
+ASSERTION FAILED: !needsLayout() in RenderRubyRun::getOverhang.
+
+* fast/ruby/ruby-overhang-crash-expected.txt: Added.
+* fast/ruby/ruby-overhang-crash.html: Added.
+
2011-09-16 Abhishek Arya infe...@chromium.org
Child not placed correctly when beforeChild (table part)
Added: trunk/LayoutTests/fast/ruby/ruby-overhang-crash-expected.txt (0 => 95462)
--- trunk/LayoutTests/fast/ruby/ruby-overhang-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/ruby/ruby-overhang-crash-expected.txt 2011-09-19 20:20:13 UTC (rev 95462)
@@ -0,0 +1,2 @@
+Test passes if it does not crash.
+
Added: trunk/LayoutTests/fast/ruby/ruby-overhang-crash.html (0 => 95462)
--- trunk/LayoutTests/fast/ruby/ruby-overhang-crash.html (rev 0)
+++ trunk/LayoutTests/fast/ruby/ruby-overhang-crash.html 2011-09-19 20:20:13 UTC (rev 95462)
@@ -0,0 +1,23 @@
+html
+body
+Test passes if it does not crash.
+rubysvgtablespandivtr/trrt id=test/rt/ruby
+script
+function runTest()
+{
+var child = document.getElementById('test');
+child.parentNode.removeChild(child);
+
+if (window.layoutTestController)
+layoutTestController.notifyDone();
+}
+
+if (window.layoutTestController) {
+layoutTestController.dumpAsText();
+layoutTestController.waitUntilDone();
+}
+
+setTimeout(runTest(), 0);
+/script
+/body
+/html
Modified: trunk/Source/WebCore/ChangeLog (95461 => 95462)
--- trunk/Source/WebCore/ChangeLog 2011-09-19 20:17:53 UTC (rev 95461)
+++ trunk/Source/WebCore/ChangeLog 2011-09-19 20:20:13 UTC (rev 95462)
@@ -1,3 +1,29 @@
+2011-09-19 Abhishek Arya infe...@chromium.org
+
+Issues with merging ruby bases.
+https://bugs.webkit.org/show_bug.cgi?id=67240
+
+Reviewed by James Robinson.
+
+1) Change fromBeforeChild to beforeChild to match
+webkit rendering naming conventions.
+2) Add assert to verify ruby base is indeed emptied
+after collecting all children in a single base.
+3) Fix condition in mergeBlockChildren to bail out only
+when we have no children and there is no work to merge
+children to toBase.
+
+Test: fast/ruby/ruby-overhang-crash.html
+
+* rendering/RenderRubyBase.cpp:
+(WebCore::RenderRubyBase::moveChildren):
+(WebCore::RenderRubyBase::moveInlineChildren):
+(WebCore::RenderRubyBase::moveBlockChildren):
+(WebCore::RenderRubyBase::mergeBlockChildren):
+* rendering/RenderRubyBase.h:
+* rendering/RenderRubyRun.cpp:
+(WebCore::RenderRubyRun::removeChild):
+
2011-09-16 Abhishek Arya infe...@chromium.org
Child not placed correctly when beforeChild (table part)
Modified: trunk/Source/WebCore/rendering/RenderRubyBase.cpp (95461 => 95462)
--- trunk/Source/WebCore/rendering/RenderRubyBase.cpp 2011-09-19 20:17:53 UTC (rev 95461)
+++ trunk/Source/WebCore/rendering/RenderRubyBase.cpp 2011-09-19 20:20:13 UTC (rev
[webkit-changes] [95463] branches/chromium/874/Source/WebCore/platform
Title: [95463] branches/chromium/874/Source/WebCore/platform
Revision 95463
Author le...@chromium.org
Date 2011-09-19 13:20:20 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 94986 - Make the ThreadSafeRefCounted support in CrossThreadCopier work for T*.
https://bugs.webkit.org/show_bug.cgi?id=67947
Reviewed by Adam Barth.
The changes are tested by compiling and added compile asserts to do some verification as well.
* platform/CrossThreadCopier.cpp:
Added some compile asserts to verify various match and non-matches for CrossThreadCopier.
* platform/CrossThreadCopier.h:
Added a typedef to convert T* to T, just like the typedef's to remove RefPtr and PassRefPtr.
Added a compile assert to verify that only one of the typedefs did anything.
(CrossThreadCopierBasefalse, true, T::copy): Remove get as it is unnecessary.
It shouldn't have been here (PassRefPtr and RefPtr easily and sometimes more efficiently
convert to PassRefPtr without get). Also, a raw pointer doesn't have a get() method.
TBR=le...@chromium.org
Review URL: http://codereview.chromium.org/7946013
Modified Paths
branches/chromium/874/Source/WebCore/platform/CrossThreadCopier.cpp
branches/chromium/874/Source/WebCore/platform/CrossThreadCopier.h
Diff
Modified: branches/chromium/874/Source/WebCore/platform/CrossThreadCopier.cpp (95462 => 95463)
--- branches/chromium/874/Source/WebCore/platform/CrossThreadCopier.cpp 2011-09-19 20:20:13 UTC (rev 95462)
+++ branches/chromium/874/Source/WebCore/platform/CrossThreadCopier.cpp 2011-09-19 20:20:20 UTC (rev 95463)
@@ -39,6 +39,8 @@
#include ResourceResponse.h
#include SerializedScriptValue.h
+#include wtf/Assertions.h
+
namespace WebCore {
CrossThreadCopierBasefalse, false, KURL::Type CrossThreadCopierBasefalse, false, KURL::copy(const KURL url)
@@ -66,4 +68,68 @@
return response.copyData();
}
+// Test CrossThreadCopier using COMPILE_ASSERT.
+
+// Verify that ThreadSafeRefCounted objects get handled correctly.
+class CopierThreadSafeRefCountedTest : public ThreadSafeRefCountedCopierThreadSafeRefCountedTest {
+};
+
+COMPILE_ASSERT((WTF::IsSameType
+ PassRefPtrCopierThreadSafeRefCountedTest,
+ CrossThreadCopierPassRefPtrCopierThreadSafeRefCountedTest ::Type
+ ::value),
+ PassRefPtrTest);
+COMPILE_ASSERT((WTF::IsSameType
+ PassRefPtrCopierThreadSafeRefCountedTest,
+ CrossThreadCopierRefPtrCopierThreadSafeRefCountedTest ::Type
+ ::value),
+ RefPtrTest);
+COMPILE_ASSERT((WTF::IsSameType
+ PassRefPtrCopierThreadSafeRefCountedTest,
+ CrossThreadCopierCopierThreadSafeRefCountedTest*::Type
+ ::value),
+ RawPointerTest);
+
+
+// Add a generic specialization which will let's us verify that no other template matches.
+templatetypename T struct CrossThreadCopierBasefalse, false, T {
+typedef int Type;
+};
+
+// Verify that RefCounted objects only match our generic template which exposes Type as int.
+class CopierRefCountedTest : public RefCountedCopierRefCountedTest {
+};
+
+COMPILE_ASSERT((WTF::IsSameType
+ int,
+ CrossThreadCopierPassRefPtrCopierRefCountedTest ::Type
+ ::value),
+ PassRefPtrRefCountedTest);
+
+COMPILE_ASSERT((WTF::IsSameType
+ int,
+ CrossThreadCopierRefPtrCopierRefCountedTest ::Type
+ ::value),
+ RefPtrRefCountedTest);
+
+COMPILE_ASSERT((WTF::IsSameType
+ int,
+ CrossThreadCopierCopierRefCountedTest*::Type
+ ::value),
+ RawPointerRefCountedTest);
+
+// Verify that PassOwnPtr gets passed through.
+COMPILE_ASSERT((WTF::IsSameType
+ PassOwnPtrfloat,
+ CrossThreadCopierPassOwnPtrfloat ::Type
+ ::value),
+ PassOwnPtrTest);
+
+// Verify that PassOwnPtr does not get passed through.
+COMPILE_ASSERT((WTF::IsSameType
+ int,
+ CrossThreadCopierOwnPtrfloat ::Type
+ ::value),
+ OwnPtrTest);
+
} // namespace WebCore
Modified: branches/chromium/874/Source/WebCore/platform/CrossThreadCopier.h (95462 => 95463)
--- branches/chromium/874/Source/WebCore/platform/CrossThreadCopier.h 2011-09-19 20:20:13 UTC (rev 95462)
+++ branches/chromium/874/Source/WebCore/platform/CrossThreadCopier.h 2011-09-19 20:20:20 UTC (rev 95463)
@@ -31,6 +31,7 @@
#ifndef CrossThreadCopier_h
#define CrossThreadCopier_h
+#include wtf/Assertions.h
#include wtf/Forward.h
#include wtf/PassOwnPtr.h
#include wtf/PassRefPtr.h
@@ -68,11 +69,19 @@
// Custom copy methods.
templatetypename T struct CrossThreadCopierBasefalse, true, T {
typedef typename WTF::RemoveTemplateT, RefPtr::Type TypeWithoutRefPtr;
-typedef typename WTF::RemoveTemplateTypeWithoutRefPtr,
[webkit-changes] [95464] branches/chromium/874/Source/WebKit/chromium/src/ WorkerFileWriterCallbacksBridge.cpp
Title: [95464] branches/chromium/874/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp
Revision 95464
Author le...@chromium.org
Date 2011-09-19 13:22:03 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 95012 - [chromium] Remove AllowCrossThreadAccess for WorkerFileWriterCallbacksBridge.
https://bugs.webkit.org/show_bug.cgi?id=67943
Reviewed by Adam Barth.
* src/WorkerFileWriterCallbacksBridge.cpp: Removed AllowCrossThreadAccess
allowing the automatic ref counting to work. This was previous needed when
the ref counting wasn't working but that was fixed in r94986. Note that the
design was to have ref counting since the methods take PassRefPtr and the
class is ThreadSafeRefCounted. (Ideally we have noticed this flaw when
adding in AllowCrossThreadAccess.)
(WebKit::WorkerFileWriterCallbacksBridge::postWriteToMainThread):
(WebKit::WorkerFileWriterCallbacksBridge::postTruncateToMainThread):
(WebKit::WorkerFileWriterCallbacksBridge::postAbortToMainThread):
(WebKit::WorkerFileWriterCallbacksBridge::didWrite):
(WebKit::WorkerFileWriterCallbacksBridge::didFail):
(WebKit::WorkerFileWriterCallbacksBridge::didTruncate):
(WebKit::WorkerFileWriterCallbacksBridge::postInitToMainThread):
(WebKit::WorkerFileWriterCallbacksBridge::dispatchTaskToMainThread):
(WebKit::WorkerFileWriterCallbacksBridge::dispatchTaskToWorkerThread):
TBR=le...@chromium.org
Review URL: http://codereview.chromium.org/7942006
Modified Paths
branches/chromium/874/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp
Diff
Modified: branches/chromium/874/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp (95463 => 95464)
--- branches/chromium/874/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp 2011-09-19 20:20:20 UTC (rev 95463)
+++ branches/chromium/874/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp 2011-09-19 20:22:03 UTC (rev 95464)
@@ -62,7 +62,7 @@
ASSERT(!m_operationInProgress);
m_operationInProgress = true;
dispatchTaskToMainThread(createCallbackTask(writeOnMainThread,
-AllowCrossThreadAccess(this), position, data));
+this, position, data));
}
void WorkerFileWriterCallbacksBridge::postTruncateToMainThread(long long length)
@@ -70,13 +70,13 @@
ASSERT(!m_operationInProgress);
m_operationInProgress = true;
dispatchTaskToMainThread(createCallbackTask(truncateOnMainThread,
-AllowCrossThreadAccess(this), length));
+this, length));
}
void WorkerFileWriterCallbacksBridge::postAbortToMainThread()
{
ASSERT(m_operationInProgress);
-dispatchTaskToMainThread(createCallbackTask(abortOnMainThread, AllowCrossThreadAccess(this)));
+dispatchTaskToMainThread(createCallbackTask(abortOnMainThread, this));
}
void WorkerFileWriterCallbacksBridge::postShutdownToMainThread(PassRefPtrWorkerFileWriterCallbacksBridge bridge)
@@ -115,17 +115,17 @@
void WorkerFileWriterCallbacksBridge::didWrite(long long bytes, bool complete)
{
-dispatchTaskToWorkerThread(createCallbackTask(didWriteOnWorkerThread, AllowCrossThreadAccess(this), bytes, complete));
+dispatchTaskToWorkerThread(createCallbackTask(didWriteOnWorkerThread, this, bytes, complete));
}
void WorkerFileWriterCallbacksBridge::didFail(WebFileError error)
{
-dispatchTaskToWorkerThread(createCallbackTask(didFailOnWorkerThread, AllowCrossThreadAccess(this), error));
+dispatchTaskToWorkerThread(createCallbackTask(didFailOnWorkerThread, this, error));
}
void WorkerFileWriterCallbacksBridge::didTruncate()
{
-dispatchTaskToWorkerThread(createCallbackTask(didTruncateOnWorkerThread, AllowCrossThreadAccess(this)));
+dispatchTaskToWorkerThread(createCallbackTask(didTruncateOnWorkerThread, this));
}
static const char fileWriterOperationsMode[] = fileWriterOperationsMode;
@@ -147,7 +147,7 @@
void WorkerFileWriterCallbacksBridge::postInitToMainThread(const KURL path)
{
dispatchTaskToMainThread(
-createCallbackTask(initOnMainThread, AllowCrossThreadAccess(this), path));
+createCallbackTask(initOnMainThread, this, path));
}
WorkerFileWriterCallbacksBridge::~WorkerFileWriterCallbacksBridge()
@@ -200,14 +200,14 @@
{
ASSERT(m_workerContext-isContextThread());
WebWorkerBase::dispatchTaskToMainThread(
-createCallbackTask(runTaskOnMainThread, AllowCrossThreadAccess(this), task));
+createCallbackTask(runTaskOnMainThread, this, task));
}
void WorkerFileWriterCallbacksBridge::dispatchTaskToWorkerThread(PassOwnPtrScriptExecutionContext::Task task)
{
ASSERT(isMainThread());
m_proxy-postTaskForModeToWorkerContext(
-createCallbackTask(runTaskOnWorkerThread, AllowCrossThreadAccess(this), task), m_mode);
+createCallbackTask(runTaskOnWorkerThread, this, task), m_mode);
}
bool
[webkit-changes] [95465] trunk/Source/WebKit/mac
Title: [95465] trunk/Source/WebKit/mac
Revision 95465
Author ander...@apple.com
Date 2011-09-19 13:27:42 -0700 (Mon, 19 Sep 2011)
Log Message
Begin removing -[WebView _usesDocumentCalls] from WebView.mm
https://bugs.webkit.org/show_bug.cgi?id=68383
Reviewed by Adam Roben.
Remove checks and begin assuming that -[WebView _usesDocumentViews] always
returns true, since viewless WebKit1 has been abandoned.
* WebView/WebView.mm:
(-[WebView selectedFrame]):
(-[WebView setHostWindow:]):
(-[WebView acceptsFirstResponder]):
(-[WebView becomeFirstResponder]):
(-[WebView _webcore_effectiveFirstResponder]):
(-[WebView setNextKeyView:]):
(-[WebView setHoverFeedbackSuspended:]):
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebView.mm
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (95464 => 95465)
--- trunk/Source/WebKit/mac/ChangeLog 2011-09-19 20:22:03 UTC (rev 95464)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-09-19 20:27:42 UTC (rev 95465)
@@ -1,5 +1,24 @@
2011-09-19 Anders Carlsson ander...@apple.com
+Begin removing -[WebView _usesDocumentCalls] from WebView.mm
+https://bugs.webkit.org/show_bug.cgi?id=68383
+
+Reviewed by Adam Roben.
+
+Remove checks and begin assuming that -[WebView _usesDocumentViews] always
+returns true, since viewless WebKit1 has been abandoned.
+
+* WebView/WebView.mm:
+(-[WebView selectedFrame]):
+(-[WebView setHostWindow:]):
+(-[WebView acceptsFirstResponder]):
+(-[WebView becomeFirstResponder]):
+(-[WebView _webcore_effectiveFirstResponder]):
+(-[WebView setNextKeyView:]):
+(-[WebView setHoverFeedbackSuspended:]):
+
+2011-09-19 Anders Carlsson ander...@apple.com
+
Remove calls to -[WebView _usesDocumentViews] from WebFrameLoaderClient.mm
https://bugs.webkit.org/show_bug.cgi?id=68379
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (95464 => 95465)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2011-09-19 20:22:03 UTC (rev 95464)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2011-09-19 20:27:42 UTC (rev 95465)
@@ -3531,14 +3531,12 @@
- (WebFrame *)selectedFrame
{
-if (_private-usesDocumentViews) {
-// If the first responder is a view in our tree, we get the frame containing the first responder.
-// This is faster than searching the frame hierarchy, and will give us a result even in the case
-// where the focused frame doesn't actually contain a selection.
-WebFrame *focusedFrame = [self _focusedFrame];
-if (focusedFrame)
-return focusedFrame;
-}
+// If the first responder is a view in our tree, we get the frame containing the first responder.
+// This is faster than searching the frame hierarchy, and will give us a result even in the case
+// where the focused frame doesn't actually contain a selection.
+WebFrame *focusedFrame = [self _focusedFrame];
+if (focusedFrame)
+return focusedFrame;
// If the first responder is outside of our view tree, we search for a frame containing a selection.
// There should be at most only one of these.
@@ -3824,20 +3822,16 @@
return;
Frame* coreFrame = [self _mainCoreFrame];
-if (_private-usesDocumentViews) {
-for (Frame* frame = coreFrame; frame; frame = frame-tree()-traverseNext(coreFrame))
-[[[kit(frame) frameView] documentView] viewWillMoveToHostWindow:hostWindow];
-}
+for (Frame* frame = coreFrame; frame; frame = frame-tree()-traverseNext(coreFrame))
+[[[kit(frame) frameView] documentView] viewWillMoveToHostWindow:hostWindow];
if (_private-hostWindow [self window] != _private-hostWindow)
[[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowWillCloseNotification object:_private-hostWindow];
if (hostWindow)
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowWillClose:) name:NSWindowWillCloseNotification object:hostWindow];
[_private-hostWindow release];
_private-hostWindow = [hostWindow retain];
-if (_private-usesDocumentViews) {
-for (Frame* frame = coreFrame; frame; frame = frame-tree()-traverseNext(coreFrame))
-[[[kit(frame) frameView] documentView] viewDidMoveToHostWindow];
-}
+for (Frame* frame = coreFrame; frame; frame = frame-tree()-traverseNext(coreFrame))
+[[[kit(frame) frameView] documentView] viewDidMoveToHostWindow];
}
- (NSWindow *)hostWindow
@@ -3958,80 +3952,68 @@
- (BOOL)acceptsFirstResponder
{
-if (_private-usesDocumentViews)
-return [[[self mainFrame] frameView] acceptsFirstResponder];
-
-// FIXME (Viewless): Need more code from WebHTMLView here.
-return YES;
+return [[[self mainFrame] frameView] acceptsFirstResponder];
}
- (BOOL)becomeFirstResponder
{
-if (_private-usesDocumentViews) {
-if
[webkit-changes] [95466] trunk/Source/JavaScriptCore
Title: [95466] trunk/Source/_javascript_Core
Revision 95466
Author mhahnenb...@apple.com
Date 2011-09-19 13:32:52 -0700 (Mon, 19 Sep 2011)
Log Message
Remove toPrimitive from JSCell
https://bugs.webkit.org/show_bug.cgi?id=67875
Reviewed by Geoffrey Garen.
Part of the refactoring process to un-virtualize JSCell. We move
all of the implicit functionality provided by the virtual toPrimitive method
in JSCell to be explicit in JSValue::toPrimitive and JSCell:toPrimitive while
also de-virtualizing JSCell::toPrimitive.
* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
* runtime/JSCell.cpp:
(JSC::JSCell::toPrimitive):
* runtime/JSCell.h:
We replace JSNotAnObject::toPrimitive with defaultValue, which it overrides from
JSObject. This pushes the virtual method further down, enabling us to get rid
of the virtual call in JSCell. Eventually we'll probably have to deal with this
again, but we'll cross that bridge when we come to it.
* runtime/JSNotAnObject.cpp:
(JSC::JSNotAnObject::defaultValue):
* runtime/JSNotAnObject.h:
* runtime/JSObject.h:
* runtime/JSString.h:
(JSC::JSValue::toPrimitive):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def
trunk/Source/_javascript_Core/runtime/JSCell.cpp
trunk/Source/_javascript_Core/runtime/JSCell.h
trunk/Source/_javascript_Core/runtime/JSNotAnObject.cpp
trunk/Source/_javascript_Core/runtime/JSNotAnObject.h
trunk/Source/_javascript_Core/runtime/JSObject.h
trunk/Source/_javascript_Core/runtime/JSString.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95465 => 95466)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-19 20:27:42 UTC (rev 95465)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-19 20:32:52 UTC (rev 95466)
@@ -1,3 +1,31 @@
+2011-09-19 Mark Hahnenberg mhahnenb...@apple.com
+
+Remove toPrimitive from JSCell
+https://bugs.webkit.org/show_bug.cgi?id=67875
+
+Reviewed by Geoffrey Garen.
+
+Part of the refactoring process to un-virtualize JSCell. We move
+all of the implicit functionality provided by the virtual toPrimitive method
+in JSCell to be explicit in JSValue::toPrimitive and JSCell:toPrimitive while
+also de-virtualizing JSCell::toPrimitive.
+
+* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+* runtime/JSCell.cpp:
+(JSC::JSCell::toPrimitive):
+* runtime/JSCell.h:
+
+We replace JSNotAnObject::toPrimitive with defaultValue, which it overrides from
+JSObject. This pushes the virtual method further down, enabling us to get rid
+of the virtual call in JSCell. Eventually we'll probably have to deal with this
+again, but we'll cross that bridge when we come to it.
+* runtime/JSNotAnObject.cpp:
+(JSC::JSNotAnObject::defaultValue):
+* runtime/JSNotAnObject.h:
+* runtime/JSObject.h:
+* runtime/JSString.h:
+(JSC::JSValue::toPrimitive):
+
2011-09-19 Oliver Hunt oli...@apple.com
Build fix.
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (95465 => 95466)
--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-09-19 20:27:42 UTC (rev 95465)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-09-19 20:32:52 UTC (rev 95466)
@@ -356,8 +356,6 @@
?toObject@JSCell@JSC@@UBEPAVJSObject@2@PAVExecState@2@PAVJSGlobalObject@2@@Z
?toObject@JSObject@JSC@@UBEPAV12@PAVExecState@2@PAVJSGlobalObject@2@@Z
?toObjectSlowCase@JSValue@JSC@@ABEPAVJSObject@2@PAVExecState@2@PAVJSGlobalObject@2@@Z
-?toPrimitive@JSCell@JSC@@UBE?AVJSValue@2@PAVExecState@2@W4PreferredPrimitiveType@2@@Z
-?toPrimitive@JSString@JSC@@EBE?AVJSValue@2@PAVExecState@2@W4PreferredPrimitiveType@2@@Z
?toStrictThisObject@JSObject@JSC@@UBE?AVJSValue@2@PAVExecState@2@@Z
?toString@JSCell@JSC@@UBE?AVUString@2@PAVExecState@2@@Z
?toString@JSObject@JSC@@UBE?AVUString@2@PAVExecState@2@@Z
Modified: trunk/Source/_javascript_Core/runtime/JSCell.cpp (95465 => 95466)
--- trunk/Source/_javascript_Core/runtime/JSCell.cpp 2011-09-19 20:27:42 UTC (rev 95465)
+++ trunk/Source/_javascript_Core/runtime/JSCell.cpp 2011-09-19 20:32:52 UTC (rev 95466)
@@ -30,6 +30,13 @@
namespace JSC {
+JSValue JSCell::toPrimitive(ExecState* exec, PreferredPrimitiveType preferredType) const
+{
+if (isString())
+return static_castconst JSString*(this)-toPrimitive(exec, preferredType);
+return static_castconst JSObject*(this)-toPrimitive(exec, preferredType);
+}
+
bool JSCell::getString(ExecState* exec, UStringstringValue) const
{
if (!isString())
@@ -117,12 +124,6 @@
return JSValue();
}
-JSValue JSCell::toPrimitive(ExecState*, PreferredPrimitiveType) const
-{
-ASSERT_NOT_REACHED();
-return
[webkit-changes] [95467] trunk/Source/WebKit/mac
Title: [95467] trunk/Source/WebKit/mac
Revision 95467
Author ander...@apple.com
Date 2011-09-19 13:39:15 -0700 (Mon, 19 Sep 2011)
Log Message
Remove -[WebView _selectionChanged] and -[WebView _setTooltip:]
https://bugs.webkit.org/show_bug.cgi?id=68385
Reviewed by Adam Roben.
Move these functions back into the respective clients and remove usesDocumentViews checks.
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::setToolTip):
* WebCoreSupport/WebEditorClient.mm:
(WebEditorClient::respondToChangedSelection):
* WebView/WebView.mm:
* WebView/WebViewEventHandling.mm:
* WebView/WebViewInternal.h:
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm
trunk/Source/WebKit/mac/WebView/WebView.mm
trunk/Source/WebKit/mac/WebView/WebViewEventHandling.mm
trunk/Source/WebKit/mac/WebView/WebViewInternal.h
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (95466 => 95467)
--- trunk/Source/WebKit/mac/ChangeLog 2011-09-19 20:32:52 UTC (rev 95466)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-09-19 20:39:15 UTC (rev 95467)
@@ -1,5 +1,22 @@
2011-09-19 Anders Carlsson ander...@apple.com
+Remove -[WebView _selectionChanged] and -[WebView _setTooltip:]
+https://bugs.webkit.org/show_bug.cgi?id=68385
+
+Reviewed by Adam Roben.
+
+Move these functions back into the respective clients and remove usesDocumentViews checks.
+
+* WebCoreSupport/WebChromeClient.mm:
+(WebChromeClient::setToolTip):
+* WebCoreSupport/WebEditorClient.mm:
+(WebEditorClient::respondToChangedSelection):
+* WebView/WebView.mm:
+* WebView/WebViewEventHandling.mm:
+* WebView/WebViewInternal.h:
+
+2011-09-19 Anders Carlsson ander...@apple.com
+
Begin removing -[WebView _usesDocumentCalls] from WebView.mm
https://bugs.webkit.org/show_bug.cgi?id=68383
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (95466 => 95467)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2011-09-19 20:32:52 UTC (rev 95466)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2011-09-19 20:39:15 UTC (rev 95467)
@@ -622,7 +622,9 @@
void WebChromeClient::setToolTip(const String toolTip, TextDirection)
{
-[m_webView _setToolTip:toolTip];
+NSViewWebDocumentView *documentView = [[[m_webView _selectedOrMainFrame] frameView] documentView];
+if ([documentView isKindOfClass:[WebHTMLView class]])
+[(WebHTMLView *)documentView _setToolTip:toolTip];
}
void WebChromeClient::print(Frame* frame)
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (95466 => 95467)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2011-09-19 20:32:52 UTC (rev 95466)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2011-09-19 20:39:15 UTC (rev 95467)
@@ -292,7 +292,9 @@
void WebEditorClient::respondToChangedSelection()
{
-[m_webView _selectionChanged];
+NSViewWebDocumentView *documentView = [[[m_webView _selectedOrMainFrame] frameView] documentView];
+if ([documentView isKindOfClass:[WebHTMLView class]])
+[(WebHTMLView *)documentView _selectionChanged];
// FIXME: This quirk is needed due to rdar://problem/5009625 - We can phase it out once Aperture can adopt the new behavior on their end
if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITHOUT_APERTURE_QUIRK) [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@com.apple.Aperture])
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (95466 => 95467)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2011-09-19 20:32:52 UTC (rev 95466)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2011-09-19 20:39:15 UTC (rev 95467)
@@ -6028,18 +6028,6 @@
_private-insertionPasteboard = pasteboard;
}
-- (void)_selectionChanged
-{
-if (_private-usesDocumentViews) {
-id documentView = [[[self _selectedOrMainFrame] frameView] documentView];
-if ([documentView isKindOfClass:[WebHTMLView class]])
-[documentView _selectionChanged];
-return;
-}
-
-// FIXME (Viewless): We'll need code here.
-}
-
- (Frame*)_mainCoreFrame
{
return (_private _private-page) ? _private-page-mainFrame() : 0;
Modified: trunk/Source/WebKit/mac/WebView/WebViewEventHandling.mm (95466 => 95467)
--- trunk/Source/WebKit/mac/WebView/WebViewEventHandling.mm 2011-09-19 20:32:52 UTC (rev 95466)
+++ trunk/Source/WebKit/mac/WebView/WebViewEventHandling.mm 2011-09-19 20:39:15 UTC (rev 95467)
@@ -225,16 +225,4 @@
[timer release];
}
-- (void)_setToolTip:(NSString *)toolTip
-{
-if (_private-usesDocumentViews) {
-id documentView = [[[self _selectedOrMainFrame] frameView] documentView];
-if ([documentView isKindOfClass:[WebHTMLView class]])
-[documentView _setToolTip:toolTip];
-return;
-}
-
-// FIXME (Viewless): Code to
[webkit-changes] [95468] branches/chromium/874/Source/WebCore/rendering
Title: [95468] branches/chromium/874/Source/WebCore/rendering
Revision 95468
Author infe...@chromium.org
Date 2011-09-19 13:48:42 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 95462 - Source/WebCore: Issues with merging ruby bases.
BUG=94809
Review URL: http://codereview.chromium.org/7941019
Modified Paths
branches/chromium/874/Source/WebCore/rendering/RenderRubyBase.cpp
branches/chromium/874/Source/WebCore/rendering/RenderRubyBase.h
branches/chromium/874/Source/WebCore/rendering/RenderRubyRun.cpp
Diff
Modified: branches/chromium/874/Source/WebCore/rendering/RenderRubyBase.cpp (95467 => 95468)
--- branches/chromium/874/Source/WebCore/rendering/RenderRubyBase.cpp 2011-09-19 20:39:15 UTC (rev 95467)
+++ branches/chromium/874/Source/WebCore/rendering/RenderRubyBase.cpp 2011-09-19 20:48:42 UTC (rev 95468)
@@ -65,7 +65,7 @@
return true;
}
-void RenderRubyBase::moveChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild)
+void RenderRubyBase::moveChildren(RenderRubyBase* toBase, RenderObject* beforeChild)
{
// This function removes all children that are before (!) beforeChild
// and appends them to toBase.
@@ -75,19 +75,19 @@
// Inline children might be wrapped in an anonymous block if there's a continuation.
// Theoretically, in ruby bases, this can happen with only the first such a child,
// so it should be OK to just climb the tree.
-while (fromBeforeChild fromBeforeChild-parent() != this)
-fromBeforeChild = fromBeforeChild-parent();
+while (beforeChild beforeChild-parent() != this)
+beforeChild = beforeChild-parent();
if (childrenInline())
-moveInlineChildren(toBase, fromBeforeChild);
+moveInlineChildren(toBase, beforeChild);
else
-moveBlockChildren(toBase, fromBeforeChild);
+moveBlockChildren(toBase, beforeChild);
setNeedsLayoutAndPrefWidthsRecalc();
toBase-setNeedsLayoutAndPrefWidthsRecalc();
}
-void RenderRubyBase::moveInlineChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild)
+void RenderRubyBase::moveInlineChildren(RenderRubyBase* toBase, RenderObject* beforeChild)
{
RenderBlock* toBlock;
@@ -106,17 +106,17 @@
}
}
// Move our inline children into the target block we determined above.
-moveChildrenTo(toBlock, firstChild(), fromBeforeChild);
+moveChildrenTo(toBlock, firstChild(), beforeChild);
}
-void RenderRubyBase::moveBlockChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild)
+void RenderRubyBase::moveBlockChildren(RenderRubyBase* toBase, RenderObject* beforeChild)
{
if (toBase-childrenInline()) {
// First check whether we move only wrapped inline objects.
-if (hasOnlyWrappedInlineChildren(fromBeforeChild)) {
+if (hasOnlyWrappedInlineChildren(beforeChild)) {
// The reason why the base is in block flow must be after beforeChild.
// We therefore can extract the inline objects and move them to toBase.
-for (RenderObject* child = firstChild(); child != fromBeforeChild; child = firstChild()) {
+for (RenderObject* child = firstChild(); child != beforeChild; child = firstChild()) {
if (child-isAnonymousBlock()) {
RenderBlock* anonBlock = toRenderBlock(child);
ASSERT(anonBlock-childrenInline());
@@ -133,7 +133,7 @@
// Moving block children - have to set toBase as block flow
toBase-makeChildrenNonInline();
// Move children, potentially collapsing anonymous block wrappers.
-mergeBlockChildren(toBase, fromBeforeChild);
+mergeBlockChildren(toBase, beforeChild);
// Now we need to check if the leftover children are all inline.
// If so, make this base inline again.
@@ -157,24 +157,24 @@
}
}
} else
-mergeBlockChildren(toBase, fromBeforeChild);
+mergeBlockChildren(toBase, beforeChild);
}
-void RenderRubyBase::mergeBlockChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild)
+void RenderRubyBase::mergeBlockChildren(RenderRubyBase* toBase, RenderObject* beforeChild)
{
-// This function removes all children that are before fromBeforeChild and appends them to toBase.
+// This function removes all children that are before beforeChild and appends them to toBase.
ASSERT(!childrenInline());
ASSERT(toBase);
ASSERT(!toBase-childrenInline());
// Quick check whether we have anything to do, to simplify the following code.
-if (fromBeforeChild != firstChild())
+if (!firstChild())
return;
// If an anonymous block would be put next to another such block, then merge those.
RenderObject* firstChildHere = firstChild();
RenderObject* lastChildThere = toBase-lastChild();
-if (firstChildHere firstChildHere-isAnonymousBlock() firstChildHere-childrenInline()
+if
[webkit-changes] [95469] branches/chromium/874/Source/WebCore/rendering
Title: [95469] branches/chromium/874/Source/WebCore/rendering
Revision 95469
Author infe...@chromium.org
Date 2011-09-19 13:52:37 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 95461 - Child not placed correctly when beforeChild (table part)
has both :before, :after content.
BUG=95520
Review URL: http://codereview.chromium.org/7946014
Modified Paths
branches/chromium/874/Source/WebCore/rendering/RenderBlock.cpp
branches/chromium/874/Source/WebCore/rendering/RenderObject.cpp
branches/chromium/874/Source/WebCore/rendering/RenderObject.h
branches/chromium/874/Source/WebCore/rendering/RenderTable.cpp
branches/chromium/874/Source/WebCore/rendering/RenderTableRow.cpp
branches/chromium/874/Source/WebCore/rendering/RenderTableSection.cpp
Diff
Modified: branches/chromium/874/Source/WebCore/rendering/RenderBlock.cpp (95468 => 95469)
--- branches/chromium/874/Source/WebCore/rendering/RenderBlock.cpp 2011-09-19 20:48:42 UTC (rev 95468)
+++ branches/chromium/874/Source/WebCore/rendering/RenderBlock.cpp 2011-09-19 20:52:37 UTC (rev 95469)
@@ -682,26 +682,17 @@
void RenderBlock::addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild)
{
// Make sure we don't append things after :after-generated content if we have it.
-if (!beforeChild) {
-RenderObject* lastRenderer = lastChild();
-while (lastRenderer lastRenderer-isAnonymous() !isAfterContent(lastRenderer))
-lastRenderer = lastRenderer-lastChild();
-if (lastRenderer isAfterContent(lastRenderer))
-beforeChild = lastRenderer;
-}
+if (!beforeChild)
+beforeChild = findAfterContentRenderer();
// If the requested beforeChild is not one of our children, then this is because
// there is an anonymous container within this object that contains the beforeChild.
if (beforeChild beforeChild-parent() != this) {
-RenderObject* anonymousChild = beforeChild-parent();
-ASSERT(anonymousChild);
+RenderObject* beforeChildAnonymousContainer = anonymousContainer(beforeChild);
+ASSERT(beforeChildAnonymousContainer);
+ASSERT(beforeChildAnonymousContainer-isAnonymous());
-while (anonymousChild-parent() != this)
-anonymousChild = anonymousChild-parent();
-
-ASSERT(anonymousChild-isAnonymous());
-
-if (anonymousChild-isAnonymousBlock()) {
+if (beforeChildAnonymousContainer-isAnonymousBlock()) {
// Insert the child into the anonymous block box instead of here.
if (newChild-isInline() || beforeChild-parent()-firstChild() != beforeChild)
beforeChild-parent()-addChild(newChild, beforeChild);
@@ -710,19 +701,19 @@
return;
}
-ASSERT(anonymousChild-isTable());
+ASSERT(beforeChildAnonymousContainer-isTable());
if ((newChild-isTableCol() newChild-style()-display() == TABLE_COLUMN_GROUP)
|| (newChild-isRenderBlock() newChild-style()-display() == TABLE_CAPTION)
|| newChild-isTableSection()
|| newChild-isTableRow()
|| newChild-isTableCell()) {
// Insert into the anonymous table.
-anonymousChild-addChild(newChild, beforeChild);
+beforeChildAnonymousContainer-addChild(newChild, beforeChild);
return;
}
// Go on to insert before the anonymous table.
-beforeChild = anonymousChild;
+beforeChild = beforeChildAnonymousContainer;
}
// Check for a spanning element in columns.
Modified: branches/chromium/874/Source/WebCore/rendering/RenderObject.cpp (95468 => 95469)
--- branches/chromium/874/Source/WebCore/rendering/RenderObject.cpp 2011-09-19 20:48:42 UTC (rev 95468)
+++ branches/chromium/874/Source/WebCore/rendering/RenderObject.cpp 2011-09-19 20:52:37 UTC (rev 95469)
@@ -283,6 +283,17 @@
if (!children)
return;
+RenderObject* beforeContent = 0;
+bool beforeChildHasBeforeAndAfterContent = false;
+if (beforeChild (beforeChild-isTable() || beforeChild-isTableSection() || beforeChild-isTableRow())) {
+beforeContent = beforeChild-findBeforeContentRenderer();
+RenderObject* afterContent = beforeChild-findAfterContentRenderer();
+if (beforeContent afterContent) {
+beforeChildHasBeforeAndAfterContent = true;
+beforeContent-destroy();
+}
+}
+
bool needsTable = false;
if (newChild-isTableCol() newChild-style()-display() == TABLE_COLUMN_GROUP)
@@ -321,11 +332,15 @@
// Just add it...
children-insertChildNode(this, newChild, beforeChild);
}
+
if (newChild-isText() newChild-style()-textTransform() == CAPITALIZE) {
RefPtrStringImpl textToTransform = toRenderText(newChild)-originalText();
if (textToTransform)
toRenderText(newChild)-setText(textToTransform.release(), true);
}
+
+if
[webkit-changes] [95470] trunk/Source/WebKit
Title: [95470] trunk/Source/WebKit
Revision 95470
Author ander...@apple.com
Date 2011-09-19 13:55:48 -0700 (Mon, 19 Sep 2011)
Log Message
Remove WebViewEventHandling.mm
https://bugs.webkit.org/show_bug.cgi?id=68387
Reviewed by Adam Roben.
../..:
Remove WebViewEventHandling.mm from the Xcode project.
* WebKit.xcodeproj/project.pbxproj:
../../mac:
WebViewEventHandling.mm was all about event handling in viewless WebKit, so rip it out since
we're getting rid of viewless WebKit1.
* WebView/WebView.mm:
(-[WebView _close]):
* WebView/WebViewData.h:
* WebView/WebViewEventHandling.mm: Removed.
* WebView/WebViewInternal.h:
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebView.mm
trunk/Source/WebKit/mac/WebView/WebViewData.h
trunk/Source/WebKit/mac/WebView/WebViewInternal.h
Removed Paths
trunk/Source/WebKit/mac/WebView/WebViewEventHandling.mm
Diff
Modified: trunk/Source/WebKit/ChangeLog (95469 => 95470)
--- trunk/Source/WebKit/ChangeLog 2011-09-19 20:52:37 UTC (rev 95469)
+++ trunk/Source/WebKit/ChangeLog 2011-09-19 20:55:48 UTC (rev 95470)
@@ -1,3 +1,14 @@
+2011-09-19 Anders Carlsson ander...@apple.com
+
+Remove WebViewEventHandling.mm
+https://bugs.webkit.org/show_bug.cgi?id=68387
+
+Reviewed by Adam Roben.
+
+Remove WebViewEventHandling.mm from the Xcode project.
+
+* WebKit.xcodeproj/project.pbxproj:
+
2011-09-19 Dan Bernstein m...@apple.com
WebKit part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (95469 => 95470)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2011-09-19 20:52:37 UTC (rev 95469)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2011-09-19 20:55:48 UTC (rev 95470)
@@ -353,7 +353,6 @@
BC7F889E10C9D30C00D6133D /* WebGeolocationPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7F889C10C9D30C00D6133D /* WebGeolocationPosition.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC7F889F10C9D30C00D6133D /* WebGeolocationPosition.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7F889D10C9D30C00D6133D /* WebGeolocationPosition.mm */; };
BC7F88A510C9D88B00D6133D /* WebGeolocationPositionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7F88A410C9D88B00D6133D /* WebGeolocationPositionInternal.h */; };
- BC97E7E210963D260010D361 /* WebViewEventHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC97E7E110963D260010D361 /* WebViewEventHandling.mm */; };
C0167BF80D7F5DD00028696E /* WebScriptDebugger.h in Headers */ = {isa = PBXBuildFile; fileRef = C0167BF60D7F5DD00028696E /* WebScriptDebugger.h */; };
C0167BF90D7F5DD00028696E /* WebScriptDebugger.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0167BF70D7F5DD00028696E /* WebScriptDebugger.mm */; };
C0B1F7E810AC8E3100C925D9 /* WebScriptWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = C0B1F7E510AC8E3100C925D9 /* WebScriptWorld.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -665,7 +664,6 @@
BC7F889C10C9D30C00D6133D /* WebGeolocationPosition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGeolocationPosition.h; sourceTree = group; };
BC7F889D10C9D30C00D6133D /* WebGeolocationPosition.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebGeolocationPosition.mm; sourceTree = group; };
BC7F88A410C9D88B00D6133D /* WebGeolocationPositionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGeolocationPositionInternal.h; sourceTree = group; };
- BC97E7E110963D260010D361 /* WebViewEventHandling.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewEventHandling.mm; sourceTree = group; };
BE4FBECB0653DF47005EDE15 /* WebEditingDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebEditingDelegate.h; sourceTree = group; tabWidth = 8; usesTabs = 0; };
BE6DC39904C62C4E004D0EF6 /* WebNSURLExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSURLExtras.h; sourceTree = group; tabWidth = 8; usesTabs = 0; };
BE6DC39A04C62C4E004D0EF6 /* WebNSURLExtras.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNSURLExtras.mm; sourceTree = group; tabWidth = 8; usesTabs = 0; };
@@ -1238,7 +1236,6 @@
51A8B57A042834F700CA2D3A /* WebView.mm */,
BC2E464B0FD8A96800A9D9DE /* WebViewData.h */,
BC2E464C0FD8A96800A9D9DE /* WebViewData.mm */,
-BC97E7E110963D260010D361 /* WebViewEventHandling.mm */,
930D02BB06275F640076701E /* WebViewInternal.h */,
[webkit-changes] [95471] trunk
Title: [95471] trunk
Revision 95471
Author dim...@chromium.org
Date 2011-09-19 14:05:28 -0700 (Mon, 19 Sep 2011)
Log Message
[Chromium] Crash after magic iframe transfer for Pepper/NaCl plugins.
https://bugs.webkit.org/show_bug.cgi?id=68267
Make adoptNode() to not enable live iframe transfer when the iframe's subtree contains plugins.
Reviewed by Adam Barth.
Source/WebCore:
Test: fast/frames/iframe-reparenting-embed-elements.html
* dom/Document.cpp:
(WebCore::Document::adoptNode):
* html/HTMLFrameElementBase.cpp:
(WebCore::hasPluginElements):
(WebCore::HTMLFrameElementBase::canRemainAliveOnRemovalFromTree):
* html/HTMLFrameElementBase.h:
LayoutTests:
* fast/frames/iframe-reparenting-embed-elements-expected.txt: Added.
* fast/frames/iframe-reparenting-embed-elements.html: Added.
* fast/frames/resources/iframe-reparenting-embed-frame1.html: Added.
* fast/frames/resources/iframe-reparenting-embed-iframe.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Document.cpp
trunk/Source/WebCore/html/HTMLFrameElementBase.cpp
trunk/Source/WebCore/html/HTMLFrameElementBase.h
Added Paths
trunk/LayoutTests/fast/frames/iframe-reparenting-embed-elements-expected.txt
trunk/LayoutTests/fast/frames/iframe-reparenting-embed-elements.html
trunk/LayoutTests/fast/frames/resources/iframe-reparenting-embed-frame1.html
trunk/LayoutTests/fast/frames/resources/iframe-reparenting-embed-iframe.html
Diff
Modified: trunk/LayoutTests/ChangeLog (95470 => 95471)
--- trunk/LayoutTests/ChangeLog 2011-09-19 20:55:48 UTC (rev 95470)
+++ trunk/LayoutTests/ChangeLog 2011-09-19 21:05:28 UTC (rev 95471)
@@ -1,3 +1,16 @@
+2011-09-19 Dmitry Titov dim...@chromium.org
+
+[Chromium] Crash after magic iframe transfer for Pepper/NaCl plugins.
+https://bugs.webkit.org/show_bug.cgi?id=68267
+Make adoptNode() to not enable live iframe transfer when the iframe's subtree contains plugins.
+
+Reviewed by Adam Barth.
+
+* fast/frames/iframe-reparenting-embed-elements-expected.txt: Added.
+* fast/frames/iframe-reparenting-embed-elements.html: Added.
+* fast/frames/resources/iframe-reparenting-embed-frame1.html: Added.
+* fast/frames/resources/iframe-reparenting-embed-iframe.html: Added.
+
2011-09-19 Abhishek Arya infe...@chromium.org
Issues with merging ruby bases.
Added: trunk/LayoutTests/fast/frames/iframe-reparenting-embed-elements-expected.txt (0 => 95471)
--- trunk/LayoutTests/fast/frames/iframe-reparenting-embed-elements-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/frames/iframe-reparenting-embed-elements-expected.txt 2011-09-19 21:05:28 UTC (rev 95471)
@@ -0,0 +1,12 @@
+This test moves an iframe between two documents 3 times: without plugins, with embed tag and then with object tag.
+
+Only the attempt without plugin elements should succeed. The presence of plugin elements should prevent the document.adoptNode() method from triggering live transfer - in which case the iframe will be reloaded.
+
+Test succeeds if there are 'PASS' messages below and no 'FAIL' messages.
+
+
+PASS: Test without plugins
+PASS: Test with embed
+PASS: Test with object
+Test Finished.
+
Property changes on: trunk/LayoutTests/fast/frames/iframe-reparenting-embed-elements-expected.txt
___
Added: svn:eol-style
Added: trunk/LayoutTests/fast/frames/iframe-reparenting-embed-elements.html (0 => 95471)
--- trunk/LayoutTests/fast/frames/iframe-reparenting-embed-elements.html (rev 0)
+++ trunk/LayoutTests/fast/frames/iframe-reparenting-embed-elements.html 2011-09-19 21:05:28 UTC (rev 95471)
@@ -0,0 +1,69 @@
+html
+script
+function log(message) {
+ document.getElementById(log).innerText += message + \n;
+}
+
+function verifyResult(message, actualToken, expectedToReload) {
+ var success = (expectedToReload != (actualToken == modified));
+ log((success ? PASS : FAIL) + : + message);
+}
+
+function transferIframe(testStepDescription, expectedToReload, nextTest)
+{
+ var iframe = frame1.contentDocument.getElementsByTagName(iframe)[0];
+ if (iframe.contentWindow.token != loaded)
+log(FAIL: invalid initial state of test iframe);
+
+ iframe.contentWindow.token = modified;
+
+ frame1.contentDocument.adoptNode(iframe);
+ frame2.contentDocument.body.appendChild(iframe);
+ verifyResult(testStepDescription, iframe.contentWindow.token, expectedToReload);
+
+ frame1._onload_ = nextTest;
+ frame1.contentWindow.location.reload();
+}
+
+function finish()
+{
+ log(Test Finished.);
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+}
+
+function test() {
+ if (window.layoutTestController) {
+layoutTestController.dumpAsText();
+layoutTestController.waitUntilDone();
+ }
+
+ frame1 = document.getElementById(frame1);
+ frame2 = document.getElementById(frame2);
+
+
[webkit-changes] [95472] trunk/Source/WebKit2
Title: [95472] trunk/Source/WebKit2
Revision 95472
Author alexis.men...@openbossa.org
Date 2011-09-19 14:09:56 -0700 (Mon, 19 Sep 2011)
Log Message
[Qt][WK2] Make loading errors API easier to use.
https://bugs.webkit.org/show_bug.cgi?id=68357
Reviewed by Tor Arne Vestbø.
Make the API to get loading errors easier to use. 95197 introduced
a QJSValue API that is a bit opaque for the client code. Rather than
using a dedicated object, we can just pass the needed information as
parameters of the slot.
* UIProcess/API/qt/qdesktopwebview.cpp:
(QDesktopWebViewPrivate::loadDidFail):
* UIProcess/API/qt/qdesktopwebview.h:
* UIProcess/API/qt/qdesktopwebview_p.h:
* UIProcess/API/qt/qtouchwebpage.h:
* UIProcess/API/qt/tests/commonviewtests/tst_commonviewtests.cpp:
(tst_CommonViewTests::loadNonexistentFileUrl):
* UIProcess/API/qt/tests/commonviewtests/webviewabstraction.cpp:
(WebViewAbstraction::WebViewAbstraction):
(WebViewAbstraction::touchViewLoadFailed):
(WebViewAbstraction::desktopViewLoadFailed):
* UIProcess/API/qt/tests/commonviewtests/webviewabstraction.h:
* UIProcess/qt/QtWebPageProxy.cpp:
(QtWebPageProxy::loadDidFail):
* UIProcess/qt/TouchViewInterface.cpp:
(WebKit::TouchViewInterface::loadDidFail):
* UIProcess/qt/TouchViewInterface.h:
* UIProcess/qt/ViewInterface.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h
trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview_p.h
trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h
trunk/Source/WebKit2/UIProcess/API/qt/tests/commonviewtests/tst_commonviewtests.cpp
trunk/Source/WebKit2/UIProcess/API/qt/tests/commonviewtests/webviewabstraction.cpp
trunk/Source/WebKit2/UIProcess/API/qt/tests/commonviewtests/webviewabstraction.h
trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp
trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.h
trunk/Source/WebKit2/UIProcess/qt/ViewInterface.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (95471 => 95472)
--- trunk/Source/WebKit2/ChangeLog 2011-09-19 21:05:28 UTC (rev 95471)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-19 21:09:56 UTC (rev 95472)
@@ -1,3 +1,34 @@
+2011-09-19 Alexis Menard alexis.men...@openbossa.org
+
+[Qt][WK2] Make loading errors API easier to use.
+https://bugs.webkit.org/show_bug.cgi?id=68357
+
+Reviewed by Tor Arne Vestbø.
+
+Make the API to get loading errors easier to use. 95197 introduced
+a QJSValue API that is a bit opaque for the client code. Rather than
+using a dedicated object, we can just pass the needed information as
+parameters of the slot.
+
+* UIProcess/API/qt/qdesktopwebview.cpp:
+(QDesktopWebViewPrivate::loadDidFail):
+* UIProcess/API/qt/qdesktopwebview.h:
+* UIProcess/API/qt/qdesktopwebview_p.h:
+* UIProcess/API/qt/qtouchwebpage.h:
+* UIProcess/API/qt/tests/commonviewtests/tst_commonviewtests.cpp:
+(tst_CommonViewTests::loadNonexistentFileUrl):
+* UIProcess/API/qt/tests/commonviewtests/webviewabstraction.cpp:
+(WebViewAbstraction::WebViewAbstraction):
+(WebViewAbstraction::touchViewLoadFailed):
+(WebViewAbstraction::desktopViewLoadFailed):
+* UIProcess/API/qt/tests/commonviewtests/webviewabstraction.h:
+* UIProcess/qt/QtWebPageProxy.cpp:
+(QtWebPageProxy::loadDidFail):
+* UIProcess/qt/TouchViewInterface.cpp:
+(WebKit::TouchViewInterface::loadDidFail):
+* UIProcess/qt/TouchViewInterface.h:
+* UIProcess/qt/ViewInterface.h:
+
2011-09-19 Dan Bernstein m...@apple.com
WebKit2 part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp (95471 => 95472)
--- trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp 2011-09-19 21:05:28 UTC (rev 95471)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp 2011-09-19 21:09:56 UTC (rev 95472)
@@ -21,6 +21,7 @@
#include config.h
#include qdesktopwebview.h
#include qdesktopwebview_p.h
+#include qweberror.h
#include QGraphicsSceneResizeEvent
#include QStyleOptionGraphicsItem
@@ -144,9 +145,9 @@
emit q-loadSucceeded();
}
-void QDesktopWebViewPrivate::loadDidFail(const QJSValue error)
+void QDesktopWebViewPrivate::loadDidFail(const QWebError error)
{
-emit q-loadFailed(error);
+emit q-loadFailed(static_castQDesktopWebView::ErrorType(error.type()), error.errorCode(), error.url());
}
void QDesktopWebViewPrivate::didChangeLoadProgress(int percentageLoaded)
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h (95471 => 95472)
--- trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h 2011-09-19 21:05:28 UTC (rev 95471)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h 2011-09-19 21:09:56 UTC (rev
[webkit-changes] [95473] branches/chromium/874/Source/WebCore/loader
Title: [95473] branches/chromium/874/Source/WebCore/loader
Revision 95473
Author infe...@chromium.org
Date 2011-09-19 14:10:40 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 95259 - Fragment navigations should interrupt a provisional load of a different document
BUG=86758
Review URL: http://codereview.chromium.org/7945015
Modified Paths
branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp
branches/chromium/874/Source/WebCore/loader/HistoryController.cpp
Diff
Modified: branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp (95472 => 95473)
--- branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp 2011-09-19 21:09:56 UTC (rev 95472)
+++ branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp 2011-09-19 21:10:40 UTC (rev 95473)
@@ -2697,6 +2697,12 @@
if (!shouldContinue)
return;
+// If we have a provisional request for a different document, a fragment scroll should cancel it.
+if (m_provisionalDocumentLoader !equalIgnoringFragmentIdentifier(m_provisionalDocumentLoader-request().url(), request.url())) {
+m_provisionalDocumentLoader-stopLoading();
+setProvisionalDocumentLoader(0);
+}
+
bool isRedirect = m_quickRedirectComing || policyChecker()-loadType() == FrameLoadTypeRedirectWithLockedBackForwardList;
loadInSameDocument(request.url(), 0, !isRedirect);
}
Modified: branches/chromium/874/Source/WebCore/loader/HistoryController.cpp (95472 => 95473)
--- branches/chromium/874/Source/WebCore/loader/HistoryController.cpp 2011-09-19 21:09:56 UTC (rev 95472)
+++ branches/chromium/874/Source/WebCore/loader/HistoryController.cpp 2011-09-19 21:10:40 UTC (rev 95473)
@@ -524,6 +524,11 @@
if (!m_provisionalItem)
return;
+// The provisional item may represent a different pending navigation.
+// Don't commit it if it isn't a same document navigation.
+if (m_currentItem !m_currentItem-shouldDoSameDocumentNavigationTo(m_provisionalItem.get()))
+return;
+
// Commit the provisional item.
m_frameLoadComplete = false;
m_previousItem = m_currentItem;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95474] trunk/Source/WebKit/mac
Title: [95474] trunk/Source/WebKit/mac
Revision 95474
Author ander...@apple.com
Date 2011-09-19 14:25:40 -0700 (Mon, 19 Sep 2011)
Log Message
Remove the last remains of viewless WebKit1
https://bugs.webkit.org/show_bug.cgi?id=68388
Reviewed by Darin Adler.
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::forceLayoutForNonHTML):
Remove null check.
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
Remove usesDocumentViews parameter and checks.
(-[WebView _initWithFrame:frameName:groupName:usesDocumentViews:]):
Add an assertion that usesDocumentViews is always true.
(-[WebView _isUsingAcceleratedCompositing]):
Remove usesDocumentViews check.
(-[WebView _isSoftwareRenderable]):
Remove usesDocumentViews check.
(-[WebView initWithFrame:frameName:groupName:]):
Remove usesDocumentViews parameter and always pass YES to the _initWithFrame method.
(-[WebView initWithCoder:]):
Remove usesDocumentViews parameter.
(-[WebView _frameViewAtWindowPoint:]):
Remove usesDocumentViews check.
* WebView/WebViewData.h:
Remove usesDocumentViews ivar.
* WebView/WebViewPrivate.h:
Remove usesDocumentViews parameters.
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
trunk/Source/WebKit/mac/WebView/WebView.mm
trunk/Source/WebKit/mac/WebView/WebViewData.h
trunk/Source/WebKit/mac/WebView/WebViewPrivate.h
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (95473 => 95474)
--- trunk/Source/WebKit/mac/ChangeLog 2011-09-19 21:10:40 UTC (rev 95473)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-09-19 21:25:40 UTC (rev 95474)
@@ -1,5 +1,44 @@
2011-09-19 Anders Carlsson ander...@apple.com
+Remove the last remains of viewless WebKit1
+https://bugs.webkit.org/show_bug.cgi?id=68388
+
+Reviewed by Darin Adler.
+
+* WebCoreSupport/WebFrameLoaderClient.mm:
+(WebFrameLoaderClient::forceLayoutForNonHTML):
+Remove null check.
+
+* WebView/WebView.mm:
+(-[WebView _commonInitializationWithFrameName:groupName:]):
+Remove usesDocumentViews parameter and checks.
+
+(-[WebView _initWithFrame:frameName:groupName:usesDocumentViews:]):
+Add an assertion that usesDocumentViews is always true.
+
+(-[WebView _isUsingAcceleratedCompositing]):
+Remove usesDocumentViews check.
+
+(-[WebView _isSoftwareRenderable]):
+Remove usesDocumentViews check.
+
+(-[WebView initWithFrame:frameName:groupName:]):
+Remove usesDocumentViews parameter and always pass YES to the _initWithFrame method.
+
+(-[WebView initWithCoder:]):
+Remove usesDocumentViews parameter.
+
+(-[WebView _frameViewAtWindowPoint:]):
+Remove usesDocumentViews check.
+
+* WebView/WebViewData.h:
+Remove usesDocumentViews ivar.
+
+* WebView/WebViewPrivate.h:
+Remove usesDocumentViews parameters.
+
+2011-09-19 Anders Carlsson ander...@apple.com
+
Remove WebViewEventHandling.mm
https://bugs.webkit.org/show_bug.cgi?id=68387
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (95473 => 95474)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2011-09-19 21:10:40 UTC (rev 95473)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2011-09-19 21:25:40 UTC (rev 95474)
@@ -247,8 +247,6 @@
void WebFrameLoaderClient::forceLayoutForNonHTML()
{
WebFrameView *thisView = m_webFrame-_private-webFrameView;
-if (!thisView) // Viewless mode.
-return;
NSView WebDocumentView *thisDocumentView = [thisView documentView];
ASSERT(thisDocumentView != nil);
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (95473 => 95474)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2011-09-19 21:10:40 UTC (rev 95473)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2011-09-19 21:25:40 UTC (rev 95474)
@@ -632,11 +632,6 @@
[types release];
}
-- (BOOL)_usesDocumentViews
-{
-return _private-usesDocumentViews;
-}
-
static NSString *leakMailQuirksUserScriptContents()
{
NSString *scriptPath = [[NSBundle bundleForClass:[WebView class]] pathForResource:@MailQuirksUserScript ofType:@js];
@@ -693,7 +688,7 @@
solarWalkQuirksScriptContents, KURL(), nullptr, nullptr, InjectAtDocumentEnd, InjectInAllFrames);
}
-- (void)_commonInitializationWithFrameName:(NSString *)frameName groupName:(NSString *)groupName usesDocumentViews:(BOOL)usesDocumentViews
+- (void)_commonInitializationWithFrameName:(NSString *)frameName groupName:(NSString *)groupName
{
WebCoreThreadViolationCheckRoundTwo();
@@ -709,17 +704,13 @@
_private-mainFrameDocumentReady = NO;
_private-drawsBackground = YES;
_private-backgroundColor = [[NSColor colorWithDeviceWhite:1 alpha:1] retain];
-_private-usesDocumentViews = usesDocumentViews;
[webkit-changes] [95475] trunk/Source/JavaScriptCore
Title: [95475] trunk/Source/_javascript_Core
Revision 95475
Author commit-qu...@webkit.org
Date 2011-09-19 14:28:06 -0700 (Mon, 19 Sep 2011)
Log Message
Unreviewed, rolling out r95466.
http://trac.webkit.org/changeset/95466
https://bugs.webkit.org/show_bug.cgi?id=68389
Incorrect version of the patch. (Requested by mhahnenberg on
#webkit).
Patch by Sheriff Bot webkit.review@gmail.com on 2011-09-19
* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
* runtime/JSCell.cpp:
(JSC::JSCell::toPrimitive):
* runtime/JSCell.h:
(JSC::JSCell::JSValue::toPrimitive):
* runtime/JSNotAnObject.cpp:
(JSC::JSNotAnObject::toPrimitive):
* runtime/JSNotAnObject.h:
* runtime/JSObject.h:
* runtime/JSString.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def
trunk/Source/_javascript_Core/runtime/JSCell.cpp
trunk/Source/_javascript_Core/runtime/JSCell.h
trunk/Source/_javascript_Core/runtime/JSNotAnObject.cpp
trunk/Source/_javascript_Core/runtime/JSNotAnObject.h
trunk/Source/_javascript_Core/runtime/JSObject.h
trunk/Source/_javascript_Core/runtime/JSString.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95474 => 95475)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-19 21:25:40 UTC (rev 95474)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-19 21:28:06 UTC (rev 95475)
@@ -1,3 +1,23 @@
+2011-09-19 Sheriff Bot webkit.review@gmail.com
+
+Unreviewed, rolling out r95466.
+http://trac.webkit.org/changeset/95466
+https://bugs.webkit.org/show_bug.cgi?id=68389
+
+Incorrect version of the patch. (Requested by mhahnenberg on
+#webkit).
+
+* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+* runtime/JSCell.cpp:
+(JSC::JSCell::toPrimitive):
+* runtime/JSCell.h:
+(JSC::JSCell::JSValue::toPrimitive):
+* runtime/JSNotAnObject.cpp:
+(JSC::JSNotAnObject::toPrimitive):
+* runtime/JSNotAnObject.h:
+* runtime/JSObject.h:
+* runtime/JSString.h:
+
2011-09-19 Mark Hahnenberg mhahnenb...@apple.com
Remove toPrimitive from JSCell
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (95474 => 95475)
--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-09-19 21:25:40 UTC (rev 95474)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-09-19 21:28:06 UTC (rev 95475)
@@ -356,6 +356,8 @@
?toObject@JSCell@JSC@@UBEPAVJSObject@2@PAVExecState@2@PAVJSGlobalObject@2@@Z
?toObject@JSObject@JSC@@UBEPAV12@PAVExecState@2@PAVJSGlobalObject@2@@Z
?toObjectSlowCase@JSValue@JSC@@ABEPAVJSObject@2@PAVExecState@2@PAVJSGlobalObject@2@@Z
+?toPrimitive@JSCell@JSC@@UBE?AVJSValue@2@PAVExecState@2@W4PreferredPrimitiveType@2@@Z
+?toPrimitive@JSString@JSC@@EBE?AVJSValue@2@PAVExecState@2@W4PreferredPrimitiveType@2@@Z
?toStrictThisObject@JSObject@JSC@@UBE?AVJSValue@2@PAVExecState@2@@Z
?toString@JSCell@JSC@@UBE?AVUString@2@PAVExecState@2@@Z
?toString@JSObject@JSC@@UBE?AVUString@2@PAVExecState@2@@Z
Modified: trunk/Source/_javascript_Core/runtime/JSCell.cpp (95474 => 95475)
--- trunk/Source/_javascript_Core/runtime/JSCell.cpp 2011-09-19 21:25:40 UTC (rev 95474)
+++ trunk/Source/_javascript_Core/runtime/JSCell.cpp 2011-09-19 21:28:06 UTC (rev 95475)
@@ -30,13 +30,6 @@
namespace JSC {
-JSValue JSCell::toPrimitive(ExecState* exec, PreferredPrimitiveType preferredType) const
-{
-if (isString())
-return static_castconst JSString*(this)-toPrimitive(exec, preferredType);
-return static_castconst JSObject*(this)-toPrimitive(exec, preferredType);
-}
-
bool JSCell::getString(ExecState* exec, UStringstringValue) const
{
if (!isString())
@@ -124,6 +117,12 @@
return JSValue();
}
+JSValue JSCell::toPrimitive(ExecState*, PreferredPrimitiveType) const
+{
+ASSERT_NOT_REACHED();
+return JSValue();
+}
+
bool JSCell::getPrimitiveNumber(ExecState*, double, JSValue)
{
ASSERT_NOT_REACHED();
Modified: trunk/Source/_javascript_Core/runtime/JSCell.h (95474 => 95475)
--- trunk/Source/_javascript_Core/runtime/JSCell.h 2011-09-19 21:25:40 UTC (rev 95474)
+++ trunk/Source/_javascript_Core/runtime/JSCell.h 2011-09-19 21:28:06 UTC (rev 95475)
@@ -102,7 +102,7 @@
virtual ConstructType getConstructData(ConstructData);
// Basic conversions.
-JSValue toPrimitive(ExecState*, PreferredPrimitiveType) const;
+virtual JSValue toPrimitive(ExecState*, PreferredPrimitiveType) const;
virtual bool getPrimitiveNumber(ExecState*, double number, JSValue);
virtual bool toBoolean(ExecState*) const;
virtual double toNumber(ExecState*) const;
@@ -285,6 +285,11 @@
return false;
}
+inline JSValue
[webkit-changes] [95476] trunk/Source/WebKit/mac
Title: [95476] trunk/Source/WebKit/mac
Revision 95476
Author ander...@apple.com
Date 2011-09-19 14:47:01 -0700 (Mon, 19 Sep 2011)
Log Message
Fix crashes when running WebKit1 tests.
-[WebView _mustDrawUnionedRect:singleRects:count:] was removed, so just put back the
equivalent code directly into -[WebHTMLView drawRect:].
* WebView/WebHTMLView.mm:
(-[WebHTMLView drawRect:]):
* WebView/WebViewInternal.h:
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebHTMLView.mm
trunk/Source/WebKit/mac/WebView/WebViewInternal.h
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (95475 => 95476)
--- trunk/Source/WebKit/mac/ChangeLog 2011-09-19 21:28:06 UTC (rev 95475)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-09-19 21:47:01 UTC (rev 95476)
@@ -1,5 +1,16 @@
2011-09-19 Anders Carlsson ander...@apple.com
+Fix crashes when running WebKit1 tests.
+
+-[WebView _mustDrawUnionedRect:singleRects:count:] was removed, so just put back the
+equivalent code directly into -[WebHTMLView drawRect:].
+
+* WebView/WebHTMLView.mm:
+(-[WebHTMLView drawRect:]):
+* WebView/WebViewInternal.h:
+
+2011-09-19 Anders Carlsson ander...@apple.com
+
Remove the last remains of viewless WebKit1
https://bugs.webkit.org/show_bug.cgi?id=68388
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (95475 => 95476)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2011-09-19 21:28:06 UTC (rev 95475)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2011-09-19 21:47:01 UTC (rev 95476)
@@ -3253,12 +3253,32 @@
double start = CFAbsoluteTimeGetCurrent();
#endif
-WebView *webView = [self _webView];
-if ([webView _mustDrawUnionedRect:rect singleRects:rects count:count])
+// If count == 0 here, use the rect passed in for drawing. This is a workaround for:
+// rdar://problem/3908282 REGRESSION (Mail): No drag image dragging selected text in Blot and Mail
+// The reason for the workaround is that this method is called explicitly from the code
+// to generate a drag image, and at that time, getRectsBeingDrawn:count: will return a zero count.
+const int cRectThreshold = 10;
+const float cWastedSpaceThreshold = 0.75f;
+BOOL useUnionedRect = (count = 1) || (count cRectThreshold);
+if (!useUnionedRect) {
+// Attempt to guess whether or not we should use the unioned rect or the individual rects.
+// We do this by computing the percentage of wasted space in the union. If that wasted space
+// is too large, then we will do individual rect painting instead.
+float unionPixels = (rect.size.width * rect.size.height);
+float singlePixels = 0;
+for (int i = 0; i count; ++i)
+singlePixels += rects[i].size.width * rects[i].size.height;
+float wastedSpace = 1 - (singlePixels / unionPixels);
+if (wastedSpace = cWastedSpaceThreshold)
+useUnionedRect = YES;
+}
+
+if (useUnionedRect)
[self drawSingleRect:rect];
-else
+else {
for (int i = 0; i count; ++i)
[self drawSingleRect:rects[i]];
+}
#ifdef LOG_TIMES
double thisTime = CFAbsoluteTimeGetCurrent() - start;
@@ -3268,6 +3288,8 @@
if (subviewsWereSetAside)
[self _setAsideSubviews];
+WebView *webView = [self _webView];
+
#if USE(ACCELERATED_COMPOSITING)
// Only do the synchronization dance if we're drawing into the window, otherwise
// we risk disabling screen updates when no flush is pending.
Modified: trunk/Source/WebKit/mac/WebView/WebViewInternal.h (95475 => 95476)
--- trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2011-09-19 21:28:06 UTC (rev 95475)
+++ trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2011-09-19 21:47:01 UTC (rev 95476)
@@ -170,8 +170,6 @@
- (BOOL)_canResetZoom:(BOOL)isTextOnly;
- (IBAction)_resetZoom:(id)sender isTextOnly:(BOOL)isTextOnly;
-- (BOOL)_mustDrawUnionedRect:(NSRect)rect singleRects:(const NSRect *)rects count:(NSInteger)count;
-
+ (BOOL)_canHandleRequest:(NSURLRequest *)request forMainFrame:(BOOL)forMainFrame;
- (void)_setInsertionPasteboard:(NSPasteboard *)pasteboard;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95477] trunk/LayoutTests
Title: [95477] trunk/LayoutTests Revision 95477 Author infe...@chromium.org Date 2011-09-19 14:48:27 -0700 (Mon, 19 Sep 2011) Log Message Unreviewed. Chromium Rebaselines for r95461. * platform/chromium-linux/fast/table/table-cell-before-after-content-around-table-block-expected.png: Added. * platform/chromium-linux/fast/table/table-cell-before-after-content-around-table-expected.png: Added. * platform/chromium-linux/fast/table/table-cell-before-after-content-around-table-row-expected.png: Added. * platform/chromium-linux/fast/table/table-row-before-after-content-around-block-expected.png: Added. * platform/chromium-linux/fast/table/table-row-before-after-content-around-table-expected.png: Added. * platform/chromium-mac/fast/table/table-cell-before-after-content-around-table-block-expected.png: Added. * platform/chromium-mac/fast/table/table-cell-before-after-content-around-table-expected.png: Added. * platform/chromium-mac/fast/table/table-cell-before-after-content-around-table-row-expected.png: Added. * platform/chromium-mac/fast/table/table-row-before-after-content-around-block-expected.png: Added. * platform/chromium-mac/fast/table/table-row-before-after-content-around-table-expected.png: Added. * platform/chromium-win/fast/table/table-cell-before-after-content-around-table-block-expected.png: Added. * platform/chromium-win/fast/table/table-cell-before-after-content-around-table-expected.png: Added. * platform/chromium-win/fast/table/table-cell-before-after-content-around-table-row-expected.png: Added. * platform/chromium-win/fast/table/table-row-before-after-content-around-block-expected.png: Added. * platform/chromium-win/fast/table/table-row-before-after-content-around-table-expected.png: Added. Modified Paths trunk/LayoutTests/ChangeLog Added Paths trunk/LayoutTests/platform/chromium-linux/fast/table/table-cell-before-after-content-around-table-block-expected.png trunk/LayoutTests/platform/chromium-linux/fast/table/table-cell-before-after-content-around-table-expected.png trunk/LayoutTests/platform/chromium-linux/fast/table/table-cell-before-after-content-around-table-row-expected.png trunk/LayoutTests/platform/chromium-linux/fast/table/table-row-before-after-content-around-block-expected.png trunk/LayoutTests/platform/chromium-linux/fast/table/table-row-before-after-content-around-table-expected.png trunk/LayoutTests/platform/chromium-mac/fast/table/table-cell-before-after-content-around-table-block-expected.png trunk/LayoutTests/platform/chromium-mac/fast/table/table-cell-before-after-content-around-table-expected.png trunk/LayoutTests/platform/chromium-mac/fast/table/table-cell-before-after-content-around-table-row-expected.png trunk/LayoutTests/platform/chromium-mac/fast/table/table-row-before-after-content-around-block-expected.png trunk/LayoutTests/platform/chromium-mac/fast/table/table-row-before-after-content-around-table-expected.png trunk/LayoutTests/platform/chromium-win/fast/table/table-cell-before-after-content-around-table-block-expected.png trunk/LayoutTests/platform/chromium-win/fast/table/table-cell-before-after-content-around-table-expected.png trunk/LayoutTests/platform/chromium-win/fast/table/table-cell-before-after-content-around-table-row-expected.png trunk/LayoutTests/platform/chromium-win/fast/table/table-row-before-after-content-around-block-expected.png trunk/LayoutTests/platform/chromium-win/fast/table/table-row-before-after-content-around-table-expected.png Diff Modified: trunk/LayoutTests/ChangeLog (95476 => 95477) --- trunk/LayoutTests/ChangeLog 2011-09-19 21:47:01 UTC (rev 95476) +++ trunk/LayoutTests/ChangeLog 2011-09-19 21:48:27 UTC (rev 95477) @@ -1,3 +1,23 @@ +2011-09-19 Abhishek Arya infe...@chromium.org + +Unreviewed. Chromium Rebaselines for r95461. + +* platform/chromium-linux/fast/table/table-cell-before-after-content-around-table-block-expected.png: Added. +* platform/chromium-linux/fast/table/table-cell-before-after-content-around-table-expected.png: Added. +* platform/chromium-linux/fast/table/table-cell-before-after-content-around-table-row-expected.png: Added. +* platform/chromium-linux/fast/table/table-row-before-after-content-around-block-expected.png: Added. +* platform/chromium-linux/fast/table/table-row-before-after-content-around-table-expected.png: Added. +* platform/chromium-mac/fast/table/table-cell-before-after-content-around-table-block-expected.png: Added. +* platform/chromium-mac/fast/table/table-cell-before-after-content-around-table-expected.png: Added. +* platform/chromium-mac/fast/table/table-cell-before-after-content-around-table-row-expected.png: Added. +* platform/chromium-mac/fast/table/table-row-before-after-content-around-block-expected.png: Added. +* platform/chromium-mac/fast/table/table-row-before-after-content-around-table-expected.png: Added. +*
[webkit-changes] [95478] trunk
Title: [95478] trunk
Revision 95478
Author rn...@webkit.org
Date 2011-09-19 14:51:44 -0700 (Mon, 19 Sep 2011)
Log Message
Incorrect selection with absolutely positioned div
https://bugs.webkit.org/show_bug.cgi?id=39503
Reviewed by Kenneth Rohde Christiansen.
Source/WebCore:
The bug was caused by a false assumption in RenderBlock::positionForPoint. Because the last child box
can be positioned, floated, invisible, etc..., we can't always trust last child's logicalTop to tell us
whether a given point is inside or below the last child box.
Fixed the bug by using the last hit-test candidate instead.
Test: editing/selection/block-with-positioned-lastchild.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::positionForPoint):
LayoutTests:
Added a regression test for placing the caret inside a block with multiple logical lines
with an absolutely positioned last child. WebKit should place the caret on the left of the first line
(instead of after the last line) when the user clicks on the left of the first line.
* editing/selection/block-with-positioned-lastchild-expected.txt: Added.
* editing/selection/block-with-positioned-lastchild.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBlock.cpp
Added Paths
trunk/LayoutTests/editing/selection/block-with-positioned-lastchild-expected.txt
trunk/LayoutTests/editing/selection/block-with-positioned-lastchild.html
Diff
Modified: trunk/LayoutTests/ChangeLog (95477 => 95478)
--- trunk/LayoutTests/ChangeLog 2011-09-19 21:48:27 UTC (rev 95477)
+++ trunk/LayoutTests/ChangeLog 2011-09-19 21:51:44 UTC (rev 95478)
@@ -1,3 +1,17 @@
+2011-09-19 Ryosuke Niwa rn...@webkit.org
+
+Incorrect selection with absolutely positioned div
+https://bugs.webkit.org/show_bug.cgi?id=39503
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Added a regression test for placing the caret inside a block with multiple logical lines
+with an absolutely positioned last child. WebKit should place the caret on the left of the first line
+(instead of after the last line) when the user clicks on the left of the first line.
+
+* editing/selection/block-with-positioned-lastchild-expected.txt: Added.
+* editing/selection/block-with-positioned-lastchild.html: Added.
+
2011-09-19 Abhishek Arya infe...@chromium.org
Unreviewed. Chromium Rebaselines for r95461.
Added: trunk/LayoutTests/editing/selection/block-with-positioned-lastchild-expected.txt (0 => 95478)
--- trunk/LayoutTests/editing/selection/block-with-positioned-lastchild-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/selection/block-with-positioned-lastchild-expected.txt 2011-09-19 21:51:44 UTC (rev 95478)
@@ -0,0 +1,4 @@
+Click on the left of this line.
+Caret should NOT be placed in this line,
+PASS
+
Added: trunk/LayoutTests/editing/selection/block-with-positioned-lastchild.html (0 => 95478)
--- trunk/LayoutTests/editing/selection/block-with-positioned-lastchild.html (rev 0)
+++ trunk/LayoutTests/editing/selection/block-with-positioned-lastchild.html 2011-09-19 21:51:44 UTC (rev 95478)
@@ -0,0 +1,30 @@
+!DOCTYPE html
+html
+body
+div style=padding: 20px; contenteditableClick on the left of this line.
+divCaret should NOT be placed in this line,/div
+div style=position:absolute; top:0px; right:0px;/div
+/div
+prescript
+
+if (window.layoutTestController) {
+layoutTestController.dumpAsText();
+
+var container = document.body.children[0];
+eventSender.mouseMoveTo(container.offsetLeft + 5, container.offsetTop + 5);
+eventSender.mouseDown();
+eventSender.mouseUp();
+
+if (!getSelection().isCollapsed)
+document.writeln('FAIL - selection was not collapsed');
+else if (getSelection().baseNode != container.firstChild)
+document.writeln('FAIL - caret was not in the first line');
+else if (getSelection().baseOffset)
+document.writeln('FAIL - caret was not on the left edge');
+else
+document.writeln('PASS');
+}
+
+/script/pre
+/body
+/html
Modified: trunk/Source/WebCore/ChangeLog (95477 => 95478)
--- trunk/Source/WebCore/ChangeLog 2011-09-19 21:48:27 UTC (rev 95477)
+++ trunk/Source/WebCore/ChangeLog 2011-09-19 21:51:44 UTC (rev 95478)
@@ -1,3 +1,21 @@
+2011-09-19 Ryosuke Niwa rn...@webkit.org
+
+Incorrect selection with absolutely positioned div
+https://bugs.webkit.org/show_bug.cgi?id=39503
+
+Reviewed by Kenneth Rohde Christiansen.
+
+The bug was caused by a false assumption in RenderBlock::positionForPoint. Because the last child box
+can be positioned, floated, invisible, etc..., we can't always trust last child's logicalTop to tell us
+whether a given point is inside or below the last child box.
+
+Fixed the bug by using the last hit-test candidate instead.
+
+Test:
[webkit-changes] [95479] trunk/Source/WebCore
Title: [95479] trunk/Source/WebCore
Revision 95479
Author cmar...@apple.com
Date 2011-09-19 14:56:23 -0700 (Mon, 19 Sep 2011)
Log Message
2011-09-19 Chris Marrin cmar...@apple.com
Crash can occur when doing a PlatformCAAnimation::copy() with no valueFunction
https://bugs.webkit.org/show_bug.cgi?id=67510
Reviewed by Adam Roben.
Another fix to take care of one last crash when running pause-crash.html.
CACF can't deal with null valueFunctions, so avoid setting it when it doesn't
exist.
This also adds logic to the Windows Hook in LayerChangesFlusher to prevent it
from catching the null pointer exception generated by the pause-crash.html test
before this bug was fixed. Windows was ignoring the exception, so the testcase
would appear to succeed, even though it should have crashed.
This is a resubmission of http://trac.webkit.org/changeset/95243 with a build fix.
* WebCore.vcproj/WebCore.vcproj:
* platform/graphics/ca/win/LayerChangesFlusher.cpp:
(WebCore::LayerChangesFlusher::hookCallback):
* platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
(PlatformCAAnimation::copy):
* platform/win/StructuredExceptionHandlerSupressor.h: Added.
(WebCore::StructuredExceptionHandlerSupressor::StructuredExceptionHandlerSupressor):
(WebCore::StructuredExceptionHandlerSupressor::~StructuredExceptionHandlerSupressor):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp
trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp
Added Paths
trunk/Source/WebCore/platform/win/StructuredExceptionHandlerSupressor.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (95478 => 95479)
--- trunk/Source/WebCore/ChangeLog 2011-09-19 21:51:44 UTC (rev 95478)
+++ trunk/Source/WebCore/ChangeLog 2011-09-19 21:56:23 UTC (rev 95479)
@@ -1,3 +1,30 @@
+2011-09-19 Chris Marrin cmar...@apple.com
+
+Crash can occur when doing a PlatformCAAnimation::copy() with no valueFunction
+https://bugs.webkit.org/show_bug.cgi?id=67510
+
+Reviewed by Adam Roben.
+
+Another fix to take care of one last crash when running pause-crash.html.
+CACF can't deal with null valueFunctions, so avoid setting it when it doesn't
+exist.
+
+This also adds logic to the Windows Hook in LayerChangesFlusher to prevent it
+from catching the null pointer exception generated by the pause-crash.html test
+before this bug was fixed. Windows was ignoring the exception, so the testcase
+would appear to succeed, even though it should have crashed.
+
+This is a resubmission of http://trac.webkit.org/changeset/95243 with a build fix.
+
+* WebCore.vcproj/WebCore.vcproj:
+* platform/graphics/ca/win/LayerChangesFlusher.cpp:
+(WebCore::LayerChangesFlusher::hookCallback):
+* platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
+(PlatformCAAnimation::copy):
+* platform/win/StructuredExceptionHandlerSupressor.h: Added.
+(WebCore::StructuredExceptionHandlerSupressor::StructuredExceptionHandlerSupressor):
+(WebCore::StructuredExceptionHandlerSupressor::~StructuredExceptionHandlerSupressor):
+
2011-09-19 Ryosuke Niwa rn...@webkit.org
Incorrect selection with absolutely positioned div
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (95478 => 95479)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-09-19 21:51:44 UTC (rev 95478)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-09-19 21:56:23 UTC (rev 95479)
@@ -27324,6 +27324,10 @@
RelativePath=..\platform\win\SoundWin.cpp
/File
+File
+RelativePath=..\platform\win\StructuredExceptionHandlerSupressor.h
+
+/File
File
RelativePath=..\platform\win\SystemInfo.cpp
Modified: trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp (95478 => 95479)
--- trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp 2011-09-19 21:51:44 UTC (rev 95478)
+++ trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp 2011-09-19 21:56:23 UTC (rev 95479)
@@ -29,6 +29,7 @@
#if USE(ACCELERATED_COMPOSITING)
#include AbstractCACFLayerTreeHost.h
+#include StructuredExceptionHandlerSupressor.h
#include wtf/StdLibExtras.h
#include wtf/Vector.h
@@ -71,6 +72,9 @@
LRESULT LayerChangesFlusher::hookCallback(int code, WPARAM wParam, LPARAM lParam)
{
+// Supress the exception handler Windows puts around all hook calls so we can
+// crash for debugging purposes if an exception is hit.
+StructuredExceptionHandlerSupressor supressor;
return shared().hookFired(code, wParam,
[webkit-changes] [95480] trunk/Source/JavaScriptCore
Title: [95480] trunk/Source/_javascript_Core
Revision 95480
Author aro...@apple.com
Date 2011-09-19 15:20:32 -0700 (Mon, 19 Sep 2011)
Log Message
Windows build fix after r94575
* _javascript_Core.vcproj/_javascript_Core.sln: Relinearized project dependencies. testRegExp
now builds just before FindSafari.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core.sln
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95479 => 95480)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-19 21:56:23 UTC (rev 95479)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-19 22:20:32 UTC (rev 95480)
@@ -1,3 +1,10 @@
+2011-09-19 Adam Roben aro...@apple.com
+
+Windows build fix after r94575
+
+* _javascript_Core.vcproj/_javascript_Core.sln: Relinearized project dependencies. testRegExp
+now builds just before FindSafari.
+
2011-09-19 Sheriff Bot webkit.review@gmail.com
Unreviewed, rolling out r95466.
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core.sln (95479 => 95480)
--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core.sln 2011-09-19 21:56:23 UTC (rev 95479)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core.sln 2011-09-19 22:20:32 UTC (rev 95480)
@@ -18,14 +18,14 @@
EndProject
Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = FindSafari, ..\..\..\Tools\FindSafari\FindSafari.vcproj, {DA31DA52-6675-48D4-89E0-333A7144397C}
ProjectSection(ProjectDependencies) = postProject
- {C59E5129-B453-49B7-A52B-1E104715F76E} = {C59E5129-B453-49B7-A52B-1E104715F76E}
+ {14C94979-1ED3-4E1D-9B55-A80FCF4677D0} = {14C94979-1ED3-4E1D-9B55-A80FCF4677D0}
EndProjectSection
EndProject
Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = _javascript_CoreGenerated, _javascript_Core\_javascript_CoreGenerated.vcproj, {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}
EndProject
Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = testRegExp, testRegExp\testRegExp.vcproj, {14C94979-1ED3-4E1D-9B55-A80FCF4677D0}
ProjectSection(ProjectDependencies) = postProject
- {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5}
+ {C59E5129-B453-49B7-A52B-1E104715F76E} = {C59E5129-B453-49B7-A52B-1E104715F76E}
EndProjectSection
EndProject
Global
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95481] trunk/Source/ThirdParty/ANGLE
Title: [95481] trunk/Source/ThirdParty/ANGLE Revision 95481 Author aro...@apple.com Date 2011-09-19 15:20:41 -0700 (Mon, 19 Sep 2011) Log Message Let Xcode 4 do its thang with ANGLE.xcodeproj * ANGLE.xcodeproj/project.pbxproj: Modified Paths trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ChangeLog Diff Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (95480 => 95481) --- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2011-09-19 22:20:32 UTC (rev 95480) +++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2011-09-19 22:20:41 UTC (rev 95481) @@ -520,6 +520,7 @@ isa = PBXProject; buildConfigurationList = FB39D0731200ED9200088E69 /* Build configuration list for PBXProject ANGLE */; compatibilityVersion = Xcode 2.4; + developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( English, Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (95480 => 95481) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2011-09-19 22:20:32 UTC (rev 95480) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2011-09-19 22:20:41 UTC (rev 95481) @@ -1,3 +1,9 @@ +2011-09-19 Adam Roben aro...@apple.com + +Let Xcode 4 do its thang with ANGLE.xcodeproj + +* ANGLE.xcodeproj/project.pbxproj: + 2011-09-13 Anders Carlsson ander...@apple.com Disable C++ exceptions when building with clang ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95482] trunk
Title: [95482] trunk Revision 95482 Author commit-qu...@webkit.org Date 2011-09-19 15:23:28 -0700 (Mon, 19 Sep 2011) Log Message Fix nonpremultiplied webgl toDataURL to jpeg https://bugs.webkit.org/show_bug.cgi?id=68366 Source/WebCore: The canvas spec says that toDataURL to formats without an alpha must be composited onto a solid black background using the source-over operator. Do that. Patch by John Bauman jbau...@chromium.org on 2011-09-19 Reviewed by Kenneth Russell. * platform/image-encoders/skia/JPEGImageEncoder.cpp: (WebCore::RGBAtoRGB): LayoutTests: Update the premultiplyalpha-test from the WebGL conformance tests. Patch by John Bauman jbau...@chromium.org on 2011-09-19 Reviewed by Kenneth Russell. * fast/canvas/webgl/premultiplyalpha-test-expected.txt: * fast/canvas/webgl/premultiplyalpha-test.html: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/fast/canvas/webgl/premultiplyalpha-test-expected.txt trunk/LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/image-encoders/skia/JPEGImageEncoder.cpp Diff Modified: trunk/LayoutTests/ChangeLog (95481 => 95482) --- trunk/LayoutTests/ChangeLog 2011-09-19 22:20:41 UTC (rev 95481) +++ trunk/LayoutTests/ChangeLog 2011-09-19 22:23:28 UTC (rev 95482) @@ -1,3 +1,15 @@ +2011-09-19 John Bauman jbau...@chromium.org + +Fix nonpremultiplied webgl toDataURL to jpeg +https://bugs.webkit.org/show_bug.cgi?id=68366 + +Update the premultiplyalpha-test from the WebGL conformance tests. + +Reviewed by Kenneth Russell. + +* fast/canvas/webgl/premultiplyalpha-test-expected.txt: +* fast/canvas/webgl/premultiplyalpha-test.html: + 2011-09-19 Ryosuke Niwa rn...@webkit.org Incorrect selection with absolutely positioned div Modified: trunk/LayoutTests/fast/canvas/webgl/premultiplyalpha-test-expected.txt (95481 => 95482) --- trunk/LayoutTests/fast/canvas/webgl/premultiplyalpha-test-expected.txt 2011-09-19 22:20:41 UTC (rev 95481) +++ trunk/LayoutTests/fast/canvas/webgl/premultiplyalpha-test-expected.txt 2011-09-19 22:23:28 UTC (rev 95482) @@ -3,35 +3,57 @@ On success, you will see a series of PASS messages, followed by TEST COMPLETE. -testing: premultipliedAlpha: true toDataURL: true +testing: premultipliedAlpha: true imageFormat: image/png PASS gl.getContextAttributes().premultipledAlpha is premultipledAlpha +PASS gl.getContextAttributes().preserveDrawingBuffer is true PASS getError was expected value: NO_ERROR : Should be no errors from setup. PASS getError was expected value: NO_ERROR : Should be no errors from drawing. PASS getError was expected value: NO_ERROR : Should be no errors from creating copy. PASS getError was expected value: NO_ERROR : Should be no errors from 2nd drawing. PASS should draw with 64,128,255,128 -testing: premultipliedAlpha: true toDataURL: false +testing: premultipliedAlpha: true imageFormat: undefined PASS gl.getContextAttributes().premultipledAlpha is premultipledAlpha +PASS gl.getContextAttributes().preserveDrawingBuffer is true PASS getError was expected value: NO_ERROR : Should be no errors from setup. PASS getError was expected value: NO_ERROR : Should be no errors from drawing. PASS getError was expected value: NO_ERROR : Should be no errors from creating copy. PASS getError was expected value: NO_ERROR : Should be no errors from 2nd drawing. PASS should draw with 64,128,255,128 -testing: premultipliedAlpha: false toDataURL: true +testing: premultipliedAlpha: false imageFormat: image/png PASS gl.getContextAttributes().premultipledAlpha is premultipledAlpha +PASS gl.getContextAttributes().preserveDrawingBuffer is true PASS getError was expected value: NO_ERROR : Should be no errors from setup. PASS getError was expected value: NO_ERROR : Should be no errors from drawing. PASS getError was expected value: NO_ERROR : Should be no errors from creating copy. PASS getError was expected value: NO_ERROR : Should be no errors from 2nd drawing. PASS should draw with 255,192,128,1 -testing: premultipliedAlpha: false toDataURL: false +testing: premultipliedAlpha: false imageFormat: undefined PASS gl.getContextAttributes().premultipledAlpha is premultipledAlpha +PASS gl.getContextAttributes().preserveDrawingBuffer is true PASS getError was expected value: NO_ERROR : Should be no errors from setup. PASS getError was expected value: NO_ERROR : Should be no errors from drawing. PASS getError was expected value: NO_ERROR : Should be no errors from creating copy. PASS getError was expected value: NO_ERROR : Should be no errors from 2nd drawing. PASS should draw with 255,192,128,1 +testing: premultipliedAlpha: false imageFormat: image/jpeg +PASS gl.getContextAttributes().premultipledAlpha is premultipledAlpha +PASS gl.getContextAttributes().preserveDrawingBuffer is true +PASS getError was expected value: NO_ERROR : Should be no errors from setup. +PASS
[webkit-changes] [95483] trunk/Source
Title: [95483] trunk/Source
Revision 95483
Author commit-qu...@webkit.org
Date 2011-09-19 15:26:34 -0700 (Mon, 19 Sep 2011)
Log Message
Unreviewed, rolling out r95385 and r95457.
http://trac.webkit.org/changeset/95385
http://trac.webkit.org/changeset/95457
https://bugs.webkit.org/show_bug.cgi?id=68395
Broke chromium browser_tests (Requested by dslomov on
#webkit).
Patch by Sheriff Bot webkit.review@gmail.com on 2011-09-19
Source/WebCore:
* bindings/v8/V8DOMWindowShell.cpp:
(WebCore::V8DOMWindowShell::disposeContextHandles):
(WebCore::V8DOMWindowShell::initContextIfNeeded):
* bindings/v8/V8IsolatedContext.cpp:
(WebCore::V8IsolatedContext::V8IsolatedContext):
(WebCore::V8IsolatedContext::destroy):
* bindings/v8/V8IsolatedContext.h:
* loader/EmptyClients.h:
(WebCore::EmptyFrameLoaderClient::didCreateScriptContextForFrame):
(WebCore::EmptyFrameLoaderClient::didDestroyScriptContextForFrame):
(WebCore::EmptyFrameLoaderClient::didCreateIsolatedScriptContext):
* loader/FrameLoaderClient.h:
Source/WebKit/chromium:
* public/WebFrameClient.h:
(WebKit::WebFrameClient::didCreateIsolatedScriptContext):
* src/FrameLoaderClientImpl.cpp:
(WebKit::FrameLoaderClientImpl::didCreateScriptContextForFrame):
(WebKit::FrameLoaderClientImpl::didDestroyScriptContextForFrame):
(WebKit::FrameLoaderClientImpl::didCreateIsolatedScriptContext):
* src/FrameLoaderClientImpl.h:
* tests/WebFrameTest.cpp:
(WebKit::TEST_F):
* tests/data/context_notifications_test.html: Removed.
* tests/data/context_notifications_test_frame.html: Removed.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
trunk/Source/WebCore/bindings/v8/V8IsolatedContext.cpp
trunk/Source/WebCore/bindings/v8/V8IsolatedContext.h
trunk/Source/WebCore/loader/EmptyClients.h
trunk/Source/WebCore/loader/FrameLoaderClient.h
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/WebFrameClient.h
trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.h
trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp
Removed Paths
trunk/Source/WebKit/chromium/tests/data/context_notifications_test.html
trunk/Source/WebKit/chromium/tests/data/context_notifications_test_frame.html
Diff
Modified: trunk/Source/WebCore/ChangeLog (95482 => 95483)
--- trunk/Source/WebCore/ChangeLog 2011-09-19 22:23:28 UTC (rev 95482)
+++ trunk/Source/WebCore/ChangeLog 2011-09-19 22:26:34 UTC (rev 95483)
@@ -1,3 +1,26 @@
+2011-09-19 Sheriff Bot webkit.review@gmail.com
+
+Unreviewed, rolling out r95385 and r95457.
+http://trac.webkit.org/changeset/95385
+http://trac.webkit.org/changeset/95457
+https://bugs.webkit.org/show_bug.cgi?id=68395
+
+Broke chromium browser_tests (Requested by dslomov on
+#webkit).
+
+* bindings/v8/V8DOMWindowShell.cpp:
+(WebCore::V8DOMWindowShell::disposeContextHandles):
+(WebCore::V8DOMWindowShell::initContextIfNeeded):
+* bindings/v8/V8IsolatedContext.cpp:
+(WebCore::V8IsolatedContext::V8IsolatedContext):
+(WebCore::V8IsolatedContext::destroy):
+* bindings/v8/V8IsolatedContext.h:
+* loader/EmptyClients.h:
+(WebCore::EmptyFrameLoaderClient::didCreateScriptContextForFrame):
+(WebCore::EmptyFrameLoaderClient::didDestroyScriptContextForFrame):
+(WebCore::EmptyFrameLoaderClient::didCreateIsolatedScriptContext):
+* loader/FrameLoaderClient.h:
+
2011-09-19 John Bauman jbau...@chromium.org
Fix nonpremultiplied webgl toDataURL to jpeg
Modified: trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp (95482 => 95483)
--- trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp 2011-09-19 22:23:28 UTC (rev 95482)
+++ trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp 2011-09-19 22:26:34 UTC (rev 95483)
@@ -173,7 +173,7 @@
void V8DOMWindowShell::disposeContextHandles()
{
if (!m_context.IsEmpty()) {
-m_frame-loader()-client()-willReleaseScriptContext(m_context, 0);
+m_frame-loader()-client()-didDestroyScriptContextForFrame();
m_context.Dispose();
m_context.Clear();
@@ -339,7 +339,7 @@
setSecurityToken();
-m_frame-loader()-client()-didCreateScriptContext(m_context, 0);
+m_frame-loader()-client()-didCreateScriptContextForFrame();
// FIXME: This is wrong. We should actually do this for the proper world once
// we do isolated worlds the WebCore way.
Modified: trunk/Source/WebCore/bindings/v8/V8IsolatedContext.cpp (95482 => 95483)
--- trunk/Source/WebCore/bindings/v8/V8IsolatedContext.cpp 2011-09-19 22:23:28 UTC (rev 95482)
+++ trunk/Source/WebCore/bindings/v8/V8IsolatedContext.cpp 2011-09-19 22:26:34 UTC (rev 95483)
@@ -49,7 +49,7 @@
}
V8IsolatedContext::V8IsolatedContext(V8Proxy* proxy, int extensionGroup, int worldId)
-: m_world(IsolatedWorld::create(worldId)), m_frame(proxy-frame())
+:
[webkit-changes] [95485] trunk/Source/JavaScriptCore
Title: [95485] trunk/Source/_javascript_Core Revision 95485 Author aro...@apple.com Date 2011-09-19 15:32:20 -0700 (Mon, 19 Sep 2011) Log Message Windows build fix after r95310 * _javascript_Core.vcproj/testRegExp/testRegExpCommon.vsprops: Added include\private\_javascript_Core to the include path so DFGIntrinsic.h can be found. Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExpCommon.vsprops Diff Modified: trunk/Source/_javascript_Core/ChangeLog (95484 => 95485) --- trunk/Source/_javascript_Core/ChangeLog 2011-09-19 22:27:38 UTC (rev 95484) +++ trunk/Source/_javascript_Core/ChangeLog 2011-09-19 22:32:20 UTC (rev 95485) @@ -1,3 +1,10 @@ +2011-09-19 Adam Roben aro...@apple.com + +Windows build fix after r95310 + +* _javascript_Core.vcproj/testRegExp/testRegExpCommon.vsprops: Added +include\private\_javascript_Core to the include path so DFGIntrinsic.h can be found. + 2011-09-19 Filip Pizlo fpi...@apple.com DFG speculation failures should act as additional value profiles Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExpCommon.vsprops (95484 => 95485) --- trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExpCommon.vsprops 2011-09-19 22:27:38 UTC (rev 95484) +++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExpCommon.vsprops 2011-09-19 22:32:20 UTC (rev 95485) @@ -6,7 +6,7 @@ Tool Name=VCCLCompilerTool - AdditionalIncludeDirectories=quot;$(ConfigurationBuildDir)\includequot;;quot;$(ConfigurationBuildDir)\include\privatequot;;quot;$(ConfigurationBuildDir)\obj\_javascript_Core\DerivedSources\quot;;../../;quot;../../os-win32/quot;;../../assembler/;../../API/;../../parser/;../../heap/;../../runtime/;../../VM/;../../bytecode/;../../interpreter/;../../wtf/;../../debugger/;../../bytecompiler/;../../profiler;../../jit/;quot;$(WebKitLibrariesDir)\include\pthreadsquot;;quot;$(WebKitLibrariesDir)\includequot; + AdditionalIncludeDirectories=quot;$(ConfigurationBuildDir)\includequot;;quot;$(ConfigurationBuildDir)\include\privatequot;;quot;$(ConfigurationBuildDir)\include\private\_javascript_Corequot;;quot;$(ConfigurationBuildDir)\obj\_javascript_Core\DerivedSources\quot;;../../;quot;../../os-win32/quot;;../../assembler/;../../API/;../../parser/;../../heap/;../../runtime/;../../VM/;../../bytecode/;../../interpreter/;../../wtf/;../../debugger/;../../bytecompiler/;../../profiler;../../jit/;quot;$(WebKitLibrariesDir)\include\pthreadsquot;;quot;$(WebKitLibrariesDir)\includequot; PreprocessorDefinitions=__STD_C ForcedIncludeFiles=ICUVersion.h ForcedUsingFiles= ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95489] trunk
Title: [95489] trunk
Revision 95489
Author aba...@webkit.org
Date 2011-09-19 15:57:30 -0700 (Mon, 19 Sep 2011)
Log Message
[V8] document.all gets confused about its prototype chain
https://bugs.webkit.org/show_bug.cgi?id=68393
Reviewed by Eric Seidel.
Source/WebCore:
GetRealNamedPropertyInPrototypeChain doesn't call interceptors, so it's
not a good idea to use its return value. It turns out that all the
callers of the API only cared about whether it returns a null handle.
Test: http/tests/security/document-all.html
* bindings/v8/V8Collection.h:
(WebCore::collectionNamedPropertyGetter):
* bindings/v8/custom/V8DOMStringMapCustom.cpp:
(WebCore::V8DOMStringMap::namedPropertyDeleter):
(WebCore::V8DOMStringMap::namedPropertySetter):
* bindings/v8/custom/V8HTMLAllCollectionCustom.cpp:
(WebCore::V8HTMLAllCollection::namedPropertyGetter):
* bindings/v8/custom/V8HTMLCollectionCustom.cpp:
(WebCore::V8HTMLCollection::namedPropertyGetter):
* bindings/v8/custom/V8NamedNodeMapCustom.cpp:
(WebCore::V8NamedNodeMap::namedPropertyGetter):
* bindings/v8/custom/V8StorageCustom.cpp:
(WebCore::storageSetter):
LayoutTests:
Test how document.all behaves when you change its prototype chain.
* http/tests/security/document-all-expected.txt: Added.
* http/tests/security/document-all.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/v8/V8Collection.h
trunk/Source/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp
trunk/Source/WebCore/bindings/v8/custom/V8HTMLAllCollectionCustom.cpp
trunk/Source/WebCore/bindings/v8/custom/V8HTMLCollectionCustom.cpp
trunk/Source/WebCore/bindings/v8/custom/V8NamedNodeMapCustom.cpp
trunk/Source/WebCore/bindings/v8/custom/V8StorageCustom.cpp
Added Paths
trunk/LayoutTests/http/tests/security/document-all-expected.txt
trunk/LayoutTests/http/tests/security/document-all.html
Diff
Modified: trunk/LayoutTests/ChangeLog (95488 => 95489)
--- trunk/LayoutTests/ChangeLog 2011-09-19 22:56:22 UTC (rev 95488)
+++ trunk/LayoutTests/ChangeLog 2011-09-19 22:57:30 UTC (rev 95489)
@@ -1,5 +1,17 @@
2011-09-19 Adam Barth aba...@webkit.org
+[V8] document.all gets confused about its prototype chain
+https://bugs.webkit.org/show_bug.cgi?id=68393
+
+Reviewed by Eric Seidel.
+
+Test how document.all behaves when you change its prototype chain.
+
+* http/tests/security/document-all-expected.txt: Added.
+* http/tests/security/document-all.html: Added.
+
+2011-09-19 Adam Barth aba...@webkit.org
+
Named property confusion with __proto__
https://bugs.webkit.org/show_bug.cgi?id=68221
Added: trunk/LayoutTests/http/tests/security/document-all-expected.txt (0 => 95489)
--- trunk/LayoutTests/http/tests/security/document-all-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/document-all-expected.txt 2011-09-19 22:57:30 UTC (rev 95489)
@@ -0,0 +1,2 @@
+CONSOLE MESSAGE: line 1: Uncaught TypeError: Illegal constructor
+
Added: trunk/LayoutTests/http/tests/security/document-all.html (0 => 95489)
--- trunk/LayoutTests/http/tests/security/document-all.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/document-all.html 2011-09-19 22:57:30 UTC (rev 95489)
@@ -0,0 +1,28 @@
+script
+if (window.layoutTestController) {
+layoutTestController.dumpAsText();
+layoutTestController.waitUntilDone();
+}
+
+window._onload_ = function()
+{
+frame = document.body.appendChild(document.createElement(iframe));
+frame.src = ""
+frame._onload_ = function() {
+frame._onload_ = null;
+
+frame.contentWindow[0].location = data:text/html,script( + function() {
+
+setTimeout(function() {
+if (window.layoutTestController)
+layoutTestController.notifyDone();
+}, 0);
+
+window.name = alert;
+obj = document.all;
+obj.__proto__ = parent;
+alert(obj.alert.constructor(return document.body.innerHTML)());
+} + )()/scr + ipt;
+}
+}
+/script
Modified: trunk/Source/WebCore/ChangeLog (95488 => 95489)
--- trunk/Source/WebCore/ChangeLog 2011-09-19 22:56:22 UTC (rev 95488)
+++ trunk/Source/WebCore/ChangeLog 2011-09-19 22:57:30 UTC (rev 95489)
@@ -1,5 +1,32 @@
2011-09-19 Adam Barth aba...@webkit.org
+[V8] document.all gets confused about its prototype chain
+https://bugs.webkit.org/show_bug.cgi?id=68393
+
+Reviewed by Eric Seidel.
+
+GetRealNamedPropertyInPrototypeChain doesn't call interceptors, so it's
+not a good idea to use its return value. It turns out that all the
+callers of the API only cared about whether it returns a null handle.
+
+Test: http/tests/security/document-all.html
+
+* bindings/v8/V8Collection.h:
+(WebCore::collectionNamedPropertyGetter):
+* bindings/v8/custom/V8DOMStringMapCustom.cpp:
[webkit-changes] [95490] trunk/Source/WebKit/chromium
Title: [95490] trunk/Source/WebKit/chromium
Revision 95490
Author bbu...@chromium.org
Date 2011-09-19 16:02:52 -0700 (Mon, 19 Sep 2011)
Log Message
Perform HTTP method and header validation in AssociatedURLLoader for
requests coming from untrusted code (eg. Native Client in Chrome). Use
the same code as XMLHttpRequest to reduce code duplication and have
behavior identical to XHR in _javascript_. Add an 'untrustedHTTP' option
to WebURLLoaderOptions, which AssociatedURLLoader can use to determine
if it should check the request method and headers.
https://bugs.webkit.org/show_bug.cgi?id=67655
Reviewed by Darin Fisher.
* public/WebURLLoaderOptions.h:
(WebKit::WebURLLoaderOptions::WebURLLoaderOptions):
* src/AssociatedURLLoader.cpp:
(WebKit::AssociatedURLLoader::ClientAdapter::setDelayedError):
(WebKit::AssociatedURLLoader::loadAsynchronously):
* tests/AssociatedURLLoaderTest.cpp:
(WebKit::AssociatedURLLoaderTest::CheckMethodFails):
(WebKit::AssociatedURLLoaderTest::CheckHeaderFails):
(WebKit::AssociatedURLLoaderTest::CheckFails):
(WebKit::TEST_F):
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/WebURLLoaderOptions.h
trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp
trunk/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (95489 => 95490)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 22:57:30 UTC (rev 95489)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 23:02:52 UTC (rev 95490)
@@ -1,3 +1,26 @@
+2011-09-19 Bill Budge bbu...@chromium.org
+
+Perform HTTP method and header validation in AssociatedURLLoader for
+requests coming from untrusted code (eg. Native Client in Chrome). Use
+the same code as XMLHttpRequest to reduce code duplication and have
+behavior identical to XHR in _javascript_. Add an 'untrustedHTTP' option
+to WebURLLoaderOptions, which AssociatedURLLoader can use to determine
+if it should check the request method and headers.
+https://bugs.webkit.org/show_bug.cgi?id=67655
+
+Reviewed by Darin Fisher.
+
+* public/WebURLLoaderOptions.h:
+(WebKit::WebURLLoaderOptions::WebURLLoaderOptions):
+* src/AssociatedURLLoader.cpp:
+(WebKit::AssociatedURLLoader::ClientAdapter::setDelayedError):
+(WebKit::AssociatedURLLoader::loadAsynchronously):
+* tests/AssociatedURLLoaderTest.cpp:
+(WebKit::AssociatedURLLoaderTest::CheckMethodFails):
+(WebKit::AssociatedURLLoaderTest::CheckHeaderFails):
+(WebKit::AssociatedURLLoaderTest::CheckFails):
+(WebKit::TEST_F):
+
2011-09-19 Adam Barth aba...@webkit.org
Rename ENABLE(OPENTYPE_SANITIZER) to USE(OPENTYPE_SANITIZER)
Modified: trunk/Source/WebKit/chromium/public/WebURLLoaderOptions.h (95489 => 95490)
--- trunk/Source/WebKit/chromium/public/WebURLLoaderOptions.h 2011-09-19 22:57:30 UTC (rev 95489)
+++ trunk/Source/WebKit/chromium/public/WebURLLoaderOptions.h 2011-09-19 23:02:52 UTC (rev 95490)
@@ -41,8 +41,15 @@
CrossOriginRequestPolicyAllow
};
-WebURLLoaderOptions() : sniffContent(false), allowCredentials(false), forcePreflight(false), crossOriginRequestPolicy(CrossOriginRequestPolicyDeny) { }
+WebURLLoaderOptions()
+: untrustedHTTP(false)
+, sniffContent(false)
+, allowCredentials(false)
+, forcePreflight(false)
+, crossOriginRequestPolicy(CrossOriginRequestPolicyDeny)
+{ }
+bool untrustedHTTP; // Whether to validate the method and headers as if this was an XMLHttpRequest.
bool sniffContent; // Whether to sniff content.
bool allowCredentials; // Whether to send HTTP credentials and cookies with the request.
bool forcePreflight; // If policy is to use access control, whether to force a preflight for GET, HEAD, and POST requests.
Modified: trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp (95489 => 95490)
--- trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp 2011-09-19 22:57:30 UTC (rev 95489)
+++ trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp 2011-09-19 23:02:52 UTC (rev 95490)
@@ -33,11 +33,13 @@
#include DocumentThreadableLoader.h
#include DocumentThreadableLoaderClient.h
+#include HTTPValidation.h
#include SubresourceLoader.h
#include Timer.h
#include WebApplicationCacheHost.h
#include WebDataSource.h
#include WebFrameImpl.h
+#include WebHTTPHeaderVisitor.h
#include WebKit.h
#include WebKitPlatformSupport.h
#include WebURLError.h
@@ -45,13 +47,34 @@
#include WebURLRequest.h
#include WrappedResourceRequest.h
#include WrappedResourceResponse.h
+#include XMLHttpRequest.h
using namespace WebCore;
-using namespace WebKit;
using namespace WTF;
namespace WebKit {
+namespace {
+
+class SafeHTTPHeaderValidator : public WebHTTPHeaderVisitor {
+WTF_MAKE_NONCOPYABLE(SafeHTTPHeaderValidator);
+public:
+SafeHTTPHeaderValidator() :
[webkit-changes] [95491] trunk/Source/WebKit/chromium
Title: [95491] trunk/Source/WebKit/chromium
Revision 95491
Author commit-qu...@webkit.org
Date 2011-09-19 16:04:11 -0700 (Mon, 19 Sep 2011)
Log Message
Expose AXObjectCache methods so that WebAccessibilityCache
can be deleted.
https://bugs.webkit.org/show_bug.cgi?id=68225
Patch by Dominic Mazzoni dmazz...@google.com on 2011-09-19
Reviewed by Dimitri Glazkov.
This patch exposes the functionality needed from AXObjectCache
with new methods in WebAccessibilityObject and WebDocument.
Next, Chromium will be updated to use only these methods and
not WebAccessibilityCache. Then, WebAccessibilityCache can be
deleted from WebKit.
* public/WebAccessibilityObject.h:
* public/WebDocument.h:
* src/WebAccessibilityObject.cpp:
(WebKit::WebAccessibilityObject::enableAccessibility):
(WebKit::WebAccessibilityObject::accessibilityEnabled):
(WebKit::WebAccessibilityObject::axID):
* src/WebDocument.cpp:
(WebKit::WebDocument::accessibilityObject):
(WebKit::WebDocument::accessibilityObjectFromID):
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/WebAccessibilityObject.h
trunk/Source/WebKit/chromium/public/WebDocument.h
trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp
trunk/Source/WebKit/chromium/src/WebDocument.cpp
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (95490 => 95491)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 23:02:52 UTC (rev 95490)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 23:04:11 UTC (rev 95491)
@@ -1,3 +1,27 @@
+2011-09-19 Dominic Mazzoni dmazz...@google.com
+
+Expose AXObjectCache methods so that WebAccessibilityCache
+can be deleted.
+https://bugs.webkit.org/show_bug.cgi?id=68225
+
+Reviewed by Dimitri Glazkov.
+
+This patch exposes the functionality needed from AXObjectCache
+with new methods in WebAccessibilityObject and WebDocument.
+Next, Chromium will be updated to use only these methods and
+not WebAccessibilityCache. Then, WebAccessibilityCache can be
+deleted from WebKit.
+
+* public/WebAccessibilityObject.h:
+* public/WebDocument.h:
+* src/WebAccessibilityObject.cpp:
+(WebKit::WebAccessibilityObject::enableAccessibility):
+(WebKit::WebAccessibilityObject::accessibilityEnabled):
+(WebKit::WebAccessibilityObject::axID):
+* src/WebDocument.cpp:
+(WebKit::WebDocument::accessibilityObject):
+(WebKit::WebDocument::accessibilityObjectFromID):
+
2011-09-19 Bill Budge bbu...@chromium.org
Perform HTTP method and header validation in AssociatedURLLoader for
Modified: trunk/Source/WebKit/chromium/public/WebAccessibilityObject.h (95490 => 95491)
--- trunk/Source/WebKit/chromium/public/WebAccessibilityObject.h 2011-09-19 23:02:52 UTC (rev 95490)
+++ trunk/Source/WebKit/chromium/public/WebAccessibilityObject.h 2011-09-19 23:04:11 UTC (rev 95491)
@@ -70,6 +70,12 @@
bool isNull() const { return m_private.isNull(); }
+// Static methods for enabling accessibility.
+WEBKIT_EXPORT static void enableAccessibility();
+WEBKIT_EXPORT static bool accessibilityEnabled();
+
+WEBKIT_EXPORT int axID() const;
+
WEBKIT_EXPORT WebString accessibilityDescription() const;
WEBKIT_EXPORT WebString actionVerb() const;
WEBKIT_EXPORT bool canSetFocusAttribute() const;
Modified: trunk/Source/WebKit/chromium/public/WebDocument.h (95490 => 95491)
--- trunk/Source/WebKit/chromium/public/WebDocument.h 2011-09-19 23:02:52 UTC (rev 95490)
+++ trunk/Source/WebKit/chromium/public/WebDocument.h 2011-09-19 23:04:11 UTC (rev 95491)
@@ -98,9 +98,17 @@
WEBKIT_EXPORT WebElement getElementById(const WebString) const;
WEBKIT_EXPORT WebNode focusedNode() const;
WEBKIT_EXPORT WebDocumentType doctype() const;
-WEBKIT_EXPORT WebAccessibilityObject accessibilityObject() const;
WEBKIT_EXPORT void cancelFullScreen();
+// Accessibility support. These methods should only be called on the
+// top-level document, because one accessibility cache spans all of
+// the documents on the page.
+
+// Gets the accessibility object for this document.
+WEBKIT_EXPORT WebAccessibilityObject accessibilityObject() const;
+
+// Gets the accessibility object for an object on this page by ID.
+WEBKIT_EXPORT WebAccessibilityObject accessibilityObjectFromID(int axID) const;
// Inserts the given CSS source code as a user stylesheet in the document.
// Meant for programatic/one-off injection, as opposed to
// WebView::addUserStyleSheet which inserts styles for the lifetime of the
Modified: trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp (95490 => 95491)
--- trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp 2011-09-19 23:02:52 UTC (rev 95490)
+++ trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp 2011-09-19 23:04:11 UTC (rev 95491)
@@ -31,6 +31,7 @@
#include config.h
#include
[webkit-changes] [95495] trunk/Source/WebKit/chromium
Title: [95495] trunk/Source/WebKit/chromium
Revision 95495
Author commit-qu...@webkit.org
Date 2011-09-19 16:49:50 -0700 (Mon, 19 Sep 2011)
Log Message
Suppress flakey test on windows in Chromium gesture recognizer
https://bugs.webkit.org/show_bug.cgi?id=68408
Patch by Robert Kroeger rjkro...@chromium.org on 2011-09-19
Reviewed by Adam Barth.
* tests/InnerGestureRecognizerTest.cpp:
(TEST_F):
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/tests/InnerGestureRecognizerTest.cpp
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (95494 => 95495)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 23:48:27 UTC (rev 95494)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 23:49:50 UTC (rev 95495)
@@ -1,3 +1,13 @@
+2011-09-19 Robert Kroeger rjkro...@chromium.org
+
+Suppress flakey test on windows in Chromium gesture recognizer
+https://bugs.webkit.org/show_bug.cgi?id=68408
+
+Reviewed by Adam Barth.
+
+* tests/InnerGestureRecognizerTest.cpp:
+(TEST_F):
+
2011-09-19 Dominic Mazzoni dmazz...@google.com
Expose AXObjectCache methods so that WebAccessibilityCache
Modified: trunk/Source/WebKit/chromium/tests/InnerGestureRecognizerTest.cpp (95494 => 95495)
--- trunk/Source/WebKit/chromium/tests/InnerGestureRecognizerTest.cpp 2011-09-19 23:48:27 UTC (rev 95494)
+++ trunk/Source/WebKit/chromium/tests/InnerGestureRecognizerTest.cpp 2011-09-19 23:49:50 UTC (rev 95495)
@@ -309,7 +309,13 @@
ASSERT_EQ(0.0, gm.lastTouchTime() - gm.firstTouchTime());
}
-TEST_F(GestureRecognizerTest, doubleTapGestureTest)
+#if OS(WINDOWS)
+#define MAYBE_doubleTapGestureTest DISABLED_doubleTapGestureTest
+#else
+#define MAYBE_doubleTapGestureTest doubleTapGestureTest
+#endif
+
+TEST_F(GestureRecognizerTest, DISABLED_doubleTapGestureTest)
{
InspectableGestureRecognizerChromium gm;
SimulateAndTestFirstClick(gm);
@@ -425,7 +431,13 @@
ASSERT_EQ(GestureRecognizerChromium::NoGesture, gm.state());
}
-TEST_F(GestureRecognizerTest, noDoubleTapGestureBecauseOfInterTouchIntervalTest)
+#if OS(WINDOWS)
+#define MAYBE_noDoubleTapGestureBecauseOfInterTouchIntervalTest DISABLED_noDoubleTapGestureBecauseOfInterTouchIntervalTest
+#else
+#define MAYBE_noDoubleTapGestureBecauseOfInterTouchIntervalTest noDoubleTapGestureBecauseOfInterTouchIntervalTest
+#endif
+
+TEST_F(GestureRecognizerTest, MAYBE_noDoubleTapGestureBecauseOfInterTouchIntervalTest)
{
InspectableGestureRecognizerChromium gm;
SimulateAndTestFirstClick(gm);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95506] trunk/Source/WebCore
Title: [95506] trunk/Source/WebCore
Revision 95506
Author commit-qu...@webkit.org
Date 2011-09-19 18:49:52 -0700 (Mon, 19 Sep 2011)
Log Message
[chromium] ContentLayer's texture updater deleted during paint when compositing turns off in the middle of paint
https://bugs.webkit.org/show_bug.cgi?id=68405
Patch by James Robinson jam...@chromium.org on 2011-09-19
Reviewed by Kenneth Russell.
Make TiledLayerChromium's textureUpdater refcounted and hold an explicit reference during paint in case
compositing is turned off halfway through a paint.
* platform/graphics/chromium/ContentLayerChromium.h:
* platform/graphics/chromium/ImageLayerChromium.cpp:
(WebCore::ImageLayerTextureUpdater::create):
* platform/graphics/chromium/ImageLayerChromium.h:
* platform/graphics/chromium/LayerTextureUpdater.h:
* platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp:
(WebCore::LayerTextureUpdaterBitmap::create):
(WebCore::LayerTextureUpdaterSkPicture::create):
* platform/graphics/chromium/LayerTextureUpdaterCanvas.h:
* platform/graphics/chromium/TiledLayerChromium.cpp:
(WebCore::TiledLayerChromium::prepareToUpdate):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h
trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp
trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h
trunk/Source/WebCore/platform/graphics/chromium/LayerTextureUpdater.h
trunk/Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp
trunk/Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.h
trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (95505 => 95506)
--- trunk/Source/WebCore/ChangeLog 2011-09-20 01:44:56 UTC (rev 95505)
+++ trunk/Source/WebCore/ChangeLog 2011-09-20 01:49:52 UTC (rev 95506)
@@ -1,3 +1,25 @@
+2011-09-19 James Robinson jam...@chromium.org
+
+[chromium] ContentLayer's texture updater deleted during paint when compositing turns off in the middle of paint
+https://bugs.webkit.org/show_bug.cgi?id=68405
+
+Reviewed by Kenneth Russell.
+
+Make TiledLayerChromium's textureUpdater refcounted and hold an explicit reference during paint in case
+compositing is turned off halfway through a paint.
+
+* platform/graphics/chromium/ContentLayerChromium.h:
+* platform/graphics/chromium/ImageLayerChromium.cpp:
+(WebCore::ImageLayerTextureUpdater::create):
+* platform/graphics/chromium/ImageLayerChromium.h:
+* platform/graphics/chromium/LayerTextureUpdater.h:
+* platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp:
+(WebCore::LayerTextureUpdaterBitmap::create):
+(WebCore::LayerTextureUpdaterSkPicture::create):
+* platform/graphics/chromium/LayerTextureUpdaterCanvas.h:
+* platform/graphics/chromium/TiledLayerChromium.cpp:
+(WebCore::TiledLayerChromium::prepareToUpdate):
+
2011-09-19 Luke Macpherson macpher...@chromium.org
Eliminate Length::undefinedLength = -1 and replace with Undefined LengthType.
Modified: trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h (95505 => 95506)
--- trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h 2011-09-20 01:44:56 UTC (rev 95505)
+++ trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h 2011-09-20 01:49:52 UTC (rev 95506)
@@ -59,7 +59,7 @@
virtual void createTextureUpdater(const CCLayerTreeHost*);
virtual LayerTextureUpdater* textureUpdater() const { return m_textureUpdater.get(); }
-OwnPtrLayerTextureUpdater m_textureUpdater;
+RefPtrLayerTextureUpdater m_textureUpdater;
};
}
Modified: trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp (95505 => 95506)
--- trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp 2011-09-20 01:44:56 UTC (rev 95505)
+++ trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp 2011-09-20 01:49:52 UTC (rev 95506)
@@ -45,11 +45,10 @@
namespace WebCore {
class ImageLayerTextureUpdater : public LayerTextureUpdater {
-WTF_MAKE_NONCOPYABLE(ImageLayerTextureUpdater);
public:
-static PassOwnPtrImageLayerTextureUpdater create(bool useMapTexSubImage)
+static PassRefPtrImageLayerTextureUpdater create(bool useMapTexSubImage)
{
-return adoptPtr(new ImageLayerTextureUpdater(useMapTexSubImage));
+return adoptRef(new ImageLayerTextureUpdater(useMapTexSubImage));
}
virtual ~ImageLayerTextureUpdater() { }
Modified: trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h (95505 => 95506)
--- trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h 2011-09-20 01:44:56 UTC (rev 95505)
+++ trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h 2011-09-20 01:49:52 UTC (rev 95506)
@@ -70,7 +70,7 @@
NativeImagePtr
[webkit-changes] [95508] trunk/Source/WebKit/chromium
Title: [95508] trunk/Source/WebKit/chromium
Revision 95508
Author commit-qu...@webkit.org
Date 2011-09-19 19:07:23 -0700 (Mon, 19 Sep 2011)
Log Message
Ask for audio hardware buffer size instead of using hardwired constants.
https://bugs.webkit.org/show_bug.cgi?id=67952
Patch by Raymond Toy r...@google.com on 2011-09-19
Reviewed by Kenneth Russell.
* public/WebKitPlatformSupport.h:
(WebKit::WebKitPlatformSupport::audioHardwareBufferSize): Declare
new member function audioHardwareBufferSize.
* src/AudioDestinationChromium.cpp:
(WebCore::AudioDestinationChromium::AudioDestinationChromium):
Call audioHardwareBufferSize() to get buffer size; update
m_callbackBuffersize and m_renderCountPerCallback appropriately.
Remove global variables callbackBufferSize and
renderCountPerCallback. Add constant for maximum
allowed buffer size and verify we don't exceed it.
(WebCore::AudioDestinationChromium::render): Use new member
variables instead of globals.
* src/AudioDestinationChromium.h:
Define new member variables m_callbackBufferSize and
m_renderCountPerCallback
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/WebKitPlatformSupport.h
trunk/Source/WebKit/chromium/src/AudioDestinationChromium.cpp
trunk/Source/WebKit/chromium/src/AudioDestinationChromium.h
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (95507 => 95508)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-20 01:53:00 UTC (rev 95507)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-20 02:07:23 UTC (rev 95508)
@@ -1,3 +1,26 @@
+2011-09-19 Raymond Toy r...@google.com
+
+Ask for audio hardware buffer size instead of using hardwired constants.
+https://bugs.webkit.org/show_bug.cgi?id=67952
+
+Reviewed by Kenneth Russell.
+
+* public/WebKitPlatformSupport.h:
+(WebKit::WebKitPlatformSupport::audioHardwareBufferSize): Declare
+new member function audioHardwareBufferSize.
+* src/AudioDestinationChromium.cpp:
+(WebCore::AudioDestinationChromium::AudioDestinationChromium):
+Call audioHardwareBufferSize() to get buffer size; update
+m_callbackBuffersize and m_renderCountPerCallback appropriately.
+Remove global variables callbackBufferSize and
+renderCountPerCallback. Add constant for maximum
+allowed buffer size and verify we don't exceed it.
+(WebCore::AudioDestinationChromium::render): Use new member
+variables instead of globals.
+* src/AudioDestinationChromium.h:
+Define new member variables m_callbackBufferSize and
+m_renderCountPerCallback
+
2011-09-19 Adam Barth aba...@webkit.org
Always enable ENABLE(EVENTSOURCE)
Modified: trunk/Source/WebKit/chromium/public/WebKitPlatformSupport.h (95507 => 95508)
--- trunk/Source/WebKit/chromium/public/WebKitPlatformSupport.h 2011-09-20 01:53:00 UTC (rev 95507)
+++ trunk/Source/WebKit/chromium/public/WebKitPlatformSupport.h 2011-09-20 02:07:23 UTC (rev 95508)
@@ -308,6 +308,7 @@
// Audio --
virtual double audioHardwareSampleRate() { return 0; }
+virtual size_t audioHardwareBufferSize() { return 0; }
virtual WebAudioDevice* createAudioDevice(size_t bufferSize, unsigned numberOfChannels, double sampleRate, WebAudioDevice::RenderCallback*) { return 0; }
// FileSystem --
Modified: trunk/Source/WebKit/chromium/src/AudioDestinationChromium.cpp (95507 => 95508)
--- trunk/Source/WebKit/chromium/src/AudioDestinationChromium.cpp 2011-09-20 01:53:00 UTC (rev 95507)
+++ trunk/Source/WebKit/chromium/src/AudioDestinationChromium.cpp 2011-09-20 02:07:23 UTC (rev 95508)
@@ -40,21 +40,11 @@
namespace WebCore {
-// Buffer size that the Chromium audio system will call us back with.
-#if OS(DARWIN)
-// For Mac OS X the chromium audio backend uses a low-latency CoreAudio API, so a low buffer size is possible.
-const unsigned callbackBufferSize = 128;
-#else
-// This value may need to be tuned based on the OS.
-// FIXME: It may be possible to reduce this value once real-time threads
-// and other Chromium audio improvements are made.
-const unsigned callbackBufferSize = 2048;
-#endif
-
// Buffer size at which the web audio engine will render.
const unsigned renderBufferSize = 128;
-const unsigned renderCountPerCallback = callbackBufferSize / renderBufferSize;
+// Maximum allowed buffer size
+const size_t maximumCallbackBufferSize = 16384;
// FIXME: add support for multi-channel.
const unsigned numberOfChannels = 2;
@@ -71,7 +61,22 @@
, m_sampleRate(sampleRate)
, m_isPlaying(false)
{
-m_audioDevice = adoptPtr(webKitPlatformSupport()-createAudioDevice(callbackBufferSize, numberOfChannels, sampleRate, this));
+// Get the minimum usable buffer size. We'll round this value up
+// to a multiple of our render size.
+size_t callbackSize =
[webkit-changes] [95509] trunk
Title: [95509] trunk
Revision 95509
Author rn...@webkit.org
Date 2011-09-19 19:48:04 -0700 (Mon, 19 Sep 2011)
Log Message
Hit testing on margins of body and head elements doesn't recur
https://bugs.webkit.org/show_bug.cgi?id=40753
Reviewed by Darin Adler.
Source/WebCore:
The bug was caused by positionForPointRespectingEditingBoundaries's comparing the editability
of head/body and html elements when hit testing was done inside margins of head and body elements.
Fixed the bug by special-casing html element (any immediate child of render view with a render layer)
since margins of head and body elements are special.
Tests: editing/selection/click-on-body-margin.html
editing/selection/click-on-head-margin.html
* rendering/RenderBlock.cpp:
(WebCore::positionForPointRespectingEditingBoundaries):
LayoutTests:
Add tests to click on margins of head and body elements. WebKit should not
(attempt to) place the caret after or before head and body elements.
* editing/selection/click-on-body-margin-expected.txt: Added.
* editing/selection/click-on-body-margin.html: Added.
* editing/selection/click-on-head-margin-expected.txt: Added.
* editing/selection/click-on-head-margin.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBlock.cpp
Added Paths
trunk/LayoutTests/editing/selection/click-on-body-margin-expected.txt
trunk/LayoutTests/editing/selection/click-on-body-margin.html
trunk/LayoutTests/editing/selection/click-on-head-margin-expected.txt
trunk/LayoutTests/editing/selection/click-on-head-margin.html
Diff
Modified: trunk/LayoutTests/ChangeLog (95508 => 95509)
--- trunk/LayoutTests/ChangeLog 2011-09-20 02:07:23 UTC (rev 95508)
+++ trunk/LayoutTests/ChangeLog 2011-09-20 02:48:04 UTC (rev 95509)
@@ -1,3 +1,18 @@
+2011-09-19 Ryosuke Niwa rn...@webkit.org
+
+Hit testing on margins of body and head elements doesn't recur
+https://bugs.webkit.org/show_bug.cgi?id=40753
+
+Reviewed by Darin Adler.
+
+Add tests to click on margins of head and body elements. WebKit should not
+(attempt to) place the caret after or before head and body elements.
+
+* editing/selection/click-on-body-margin-expected.txt: Added.
+* editing/selection/click-on-body-margin.html: Added.
+* editing/selection/click-on-head-margin-expected.txt: Added.
+* editing/selection/click-on-head-margin.html: Added.
+
2011-09-19 Gavin Barraclough barraclo...@apple.com
String#split is buggy
Added: trunk/LayoutTests/editing/selection/click-on-body-margin-expected.txt (0 => 95509)
--- trunk/LayoutTests/editing/selection/click-on-body-margin-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/selection/click-on-body-margin-expected.txt 2011-09-20 02:48:04 UTC (rev 95509)
@@ -0,0 +1,4 @@
+Click on the right of this line outside the black box.
+The caret should be placed on the right of the first line, NOT on the right of this line.
+PASS
+
Added: trunk/LayoutTests/editing/selection/click-on-body-margin.html (0 => 95509)
--- trunk/LayoutTests/editing/selection/click-on-body-margin.html (rev 0)
+++ trunk/LayoutTests/editing/selection/click-on-body-margin.html 2011-09-20 02:48:04 UTC (rev 95509)
@@ -0,0 +1,36 @@
+!DOCTYPE html
+html
+body style=white-space: nowrap; margin:100px; border: solid 1px black; contenteditable
+span id=firstLineClick on the right of this line outside the black box./spanbr
+span id=longLineThe caret should be placed on the right of the first line, NOT on the right of this line.
+span/span/span
+prescript
+
+var longLine = document.getElementById('longLine');
+while (longLine.offsetWidth document.body.offsetWidth + 200)
+longLine.lastChild.textContent += ' some text';
+
+if (window.layoutTestController) {
+layoutTestController.dumpAsText();
+
+var firstLine = document.getElementById('firstLine');
+eventSender.mouseMoveTo(firstLine.offsetLeft + document.body.offsetWidth + 10,
+firstLine.offsetTop + firstLine.offsetHeight / 2);
+eventSender.mouseDown();
+eventSender.mouseUp();
+
+if (!getSelection().isCollapsed)
+document.writeln('FAIL - selection was not collapsed');
+else if (getSelection().baseNode != firstLine.firstChild)
+document.writeln('FAIL - caret was not in the first line');
+else if (getSelection().baseOffset != firstLine.textContent.length)
+document.writeln('FAIL - caret was not on the right edge');
+else
+document.writeln('PASS');
+
+longLine.lastChild.style.display = 'none';
+}
+
+/script/pre
+/body
+/html
Added: trunk/LayoutTests/editing/selection/click-on-head-margin-expected.txt (0 => 95509)
--- trunk/LayoutTests/editing/selection/click-on-head-margin-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/selection/click-on-head-margin-expected.txt 2011-09-20 02:48:04 UTC (rev
[webkit-changes] [95510] trunk/Source/JavaScriptCore
Title: [95510] trunk/Source/_javascript_Core
Revision 95510
Author gga...@apple.com
Date 2011-09-19 20:35:49 -0700 (Mon, 19 Sep 2011)
Log Message
Removed ENABLE_JSC_MULTIPLE_THREADS and related #ifdefs.
https://bugs.webkit.org/show_bug.cgi?id=68422
As discussed on webkit-dev. All ports build with threads enabled in JSC now.
This may break WinCE and other ports that have not built and tested with
this configuration. I've filed bugs for port maintainers. It's time for
WebKit to move forward.
Reviewed by Sam Weinig.
* API/APIShims.h:
(JSC::APIEntryShimWithoutLock::APIEntryShimWithoutLock):
* API/JSContextRef.cpp:
* heap/MachineStackMarker.cpp:
(JSC::MachineThreads::MachineThreads):
(JSC::MachineThreads::~MachineThreads):
(JSC::MachineThreads::gatherConservativeRoots):
* heap/MachineStackMarker.h:
* runtime/InitializeThreading.cpp:
(JSC::initializeThreadingOnce):
(JSC::initializeThreading):
* runtime/JSGlobalData.cpp:
(JSC::JSGlobalData::sharedInstance):
* runtime/JSGlobalData.h:
(JSC::JSGlobalData::makeUsableFromMultipleThreads):
* runtime/JSLock.cpp:
* runtime/Structure.cpp:
* wtf/Platform.h:
Modified Paths
trunk/Source/_javascript_Core/API/APIShims.h
trunk/Source/_javascript_Core/API/JSContextRef.cpp
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/heap/MachineStackMarker.cpp
trunk/Source/_javascript_Core/heap/MachineStackMarker.h
trunk/Source/_javascript_Core/runtime/InitializeThreading.cpp
trunk/Source/_javascript_Core/runtime/JSGlobalData.cpp
trunk/Source/_javascript_Core/runtime/JSGlobalData.h
trunk/Source/_javascript_Core/runtime/JSLock.cpp
trunk/Source/_javascript_Core/runtime/Structure.cpp
trunk/Source/_javascript_Core/wtf/Platform.h
Diff
Modified: trunk/Source/_javascript_Core/API/APIShims.h (95509 => 95510)
--- trunk/Source/_javascript_Core/API/APIShims.h 2011-09-20 02:48:04 UTC (rev 95509)
+++ trunk/Source/_javascript_Core/API/APIShims.h 2011-09-20 03:35:49 UTC (rev 95510)
@@ -40,10 +40,8 @@
, m_entryIdentifierTable(wtfThreadData().setCurrentIdentifierTable(globalData-identifierTable))
{
UNUSED_PARAM(registerThread);
-#if ENABLE(JSC_MULTIPLE_THREADS)
if (registerThread)
globalData-heap.machineThreads().addCurrentThread();
-#endif
m_globalData-heap.activityCallback()-synchronize();
m_globalData-timeoutChecker.start();
}
Modified: trunk/Source/_javascript_Core/API/JSContextRef.cpp (95509 => 95510)
--- trunk/Source/_javascript_Core/API/JSContextRef.cpp 2011-09-20 02:48:04 UTC (rev 95509)
+++ trunk/Source/_javascript_Core/API/JSContextRef.cpp 2011-09-20 03:35:49 UTC (rev 95510)
@@ -92,9 +92,7 @@
APIEntryShim entryShim(globalData.get(), false);
-#if ENABLE(JSC_MULTIPLE_THREADS)
globalData-makeUsableFromMultipleThreads();
-#endif
if (!globalObjectClass) {
JSGlobalObject* globalObject = JSGlobalObject::create(*globalData, JSGlobalObject::createStructure(*globalData, jsNull()));
Modified: trunk/Source/_javascript_Core/ChangeLog (95509 => 95510)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-20 02:48:04 UTC (rev 95509)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-20 03:35:49 UTC (rev 95510)
@@ -1,3 +1,35 @@
+2011-09-19 Geoffrey Garen gga...@apple.com
+
+Removed ENABLE_JSC_MULTIPLE_THREADS and related #ifdefs.
+https://bugs.webkit.org/show_bug.cgi?id=68422
+
+As discussed on webkit-dev. All ports build with threads enabled in JSC now.
+
+This may break WinCE and other ports that have not built and tested with
+this configuration. I've filed bugs for port maintainers. It's time for
+WebKit to move forward.
+
+Reviewed by Sam Weinig.
+
+* API/APIShims.h:
+(JSC::APIEntryShimWithoutLock::APIEntryShimWithoutLock):
+* API/JSContextRef.cpp:
+* heap/MachineStackMarker.cpp:
+(JSC::MachineThreads::MachineThreads):
+(JSC::MachineThreads::~MachineThreads):
+(JSC::MachineThreads::gatherConservativeRoots):
+* heap/MachineStackMarker.h:
+* runtime/InitializeThreading.cpp:
+(JSC::initializeThreadingOnce):
+(JSC::initializeThreading):
+* runtime/JSGlobalData.cpp:
+(JSC::JSGlobalData::sharedInstance):
+* runtime/JSGlobalData.h:
+(JSC::JSGlobalData::makeUsableFromMultipleThreads):
+* runtime/JSLock.cpp:
+* runtime/Structure.cpp:
+* wtf/Platform.h:
+
2011-09-19 Sheriff Bot webkit.review@gmail.com
Unreviewed, rolling out r95493 and r95496.
Modified: trunk/Source/_javascript_Core/heap/MachineStackMarker.cpp (95509 => 95510)
--- trunk/Source/_javascript_Core/heap/MachineStackMarker.cpp 2011-09-20 02:48:04 UTC (rev 95509)
+++ trunk/Source/_javascript_Core/heap/MachineStackMarker.cpp 2011-09-20 03:35:49 UTC (rev 95510)
@@ -76,7 +76,7 @@
#include errno.h
#endif
-#if ENABLE(JSC_MULTIPLE_THREADS) USE(PTHREADS)
[webkit-changes] [95511] trunk/Source/JavaScriptCore
Title: [95511] trunk/Source/_javascript_Core
Revision 95511
Author gga...@apple.com
Date 2011-09-19 20:55:29 -0700 (Mon, 19 Sep 2011)
Log Message
Removed ENABLE_WTF_MULTIPLE_THREADS and related #ifdefs
https://bugs.webkit.org/show_bug.cgi?id=68423
As discussed on webkit-dev. All ports build with threads enabled in WTF now.
This may break WinCE and other ports that have not built and tested with
this configuration. I've filed bugs for port maintainers. It's time for
WebKit to move forward.
Reviewed by Mark Rowe.
* wtf/CryptographicallyRandomNumber.cpp:
(WTF::ARC4Stream::ARC4RandomNumberGenerator::randomNumber):
(WTF::ARC4Stream::ARC4RandomNumberGenerator::randomValues):
* wtf/FastMalloc.cpp:
* wtf/Platform.h:
* wtf/RandomNumber.cpp:
(WTF::randomNumber):
* wtf/RefCountedLeakCounter.cpp:
(WTF::RefCountedLeakCounter::increment):
(WTF::RefCountedLeakCounter::decrement):
* wtf/ThreadingPthreads.cpp:
(WTF::initializeThreading):
* wtf/ThreadingWin.cpp:
(WTF::initializeThreading):
* wtf/dtoa.cpp:
(WTF::pow5mult):
* wtf/gtk/ThreadingGtk.cpp:
(WTF::initializeThreading):
* wtf/qt/ThreadingQt.cpp:
(WTF::initializeThreading):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/wtf/CryptographicallyRandomNumber.cpp
trunk/Source/_javascript_Core/wtf/FastMalloc.cpp
trunk/Source/_javascript_Core/wtf/Platform.h
trunk/Source/_javascript_Core/wtf/RandomNumber.cpp
trunk/Source/_javascript_Core/wtf/RefCountedLeakCounter.cpp
trunk/Source/_javascript_Core/wtf/ThreadingPthreads.cpp
trunk/Source/_javascript_Core/wtf/ThreadingWin.cpp
trunk/Source/_javascript_Core/wtf/dtoa.cpp
trunk/Source/_javascript_Core/wtf/gtk/ThreadingGtk.cpp
trunk/Source/_javascript_Core/wtf/qt/ThreadingQt.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95510 => 95511)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-20 03:35:49 UTC (rev 95510)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-20 03:55:29 UTC (rev 95511)
@@ -1,5 +1,39 @@
2011-09-19 Geoffrey Garen gga...@apple.com
+Removed ENABLE_WTF_MULTIPLE_THREADS and related #ifdefs
+https://bugs.webkit.org/show_bug.cgi?id=68423
+
+As discussed on webkit-dev. All ports build with threads enabled in WTF now.
+
+This may break WinCE and other ports that have not built and tested with
+this configuration. I've filed bugs for port maintainers. It's time for
+WebKit to move forward.
+
+Reviewed by Mark Rowe.
+
+* wtf/CryptographicallyRandomNumber.cpp:
+(WTF::ARC4Stream::ARC4RandomNumberGenerator::randomNumber):
+(WTF::ARC4Stream::ARC4RandomNumberGenerator::randomValues):
+* wtf/FastMalloc.cpp:
+* wtf/Platform.h:
+* wtf/RandomNumber.cpp:
+(WTF::randomNumber):
+* wtf/RefCountedLeakCounter.cpp:
+(WTF::RefCountedLeakCounter::increment):
+(WTF::RefCountedLeakCounter::decrement):
+* wtf/ThreadingPthreads.cpp:
+(WTF::initializeThreading):
+* wtf/ThreadingWin.cpp:
+(WTF::initializeThreading):
+* wtf/dtoa.cpp:
+(WTF::pow5mult):
+* wtf/gtk/ThreadingGtk.cpp:
+(WTF::initializeThreading):
+* wtf/qt/ThreadingQt.cpp:
+(WTF::initializeThreading):
+
+2011-09-19 Geoffrey Garen gga...@apple.com
+
Removed ENABLE_JSC_MULTIPLE_THREADS and related #ifdefs.
https://bugs.webkit.org/show_bug.cgi?id=68422
Modified: trunk/Source/_javascript_Core/wtf/CryptographicallyRandomNumber.cpp (95510 => 95511)
--- trunk/Source/_javascript_Core/wtf/CryptographicallyRandomNumber.cpp 2011-09-20 03:35:49 UTC (rev 95510)
+++ trunk/Source/_javascript_Core/wtf/CryptographicallyRandomNumber.cpp 2011-09-20 03:55:29 UTC (rev 95511)
@@ -65,9 +65,7 @@
ARC4Stream m_stream;
int m_count;
-#if ENABLE(WTF_MULTIPLE_THREADS)
Mutex m_mutex;
-#endif
};
ARC4Stream::ARC4Stream()
@@ -139,9 +137,7 @@
uint32_t ARC4RandomNumberGenerator::randomNumber()
{
-#if ENABLE(WTF_MULTIPLE_THREADS)
MutexLocker locker(m_mutex);
-#endif
m_count -= 4;
stirIfNeeded();
@@ -150,9 +146,7 @@
void ARC4RandomNumberGenerator::randomValues(void* buffer, size_t length)
{
-#if ENABLE(WTF_MULTIPLE_THREADS)
MutexLocker locker(m_mutex);
-#endif
unsigned char* result = reinterpret_castunsigned char*(buffer);
stirIfNeeded();
Modified: trunk/Source/_javascript_Core/wtf/FastMalloc.cpp (95510 => 95511)
--- trunk/Source/_javascript_Core/wtf/FastMalloc.cpp 2011-09-20 03:35:49 UTC (rev 95510)
+++ trunk/Source/_javascript_Core/wtf/FastMalloc.cpp 2011-09-20 03:55:29 UTC (rev 95511)
@@ -79,14 +79,13 @@
#include Assertions.h
#include limits
-#if ENABLE(WTF_MULTIPLE_THREADS)
#if OS(WINDOWS) PLATFORM(CHROMIUM) || OS(WINCE) PLATFORM(WIN)
#include windows.h
#else
#include pthread.h
#endif // OS(WINDOWS) PLATFORM(CHROMIUM) || OS(WINCE) PLATFORM(WIN)
-#endif
#include wtf/StdLibExtras.h
+#include string.h
[webkit-changes] [95512] trunk/Source/JavaScriptCore
Title: [95512] trunk/Source/_javascript_Core
Revision 95512
Author gga...@apple.com
Date 2011-09-19 21:05:28 -0700 (Mon, 19 Sep 2011)
Log Message
Removed ENABLE_LAZY_BLOCK_FREEING and related #ifdefs
https://bugs.webkit.org/show_bug.cgi?id=68424
As discussed on webkit-dev. All ports build with threads enabled in JSC now.
This may break WinCE and other ports that have not built and tested with
this configuration. I've filed bugs for port maintainers. It's time for
WebKit to move forward.
Reviewed by Mark Rowe.
* heap/Heap.cpp:
(JSC::Heap::Heap):
(JSC::Heap::~Heap):
(JSC::Heap::destroy):
(JSC::Heap::blockFreeingThreadMain):
(JSC::Heap::allocateBlock):
(JSC::Heap::freeBlocks):
(JSC::Heap::releaseFreeBlocks):
* heap/Heap.h:
* wtf/Platform.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/heap/Heap.cpp
trunk/Source/_javascript_Core/heap/Heap.h
trunk/Source/_javascript_Core/wtf/Platform.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95511 => 95512)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-20 03:55:29 UTC (rev 95511)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-20 04:05:28 UTC (rev 95512)
@@ -1,5 +1,29 @@
2011-09-19 Geoffrey Garen gga...@apple.com
+Removed ENABLE_LAZY_BLOCK_FREEING and related #ifdefs
+https://bugs.webkit.org/show_bug.cgi?id=68424
+
+As discussed on webkit-dev. All ports build with threads enabled in JSC now.
+
+This may break WinCE and other ports that have not built and tested with
+this configuration. I've filed bugs for port maintainers. It's time for
+WebKit to move forward.
+
+Reviewed by Mark Rowe.
+
+* heap/Heap.cpp:
+(JSC::Heap::Heap):
+(JSC::Heap::~Heap):
+(JSC::Heap::destroy):
+(JSC::Heap::blockFreeingThreadMain):
+(JSC::Heap::allocateBlock):
+(JSC::Heap::freeBlocks):
+(JSC::Heap::releaseFreeBlocks):
+* heap/Heap.h:
+* wtf/Platform.h:
+
+2011-09-19 Geoffrey Garen gga...@apple.com
+
Removed ENABLE_WTF_MULTIPLE_THREADS and related #ifdefs
https://bugs.webkit.org/show_bug.cgi?id=68423
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (95511 => 95512)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2011-09-20 03:55:29 UTC (rev 95511)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2011-09-20 04:05:28 UTC (rev 95512)
@@ -261,16 +261,13 @@
{
m_markedSpace.setHighWaterMark(m_minBytesPerCycle);
(*m_activityCallback)();
-#if ENABLE(LAZY_BLOCK_FREEING)
m_numberOfFreeBlocks = 0;
m_blockFreeingThread = createThread(blockFreeingThreadStartFunc, this, _javascript_Core::BlockFree);
ASSERT(m_blockFreeingThread);
-#endif
}
Heap::~Heap()
{
-#if ENABLE(LAZY_BLOCK_FREEING)
// destroy our thread
{
MutexLocker locker(m_freeBlockLock);
@@ -278,7 +275,6 @@
m_freeBlockCondition.broadcast();
}
waitForThreadCompletion(m_blockFreeingThread, 0);
-#endif
// The destroy function must already have been called, so assert this.
ASSERT(!m_globalData);
@@ -317,14 +313,11 @@
m_destroyedTypeCounts.dump(stderr, Destroyed Type Counts);
#endif
-#if ENABLE(LAZY_BLOCK_FREEING)
releaseFreeBlocks();
-#endif
m_globalData = 0;
}
-#if ENABLE(LAZY_BLOCK_FREEING)
void Heap::waitForRelativeTimeWhileHoldingLock(double relative)
{
if (m_blockFreeingThreadShouldQuit)
@@ -386,7 +379,6 @@
}
}
}
-#endif // ENABLE(LAZY_BLOCK_FREEING)
void Heap::reportExtraMemoryCostSlowCase(size_t cost)
{
@@ -736,12 +728,6 @@
{
MarkedBlock* block;
-#if !ENABLE(LAZY_BLOCK_FREEING)
-if (allocationEffort == AllocationCanFail)
-return 0;
-
-block = MarkedBlock::create(this, cellSize);
-#else
{
MutexLocker locker(m_freeBlockLock);
if (m_numberOfFreeBlocks) {
@@ -757,7 +743,6 @@
return 0;
else
block = MarkedBlock::create(this, cellSize);
-#endif
m_blocks.add(block);
@@ -772,13 +757,9 @@
m_blocks.remove(block);
block-reset();
-#if !ENABLE(LAZY_BLOCK_FREEING)
-MarkedBlock::destroy(block);
-#else
MutexLocker locker(m_freeBlockLock);
m_freeBlocks.append(block);
m_numberOfFreeBlocks++;
-#endif
}
}
@@ -789,7 +770,6 @@
freeBlocks(forEachBlock(takeIfEmpty));
}
-#if ENABLE(LAZY_BLOCK_FREEING)
void Heap::releaseFreeBlocks()
{
while (true) {
@@ -811,7 +791,6 @@
MarkedBlock::destroy(block);
}
}
-#endif
#if ENABLE(GGC)
void Heap::writeBarrierSlowCase(const JSCell* owner, JSCell* cell)
Modified: trunk/Source/_javascript_Core/heap/Heap.h (95511 => 95512)
--- trunk/Source/_javascript_Core/heap/Heap.h 2011-09-20 03:55:29 UTC (rev 95511)
+++ trunk/Source/_javascript_Core/heap/Heap.h 2011-09-20 04:05:28 UTC (rev 95512)
@@ -164,12 +164,10 @@
static void writeBarrierSlowCase(const
[webkit-changes] [95513] trunk/Source
Title: [95513] trunk/Source Revision 95513 Author mr...@apple.com Date 2011-09-19 21:14:55 -0700 (Mon, 19 Sep 2011) Log Message http://webkit.org/b/68421 Stop calling UpdateSystemActivity in places where we hold power assertions that achieve the same effect On SnowLeopard and newer it's not necessary to call UpdateSystemActivity to prevent the screensaver from kicking in as the NoDisplaySleep assertion now has that effect. It's also not necessary to hold both a NoDisplaySleep and a NoIdleSleep assertion as the latter is implied by the former. Source/WebCore: Since there were multiple copies of the same code to disable display sleep spread across WebCore, WebKit and WebKit2 this patch takes the approach of moving this functionality to a new DisplaySleepDisabler class that lives in WebCore. A class is used as it makes it easier to reason about the lifetime of the assertions and to ensure that the assertions will always be released when their owning objects go away. Reviewed by Dan Bernstein. * WebCore.exp.in: * WebCore.xcodeproj/project.pbxproj: * platform/mac/DisplaySleepDisabler.cpp: (WebCore::DisplaySleepDisabler::DisplaySleepDisabler): Register for the NoDisplaySleep assertion, and start our system activity timer when on Leopard. (WebCore::DisplaySleepDisabler::~DisplaySleepDisabler): Unregister for the assertion. (WebCore::DisplaySleepDisabler::systemActivityTimerFired): Call UpdateSystemActivity to prevent the screensaver from triggering on Leopard. * platform/mac/DisplaySleepDisabler.h: (WebCore::DisplaySleepDisabler::create): * platform/mac/WebVideoFullscreenController.h: * platform/mac/WebVideoFullscreenController.mm: (-[WebVideoFullscreenController dealloc]): (-[WebVideoFullscreenController setupVideoOverlay:]): Remove the now-unnecessary explicit use of the WebCore namespace. (-[WebVideoFullscreenController mediaElement]): Ditto. (-[WebVideoFullscreenController setMediaElement:]): Ditto. (-[WebVideoFullscreenController windowDidExitFullscreen]): Ditto. (-[WebVideoFullscreenController updatePowerAssertions]): Create a DisplaySleepDisabler instance when transitioning from permitting display sleep to disabling display sleep. Clear out our reference when sleep should be permitted, destroying any disabler that we own. Source/WebKit/mac: Adopt the DisplaySleepDisabler class that was added to WebCore and remove all of duplicated logic from WebFullScreenController. Reviewed by Dan Bernstein. * WebView/WebFullScreenController.h: * WebView/WebFullScreenController.mm: (-[WebFullScreenController dealloc]): (-[WebFullScreenController _updatePowerAssertions]): Create a DisplaySleepDisabler instance when transitioning from permitting display sleep to disabling display sleep. Clear out our reference when sleep should be permitted, destroying any disabler that we own. Source/WebKit2: Adopt the DisplaySleepDisabler class that was added to WebCore and remove all of duplicated logic from WKFullScreenWindowController. Reviewed by Dan Bernstein. * UIProcess/mac/WKFullScreenWindowController.h: * UIProcess/mac/WKFullScreenWindowController.mm: (-[WKFullScreenWindowController _updatePowerAssertions]): Create a DisplaySleepDisabler instance when transitioning from permitting display sleep to disabling display sleep. Clear out our reference when sleep should be permitted, destroying any disabler that we own. Also adds a FIXME about an error that was noticed while working in this code. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.exp.in trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.h trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm trunk/Source/WebKit/mac/ChangeLog trunk/Source/WebKit/mac/WebView/WebFullScreenController.h trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm Added Paths trunk/Source/WebCore/platform/mac/DisplaySleepDisabler.cpp trunk/Source/WebCore/platform/mac/DisplaySleepDisabler.h Diff Modified: trunk/Source/WebCore/ChangeLog (95512 => 95513) --- trunk/Source/WebCore/ChangeLog 2011-09-20 04:05:28 UTC (rev 95512) +++ trunk/Source/WebCore/ChangeLog 2011-09-20 04:14:55 UTC (rev 95513) @@ -1,3 +1,39 @@ +2011-09-19 Mark Rowe mr...@apple.com + +http://webkit.org/b/68421 Stop calling UpdateSystemActivity in places where we hold power assertions that achieve the same effect + +On SnowLeopard and newer it's not necessary to call UpdateSystemActivity to prevent the screensaver from kicking +in as the NoDisplaySleep assertion now has that effect. It's also not necessary to hold both a NoDisplaySleep and +a NoIdleSleep assertion as the latter is implied by the former. + +Since there were multiple copies of the same code to disable display sleep spread across
[webkit-changes] [95514] trunk/Source/WebKit/chromium
Title: [95514] trunk/Source/WebKit/chromium Revision 95514 Author gga...@apple.com Date 2011-09-19 21:24:34 -0700 (Mon, 19 Sep 2011) Log Message Removed ENABLE_JSC_MULTIPLE_THREADS and related #ifdefs. https://bugs.webkit.org/show_bug.cgi?id=68422 Missed this one case before. * features.gypi: Modified Paths trunk/Source/WebKit/chromium/ChangeLog trunk/Source/WebKit/chromium/features.gypi Diff Modified: trunk/Source/WebKit/chromium/ChangeLog (95513 => 95514) --- trunk/Source/WebKit/chromium/ChangeLog 2011-09-20 04:14:55 UTC (rev 95513) +++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-20 04:24:34 UTC (rev 95514) @@ -1,3 +1,12 @@ +2011-09-19 Geoffrey Garen gga...@apple.com + +Removed ENABLE_JSC_MULTIPLE_THREADS and related #ifdefs. +https://bugs.webkit.org/show_bug.cgi?id=68422 + +Missed this one case before. + +* features.gypi: + 2011-09-19 Raymond Toy r...@google.com Ask for audio hardware buffer size instead of using hardwired constants. Modified: trunk/Source/WebKit/chromium/features.gypi (95513 => 95514) --- trunk/Source/WebKit/chromium/features.gypi 2011-09-20 04:14:55 UTC (rev 95513) +++ trunk/Source/WebKit/chromium/features.gypi 2011-09-20 04:24:34 UTC (rev 95514) @@ -55,7 +55,6 @@ 'ENABLE_INPUT_SPEECH=1', 'ENABLE_JAVASCRIPT_DEBUGGER=1', 'ENABLE_JAVASCRIPT_I18N_API=1', - 'ENABLE_JSC_MULTIPLE_THREADS=0', 'ENABLE_LINK_PREFETCH=1', 'ENABLE_MEDIA_STATISTICS=1', 'ENABLE_MEDIA_STREAM=1', ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95515] trunk/Source/cmake/OptionsWinCE.cmake
Title: [95515] trunk/Source/cmake/OptionsWinCE.cmake Revision 95515 Author gga...@apple.com Date 2011-09-19 21:30:58 -0700 (Mon, 19 Sep 2011) Log Message Removing one last case of DENABLE_JSC_MULTIPLE_THREADS -- the cmake folder doesn't seem to have a ChangeLog Modified Paths trunk/Source/cmake/OptionsWinCE.cmake Diff Modified: trunk/Source/cmake/OptionsWinCE.cmake (95514 => 95515) --- trunk/Source/cmake/OptionsWinCE.cmake 2011-09-20 04:24:34 UTC (rev 95514) +++ trunk/Source/cmake/OptionsWinCE.cmake 2011-09-20 04:30:58 UTC (rev 95515) @@ -4,7 +4,6 @@ ADD_DEFINITIONS(-DWTF_USE_WININET=1) ADD_DEFINITIONS(-DWTF_CPU_ARM_TRADITIONAL -DWINCEBASIC) ADD_DEFINITIONS(-DJS_NO_EXPORT) -ADD_DEFINITIONS(-DENABLE_JSC_MULTIPLE_THREADS=0) ADD_DEFINITIONS(-DHAVE_ACCESSIBILITY=0) ADD_DEFINITIONS(-DUSE_SYSTEM_MALLOC=1) ADD_DEFINITIONS(-DJSCCOLLECTOR_VIRTUALMEM_RESERVATION=0x20) ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [95516] trunk/Source/JavaScriptCore
Title: [95516] trunk/Source/_javascript_Core
Revision 95516
Author mhahnenb...@apple.com
Date 2011-09-19 21:33:10 -0700 (Mon, 19 Sep 2011)
Log Message
Remove toPrimitive from JSCell
https://bugs.webkit.org/show_bug.cgi?id=67875
Reviewed by Darin Adler.
Part of the refactoring process to un-virtualize JSCell. We move
all of the implicit functionality provided by the virtual toPrimitive method
in JSCell to be explicit in JSValue::toPrimitive and JSCell:toPrimitive while
also de-virtualizing JSCell::toPrimitive.
* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
* runtime/JSCell.cpp:
(JSC::JSCell::toPrimitive):
* runtime/JSCell.h:
We replace JSNotAnObject::toPrimitive with defaultValue, which it overrides from
JSObject. This pushes the virtual method further down, enabling us to get rid
of the virtual call in JSCell. Eventually we'll probably have to deal with this
again, but we'll cross that bridge when we come to it.
* runtime/JSNotAnObject.cpp:
(JSC::JSNotAnObject::defaultValue):
* runtime/JSNotAnObject.h:
* runtime/JSObject.h:
* runtime/JSString.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def
trunk/Source/_javascript_Core/runtime/JSCell.cpp
trunk/Source/_javascript_Core/runtime/JSCell.h
trunk/Source/_javascript_Core/runtime/JSNotAnObject.cpp
trunk/Source/_javascript_Core/runtime/JSNotAnObject.h
trunk/Source/_javascript_Core/runtime/JSObject.h
trunk/Source/_javascript_Core/runtime/JSString.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95515 => 95516)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-20 04:30:58 UTC (rev 95515)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-20 04:33:10 UTC (rev 95516)
@@ -1,3 +1,30 @@
+2011-09-19 Mark Hahnenberg mhahnenb...@apple.com
+
+Remove toPrimitive from JSCell
+https://bugs.webkit.org/show_bug.cgi?id=67875
+
+Reviewed by Darin Adler.
+
+Part of the refactoring process to un-virtualize JSCell. We move
+all of the implicit functionality provided by the virtual toPrimitive method
+in JSCell to be explicit in JSValue::toPrimitive and JSCell:toPrimitive while
+also de-virtualizing JSCell::toPrimitive.
+
+* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+* runtime/JSCell.cpp:
+(JSC::JSCell::toPrimitive):
+* runtime/JSCell.h:
+
+We replace JSNotAnObject::toPrimitive with defaultValue, which it overrides from
+JSObject. This pushes the virtual method further down, enabling us to get rid
+of the virtual call in JSCell. Eventually we'll probably have to deal with this
+again, but we'll cross that bridge when we come to it.
+* runtime/JSNotAnObject.cpp:
+(JSC::JSNotAnObject::defaultValue):
+* runtime/JSNotAnObject.h:
+* runtime/JSObject.h:
+* runtime/JSString.h:
+
2011-09-19 Geoffrey Garen gga...@apple.com
Removed ENABLE_LAZY_BLOCK_FREEING and related #ifdefs
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (95515 => 95516)
--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-09-20 04:30:58 UTC (rev 95515)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-09-20 04:33:10 UTC (rev 95516)
@@ -356,8 +356,6 @@
?toObject@JSCell@JSC@@UBEPAVJSObject@2@PAVExecState@2@PAVJSGlobalObject@2@@Z
?toObject@JSObject@JSC@@UBEPAV12@PAVExecState@2@PAVJSGlobalObject@2@@Z
?toObjectSlowCase@JSValue@JSC@@ABEPAVJSObject@2@PAVExecState@2@PAVJSGlobalObject@2@@Z
-?toPrimitive@JSCell@JSC@@UBE?AVJSValue@2@PAVExecState@2@W4PreferredPrimitiveType@2@@Z
-?toPrimitive@JSString@JSC@@EBE?AVJSValue@2@PAVExecState@2@W4PreferredPrimitiveType@2@@Z
?toStrictThisObject@JSObject@JSC@@UBE?AVJSValue@2@PAVExecState@2@@Z
?toString@JSCell@JSC@@UBE?AVUString@2@PAVExecState@2@@Z
?toString@JSObject@JSC@@UBE?AVUString@2@PAVExecState@2@@Z
Modified: trunk/Source/_javascript_Core/runtime/JSCell.cpp (95515 => 95516)
--- trunk/Source/_javascript_Core/runtime/JSCell.cpp 2011-09-20 04:30:58 UTC (rev 95515)
+++ trunk/Source/_javascript_Core/runtime/JSCell.cpp 2011-09-20 04:33:10 UTC (rev 95516)
@@ -117,10 +117,11 @@
return JSValue();
}
-JSValue JSCell::toPrimitive(ExecState*, PreferredPrimitiveType) const
+JSValue JSCell::toPrimitive(ExecState* exec, PreferredPrimitiveType preferredType) const
{
-ASSERT_NOT_REACHED();
-return JSValue();
+if (isString())
+return static_castconst JSString*(this)-toPrimitive(exec, preferredType);
+return static_castconst JSObject*(this)-toPrimitive(exec, preferredType);
}
bool JSCell::getPrimitiveNumber(ExecState*, double, JSValue)
Modified: trunk/Source/_javascript_Core/runtime/JSCell.h (95515 => 95516)
---
