Changeset 106749 in webkit

Timestamp:

Feb 4, 2012 4:18:17 PM (12 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/10772406> WKPreferences instances cannot be copied
​https://bugs.webkit.org/show_bug.cgi?id=77816

Reviewed by Sam Weinig.

Source/WebKit2:

Test added in TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp.

• UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesCreateCopy): Added.

• UIProcess/API/C/WKPreferencesPrivate.h:
• UIProcess/WebPreferences.cpp:

(WebKit::WebPreferences::WebPreferences): Added this constructor that copies the
WebPreferencesStore of the given WebPreferences.

• UIProcess/WebPreferences.h:

(WebKit::WebPreferences::create): Added this create function that takes a WebPreferences
instance and creates a new instance with a copy of the given instance’s store.

Tools:

• TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h (modified) (1 diff)
• Source/WebKit2/UIProcess/WebPreferences.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/WebPreferences.h (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-02-04  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10772406> WKPreferences instances cannot be copied
+        https://bugs.webkit.org/show_bug.cgi?id=77816
+
+        Reviewed by Sam Weinig.
+
+        Test added in TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp.
+
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesCreateCopy): Added.
+        * UIProcess/API/C/WKPreferencesPrivate.h:
+        * UIProcess/WebPreferences.cpp:
+        (WebKit::WebPreferences::WebPreferences): Added this constructor that copies the
+        WebPreferencesStore of the given WebPreferences.
+        * UIProcess/WebPreferences.h:
+        (WebKit::WebPreferences::create): Added this create function that takes a WebPreferences
+        instance and creates a new instance with a copy of the given instance’s store.
+
 2012-02-03  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp

@@ -53 +53 @@
 }
 
+WKPreferencesRef WKPreferencesCreateCopy(WKPreferencesRef preferencesRef)
+{
+    RefPtr<WebPreferences> preferences = WebPreferences::create(*toImpl(preferencesRef));
+    return toAPI(preferences.release().leakRef());
+}
+
 void WKPreferencesSetJavaScriptEnabled(WKPreferencesRef preferencesRef, bool javaScriptEnabled)
 {

trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h

@@ -52 +52 @@
 };
 typedef enum WKEditableLinkBehavior WKEditableLinkBehavior;
+
+// Creates a copy with no identifier.
+WK_EXPORT WKPreferencesRef WKPreferencesCreateCopy(WKPreferencesRef);
 
 // Defaults to kWKFontSmoothingLevelWindows on Windows, kWKFontSmoothingLevelMedium on other platforms.

trunk/Source/WebKit2/UIProcess/WebPreferences.cpp

@@ -38 +38 @@
 WebPreferences::WebPreferences(const String& identifier)
     : m_identifier(identifier)
+{
+    platformInitializeStore();
+}
+
+WebPreferences::WebPreferences(const WebPreferences& other)
+    : m_store(other.m_store)
 {
     platformInitializeStore();

trunk/Source/WebKit2/UIProcess/WebPreferences.h

@@ -55 +55 @@
     }
 
+    static PassRefPtr<WebPreferences> create(const WebPreferences& other)
+    {
+        return adoptRef(new WebPreferences(other));
+    }
+
     virtual ~WebPreferences();
 
@@ -76 +81 @@
     WebPreferences();
     WebPreferences(const String& identifier);
+    WebPreferences(const WebPreferences&);
 
     void platformInitializeStore();

trunk/Tools/ChangeLog

@@ +1 @@
+2012-02-04  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10772406> WKPreferences instances cannot be copied
+        https://bugs.webkit.org/show_bug.cgi?id=77816
+
+        Reviewed by Sam Weinig.
+
+        * TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
+        (TestWebKitAPI::TEST):
+
 2012-02-04  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp

@@ -98 +98 @@
 }
 
+TEST(WebKit2, WKPreferencesCopying)
+{
+    WKRetainPtr<WKStringRef> identifier(AdoptWK, WKStringCreateWithUTF8CString("identifier"));
+
+    WKRetainPtr<WKPreferencesRef> preferences(AdoptWK, WKPreferencesCreateWithIdentifier(identifier.get()));
+    WKPreferencesSetDefaultFontSize(preferences.get(), 36);
+
+    WKRetainPtr<WKPreferencesRef> copy(AdoptWK, WKPreferencesCreateCopy(preferences.get()));
+
+    WKPreferencesSetDefaultFontSize(preferences.get(), 24);
+    EXPECT_EQ(24u, WKPreferencesGetDefaultFontSize(preferences.get()));
+    EXPECT_EQ(36u, WKPreferencesGetDefaultFontSize(copy.get()));
+}
+
 } // namespace TestWebKitAPI