Changeset 176551 in webkit
- Timestamp:
- Nov 27, 2014, 10:00:10 AM (12 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 5 edited
- 2 copied
-
ChangeLog (modified) (1 diff)
-
WebKit.xcodeproj/project.pbxproj (modified) (5 diffs)
-
mac/ChangeLog (modified) (1 diff)
-
mac/WebCoreSupport/WebViewGroup.h (modified) (3 diffs)
-
mac/WebCoreSupport/WebViewGroup.mm (modified) (2 diffs)
-
mac/WebCoreSupport/WebVisitedLinkStore.h (copied) (copied from trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.h ) (1 diff)
-
mac/WebCoreSupport/WebVisitedLinkStore.mm (copied) (copied from trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.h ) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r176469 r176551 1 2014-11-27 Anders Carlsson <andersca@apple.com> 2 3 Add a stubbed out WebVisitedLinkStore to WebViewGroup 4 https://bugs.webkit.org/show_bug.cgi?id=139066 5 6 Reviewed by Antti Koivisto. 7 8 * WebKit.xcodeproj/project.pbxproj: 9 1 10 2014-11-21 Anders Carlsson <andersca@apple.com> 2 11 -
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
r175182 r176551 59 59 1AB1DAC118BC0232004B6A9F /* WebViewGroup.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */; }; 60 60 1AB1DAC218BC0232004B6A9F /* WebViewGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */; }; 61 1AC7176E1A26568A002E3115 /* WebVisitedLinkStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC7176C1A26568A002E3115 /* WebVisitedLinkStore.mm */; }; 62 1AC7176F1A26568A002E3115 /* WebVisitedLinkStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC7176D1A26568A002E3115 /* WebVisitedLinkStore.h */; }; 61 63 1AEA66D40DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */; }; 62 64 1AEA66D50DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEA66D30DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm */; }; … … 499 501 1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewGroup.mm; sourceTree = "<group>"; }; 500 502 1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewGroup.h; sourceTree = "<group>"; }; 503 1AC7176C1A26568A002E3115 /* WebVisitedLinkStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVisitedLinkStore.mm; sourceTree = "<group>"; }; 504 1AC7176D1A26568A002E3115 /* WebVisitedLinkStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVisitedLinkStore.h; sourceTree = "<group>"; }; 501 505 1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandler.h; sourceTree = "<group>"; }; 502 506 1AEA66D30DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNetscapePluginEventHandler.mm; sourceTree = "<group>"; }; … … 1571 1575 1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */, 1572 1576 1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */, 1577 1AC7176D1A26568A002E3115 /* WebVisitedLinkStore.h */, 1578 1AC7176C1A26568A002E3115 /* WebVisitedLinkStore.mm */, 1573 1579 ); 1574 1580 name = WebCoreSupport; … … 1865 1871 939810B10824BF01008DF038 /* WebPluginContainerCheck.h in Headers */, 1866 1872 939810B00824BF01008DF038 /* WebPluginContainerPrivate.h in Headers */, 1873 1AC7176F1A26568A002E3115 /* WebVisitedLinkStore.h in Headers */, 1867 1874 939810370824BF01008DF038 /* WebPluginController.h in Headers */, 1868 1875 7C1FB3C21846E8E1001A03D8 /* WebAllowDenyPolicyListener.h in Headers */, … … 2149 2156 14D825300AF955090004F057 /* WebChromeClient.mm in Sources */, 2150 2157 A10C1D711820300E0036883A /* WebInspectorClientIOS.mm in Sources */, 2158 1AC7176E1A26568A002E3115 /* WebVisitedLinkStore.mm in Sources */, 2151 2159 939810EB0824BF01008DF038 /* WebClipView.mm in Sources */, 2152 2160 065AD5A40B0C32C7005A2B1D /* WebContextMenuClient.mm in Sources */, -
trunk/Source/WebKit/mac/ChangeLog
r176544 r176551 1 2014-11-27 Anders Carlsson <andersca@apple.com> 2 3 Add a stubbed out WebVisitedLinkStore to WebViewGroup 4 https://bugs.webkit.org/show_bug.cgi?id=139066 5 6 Reviewed by Antti Koivisto. 7 8 * WebCoreSupport/WebViewGroup.h: 9 (WebViewGroup::visitedLinkStore): 10 * WebCoreSupport/WebViewGroup.mm: 11 (WebViewGroup::WebViewGroup): 12 * WebCoreSupport/WebVisitedLinkStore.h: Copied from Source/WebKit/mac/WebCoreSupport/WebViewGroup.h. 13 * WebCoreSupport/WebVisitedLinkStore.mm: Copied from Source/WebKit/mac/WebCoreSupport/WebViewGroup.h. 14 (WebVisitedLinkStore::create): 15 (WebVisitedLinkStore::WebVisitedLinkStore): 16 (WebVisitedLinkStore::~WebVisitedLinkStore): 17 (WebVisitedLinkStore::isLinkVisited): 18 (WebVisitedLinkStore::addVisitedLink): 19 1 20 2014-11-25 Anders Carlsson <andersca@apple.com> 2 21 -
trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.h
r176542 r176551 26 26 #import <WebCore/UserContentController.h> 27 27 28 class WebVisitedLinkStore; 29 28 30 @class WebView; 29 31 … … 39 41 40 42 WebCore::UserContentController& userContentController() { return m_userContentController.get(); } 43 WebVisitedLinkStore& visitedLinkStore() { return m_visitedLinkStore.get(); } 41 44 42 45 private: … … 47 50 48 51 Ref<WebCore::UserContentController> m_userContentController; 52 Ref<WebVisitedLinkStore> m_visitedLinkStore; 49 53 }; -
trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.mm
r176542 r176551 27 27 28 28 #import "WebView.h" 29 #import "WebVisitedLinkStore.h" 29 30 #import <wtf/NeverDestroyed.h> 30 31 #import <wtf/text/StringHash.h> … … 62 63 : m_name(name) 63 64 , m_userContentController(*UserContentController::create()) 65 , m_visitedLinkStore(WebVisitedLinkStore::create()) 64 66 { 65 67 } -
trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.h
r176550 r176551 24 24 */ 25 25 26 #import <WebCore/UserContentController.h> 26 #ifndef WebVisitedLinkStore_h 27 #define WebVisitedLinkStore_h 27 28 28 @class WebView; 29 #import <WebCore/VisitedLinkStore.h> 30 #import <wtf/PassRef.h> 29 31 30 class WebVi ewGroup : public RefCounted<WebViewGroup>{32 class WebVisitedLinkStore final : public WebCore::VisitedLinkStore { 31 33 public: 32 static PassRefPtr<WebViewGroup> getOrCreate(const String& name); 33 ~WebViewGroup(); 34 35 static WebViewGroup* get(const String& name); 36 37 void addWebView(WebView *); 38 void removeWebView(WebView *); 39 40 WebCore::UserContentController& userContentController() { return m_userContentController.get(); } 34 static PassRef<WebVisitedLinkStore> create(); 35 virtual ~WebVisitedLinkStore(); 41 36 42 37 private: 43 WebVi ewGroup(const String& name);38 WebVisitedLinkStore(); 44 39 45 String m_name; 46 HashSet<WebView *> m_webViews; 40 virtual bool isLinkVisited(WebCore::Page&, WebCore::LinkHash, const WebCore::URL& baseURL, const AtomicString& attributeURL) override; 41 virtual void addVisitedLink(WebCore::Page&, WebCore::LinkHash) override; 42 }; 47 43 48 Ref<WebCore::UserContentController> m_userContentController; 49 }; 44 #endif // WebVisitedLinkStore_h -
trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.mm
r176550 r176551 24 24 */ 25 25 26 #import <WebCore/UserContentController.h>26 #import "WebVisitedLinkStore.h" 27 27 28 @class WebView; 28 PassRef<WebVisitedLinkStore> WebVisitedLinkStore::create() 29 { 30 return adoptRef(*new WebVisitedLinkStore); 31 } 29 32 30 class WebViewGroup : public RefCounted<WebViewGroup> { 31 public: 32 static PassRefPtr<WebViewGroup> getOrCreate(const String& name); 33 ~WebViewGroup(); 33 WebVisitedLinkStore::WebVisitedLinkStore() 34 { 35 } 34 36 35 static WebViewGroup* get(const String& name); 37 WebVisitedLinkStore::~WebVisitedLinkStore() 38 { 39 } 36 40 37 void addWebView(WebView *); 38 void removeWebView(WebView *); 41 bool WebVisitedLinkStore::isLinkVisited(WebCore::Page&, WebCore::LinkHash, const WebCore::URL& baseURL, const AtomicString& attributeURL) 42 { 43 // FIXME: Implement. 44 return false; 45 } 39 46 40 WebCore::UserContentController& userContentController() { return m_userContentController.get(); } 41 42 private: 43 WebViewGroup(const String& name); 44 45 String m_name; 46 HashSet<WebView *> m_webViews; 47 48 Ref<WebCore::UserContentController> m_userContentController; 49 }; 47 void WebVisitedLinkStore::addVisitedLink(WebCore::Page&, WebCore::LinkHash) 48 { 49 // FIXME: Implement. 50 }
Note:
See TracChangeset
for help on using the changeset viewer.