Diff
Modified: trunk/Source/WebKit2/ChangeLog (167392 => 167393)
--- trunk/Source/WebKit2/ChangeLog 2014-04-16 22:39:05 UTC (rev 167392)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-16 22:39:47 UTC (rev 167393)
@@ -1,3 +1,29 @@
+2014-04-16 Tim Horton <timothy_hor...@apple.com>
+
+ Don't build LayerTreeHost on Mac (and clean it up)
+ https://bugs.webkit.org/show_bug.cgi?id=131769
+
+ Reviewed by Simon Fraser.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Don't include it in the project.
+
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:
+ (WebKit::CoordinatedDrawingArea::updatePreferences):
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::updatePreferences):
+ * WebProcess/WebPage/LayerTreeHost.h:
+ (WebKit::LayerTreeHost::setLayerHostingMode): Deleted.
+ (WebKit::LayerTreeHost::supportsAcceleratedCompositing): Deleted.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ Get rid of LayerTreeHost::supportsAcceleratedCompositing, which always returns true everywhere.
+ Remove some LayerTreeHost.h includes.
+ Remove LayerTreeHost::setLayerHostingMode, which is PLATFORM(COCOA) and not needed.
+
2014-04-16 Simon Fraser <simon.fra...@apple.com>
Failing to decode a layer tree commit message resulted in silent and mysterious failure
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (167392 => 167393)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-04-16 22:39:05 UTC (rev 167392)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-04-16 22:39:47 UTC (rev 167393)
@@ -129,8 +129,6 @@
1A15841A189044F50017616C /* WKProcessPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A158418189044F50017616C /* WKProcessPool.h */; settings = {ATTRIBUTES = (Public, ); }; };
1A17977F137EE82C00F97D45 /* PluginCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A17977D137EE82C00F97D45 /* PluginCreationParameters.cpp */; };
1A179780137EE82C00F97D45 /* PluginCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A17977E137EE82C00F97D45 /* PluginCreationParameters.h */; };
- 1A186EEA12EF7618008E5F37 /* LayerTreeHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A186EE812EF7618008E5F37 /* LayerTreeHost.h */; };
- 1A186EEB12EF7618008E5F37 /* LayerTreeHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A186EE912EF7618008E5F37 /* LayerTreeHost.cpp */; };
1A1B0EB518A424950038481A /* WKNavigationResponse.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1B0EB318A424950038481A /* WKNavigationResponse.mm */; };
1A1B0EB618A424950038481A /* WKNavigationResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1B0EB418A424950038481A /* WKNavigationResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
1A1B0EB818A424CD0038481A /* WKNavigationResponseInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1B0EB718A424CD0038481A /* WKNavigationResponseInternal.h */; };
@@ -1898,8 +1896,6 @@
1A17635516B1D5D000D88FD6 /* StorageNamespaceImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespaceImpl.h; sourceTree = "<group>"; };
1A17977D137EE82C00F97D45 /* PluginCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginCreationParameters.cpp; sourceTree = "<group>"; };
1A17977E137EE82C00F97D45 /* PluginCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginCreationParameters.h; sourceTree = "<group>"; };
- 1A186EE812EF7618008E5F37 /* LayerTreeHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerTreeHost.h; sourceTree = "<group>"; };
- 1A186EE912EF7618008E5F37 /* LayerTreeHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayerTreeHost.cpp; sourceTree = "<group>"; };
1A1B0EB318A424950038481A /* WKNavigationResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNavigationResponse.mm; sourceTree = "<group>"; };
1A1B0EB418A424950038481A /* WKNavigationResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationResponse.h; sourceTree = "<group>"; };
1A1B0EB718A424CD0038481A /* WKNavigationResponseInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationResponseInternal.h; sourceTree = "<group>"; };
@@ -5347,8 +5343,6 @@
1AA575FD1496B6F300A4EE06 /* EventDispatcher.messages.in */,
1A90C1F31264FD71003E44D4 /* FindController.cpp */,
1A90C1F21264FD71003E44D4 /* FindController.h */,
- 1A186EE912EF7618008E5F37 /* LayerTreeHost.cpp */,
- 1A186EE812EF7618008E5F37 /* LayerTreeHost.h */,
7C387433172F5615001BD88A /* PageBanner.cpp */,
7CF47FF917275C57008ACB91 /* PageBanner.h */,
1A90C23612650717003E44D4 /* PageOverlay.cpp */,
@@ -6803,7 +6797,6 @@
BCE0937814FB128C001138D9 /* LayerHostingContext.h in Headers */,
1A92DC1112F8BA460017AF65 /* LayerTreeContext.h in Headers */,
C59C4A5918B81174007BDCB6 /* AssistedNodeInformation.h in Headers */,
- 1A186EEA12EF7618008E5F37 /* LayerTreeHost.h in Headers */,
1A1D8BA21731A36300141DA4 /* LocalStorageDatabase.h in Headers */,
1A8C728D1738477C000A6554 /* LocalStorageDatabaseTracker.h in Headers */,
51A7F2F3125BF820008AEB1D /* Logging.h in Headers */,
@@ -8243,7 +8236,6 @@
1AE4987911FF7FAA0048B464 /* JSNPObject.cpp in Sources */,
BCE0937714FB128C001138D9 /* LayerHostingContext.mm in Sources */,
1A92DC1312F8BAB90017AF65 /* LayerTreeContextMac.mm in Sources */,
- 1A186EEB12EF7618008E5F37 /* LayerTreeHost.cpp in Sources */,
1A1D8BA11731A36300141DA4 /* LocalStorageDatabase.cpp in Sources */,
1A8C728C1738477C000A6554 /* LocalStorageDatabaseTracker.cpp in Sources */,
51A7F2F5125BF8D4008AEB1D /* Logging.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (167392 => 167393)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-04-16 22:39:05 UTC (rev 167392)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-04-16 22:39:47 UTC (rev 167393)
@@ -30,7 +30,6 @@
#include "Arguments.h"
#include "InjectedBundleScriptWorld.h"
#include "InjectedBundleUserMessageCoders.h"
-#include "LayerTreeHost.h"
#include "NotificationPermissionRequestManager.h"
#include "SessionTracker.h"
#include "WKAPICast.h"
@@ -219,9 +218,6 @@
macro(WebKitDisplayImagesKey, LoadsImagesAutomatically, loadsImagesAutomatically) \
macro(WebKitMediaStreamEnabled, MediaStreamEnabled, mediaStreamEnabled)
- if (preference == "WebKitAcceleratedCompositingEnabled")
- enabled = enabled && LayerTreeHost::supportsAcceleratedCompositing();
-
#define OVERRIDE_PREFERENCE_AND_SET_IN_EXISTING_PAGES(TestRunnerName, SettingsName, WebPreferencesName) \
if (preference == #TestRunnerName) { \
WebPreferencesStore::overrideBoolValueForKey(WebPreferencesKey::WebPreferencesName##Key(), enabled); \
Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp (167392 => 167393)
--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2014-04-16 22:39:05 UTC (rev 167392)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2014-04-16 22:39:47 UTC (rev 167393)
@@ -221,7 +221,7 @@
void CoordinatedDrawingArea::updatePreferences(const WebPreferencesStore& store)
{
- m_webPage->corePage()->settings().setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()) && LayerTreeHost::supportsAcceleratedCompositing());
+ m_webPage->corePage()->settings().setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()));
}
void CoordinatedDrawingArea::mainFrameContentSizeChanged(const WebCore::IntSize&)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (167392 => 167393)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2014-04-16 22:39:05 UTC (rev 167392)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2014-04-16 22:39:47 UTC (rev 167393)
@@ -251,7 +251,7 @@
void DrawingAreaImpl::updatePreferences(const WebPreferencesStore& store)
{
- m_webPage->corePage()->settings().setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()) && LayerTreeHost::supportsAcceleratedCompositing());
+ m_webPage->corePage()->settings().setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()));
}
void DrawingAreaImpl::layerHostDidFlushLayers()
Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (167392 => 167393)
--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2014-04-16 22:39:05 UTC (rev 167392)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2014-04-16 22:39:47 UTC (rev 167393)
@@ -56,8 +56,6 @@
static PassRefPtr<LayerTreeHost> create(WebPage*);
virtual ~LayerTreeHost();
- static bool supportsAcceleratedCompositing();
-
virtual const LayerTreeContext& layerTreeContext() = 0;
virtual void scheduleLayerFlush() = 0;
virtual void setLayerFlushSchedulingEnabled(bool) = 0;
@@ -89,10 +87,6 @@
virtual void didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection*, IPC::MessageDecoder&) = 0;
#endif
-#if PLATFORM(COCOA)
- virtual void setLayerHostingMode(LayerHostingMode) { }
-#endif
-
#if USE(COORDINATED_GRAPHICS) && ENABLE(REQUEST_ANIMATION_FRAME)
virtual void scheduleAnimation() = 0;
#endif
@@ -103,11 +97,6 @@
WebPage* m_webPage;
};
-inline bool LayerTreeHost::supportsAcceleratedCompositing()
-{
- return true;
-}
-
} // namespace WebKit
#endif // LayerTreeHost_h
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167392 => 167393)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-16 22:39:05 UTC (rev 167392)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-16 22:39:47 UTC (rev 167393)
@@ -2502,9 +2502,9 @@
settings.setShowsToolTipOverTruncatedText(store.getBoolValueForKey(WebPreferencesKey::showsToolTipOverTruncatedTextKey()));
settings.setAcceleratedCompositingForOverflowScrollEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedCompositingForOverflowScrollEnabledKey()));
- settings.setAcceleratedCompositingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedCompositingEnabledKey()) && LayerTreeHost::supportsAcceleratedCompositing());
- settings.setAcceleratedDrawingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedDrawingEnabledKey()) && LayerTreeHost::supportsAcceleratedCompositing());
- settings.setCanvasUsesAcceleratedDrawing(store.getBoolValueForKey(WebPreferencesKey::canvasUsesAcceleratedDrawingKey()) && LayerTreeHost::supportsAcceleratedCompositing());
+ settings.setAcceleratedCompositingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedCompositingEnabledKey()));
+ settings.setAcceleratedDrawingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedDrawingEnabledKey()));
+ settings.setCanvasUsesAcceleratedDrawing(store.getBoolValueForKey(WebPreferencesKey::canvasUsesAcceleratedDrawingKey()));
settings.setShowDebugBorders(store.getBoolValueForKey(WebPreferencesKey::compositingBordersVisibleKey()));
settings.setShowRepaintCounter(store.getBoolValueForKey(WebPreferencesKey::compositingRepaintCountersVisibleKey()));
settings.setShowTiledScrollingIndicator(store.getBoolValueForKey(WebPreferencesKey::tiledScrollingIndicatorVisibleKey()));
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (167392 => 167393)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-04-16 22:39:05 UTC (rev 167392)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-04-16 22:39:47 UTC (rev 167393)
@@ -36,7 +36,6 @@
#import "GestureTypes.h"
#import "InjectedBundleUserMessageCoders.h"
#import "InteractionInformationAtPosition.h"
-#import "LayerTreeHost.h"
#import "PluginView.h"
#import "VisibleContentRectUpdateInfo.h"
#import "WKAccessibilityWebPageObjectIOS.h"
