Title: [163636] trunk/Source/WebKit2
- Revision
- 163636
- Author
- [email protected]
- Date
- 2014-02-07 11:43:26 -0800 (Fri, 07 Feb 2014)
Log Message
Copying a WebPreferences object should be done through a member function
https://bugs.webkit.org/show_bug.cgi?id=128385
Reviewed by Andreas Kling.
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesCreateCopy):
* UIProcess/WebPreferences.cpp:
(WebKit::WebPreferences::copy):
* UIProcess/WebPreferences.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163635 => 163636)
--- trunk/Source/WebKit2/ChangeLog 2014-02-07 19:10:47 UTC (rev 163635)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-07 19:43:26 UTC (rev 163636)
@@ -1,5 +1,18 @@
2014-02-07 Anders Carlsson <[email protected]>
+ Copying a WebPreferences object should be done through a member function
+ https://bugs.webkit.org/show_bug.cgi?id=128385
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesCreateCopy):
+ * UIProcess/WebPreferences.cpp:
+ (WebKit::WebPreferences::copy):
+ * UIProcess/WebPreferences.h:
+
+2014-02-07 Anders Carlsson <[email protected]>
+
WebPageGroup::setPreferences should set the preferences on all pages in the group
https://bugs.webkit.org/show_bug.cgi?id=128383
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (163635 => 163636)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-02-07 19:10:47 UTC (rev 163635)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-02-07 19:43:26 UTC (rev 163636)
@@ -55,7 +55,7 @@
WKPreferencesRef WKPreferencesCreateCopy(WKPreferencesRef preferencesRef)
{
- RefPtr<WebPreferences> preferences = WebPreferences::create(*toImpl(preferencesRef));
+ RefPtr<WebPreferences> preferences = toImpl(preferencesRef)->copy();
return toAPI(preferences.release().leakRef());
}
Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.cpp (163635 => 163636)
--- trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2014-02-07 19:10:47 UTC (rev 163635)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2014-02-07 19:43:26 UTC (rev 163636)
@@ -58,6 +58,11 @@
ASSERT(m_pageGroups.isEmpty());
}
+PassRefPtr<WebPreferences> WebPreferences::copy() const
+{
+ return adoptRef(new WebPreferences(*this));
+}
+
void WebPreferences::addPageGroup(WebPageGroup* pageGroup)
{
bool didAddPageGroup = m_pageGroups.add(pageGroup).isNewEntry;
Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.h (163635 => 163636)
--- trunk/Source/WebKit2/UIProcess/WebPreferences.h 2014-02-07 19:10:47 UTC (rev 163635)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.h 2014-02-07 19:43:26 UTC (rev 163636)
@@ -52,13 +52,10 @@
return adoptRef(new WebPreferences(identifier));
}
- static PassRefPtr<WebPreferences> create(const WebPreferences& other)
- {
- return adoptRef(new WebPreferences(other));
- }
-
virtual ~WebPreferences();
+ PassRefPtr<WebPreferences> copy() const;
+
void addPageGroup(WebPageGroup*);
void removePageGroup(WebPageGroup*);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
