[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 15:57:03 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e322062829e8c3aff54322196ccc85b7ccc2b52d
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 17 03:13:27 2010 +0000
WebKit2: Support enabling site-specific quirks
<rdar://problem/8451371>
https://bugs.webkit.org/show_bug.cgi?id=46076
Reviewed by Adam Roben.
* Shared/WebPreferencesStore.cpp:
(WebKit::WebPreferencesStore::WebPreferencesStore):
(WebKit::WebPreferencesStore::encode):
(WebKit::WebPreferencesStore::decode):
* Shared/WebPreferencesStore.h:
Add needsSiteSpecificQuirks;
* UIProcess/API/C/WKAPICast.h:
(WebKit::toFontSmoothingLevel):
(WebKit::toAPI):
Move FontSmoothing conversion functions here.
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetFontSmoothingLevel):
(WKPreferencesGetFontSmoothingLevel):
(WKPreferencesSetAcceleratedCompositingEnabled):
(WKPreferencesGetAcceleratedCompositingEnabled):
(WKPreferencesSetCompositingBordersVisible):
(WKPreferencesGetCompositingBordersVisible):
(WKPreferencesSetCompositingRepaintCountersVisible):
(WKPreferencesGetCompositingRepaintCountersVisible):
(WKPreferencesSetNeedsSiteSpecificQuirks):
(WKPreferencesGetNeedsSiteSpecificQuirks):
Add WKPreferencesSetNeedsSiteSpecificQuirks/WKPreferencesGetNeedsSiteSpecificQuirks
and move implementations from WKPreferencesPrivate.cpp here.
* UIProcess/API/C/WKPreferencesPrivate.cpp: Removed.
* UIProcess/API/C/WKPreferencesPrivate.h:
Add Add WKPreferencesSetNeedsSiteSpecificQuirks/WKPreferencesGetNeedsSiteSpecificQuirks.
* UIProcess/WebPreferences.cpp:
(WebKit::WebPreferences::setNeedsSiteSpecificQuirks):
(WebKit::WebPreferences::needsSiteSpecificQuirks):
* UIProcess/WebPreferences.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
Pipe through needsSiteSpecificQuirks.
* WebKit2.xcodeproj/project.pbxproj:
* WebKit2.pro:
* win/WebKit2.vcproj:
Update for removed files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72162 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 03647b0..66a7a47 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,55 @@
+2010-11-16 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Adam Roben.
+
+ WebKit2: Support enabling site-specific quirks
+ <rdar://problem/8451371>
+ https://bugs.webkit.org/show_bug.cgi?id=46076
+
+ * Shared/WebPreferencesStore.cpp:
+ (WebKit::WebPreferencesStore::WebPreferencesStore):
+ (WebKit::WebPreferencesStore::encode):
+ (WebKit::WebPreferencesStore::decode):
+ * Shared/WebPreferencesStore.h:
+ Add needsSiteSpecificQuirks;
+
+ * UIProcess/API/C/WKAPICast.h:
+ (WebKit::toFontSmoothingLevel):
+ (WebKit::toAPI):
+ Move FontSmoothing conversion functions here.
+
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetFontSmoothingLevel):
+ (WKPreferencesGetFontSmoothingLevel):
+ (WKPreferencesSetAcceleratedCompositingEnabled):
+ (WKPreferencesGetAcceleratedCompositingEnabled):
+ (WKPreferencesSetCompositingBordersVisible):
+ (WKPreferencesGetCompositingBordersVisible):
+ (WKPreferencesSetCompositingRepaintCountersVisible):
+ (WKPreferencesGetCompositingRepaintCountersVisible):
+ (WKPreferencesSetNeedsSiteSpecificQuirks):
+ (WKPreferencesGetNeedsSiteSpecificQuirks):
+ Add WKPreferencesSetNeedsSiteSpecificQuirks/WKPreferencesGetNeedsSiteSpecificQuirks
+ and move implementations from WKPreferencesPrivate.cpp here.
+
+ * UIProcess/API/C/WKPreferencesPrivate.cpp: Removed.
+
+ * UIProcess/API/C/WKPreferencesPrivate.h:
+ Add Add WKPreferencesSetNeedsSiteSpecificQuirks/WKPreferencesGetNeedsSiteSpecificQuirks.
+
+ * UIProcess/WebPreferences.cpp:
+ (WebKit::WebPreferences::setNeedsSiteSpecificQuirks):
+ (WebKit::WebPreferences::needsSiteSpecificQuirks):
+ * UIProcess/WebPreferences.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+ Pipe through needsSiteSpecificQuirks.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebKit2.pro:
+ * win/WebKit2.vcproj:
+ Update for removed files.
+
2010-11-16 Adam Roben <aroben at apple.com>
Fix horizontal scrolling via the mousewheel/trackpad on Windows
diff --git a/WebKit2/Shared/WebPreferencesStore.cpp b/WebKit2/Shared/WebPreferencesStore.cpp
index 5a59d0e..22165c0 100644
--- a/WebKit2/Shared/WebPreferencesStore.cpp
+++ b/WebKit2/Shared/WebPreferencesStore.cpp
@@ -41,11 +41,12 @@ WebPreferencesStore::WebPreferencesStore()
, localStorageEnabled(true)
, xssAuditorEnabled(true)
, frameFlatteningEnabled(false)
+ , developerExtrasEnabled(false)
+ , privateBrowsingEnabled(false)
+ , needsSiteSpecificQuirks(false)
, acceleratedCompositingEnabled(true)
, compositingBordersVisible(false)
, compositingRepaintCountersVisible(false)
- , privateBrowsingEnabled(false)
- , developerExtrasEnabled(false)
, fontSmoothingLevel(FontSmoothingLevelMedium)
, minimumFontSize(0)
, minimumLogicalFontSize(9)
@@ -95,6 +96,7 @@ void WebPreferencesStore::encode(CoreIPC::ArgumentEncoder* encoder) const
encoder->encode(acceleratedCompositingEnabled);
encoder->encode(compositingBordersVisible);
encoder->encode(compositingRepaintCountersVisible);
+ encoder->encode(needsSiteSpecificQuirks);
}
bool WebPreferencesStore::decode(CoreIPC::ArgumentDecoder* decoder, WebPreferencesStore& s)
@@ -147,6 +149,8 @@ bool WebPreferencesStore::decode(CoreIPC::ArgumentDecoder* decoder, WebPreferenc
return false;
if (!decoder->decode(s.compositingRepaintCountersVisible))
return false;
+ if (!decoder->decode(s.needsSiteSpecificQuirks))
+ return false;
if (hasXSSAuditorEnabledTestRunnerOverride)
s.xssAuditorEnabled = xssAuditorEnabledTestRunnerOverride;
diff --git a/WebKit2/Shared/WebPreferencesStore.h b/WebKit2/Shared/WebPreferencesStore.h
index 7d8f60c..c7b02e1 100644
--- a/WebKit2/Shared/WebPreferencesStore.h
+++ b/WebKit2/Shared/WebPreferencesStore.h
@@ -50,17 +50,13 @@ struct WebPreferencesStore {
bool localStorageEnabled;
bool xssAuditorEnabled;
bool frameFlatteningEnabled;
-
+ bool developerExtrasEnabled;
+ bool privateBrowsingEnabled;
+ bool needsSiteSpecificQuirks;
bool acceleratedCompositingEnabled;
bool compositingBordersVisible;
bool compositingRepaintCountersVisible;
-
- bool privateBrowsingEnabled;
-
- bool developerExtrasEnabled;
-
uint32_t fontSmoothingLevel;
-
uint32_t minimumFontSize;
uint32_t minimumLogicalFontSize;
uint32_t defaultFontSize;
diff --git a/WebKit2/UIProcess/API/C/WKAPICast.h b/WebKit2/UIProcess/API/C/WKAPICast.h
index 71f8537..ead40a0 100644
--- a/WebKit2/UIProcess/API/C/WKAPICast.h
+++ b/WebKit2/UIProcess/API/C/WKAPICast.h
@@ -28,8 +28,10 @@
#include "CacheModel.h"
#include "FindOptions.h"
+#include "FontSmoothingLevel.h"
#include "WKContext.h"
#include "WKPage.h"
+#include "WKPreferencesPrivate.h"
#include "WKSharedAPICast.h"
#include <WebCore/FrameLoaderTypes.h>
@@ -149,6 +151,49 @@ inline FindOptions toFindOptions(WKFindOptions wkFindOptions)
return static_cast<FindOptions>(findOptions);
}
+inline FontSmoothingLevel toFontSmoothingLevel(WKFontSmoothingLevel wkLevel)
+{
+ switch (wkLevel) {
+ case kWKFontSmoothingLevelNoSubpixelAntiAliasing:
+ return FontSmoothingLevelNoSubpixelAntiAliasing;
+ case kWKFontSmoothingLevelLight:
+ return FontSmoothingLevelLight;
+ case kWKFontSmoothingLevelMedium:
+ return FontSmoothingLevelMedium;
+ case kWKFontSmoothingLevelStrong:
+ return FontSmoothingLevelStrong;
+#if PLATFORM(WIN)
+ case kWKFontSmoothingLevelWindows:
+ return FontSmoothingLevelWindows;
+#endif
+ }
+
+ ASSERT_NOT_REACHED();
+ return FontSmoothingLevelMedium;
+}
+
+
+inline WKFontSmoothingLevel toAPI(FontSmoothingLevel level)
+{
+ switch (level) {
+ case FontSmoothingLevelNoSubpixelAntiAliasing:
+ return kWKFontSmoothingLevelNoSubpixelAntiAliasing;
+ case FontSmoothingLevelLight:
+ return kWKFontSmoothingLevelLight;
+ case FontSmoothingLevelMedium:
+ return kWKFontSmoothingLevelMedium;
+ case FontSmoothingLevelStrong:
+ return kWKFontSmoothingLevelStrong;
+#if PLATFORM(WIN)
+ case FontSmoothingLevelWindows:
+ return kWKFontSmoothingLevelWindows;
+#endif
+ }
+
+ ASSERT_NOT_REACHED();
+ return kWKFontSmoothingLevelMedium;
+}
+
} // namespace WebKit
#if defined(WIN32) || defined(_WIN32)
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.cpp b/WebKit2/UIProcess/API/C/WKPreferences.cpp
index cfd021e..b3059ac 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.cpp
+++ b/WebKit2/UIProcess/API/C/WKPreferences.cpp
@@ -24,6 +24,7 @@
*/
#include "WKPreferences.h"
+#include "WKPreferencesPrivate.h"
#include "WKAPICast.h"
#include "WebPreferences.h"
@@ -218,3 +219,53 @@ bool WKPreferencesGetDeveloperExtrasEnabled(WKPreferencesRef preferencesRef)
{
return toImpl(preferencesRef)->developerExtrasEnabled();
}
+
+void WKPreferencesSetFontSmoothingLevel(WKPreferencesRef preferencesRef, WKFontSmoothingLevel wkLevel)
+{
+ toImpl(preferencesRef)->setFontSmoothingLevel(toFontSmoothingLevel(wkLevel));
+}
+
+WKFontSmoothingLevel WKPreferencesGetFontSmoothingLevel(WKPreferencesRef preferencesRef)
+{
+ return toAPI(toImpl(preferencesRef)->fontSmoothingLevel());
+}
+
+void WKPreferencesSetAcceleratedCompositingEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setAcceleratedCompositingEnabled(flag);
+}
+
+bool WKPreferencesGetAcceleratedCompositingEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->acceleratedCompositingEnabled();
+}
+
+void WKPreferencesSetCompositingBordersVisible(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setCompositingBordersVisible(flag);
+}
+
+bool WKPreferencesGetCompositingBordersVisible(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->compositingBordersVisible();
+}
+
+void WKPreferencesSetCompositingRepaintCountersVisible(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setCompositingRepaintCountersVisible(flag);
+}
+
+bool WKPreferencesGetCompositingRepaintCountersVisible(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->compositingRepaintCountersVisible();
+}
+
+void WKPreferencesSetNeedsSiteSpecificQuirks(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setNeedsSiteSpecificQuirks(flag);
+}
+
+bool WKPreferencesGetNeedsSiteSpecificQuirks(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->needsSiteSpecificQuirks();
+}
diff --git a/WebKit2/UIProcess/API/C/WKPreferencesPrivate.cpp b/WebKit2/UIProcess/API/C/WKPreferencesPrivate.cpp
deleted file mode 100644
index 76fcc95..0000000
--- a/WebKit2/UIProcess/API/C/WKPreferencesPrivate.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "WKPreferencesPrivate.h"
-
-#include "FontSmoothingLevel.h"
-#include "WKAPICast.h"
-#include "WKPreferences.h"
-#include "WebPreferences.h"
-
-using namespace WebKit;
-
-void WKPreferencesSetFontSmoothingLevel(WKPreferencesRef preferencesRef, WKFontSmoothingLevel wkLevel)
-{
- FontSmoothingLevel level;
- switch (wkLevel) {
- case kWKFontSmoothingLevelNoSubpixelAntiAliasing:
- level = FontSmoothingLevelNoSubpixelAntiAliasing;
- break;
- case kWKFontSmoothingLevelLight:
- level = FontSmoothingLevelLight;
- break;
- case kWKFontSmoothingLevelMedium:
- level = FontSmoothingLevelMedium;
- break;
- case kWKFontSmoothingLevelStrong:
- level = FontSmoothingLevelStrong;
- break;
-#if PLATFORM(WIN)
- case kWKFontSmoothingLevelWindows:
- level = FontSmoothingLevelWindows;
- break;
-#endif
- default:
- ASSERT_NOT_REACHED();
- level = FontSmoothingLevelMedium;
- break;
- }
- toImpl(preferencesRef)->setFontSmoothingLevel(level);
-}
-
-WKFontSmoothingLevel WKPreferencesGetFontSmoothingLevel(WKPreferencesRef preferencesRef)
-{
- FontSmoothingLevel level = toImpl(preferencesRef)->fontSmoothingLevel();
- switch (level) {
- case FontSmoothingLevelNoSubpixelAntiAliasing:
- return kWKFontSmoothingLevelNoSubpixelAntiAliasing;
- case FontSmoothingLevelLight:
- return kWKFontSmoothingLevelLight;
- case FontSmoothingLevelMedium:
- return kWKFontSmoothingLevelMedium;
- case FontSmoothingLevelStrong:
- return kWKFontSmoothingLevelStrong;
-#if PLATFORM(WIN)
- case FontSmoothingLevelWindows:
- return kWKFontSmoothingLevelWindows;
-#endif
- }
-
- ASSERT_NOT_REACHED();
- return kWKFontSmoothingLevelMedium;
-}
-
-void WKPreferencesSetAcceleratedCompositingEnabled(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setAcceleratedCompositingEnabled(flag);
-}
-
-bool WKPreferencesGetAcceleratedCompositingEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->acceleratedCompositingEnabled();
-}
-
-void WKPreferencesSetCompositingBordersVisible(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setCompositingBordersVisible(flag);
-}
-
-bool WKPreferencesGetCompositingBordersVisible(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->compositingBordersVisible();
-}
-
-void WKPreferencesSetCompositingRepaintCountersVisible(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setCompositingRepaintCountersVisible(flag);
-}
-
-bool WKPreferencesGetCompositingRepaintCountersVisible(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->compositingRepaintCountersVisible();
-}
diff --git a/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h b/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h
index 7af8140..4c11232 100644
--- a/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h
+++ b/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h
@@ -59,6 +59,10 @@ WK_EXPORT bool WKPreferencesGetCompositingBordersVisible(WKPreferencesRef);
WK_EXPORT void WKPreferencesSetCompositingRepaintCountersVisible(WKPreferencesRef, bool);
WK_EXPORT bool WKPreferencesGetCompositingRepaintCountersVisible(WKPreferencesRef);
+// Defaults to false.
+WK_EXPORT void WKPreferencesSetNeedsSiteSpecificQuirks(WKPreferencesRef, bool);
+WK_EXPORT bool WKPreferencesGetNeedsSiteSpecificQuirks(WKPreferencesRef);
+
#ifdef __cplusplus
}
#endif
diff --git a/WebKit2/UIProcess/WebPreferences.cpp b/WebKit2/UIProcess/WebPreferences.cpp
index 70edd8e..c7f242f 100644
--- a/WebKit2/UIProcess/WebPreferences.cpp
+++ b/WebKit2/UIProcess/WebPreferences.cpp
@@ -152,6 +152,17 @@ bool WebPreferences::developerExtrasEnabled() const
return m_store.developerExtrasEnabled;
}
+void WebPreferences::setNeedsSiteSpecificQuirks(bool b)
+{
+ m_store.needsSiteSpecificQuirks = b;
+ update();
+}
+
+bool WebPreferences::needsSiteSpecificQuirks() const
+{
+ return m_store.needsSiteSpecificQuirks;
+}
+
void WebPreferences::setPluginsEnabled(bool b)
{
m_store.pluginsEnabled = b;
diff --git a/WebKit2/UIProcess/WebPreferences.h b/WebKit2/UIProcess/WebPreferences.h
index 0dc9da1..655e3a5 100644
--- a/WebKit2/UIProcess/WebPreferences.h
+++ b/WebKit2/UIProcess/WebPreferences.h
@@ -122,6 +122,9 @@ public:
void setDeveloperExtrasEnabled(bool);
bool developerExtrasEnabled() const;
+ void setNeedsSiteSpecificQuirks(bool);
+ bool needsSiteSpecificQuirks() const;
+
private:
WebPreferences();
WebPreferences(WebPreferences*);
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index c7f8805..956362e 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -442,7 +442,6 @@ SOURCES += \
UIProcess/API/C/WKPage.cpp \
UIProcess/API/C/WKPageNamespace.cpp \
UIProcess/API/C/WKPreferences.cpp \
- UIProcess/API/C/WKPreferencesPrivate.cpp \
UIProcess/API/cpp/qt/WKStringQt.cpp \
UIProcess/API/cpp/qt/WKURLQt.cpp \
UIProcess/API/qt/ClientImpl.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index b796c46..f5b7201 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -217,7 +217,6 @@
51B3005112529D0E000B5CA0 /* WebPageProxyCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51B3004F12529D0E000B5CA0 /* WebPageProxyCF.cpp */; };
6D8A91A611F0EFD100DD01FE /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = 6D8A91A511F0EFD100DD01FE /* com.apple.WebProcess.sb */; };
762B748D120BC75C00819339 /* WKPreferencesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 762B7484120BBA2D00819339 /* WKPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 762B74AF120BC94F00819339 /* WKPreferencesPrivate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 762B749D120BC8EA00819339 /* WKPreferencesPrivate.cpp */; };
8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
935EEB9B1277617C003322B8 /* WKBundleBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 935EEB981277616D003322B8 /* WKBundleBackForwardListItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -785,7 +784,6 @@
6D8A91A511F0EFD100DD01FE /* com.apple.WebProcess.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = com.apple.WebProcess.sb; path = WebProcess/com.apple.WebProcess.sb; sourceTree = "<group>"; };
762B7481120BBA0100819339 /* FontSmoothingLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSmoothingLevel.h; sourceTree = "<group>"; };
762B7484120BBA2D00819339 /* WKPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesPrivate.h; sourceTree = "<group>"; };
- 762B749D120BC8EA00819339 /* WKPreferencesPrivate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKPreferencesPrivate.cpp; sourceTree = "<group>"; };
8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8DC2EF5B0486A6940098B216 /* WebKit2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
935EEB8F1277615D003322B8 /* InjectedBundleBackForwardList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleBackForwardList.cpp; sourceTree = "<group>"; };
@@ -1753,7 +1751,6 @@
BC177464118B9FF4007D9E9A /* WKPagePrivate.h */,
BCD597CF112B56AC00EC8C23 /* WKPreferences.cpp */,
BCD597CE112B56AC00EC8C23 /* WKPreferences.h */,
- 762B749D120BC8EA00819339 /* WKPreferencesPrivate.cpp */,
762B7484120BBA2D00819339 /* WKPreferencesPrivate.h */,
);
path = C;
@@ -2629,7 +2626,6 @@
BCD597D6112B56DC00EC8C23 /* WKPage.cpp in Sources */,
BCEE98CC1133174C006BCC24 /* WKPageNamespace.cpp in Sources */,
BCD597D1112B56AC00EC8C23 /* WKPreferences.cpp in Sources */,
- 762B74AF120BC94F00819339 /* WKPreferencesPrivate.cpp in Sources */,
BC8699B6116AADAA002A925B /* WKView.mm in Sources */,
BC2E6E8D1141971500A63B1E /* WorkQueue.cpp in Sources */,
BC0092F8115837A300E0AE2A /* WorkQueueMac.cpp in Sources */,
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 14c3df7..170cce3 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -863,6 +863,7 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
settings->setFrameFlatteningEnabled(store.frameFlatteningEnabled);
settings->setPrivateBrowsingEnabled(store.privateBrowsingEnabled);
settings->setDeveloperExtrasEnabled(store.developerExtrasEnabled);
+ settings->setNeedsSiteSpecificQuirks(store.needsSiteSpecificQuirks);
settings->setMinimumFontSize(store.minimumFontSize);
settings->setMinimumLogicalFontSize(store.minimumLogicalFontSize);
settings->setDefaultFontSize(store.defaultFontSize);
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index 1c56501..53130eb 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -2148,10 +2148,6 @@
>
</File>
<File
- RelativePath="..\UIProcess\API\C\WKPreferencesPrivate.cpp"
- >
- </File>
- <File
RelativePath="..\UIProcess\API\C\WKPreferencesPrivate.h"
>
</File>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list