Changeset 176697 in webkit
- Timestamp:
- Dec 2, 2014, 4:32:33 PM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 2 deleted
- 18 edited
-
WebCore/ChangeLog (modified) (1 diff)
-
WebCore/WebCore.exp.in (modified) (1 diff)
-
WebCore/WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
-
WebCore/loader/EmptyClients.h (modified) (1 diff)
-
WebCore/loader/FrameLoader.cpp (modified) (1 diff)
-
WebCore/loader/FrameLoaderClient.h (modified) (1 diff)
-
WebCore/platform/mac/QuickLookMac.h (deleted)
-
WebCore/platform/mac/QuickLookMac.mm (deleted)
-
WebKit/mac/ChangeLog (modified) (1 diff)
-
WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (modified) (1 diff)
-
WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (modified) (1 diff)
-
WebKit2/ChangeLog (modified) (1 diff)
-
WebKit2/Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
-
WebKit2/Shared/WebProcessCreationParameters.h (modified) (1 diff)
-
WebKit2/UIProcess/mac/WebContextMac.mm (modified) (1 diff)
-
WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)
-
WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (modified) (1 diff)
-
WebKit2/WebProcess/WebProcess.cpp (modified) (1 diff)
-
WebKit2/WebProcess/WebProcess.h (modified) (2 diffs)
-
WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r176696 r176697 1 2014-12-02 Tim Horton <timothy_horton@apple.com> 2 3 Remove a SnowLeopard-era quirk for QuickLook 4 https://bugs.webkit.org/show_bug.cgi?id=139208 5 <rdar://problem/19121822> 6 7 Reviewed by Alexey Proskuryakov. 8 9 * WebCore.exp.in: 10 * WebCore.xcodeproj/project.pbxproj: 11 * loader/EmptyClients.h: 12 * loader/FrameLoader.cpp: 13 (WebCore::FrameLoader::subresourceCachePolicy): 14 * loader/FrameLoaderClient.h: 15 * platform/mac/QuickLookMac.h: Removed. 16 * platform/mac/QuickLookMac.mm: Removed. 17 1 18 2014-12-02 Anders Carlsson <andersca@apple.com> 2 19 -
trunk/Source/WebCore/WebCore.exp.in
r176675 r176697 243 243 __ZN7WebCore12PrintContextC1EPNS_5FrameE 244 244 __ZN7WebCore12PrintContextD1Ev 245 __ZN7WebCore12QuickLookMac42computeNeedsQuickLookResourceCachingQuirksEv246 245 __ZN7WebCore12RenderObject16paintingRootRectERNS_10LayoutRectE 247 246 __ZN7WebCore12RenderObject19scrollRectToVisibleERKNS_10LayoutRectERKNS_15ScrollAlignmentES6_ -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r176696 r176697 1616 1616 45FEA5CF156DDE8C00654101 /* Decimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45FEA5CD156DDE8C00654101 /* Decimal.cpp */; }; 1617 1617 45FEA5D0156DDE8C00654101 /* Decimal.h in Headers */ = {isa = PBXBuildFile; fileRef = 45FEA5CE156DDE8C00654101 /* Decimal.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1618 4643783119F720EF001E38B3 /* QuickLookMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 4643782F19F720EF001E38B3 /* QuickLookMac.h */; settings = {ATTRIBUTES = (Private, ); }; };1619 4643783219F720EF001E38B3 /* QuickLookMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4643783019F720EF001E38B3 /* QuickLookMac.mm */; };1620 1618 4689F1AF1267BAE100E8D380 /* FileMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 4689F1AE1267BAE100E8D380 /* FileMetadata.h */; }; 1621 1619 490707E61219C04300D90E51 /* ANGLEWebKitBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 490707E41219C04300D90E51 /* ANGLEWebKitBridge.cpp */; }; … … 8712 8710 45FEA5CD156DDE8C00654101 /* Decimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Decimal.cpp; sourceTree = "<group>"; }; 8713 8711 45FEA5CE156DDE8C00654101 /* Decimal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decimal.h; sourceTree = "<group>"; }; 8714 4643782F19F720EF001E38B3 /* QuickLookMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookMac.h; sourceTree = "<group>"; };8715 4643783019F720EF001E38B3 /* QuickLookMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLookMac.mm; sourceTree = "<group>"; };8716 8712 4689F1AE1267BAE100E8D380 /* FileMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileMetadata.h; path = platform/FileMetadata.h; sourceTree = "<group>"; }; 8717 8713 490707E41219C04300D90E51 /* ANGLEWebKitBridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ANGLEWebKitBridge.cpp; sourceTree = "<group>"; }; … … 16509 16505 29E4D8E016B0959800C84704 /* PlatformSpeechSynthesizerMac.mm */, 16510 16506 0081FEFE16B0A2B6008AAA7A /* PublicSuffixMac.mm */, 16511 4643782F19F720EF001E38B3 /* QuickLookMac.h */,16512 4643783019F720EF001E38B3 /* QuickLookMac.mm */,16513 16507 BCAE1FA512939DB7004CB026 /* ScrollAnimatorMac.h */, 16514 16508 BC51156D12B1749C00C96754 /* ScrollAnimatorMac.mm */, … … 25728 25722 CE1252391A166FA000864480 /* QuickLookSPI.h in Headers */, 25729 25723 A10DBF4718F92317000D70C6 /* QuickLookHandleClient.h in Headers */, 25730 4643783119F720EF001E38B3 /* QuickLookMac.h in Headers */,25731 25724 072AE1E8183C0741000A5988 /* QuickTimePluginReplacement.h in Headers */, 25732 25725 379E371713736A6600B9E919 /* QuotedPrintable.h in Headers */, … … 29213 29206 550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */, 29214 29207 442AF7AA102CDDEA008FD4D3 /* QuickLook.mm in Sources */, 29215 4643783219F720EF001E38B3 /* QuickLookMac.mm in Sources */,29216 29208 072AE1E6183C0741000A5988 /* QuickTimePluginReplacement.mm in Sources */, 29217 29209 379E371613736A6600B9E919 /* QuotedPrintable.cpp in Sources */, -
trunk/Source/WebCore/loader/EmptyClients.h
r176577 r176697 404 404 #endif 405 405 406 #if PLATFORM(MAC)407 virtual bool needsQuickLookResourceCachingQuirks() const override { return false; }408 #endif409 410 406 virtual bool isEmptyFrameLoaderClient() override { return true; } 411 407 }; -
trunk/Source/WebCore/loader/FrameLoader.cpp
r176683 r176697 2153 2153 2154 2154 const ResourceRequest& request(documentLoader()->request()); 2155 #if PLATFORM(MAC)2156 if (request.cachePolicy() == ReloadIgnoringCacheData && !equalIgnoringCase(request.httpMethod(), "post") && m_client.needsQuickLookResourceCachingQuirks())2157 return CachePolicyRevalidate;2158 #endif2159 2160 2155 if (request.cachePolicy() == ReturnCacheDataElseLoad) 2161 2156 return CachePolicyHistoryBuffer; -
trunk/Source/WebCore/loader/FrameLoaderClient.h
r176136 r176697 284 284 virtual void registerForIconNotification(bool listen = true) = 0; 285 285 286 #if PLATFORM(MAC)287 virtual bool needsQuickLookResourceCachingQuirks() const = 0;288 #endif289 290 286 #if PLATFORM(COCOA) 291 287 // Allow an accessibility object to retrieve a Frame parent if there's no PlatformWidget. -
trunk/Source/WebKit/mac/ChangeLog
r176695 r176697 1 2014-12-02 Tim Horton <timothy_horton@apple.com> 2 3 Remove a SnowLeopard-era quirk for QuickLook 4 https://bugs.webkit.org/show_bug.cgi?id=139208 5 <rdar://problem/19121822> 6 7 Reviewed by Alexey Proskuryakov. 8 9 * WebCoreSupport/WebFrameLoaderClient.h: 10 * WebCoreSupport/WebFrameLoaderClient.mm: 11 1 12 2014-12-02 Tim Horton <timothy_horton@apple.com> 2 13 -
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
r175055 r176697 240 240 #endif 241 241 242 #if PLATFORM(MAC)243 virtual bool needsQuickLookResourceCachingQuirks() const override;244 #endif245 246 242 virtual void contentFilterDidBlockLoad(std::unique_ptr<WebCore::ContentFilter>) override; 247 243 -
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
r176142 r176697 2250 2250 #endif 2251 2251 2252 #if PLATFORM(MAC)2253 bool WebFrameLoaderClient::needsQuickLookResourceCachingQuirks() const2254 {2255 static const bool shouldUseQuickLookResourceCachingQuirks = QuickLookMac::computeNeedsQuickLookResourceCachingQuirks();2256 return shouldUseQuickLookResourceCachingQuirks;2257 }2258 #endif2259 2260 2252 void WebFrameLoaderClient::contentFilterDidBlockLoad(std::unique_ptr<WebCore::ContentFilter> contentFilter) 2261 2253 { -
trunk/Source/WebKit2/ChangeLog
r176691 r176697 1 2014-12-02 Tim Horton <timothy_horton@apple.com> 2 3 Remove a SnowLeopard-era quirk for QuickLook 4 https://bugs.webkit.org/show_bug.cgi?id=139208 5 <rdar://problem/19121822> 6 7 Reviewed by Alexey Proskuryakov. 8 9 * Shared/WebProcessCreationParameters.cpp: 10 (WebKit::WebProcessCreationParameters::encode): 11 (WebKit::WebProcessCreationParameters::decode): 12 * Shared/WebProcessCreationParameters.h: 13 * UIProcess/mac/WebContextMac.mm: 14 (WebKit::WebContext::platformInitializeWebProcess): 15 * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: 16 (WebKit::WebFrameLoaderClient::needsQuickLookResourceCachingQuirks): Deleted. 17 * WebProcess/WebCoreSupport/WebFrameLoaderClient.h: 18 * WebProcess/WebProcess.cpp: 19 (WebKit::WebProcess::WebProcess): 20 * WebProcess/WebProcess.h: 21 (WebKit::WebProcess::needsQuickLookResourceCachingQuirks): Deleted. 22 * WebProcess/cocoa/WebProcessCocoa.mm: 23 (WebKit::WebProcess::platformInitializeWebProcess): 24 1 25 2014-12-02 Beth Dakin <bdakin@apple.com> 2 26 -
trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
r175288 r176697 109 109 encoder << presenterApplicationPid; 110 110 encoder << accessibilityEnhancedUserInterfaceEnabled; 111 encoder << needsQuickLookResourceCachingQuirks;112 111 encoder << nsURLCacheMemoryCapacity; 113 112 encoder << nsURLCacheDiskCapacity; … … 238 237 if (!decoder.decode(parameters.accessibilityEnhancedUserInterfaceEnabled)) 239 238 return false; 240 if (!decoder.decode(parameters.needsQuickLookResourceCachingQuirks))241 return false;242 239 if (!decoder.decode(parameters.nsURLCacheMemoryCapacity)) 243 240 return false; -
trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h
r175288 r176697 127 127 128 128 bool accessibilityEnhancedUserInterfaceEnabled; 129 bool needsQuickLookResourceCachingQuirks;130 129 131 130 uint64_t nsURLCacheMemoryCapacity; -
trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm
r176347 r176697 168 168 #if PLATFORM(MAC) 169 169 parameters.accessibilityEnhancedUserInterfaceEnabled = [[NSApp accessibilityAttributeValue:@"AXEnhancedUserInterface"] boolValue]; 170 static const bool shouldUseQuickLookResourceCachingQuirks = QuickLookMac::computeNeedsQuickLookResourceCachingQuirks();171 parameters.needsQuickLookResourceCachingQuirks = shouldUseQuickLookResourceCachingQuirks;172 170 #else 173 171 parameters.accessibilityEnhancedUserInterfaceEnabled = false; 174 parameters.needsQuickLookResourceCachingQuirks = false;175 172 #endif 176 173 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
r176437 r176697 1643 1643 #endif 1644 1644 1645 #if PLATFORM(MAC)1646 bool WebFrameLoaderClient::needsQuickLookResourceCachingQuirks() const1647 {1648 return WebProcess::shared().needsQuickLookResourceCachingQuirks();1649 }1650 #endif1651 1652 1645 } // namespace WebKit -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
r176136 r176697 232 232 #endif 233 233 234 #if PLATFORM(MAC)235 virtual bool needsQuickLookResourceCachingQuirks() const override;236 #endif237 238 234 #if ENABLE(CONTENT_FILTERING) 239 235 virtual void contentFilterDidBlockLoad(std::unique_ptr<WebCore::ContentFilter>) override; -
trunk/Source/WebKit2/WebProcess/WebProcess.cpp
r176459 r176697 162 162 , m_clearResourceCachesDispatchGroup(0) 163 163 #endif 164 #if PLATFORM(MAC)165 , m_needsQuickLookResourceCachingQuirks(false)166 #endif167 164 , m_fullKeyboardAccessEnabled(false) 168 165 , m_textCheckerState() -
trunk/Source/WebKit2/WebProcess/WebProcess.h
r176459 r176697 119 119 #endif 120 120 121 #if PLATFORM(MAC)122 bool needsQuickLookResourceCachingQuirks() const { return m_needsQuickLookResourceCachingQuirks; }123 #endif124 125 121 bool shouldPlugInAutoStartFromOrigin(WebPage&, const String& pageOrigin, const String& pluginOrigin, const String& mimeType); 126 122 void plugInDidStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID); … … 324 320 bool m_shouldForceScreenFontSubstitution; 325 321 #endif 326 #if PLATFORM(MAC)327 bool m_needsQuickLookResourceCachingQuirks;328 #endif329 322 330 323 bool m_fullKeyboardAccessEnabled; -
trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm
r176450 r176697 196 196 197 197 setEnhancedAccessibility(parameters.accessibilityEnhancedUserInterfaceEnabled); 198 #if PLATFORM(MAC)199 m_needsQuickLookResourceCachingQuirks = parameters.needsQuickLookResourceCachingQuirks;200 #endif201 198 202 199 #if USE(APPKIT)
Note:
See TracChangeset
for help on using the changeset viewer.