Diff
Modified: tags/Safari-537.16/Source/WebCore/ChangeLog (132809 => 132810)
--- tags/Safari-537.16/Source/WebCore/ChangeLog 2012-10-29 16:56:11 UTC (rev 132809)
+++ tags/Safari-537.16/Source/WebCore/ChangeLog 2012-10-29 16:59:51 UTC (rev 132810)
@@ -1,51 +1,511 @@
-2012-10-26 Lucas Forschler <[email protected]>
+2012-10-26 Elliott Sprehn <[email protected]>
- Merge r132695
+ Try to fix the windows build
+ https://bugs.webkit.org/show_bug.cgi?id=100556
-2012-10-26 Brady Eidson <[email protected]>
+ Reviewed by Eric Seidel.
- Crash in WebProces at WebCore::ResourceLoadScheduler::crossOriginRedirectReceived + 78
- <rdar://problem/12575514> and https://bugs.webkit.org/show_bug.cgi?id=100554
+ Touch files by adding whitespace to try and make the windows
+ build bot regenerate files.
- Reviewed by Alexey Proskuryakov.
+ No new tests, just kick the bot.
- This was fallout from http://trac.webkit.org/changeset/132501 where I missed some of the
- spots that call resourceLoadScheduler().
+ * dom/DOMAllInOne.cpp:
+ * html/HTMLElementsAllInOne.cpp:
+ * html/shadow/TextControlInnerElements.cpp:
- As a result we were creating more than one ResourceLoadScheduler, allowing the host records
- to get out of sync.
+2012-10-26 Rob Buis <[email protected]>
- The fix that also results in less #ifdefs scattered throughout the code is to use a single
- choke point for all ResourceLoadScheduler access.
+ [BlackBerry] Platform Abstraction for WebKit Resource/Image Loading
+ https://bugs.webkit.org/show_bug.cgi?id=100518
- No new tests
- (No change of behavior for the default config, not testable at this time in the repro config)
+ PR 231732
- Add a single choke point for accessing the correct ResourceLoadScheduler:
- * loader/ResourceLoadScheduler.cpp:
- (WebCore::defaultResourceLoadScheduler): New private function that keeps the singleton default ResourceLoadScheduler.
- (WebCore::resourceLoadScheduler): Refactor this function to either ask the LoaderStrategy or call through to
+ Reviewed by Yong Li.
- Revert back to using that single choke point everywhere:
- * dom/ContainerNode.cpp:
- (WebCore::ContainerNode::suspendPostAttachCallbacks):
- (WebCore::ContainerNode::resumePostAttachCallbacks):
+ Use the new resource/image loading abstraction ResourceStore.
- * loader/MainResourceLoader.cpp:
- (WebCore::MainResourceLoader::loadNow):
+ * platform/graphics/blackberry/ImageBlackBerry.cpp:
+ (WebCore::Image::loadPlatformResource):
- * loader/ResourceLoader.cpp:
- (WebCore::ResourceLoader::releaseResources):
- (WebCore::ResourceLoader::willSendRequest):
+2012-10-26 Bear Travis <[email protected]>
- * loader/cache/CachedResource.cpp:
- (WebCore::CachedResource::load):
+ [CSS Exclusions] Block children have incorrect offset when shape-inside element lays out below other elements
+ https://bugs.webkit.org/show_bug.cgi?id=98189
- * loader/cache/CachedResourceLoader.cpp:
- (WebCore::CachedResourceLoader::performPostLoadActions):
+ Reviewed by Dirk Schulze.
+ The initial code assumed that each block created a new layout state, such that
+ LayoutState::layoutOffset would be specific to each block child of a shape-inside.
+ Typically, however, block children of a shape-inside do not create a new layout state,
+ and therefore we use the current element's offset instead.
+
+ Test: fast/exclusions/shape-inside/shape-inside-subsequent-blocks.html
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlock::layoutRunsAndFloatsInRange): Modified to use only logicalTop
+ rather than LayoutState::layoutOffset::width/height and logicalTop.
+
+2012-10-26 Elliott Sprehn <[email protected]>
+
+ Remove setRenderStyle in favor of callbacks on HTMLOptionElement and HTMLOptGroupElement
+ https://bugs.webkit.org/show_bug.cgi?id=100397
+
+ Reviewed by Ojan Vafai.
+
+ Use Node custom callbacks to support the non-renderer style caching for option
+ and optgroup eliminating the need for setRenderStyle.
+
+ setRenderStyle only existed to support HTMLOptionElement and HTMLOptGroupElement
+ so they could store their RenderStyle even though they have no renderer. This
+ means all style setting went through the virtual call to setRenderStyle, and it
+ also hid the if statement protecting against null renderers meaning we end up
+ checking if the renderer is null repeatedly in recalcStyle. This refactor cleans
+ up recalcStyle to be more clear about what's going on.
+
+ No new tests needed, this is just a refactor.
+
+ * dom/Element.cpp:
+ (WebCore::Element::pseudoStyleCacheIsInvalid):
+ (WebCore::Element::recalcStyle):
+ * dom/Node.cpp:
+ (WebCore::Node::createRenderer):
+ (WebCore::Node::setRenderStyle):
+ Removed this method because it was only here to support HTMLOptionElement
+ and HTMLOptGroupElement. Instead we can use node custom callbacks.
+ * dom/Node.h:
+ (WebCore::Node::nonRendererStyle): Renamed from nonRendererRenderStyle to match other style methods.
+ * dom/NodeRenderStyle.h:
+ (WebCore::Node::renderStyle):
+ * html/HTMLOptGroupElement.cpp:
+ (WebCore::HTMLOptGroupElement::HTMLOptGroupElement):
+ (WebCore::HTMLOptGroupElement::attach): Reorder the logic to avoid calling styleForRenderer twice.
+ (WebCore::HTMLOptGroupElement::updateNonRenderStyle): Updates the cached non-renderer style.
+ (WebCore::HTMLOptGroupElement::nonRendererStyle):
+ (WebCore::HTMLOptGroupElement::customStyleForRenderer):
+ * html/HTMLOptGroupElement.h:
+ * html/HTMLOptionElement.cpp:
+ (WebCore::HTMLOptionElement::HTMLOptionElement):
+ (WebCore::HTMLOptionElement::attach): Reorder the logic to avoid calling styleForRenderer twice.
+ (WebCore::HTMLOptionElement::updateNonRenderStyle): Updates the cached non-renderer style.
+ (WebCore::HTMLOptionElement::nonRendererStyle):
+ (WebCore::HTMLOptionElement::customStyleForRenderer):
+ (WebCore::HTMLOptionElement::didRecalcStyle): Requests the repaint of the select like setRenderStyle used to.
+ * html/HTMLOptionElement.h:
+
+2012-10-26 Dirk Schulze <[email protected]>
+
+ -webkit-clip-path property should just reference clipPath
+ https://bugs.webkit.org/show_bug.cgi?id=100531
+
+ Reviewed by Eric Seidel.
+
+ The -webkit-clip-path property should just reference clipPath. Added a check for that.
+
+ Test: css3/masking/clip-path-reference-of-fake-clipPath.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintLayerContents):
+
+2012-10-26 Aaron Colwell <[email protected]>
+
+ Remove the circular reference between TextTrack and TextTrackCue
+ https://bugs.webkit.org/show_bug.cgi?id=100300
+
+ Reviewed by Eric Carlson.
+
+ Changed TextTrackCue.m_track to a normal pointer to break the circular
+ reference that was keeping both objects from ever getting deleted.
+
+ No new tests. This simply fixes a memory leak.
+
+ * html/track/TextTrack.cpp:
+ (WebCore::TextTrack::~TextTrack):
+ * html/track/TextTrackCue.cpp:
+ (WebCore::TextTrackCue::TextTrackCue):
+ (WebCore::TextTrackCue::~TextTrackCue):
+ (WebCore::TextTrackCue::track):
+ (WebCore::TextTrackCue::setTrack):
+ * html/track/TextTrackCue.h:
+ (TextTrackCue):
+
+2012-10-26 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Breakpoints are not managed correctly when editing uiSourceCode that was bound to ScriptFile after _javascript_SourceFrame creation.
+ https://bugs.webkit.org/show_bug.cgi?id=100535
+
+ Reviewed by Pavel Feldman.
+
+ Added SourceMappingChanged event to UISourceCode and made
+ _javascript_SourceFrame update ScriptFile events listeners on it.
+
+ * inspector/front-end/_javascript_SourceFrame.js:
+ (WebInspector._javascript_SourceFrame):
+ (WebInspector._javascript_SourceFrame.prototype._onSourceMappingChanged):
+ (WebInspector._javascript_SourceFrame.prototype._updateScriptFile):
+ * inspector/front-end/ResourceScriptMapping.js:
+ (WebInspector.ResourceScriptMapping.prototype._bindUISourceCodeToScripts):
+ * inspector/front-end/UISourceCode.js:
+ (WebInspector.UISourceCode.prototype.setSourceMapping):
+
+2012-10-26 Vincent Scheib <[email protected]>
+
+ Unreviewed, rolling out r132644.
+ http://trac.webkit.org/changeset/132644
+ https://bugs.webkit.org/show_bug.cgi?id=100497
+
+ Causes webkit_unit_tests
+ MemoryInstrumentationTest.ImageObserver to fail.
+
+ * platform/network/ResourceRequestBase.cpp:
+ (WebCore::ResourceRequestBase::reportMemoryUsage):
+ * platform/network/ResourceRequestBase.h:
+ (ResourceRequestBase):
+ * platform/network/chromium/ResourceRequest.cpp:
+ * platform/network/chromium/ResourceRequest.h:
+
+2012-10-26 Zeno Albisser <[email protected]>
+
+ [Qt] MiniBrowser segfaults on exit after using WebGL.
+ https://bugs.webkit.org/show_bug.cgi?id=100523
+
+ The display connection must not be closed before
+ destroying the offscreen window.
+ Therefore opening the connection is moved to the
+ getXWindow() function. And closing the connection
+ is being moved to the destructor of the offscreen window.
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+
+ * platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp:
+ (WebCore::OffScreenRootWindow::OffScreenRootWindow):
+ (WebCore::OffScreenRootWindow::getXWindow):
+ (OffScreenRootWindow):
+ (WebCore::OffScreenRootWindow::display):
+ (WebCore::OffScreenRootWindow::~OffScreenRootWindow):
+ (WebCore):
+ (WebCore::GraphicsSurfacePrivate::GraphicsSurfacePrivate):
+ (WebCore::GraphicsSurfacePrivate::~GraphicsSurfacePrivate):
+ (WebCore::GraphicsSurfacePrivate::createSurface):
+
+2012-10-26 Parth Patel <[email protected]>
+
+ [BlackBerry] Extending existing ThreadUnsafe singletons in webkit to
+ Generic ThreadUnsafe Singleton
+ https://bugs.webkit.org/show_bug.cgi?id=100529
+
+ Reviewed by Yong Li.
+
+ No new tests added as there was no behavioural change.
+
+ * platform/network/blackberry/NetworkManager.cpp:
+ (WebCore):
+ * platform/network/blackberry/NetworkManager.h:
+ (NetworkManager):
+
+2012-10-26 Mike West <[email protected]>
+
+ Web Inspector: Fix log-type icon alignment.
+ https://bugs.webkit.org/show_bug.cgi?id=100520
+
+ Reviewed by Yury Semikhatsky.
+
+ The icons are just a pixel or two off, and it's driving me nuts.
+
+ * inspector/front-end/inspector.css:
+ (.console-message::before, .console-user-command::before, #console-prompt::before, .console-group-title::before):
+ (.console-warning-level::before):
+
+2012-10-26 Erik Arvidsson <[email protected]>
+
+ Replaceable attributes should also have readonly
+ https://bugs.webkit.org/show_bug.cgi?id=91768
+
+ Reviewed by Adam Barth.
+
+ This updates the code generators for JSC and V8 to handle this case correctly.
+
+ * Modules/intents/DOMWindowIntents.idl:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ * bindings/scripts/CodeGeneratorV8.pm:
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+ * bindings/scripts/test/ObjC/DOMTestObj.h:
+ * bindings/scripts/test/ObjC/DOMTestObj.mm:
+ * bindings/scripts/test/TestObj.idl:
+ * bindings/scripts/test/V8/V8TestObj.cpp:
+ * page/DOMWindow.idl:
+ * workers/WorkerContext.idl:
+
+2012-10-26 Nico Weber <[email protected]>
+
+ Clear m_orientation in FrameData::clear() for skia
+ https://bugs.webkit.org/show_bug.cgi?id=100456
+
+ Reviewed by Stephen White.
+
+ clear() is only called by the FrameData destructor and for multi-image
+ images in BitmapImage::destroyDecodedData(). Multi-frame images don't
+ have exif data, so this patch should have no effect in practice. It
+ makes the skia code match the CG code in BitmapImageCG.cpp though.
+
+ * platform/graphics/skia/ImageSkia.cpp:
+ (WebCore::FrameData::clear):
+
+2012-10-26 Florin Malita <[email protected]>
+
+ Crash on loading SVG filter resource on HTML element
+ https://bugs.webkit.org/show_bug.cgi?id=100491
+
+ Reviewed by Dirk Schulze.
+
+ Skip non-filter elements referenced via -webkit-filter.
+
+ Test: svg/filters/filter-reference-crash.html
+
+ * rendering/RenderLayerFilterInfo.cpp:
+ (WebCore::RenderLayerFilterInfo::updateReferenceFilterClients):
+
+2012-10-26 Antti Koivisto <[email protected]>
+
+ Lots of time spent under DNSResolveQueue::platformProxyIsEnabledInSystemPreferences
+ https://bugs.webkit.org/show_bug.cgi?id=100514
+
+ Reviewed by Anders Carlsson.
+
+ DNSResolveQueue::platformProxyIsEnabledInSystemPreferences gets called for every link in
+ the document. The function is relatively slow.
+
+ This patch caches the result of the last check for 5 seconds. Based on code comments
+ prefetching is disabled with proxies due to regressing performance with some configurations.
+ Proxy status changes rarely and a slight reaction delay shoudn't cause practical problems.
+
+ * platform/network/DNSResolveQueue.cpp:
+ (WebCore::DNSResolveQueue::DNSResolveQueue):
+
+ Add constructor. Also fixes a bug, m_requestsInFlight was not initialized.
+
+ (WebCore):
+ (WebCore::DNSResolveQueue::isUsingProxy):
+ (WebCore::DNSResolveQueue::add):
+ (WebCore::DNSResolveQueue::fired):
+ * platform/network/DNSResolveQueue.h:
+ (DNSResolveQueue):
+
+2012-10-26 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r132662.
+ http://trac.webkit.org/changeset/132662
+ https://bugs.webkit.org/show_bug.cgi?id=100528
+
+ It is not necessary any more. (Requested by loislo on
+ #webkit).
+
+ * platform/qt/MemoryUsageSupportQt.cpp:
+ (WebCore::MemoryUsageSupport::memoryUsageByComponents):
+ (WebCore):
+
+2012-10-26 Ilya Tikhonovsky <[email protected]>
+
+ Unreviewed build fix for Qt builders.
+
+ * platform/qt/MemoryUsageSupportQt.cpp:
+
+2012-10-26 Csaba Osztrogonác <[email protected]>
+
+ Unreviewed, rolling out r132658.
+ http://trac.webkit.org/changeset/132658
+ https://bugs.webkit.org/show_bug.cgi?id=100515
+
+ It broke the Qt build
+
+ * inspector/InspectorMemoryAgent.cpp:
+ (WebCore::addPlatformComponentsInfo):
+ (WebCore):
+ (WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):
+ * platform/MemoryUsageSupport.cpp:
+ (WebCore::MemoryUsageSupport::memoryUsageByComponents):
+ * platform/MemoryUsageSupport.h:
+ (ComponentInfo):
+ (WebCore::MemoryUsageSupport::ComponentInfo::ComponentInfo):
+ (MemoryUsageSupport):
+ * platform/PlatformMemoryInstrumentation.cpp:
+ (WebCore):
+ * platform/PlatformMemoryInstrumentation.h:
+ (PlatformMemoryTypes):
+ * platform/chromium/MemoryUsageSupportChromium.cpp:
+ (WebCore::MemoryUsageSupport::memoryUsageByComponents):
+
+2012-10-26 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Some context menu items are duplicated on Resources and Sources panels.
+ https://bugs.webkit.org/show_bug.cgi?id=100522
+
+ Reviewed by Pavel Feldman.
+
+ Method appendApplicableItems now receives event as a parameter.
+ HandlerRegistry now makes sure that it is not called more than once for certain context menu event.
+
+ * inspector/front-end/BreakpointsSidebarPane.js:
+ (WebInspector._javascript_BreakpointsSidebarPane.prototype._emptyElementContextMenu):
+ (WebInspector._javascript_BreakpointsSidebarPane.prototype._breakpointContextMenu):
+ (WebInspector.XHRBreakpointsSidebarPane.prototype._emptyElementContextMenu):
+ (WebInspector.XHRBreakpointsSidebarPane.prototype._contextMenu):
+ * inspector/front-end/CallStackSidebarPane.js:
+ (WebInspector.CallStackSidebarPane.Placard.prototype._placardContextMenu):
+ * inspector/front-end/ConsoleView.js:
+ * inspector/front-end/ContextMenu.js:
+ (WebInspector.ContextMenu):
+ (WebInspector.ContextMenu.prototype.show):
+ (WebInspector.ContextMenu.prototype.appendApplicableItems):
+ (WebInspector.ContextMenu.Provider.prototype.appendApplicableItems):
+ * inspector/front-end/CookieItemsView.js:
+ (WebInspector.CookieItemsView.prototype._contextMenu):
+ * inspector/front-end/DOMBreakpointsSidebarPane.js:
+ (WebInspector.DOMBreakpointsSidebarPane.prototype._contextMenu):
+ * inspector/front-end/DataGrid.js:
+ (WebInspector.DataGrid.prototype._contextMenuInDataTable):
+ * inspector/front-end/DefaultTextEditor.js:
+ (WebInspector.DefaultTextEditor.prototype._contextMenu):
+ * inspector/front-end/ElementsPanel.js:
+ (WebInspector.ElementsPanel.prototype._contextMenuEventFired.set get var):
+ * inspector/front-end/ElementsPanelDescriptor.js:
+ (WebInspector.ElementsPanelDescriptor.prototype.appendApplicableItems):
+ * inspector/front-end/ElementsTreeOutline.js:
+ (WebInspector.ElementsTreeOutline.prototype._contextMenuEventFired):
+ * inspector/front-end/HandlerRegistry.js:
+ (WebInspector.HandlerRegistry.prototype.appendApplicableItems):
+ * inspector/front-end/ImageView.js:
+ (WebInspector.ImageView.prototype._contextMenu):
+ * inspector/front-end/NavigatorView.js:
+ (WebInspector.NavigatorView.prototype.handleContextMenu):
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkLogView.prototype._contextMenu):
+ * inspector/front-end/NetworkPanelDescriptor.js:
+ (WebInspector.NetworkPanelDescriptor.prototype.appendApplicableItems):
+ * inspector/front-end/ObjectPropertiesSection.js:
+ (WebInspector.ObjectPropertiesSection.prototype._contextMenuEventFired):
+ (WebInspector.ObjectPropertyTreeElement.prototype._contextMenuFired):
+ * inspector/front-end/ProfilesPanel.js:
+ (WebInspector.ProfilesPanel.prototype._handleContextMenuEvent):
+ (WebInspector.ProfileSidebarTreeElement.prototype.handleContextMenuEvent):
+ * inspector/front-end/ResourcesPanel.js:
+ (WebInspector.FrameResourceTreeElement.prototype._handleContextMenuEvent):
+ (WebInspector.IndexedDBTreeElement.prototype._handleContextMenuEvent):
+ (WebInspector.FileSystemListTreeElement.prototype._handleContextMenuEvent):
+ (WebInspector.IDBDatabaseTreeElement.prototype._handleContextMenuEvent):
+ * inspector/front-end/ScriptsNavigator.js:
+ (WebInspector.SnippetsNavigatorView.prototype.handleContextMenu):
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype.appendApplicableItems):
+ * inspector/front-end/ScriptsPanelDescriptor.js:
+ (WebInspector.ScriptsPanelDescriptor.prototype.appendApplicableItems):
+ * inspector/front-end/StylesSidebarPane.js:
+ (WebInspector.StylesSidebarPane.prototype._contextMenuEventFired):
+ * inspector/front-end/TabbedPane.js:
+ (WebInspector.TabbedPaneTab.prototype._tabContextMenu):
+ * inspector/front-end/TimelinePanel.js:
+ (WebInspector.TimelinePanel.prototype._contextMenu):
+ * inspector/front-end/WatchExpressionsSidebarPane.js:
+ (WebInspector.WatchExpressionsSection.prototype._emptyElementContextMenu):
+ (WebInspector.WatchExpressionTreeElement.prototype._contextMenu):
+
+2012-10-26 Ilya Tikhonovsky <[email protected]>
+
+ Web Inspector: instrument chromium GlyphCache. It keeps ~2mb data on gmail.
+ https://bugs.webkit.org/show_bug.cgi?id=100515
+
+ Reviewed by Yury Semikhatsky.
+
+ I replaced old version with an abstract number with new one which precisely reports allocated SkGlyphCache objects and their sizes.
+
+ * inspector/InspectorMemoryAgent.cpp:
+ (WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):
+ * platform/MemoryUsageSupport.cpp:
+ (WebCore::MemoryUsageSupport::reportMemoryUsage):
+ * platform/MemoryUsageSupport.h:
+ (MemoryUsageSupport):
+ * platform/PlatformMemoryInstrumentation.cpp:
+ (WebCore):
+ * platform/PlatformMemoryInstrumentation.h:
+ (PlatformMemoryTypes):
+ * platform/chromium/MemoryUsageSupportChromium.cpp:
+ (reportMemoryUsage):
+ (WebCore::reportGlyphCache):
+ (WebCore):
+ (WebCore::MemoryUsageSupport::reportMemoryUsage):
+
2012-10-26 Kent Tamura <[email protected]>
+ [Chromium] Build fix for r132650.
+ https://bugs.webkit.org/show_bug.cgi?id=100482
+
+ * platform/text/LocaleWin.cpp:
+ (WebCore::LocaleWin::timeFormat):
+
+2012-10-26 Yury Semikhatsky <[email protected]>
+
+ [v8] Memory instrumentation: don't count memory of WrapperTypeInfo
+ https://bugs.webkit.org/show_bug.cgi?id=100517
+
+ Reviewed by Alexander Pavlov.
+
+ * bindings/v8/V8PerIsolateData.cpp: when estimating bindings memory size skip
+ pointers to WrapperTypeInfo objects as they are static fields and belong to
+ the data segment.
+ (WTF):
+
+2012-10-26 Kent Tamura <[email protected]>
+
+ Refactor Localizer-related classes.
+ https://bugs.webkit.org/show_bug.cgi?id=100482
+
+ Reviewed by Kentaro Hara.
+
+ - Localizer has unused code
+ Localizer should have function implementations only if they are used in
+ multiple subclasses.
+ - Some Localizer subclasses hide Localizer data members
+ - Should use String::isNull to check initialization-or-not
+
+ No new tests. This should not change any behavior.
+
+ * platform/text/Localizer.h:
+ (Localizer):
+ - timeFormat, shortTimeFormat, and timeAMPMLabels should be pure virtual.
+ - Remove m_localizedDateFormatText, m_localizedShortTimeFormatText, and
+ m_timeAMPMLabels
+ * platform/text/Localizer.cpp:
+ Remove implementations of timeFormat, shortTimeFormat, and timeAMPMLabels.
+
+ * platform/text/LocaleICU.h:
+ (LocaleICU): Introduce m_timeFormatWithSeconds and m_timeFormatWithoutSeconds.
+ * platform/text/LocaleICU.cpp:
+ (WebCore::LocaleICU::initializeDateTimeFormat):
+ Use new data members instead of Localizer data members.
+ (WebCore::LocaleICU::dateFormat): Use isNull.
+
+ * platform/text/LocaleNone.cpp:
+ (LocaleNone): Add timeFormat, shortTimeFormat, timeAMPMLabels
+ implementations, and m_timeAMPMLabels.
+ (WebCore::LocaleNone::timeFormat): Returns the HTML time format.
+ (WebCore::LocaleNone::shortTimeFormat): Returns the HTML time format.
+ (WebCore::LocaleNone::timeAMPMLabels): Returns "AM" and "PM".
+
+ * platform/text/LocaleWin.h:
+ (LocaleWin): Add m_timeFormatWithSeconds.
+ * platform/text/LocaleWin.cpp:
+ (WebCore::LocaleWin::dateFormat): Use isNull.
+ (WebCore::LocaleWin::timeFormat): Use m_timeFormatWithSeconds.
+
+ * platform/text/mac/LocaleMac.h:
+ (LocaleMac): Rename m_localized*TimeFormatText to m_timeFormatWith*Seconds.
+ * platform/text/mac/LocaleMac.mm:
+ (WebCore::LocaleMac::timeFormat): Follow the renaming.
+ (WebCore::LocaleMac::shortTimeFormat): Ditto.
+
+2012-10-26 Kent Tamura <[email protected]>
+
Crash in PagePopupController by events after WebPagePopupImpl::closePopup
https://bugs.webkit.org/show_bug.cgi?id=100454
Modified: tags/Safari-537.16/Source/WebCore/dom/ContainerNode.cpp (132809 => 132810)
--- tags/Safari-537.16/Source/WebCore/dom/ContainerNode.cpp 2012-10-29 16:56:11 UTC (rev 132809)
+++ tags/Safari-537.16/Source/WebCore/dom/ContainerNode.cpp 2012-10-29 16:59:51 UTC (rev 132810)
@@ -35,13 +35,15 @@
#include "InlineTextBox.h"
#include "InsertionPoint.h"
#include "InspectorInstrumentation.h"
+#include "LoaderStrategy.h"
#include "MemoryCache.h"
#include "MutationEvent.h"
+#include "ResourceLoadScheduler.h"
#include "Page.h"
+#include "PlatformStrategies.h"
#include "RenderBox.h"
#include "RenderTheme.h"
#include "RenderWidget.h"
-#include "ResourceLoadScheduler.h"
#include "RootInlineBox.h"
#include "UndoManager.h"
#include <wtf/CurrentTime.h>
@@ -641,7 +643,11 @@
s_shouldReEnableMemoryCacheCallsAfterAttach = true;
}
}
+#if USE(PLATFORM_STRATEGIES)
+ platformStrategies()->loaderStrategy()->resourceLoadScheduler()->suspendPendingRequests();
+#else
resourceLoadScheduler()->suspendPendingRequests();
+#endif
}
++s_attachDepth;
}
@@ -658,7 +664,11 @@
if (Page* page = document()->page())
page->setMemoryCacheClientCallsEnabled(true);
}
+#if USE(PLATFORM_STRATEGIES)
+ platformStrategies()->loaderStrategy()->resourceLoadScheduler()->resumePendingRequests();
+#else
resourceLoadScheduler()->resumePendingRequests();
+#endif
}
--s_attachDepth;
}
Modified: tags/Safari-537.16/Source/WebCore/loader/MainResourceLoader.cpp (132809 => 132810)
--- tags/Safari-537.16/Source/WebCore/loader/MainResourceLoader.cpp 2012-10-29 16:56:11 UTC (rev 132809)
+++ tags/Safari-537.16/Source/WebCore/loader/MainResourceLoader.cpp 2012-10-29 16:59:51 UTC (rev 132810)
@@ -44,7 +44,9 @@
#include "HTMLFormElement.h"
#include "HistoryItem.h"
#include "InspectorInstrumentation.h"
+#include "LoaderStrategy.h"
#include "Page.h"
+#include "PlatformStrategies.h"
#include "ResourceError.h"
#include "ResourceHandle.h"
#include "ResourceLoadScheduler.h"
@@ -630,7 +632,11 @@
if (shouldLoadEmptyBeforeRedirect && !shouldLoadEmpty && defersLoading())
return true;
+#if USE(PLATFORM_STRATEGIES)
+ platformStrategies()->loaderStrategy()->resourceLoadScheduler()->addMainResourceLoad(this);
+#else
resourceLoadScheduler()->addMainResourceLoad(this);
+#endif
if (m_substituteData.isValid())
handleSubstituteDataLoadSoon(r);
Modified: tags/Safari-537.16/Source/WebCore/loader/ResourceLoadScheduler.cpp (132809 => 132810)
--- tags/Safari-537.16/Source/WebCore/loader/ResourceLoadScheduler.cpp 2012-10-29 16:56:11 UTC (rev 132809)
+++ tags/Safari-537.16/Source/WebCore/loader/ResourceLoadScheduler.cpp 2012-10-29 16:59:51 UTC (rev 132810)
@@ -31,10 +31,8 @@
#include "FrameLoader.h"
#include "InspectorInstrumentation.h"
#include "KURL.h"
-#include "LoaderStrategy.h"
#include "Logging.h"
#include "NetscapePlugInStreamLoader.h"
-#include "PlatformStrategies.h"
#include "ResourceLoader.h"
#include "ResourceRequest.h"
#include "SubresourceLoader.h"
@@ -73,22 +71,13 @@
return host;
}
-ResourceLoadScheduler* ResourceLoadScheduler::defaultResourceLoadScheduler()
+ResourceLoadScheduler* resourceLoadScheduler()
{
ASSERT(isMainThread());
DEFINE_STATIC_LOCAL(ResourceLoadScheduler, resourceLoadScheduler, ());
return &resourceLoadScheduler;
}
-ResourceLoadScheduler* resourceLoadScheduler()
-{
-#if USE(PLATFORM_STRATEGIES)
- return platformStrategies()->loaderStrategy()->resourceLoadScheduler();
-#else
- return ResourceLoadScheduler::defaultResourceLoadScheduler();
-#endif
-}
-
ResourceLoadScheduler::ResourceLoadScheduler()
: m_nonHTTPProtocolHost(new HostInformation(String(), maxRequestsInFlightForNonHTTPProtocols))
, m_requestTimer(this, &ResourceLoadScheduler::requestTimerFired)
Modified: tags/Safari-537.16/Source/WebCore/loader/ResourceLoadScheduler.h (132809 => 132810)
--- tags/Safari-537.16/Source/WebCore/loader/ResourceLoadScheduler.h 2012-10-29 16:56:11 UTC (rev 132809)
+++ tags/Safari-537.16/Source/WebCore/loader/ResourceLoadScheduler.h 2012-10-29 16:59:51 UTC (rev 132810)
@@ -105,8 +105,6 @@
HostInformation* hostForURL(const KURL&, CreateHostPolicy = FindOnly);
void servePendingRequests(HostInformation*, ResourceLoadPriority);
- static ResourceLoadScheduler* defaultResourceLoadScheduler();
-
typedef HashMap<String, HostInformation*, StringHash> HostMap;
HostMap m_hosts;
HostInformation* m_nonHTTPProtocolHost;
Modified: tags/Safari-537.16/Source/WebCore/loader/ResourceLoader.cpp (132809 => 132810)
--- tags/Safari-537.16/Source/WebCore/loader/ResourceLoader.cpp 2012-10-29 16:56:11 UTC (rev 132809)
+++ tags/Safari-537.16/Source/WebCore/loader/ResourceLoader.cpp 2012-10-29 16:59:51 UTC (rev 132810)
@@ -37,7 +37,9 @@
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
#include "InspectorInstrumentation.h"
+#include "LoaderStrategy.h"
#include "Page.h"
+#include "PlatformStrategies.h"
#include "ProgressTracker.h"
#include "ResourceBuffer.h"
#include "ResourceError.h"
@@ -89,10 +91,14 @@
// the resources to prevent a double dealloc of WebView <rdar://problem/4372628>
m_reachedTerminalState = true;
+#if USE(PLATFORM_STRATEGIES)
+ platformStrategies()->loaderStrategy()->resourceLoadScheduler()->remove(this);
+#endif
+ m_identifier = 0;
+#if !USE(PLATFORM_STRATEGIES)
resourceLoadScheduler()->remove(this);
+#endif
- m_identifier = 0;
-
if (m_handle) {
// Clear out the ResourceHandle's client so that it doesn't try to call
// us back after we release it, unless it has been replaced by someone else.
@@ -237,9 +243,13 @@
frameLoader()->notifier()->willSendRequest(this, request, redirectResponse);
}
- if (!redirectResponse.isNull())
+ if (!redirectResponse.isNull()) {
+#if USE(PLATFORM_STRATEGIES)
+ platformStrategies()->loaderStrategy()->resourceLoadScheduler()->crossOriginRedirectReceived(this, request.url());
+#else
resourceLoadScheduler()->crossOriginRedirectReceived(this, request.url());
-
+#endif
+ }
m_request = request;
}
Modified: tags/Safari-537.16/Source/WebCore/loader/cache/CachedResource.cpp (132809 => 132810)
--- tags/Safari-537.16/Source/WebCore/loader/cache/CachedResource.cpp 2012-10-29 16:56:11 UTC (rev 132809)
+++ tags/Safari-537.16/Source/WebCore/loader/cache/CachedResource.cpp 2012-10-29 16:59:51 UTC (rev 132810)
@@ -36,7 +36,9 @@
#include "FrameLoaderClient.h"
#include "InspectorInstrumentation.h"
#include "KURL.h"
+#include "LoaderStrategy.h"
#include "Logging.h"
+#include "PlatformStrategies.h"
#include "PurgeableBuffer.h"
#include "ResourceBuffer.h"
#include "ResourceHandle.h"
@@ -283,7 +285,11 @@
if (type() != MainResource)
addAdditionalRequestHeaders(cachedResourceLoader);
+#if USE(PLATFORM_STRATEGIES)
+ m_loader = platformStrategies()->loaderStrategy()->resourceLoadScheduler()->scheduleSubresourceLoad(cachedResourceLoader->frame(), this, m_resourceRequest, m_resourceRequest.priority(), options);
+#else
m_loader = resourceLoadScheduler()->scheduleSubresourceLoad(cachedResourceLoader->frame(), this, m_resourceRequest, m_resourceRequest.priority(), options);
+#endif
if (!m_loader) {
failBeforeStarting();
Modified: tags/Safari-537.16/Source/WebCore/loader/cache/CachedResourceLoader.cpp (132809 => 132810)
--- tags/Safari-537.16/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2012-10-29 16:56:11 UTC (rev 132809)
+++ tags/Safari-537.16/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2012-10-29 16:59:51 UTC (rev 132810)
@@ -44,9 +44,11 @@
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
#include "HTMLElement.h"
+#include "LoaderStrategy.h"
#include "Logging.h"
#include "MemoryCache.h"
#include "PingLoader.h"
+#include "PlatformStrategies.h"
#include "ResourceLoadScheduler.h"
#include "SecurityOrigin.h"
#include "Settings.h"
@@ -728,7 +730,11 @@
{
checkForPendingPreloads();
+#if USE(PLATFORM_STRATEGIES)
+ platformStrategies()->loaderStrategy()->resourceLoadScheduler()->servePendingRequests();
+#else
resourceLoadScheduler()->servePendingRequests();
+#endif
}
void CachedResourceLoader::notifyLoadedFromMemoryCache(CachedResource* resource)
