Changeset 151926 in webkit

Timestamp:

Jun 24, 2013 2:02:36 PM (11 years ago)

Author:

Simon Fraser

Message:

Move displayID stuff from Widget to Chrome
​https://bugs.webkit.org/show_bug.cgi?id=117944

Reviewed by Anders Carlsson.

In r151877 I polluted Widget with displayID-related stuff. This would
be better on HostWindow, so move it there. This is a net code reduction,
and eliminates PlatformScreenMac.h, and the NSScreen category.

Source/WebCore:

• WebCore.exp.in: Remove some functions from the exports list.
• WebCore.xcodeproj/project.pbxproj: PlatformScreenMac.h is gone!
• dom/Document.cpp:

(WebCore::Document::requestAnimationFrame): Get the displayID from page->chrome()

• page/Chrome.cpp:

(WebCore::Chrome::Chrome): Initialize m_displayID.
(WebCore::Chrome::displayID):
(WebCore::Chrome::windowScreenDidChange): Code moved from Page; save the
displayID, and tell all subframes that the displayID changed.

• page/Chrome.h: Add displayID-related functions.
• page/FrameView.cpp: Removed windowDisplayID().
• page/FrameView.h: Ditto.
• page/Page.cpp: Removed code.

(WebCore::Page::Page):

• page/Page.h:
• platform/HostWindow.h: Added virtual displayID-related functions.
• platform/Widget.cpp: Removed code.
• platform/Widget.h: Ditto.
• platform/mac/PlatformScreenMac.h: Removed.
• platform/mac/PlatformScreenMac.mm: Removed the NSScreen category.

(WebCore::displayIDFromScreen):
(WebCore::screenForDisplayID):
(WebCore::displayFromWidget):
(WebCore::screenForWidget):

• platform/mac/WidgetMac.mm: Removed windowDisplayID().
• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::notifyFlushBeforeDisplayRefresh): Get
the displayID via chrome().

Source/WebKit/mac:

• WebView/WebView.mm:

(-[WebView doWindowDidChangeScreen]): Go via chrome().

Source/WebKit2:

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::windowScreenDidChange): Go via chrome().

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (2 diffs)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/page/Chrome.cpp (modified) (2 diffs)
• WebCore/page/Chrome.h (modified) (2 diffs)
• WebCore/page/FrameView.cpp (modified) (1 diff)
• WebCore/page/FrameView.h (modified) (1 diff)
• WebCore/page/Page.cpp (modified) (2 diffs)
• WebCore/page/Page.h (modified) (3 diffs)
• WebCore/platform/HostWindow.h (modified) (1 diff)
• WebCore/platform/Widget.cpp (modified) (1 diff)
• WebCore/platform/Widget.h (modified) (1 diff)
• WebCore/platform/mac/PlatformScreenMac.h (deleted)
• WebCore/platform/mac/PlatformScreenMac.mm (modified) (3 diffs)
• WebCore/platform/mac/WidgetMac.mm (modified) (2 diffs)
• WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Move displayID stuff from Widget to Chrome
+        https://bugs.webkit.org/show_bug.cgi?id=117944
+
+        Reviewed by Anders Carlsson.
+
+        In r151877 I polluted Widget with displayID-related stuff. This would
+        be better on HostWindow, so move it there. This is a net code reduction,
+        and eliminates PlatformScreenMac.h, and the NSScreen category.
+
+        * WebCore.exp.in: Remove some functions from the exports list.
+        * WebCore.xcodeproj/project.pbxproj: PlatformScreenMac.h is gone!
+        * dom/Document.cpp:
+        (WebCore::Document::requestAnimationFrame): Get the displayID from page->chrome()
+        * page/Chrome.cpp:
+        (WebCore::Chrome::Chrome): Initialize m_displayID.
+        (WebCore::Chrome::displayID):
+        (WebCore::Chrome::windowScreenDidChange): Code moved from Page; save the
+        displayID, and tell all subframes that the displayID changed.
+        * page/Chrome.h: Add displayID-related functions.
+        * page/FrameView.cpp: Removed windowDisplayID().
+        * page/FrameView.h: Ditto.
+        * page/Page.cpp: Removed code.
+        (WebCore::Page::Page):
+        * page/Page.h:
+        * platform/HostWindow.h: Added virtual displayID-related functions.
+        * platform/Widget.cpp: Removed code.
+        * platform/Widget.h: Ditto.
+        * platform/mac/PlatformScreenMac.h: Removed.
+        * platform/mac/PlatformScreenMac.mm: Removed the NSScreen category.
+        (WebCore::displayIDFromScreen):
+        (WebCore::screenForDisplayID):
+        (WebCore::displayFromWidget):
+        (WebCore::screenForWidget):
+        * platform/mac/WidgetMac.mm: Removed windowDisplayID().
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::notifyFlushBeforeDisplayRefresh): Get
+        the displayID via chrome().
+
 2013-06-24  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1012 +1012 @@
 __ZN7WebCore6Widget9setParentEPNS_10ScrollViewE
 __ZN7WebCore6WidgetD2Ev
-__ZNK7WebCore6Widget15windowDisplayIDEv
 __ZN7WebCore6toInt8EPN3JSC9ExecStateENS0_7JSValueENS_30IntegerConversionConfigurationE
 __ZN7WebCore6toNodeEN3JSC7JSValueE
@@ -1899 +1898 @@
 __ZN7WebCore42contextMenuItemTagCheckSpellingWhileTypingEv
 __ZN7WebCore46contextMenuItemTagCorrectSpellingAutomaticallyEv
-__ZN7WebCore4Page21windowScreenDidChangeEj
 __ZN7WebCore5Frame9nodeImageEPNS_4NodeE
 __ZN7WebCore6Cursor8fromTypeENS0_4TypeE

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -252 +252 @@
                 0F15DA8A0F3AAEE70000CE47 /* AnimationControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F15DA890F3AAEE70000CE47 /* AnimationControllerPrivate.h */; };
                 0F29C16E1300C2E2002D794E /* AccessibilityAllInOne.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F29C16D1300C2E2002D794E /* AccessibilityAllInOne.cpp */; };
-                0F2C98EB1774084C00C1BBBA /* PlatformScreenMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F2C98EA1774084C00C1BBBA /* PlatformScreenMac.h */; };
                 0F3DD44F12F5EA1B000D9190 /* ShadowBlur.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F3DD44D12F5EA1B000D9190 /* ShadowBlur.cpp */; };
                 0F3DD45012F5EA1B000D9190 /* ShadowBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F3DD44E12F5EA1B000D9190 /* ShadowBlur.h */; };
@@ -6475 +6474 @@
                 0F15DA890F3AAEE70000CE47 /* AnimationControllerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationControllerPrivate.h; path = animation/AnimationControllerPrivate.h; sourceTree = "<group>"; };
                 0F29C16D1300C2E2002D794E /* AccessibilityAllInOne.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityAllInOne.cpp; sourceTree = "<group>"; };
-                0F2C98EA1774084C00C1BBBA /* PlatformScreenMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformScreenMac.h; sourceTree = "<group>"; };
                 0F3DD44D12F5EA1B000D9190 /* ShadowBlur.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowBlur.cpp; sourceTree = "<group>"; };
                 0F3DD44E12F5EA1B000D9190 /* ShadowBlur.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowBlur.h; sourceTree = "<group>"; };
@@ -14595 +14593 @@
                                 BCAA486D14A052530088FAC4 /* PlatformEventFactoryMac.mm */,
                                 C5F765BA14E1ECF4006C899B /* PlatformPasteboardMac.mm */,
-                                0F2C98EA1774084C00C1BBBA /* PlatformScreenMac.h */,
                                 BC94D1070C274F88006BC617 /* PlatformScreenMac.mm */,
                                 29E4D8E016B0959800C84704 /* PlatformSpeechSynthesizerMac.mm */,
@@ -23001 +22998 @@
                                 C598905814E9C29900E8D18B /* PlatformPasteboard.h in Headers */,
                                 BCEC01D70C274EB4009F4EC9 /* PlatformScreen.h in Headers */,
-                                0F2C98EB1774084C00C1BBBA /* PlatformScreenMac.h in Headers */,
                                 297BE3D516C03C08003316BD /* PlatformSpeechSynthesisUtterance.h in Headers */,
                                 297BE3D616C03C0B003316BD /* PlatformSpeechSynthesisVoice.h in Headers */,

trunk/Source/WebCore/dom/Document.cpp

@@ -5468 +5468 @@
     if (!m_scriptedAnimationController) {
 #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-        m_scriptedAnimationController = ScriptedAnimationController::create(this, page() ? page()->displayID() : 0);
+        m_scriptedAnimationController = ScriptedAnimationController::create(this, page() ? page()->chrome().displayID() : 0);
 #else
         m_scriptedAnimationController = ScriptedAnimationController::create(this, 0);

trunk/Source/WebCore/page/Chrome.cpp

@@ -66 +66 @@
     : m_page(page)
     , m_client(client)
+    , m_displayID(0)
 {
     ASSERT(m_client);
@@ -530 +531 @@
 #endif
 
+PlatformDisplayID Chrome::displayID() const
+{
+    return m_displayID;
+}
+
+void Chrome::windowScreenDidChange(PlatformDisplayID displayID)
+{
+    if (displayID == m_displayID)
+        return;
+
+    m_displayID = displayID;
+
+    for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+        if (frame->document())
+            frame->document()->windowScreenDidChange(displayID);
+    }
+}
+
 // --------
 

trunk/Source/WebCore/page/Chrome.h

@@ -88 +88 @@
     virtual void scheduleAnimation() OVERRIDE;
 #endif
+
+    virtual PlatformDisplayID displayID() const OVERRIDE;
+    virtual void windowScreenDidChange(PlatformDisplayID) OVERRIDE;
 
     void scrollRectIntoView(const IntRect&) const;
@@ -187 +190 @@
     Page* m_page;
     ChromeClient* m_client;
+    PlatformDisplayID m_displayID;
     Vector<PopupOpeningObserver*> m_popupOpeningObservers;
 };

trunk/Source/WebCore/page/FrameView.cpp

@@ -3976 +3976 @@
 }
 
-PlatformDisplayID FrameView::windowDisplayID() const
-{
-    if (Page* page = m_frame->page())
-        return page->displayID();
-    
-    return Widget::windowDisplayID();
-}
-
 // Normal delay
 void FrameView::setRepaintThrottlingDeferredRepaintDelay(double p)

trunk/Source/WebCore/page/FrameView.h

@@ -483 +483 @@
     virtual IntPoint convertFromContainingView(const IntPoint&) const OVERRIDE;
 
-    virtual PlatformDisplayID windowDisplayID() const OVERRIDE;
-
     // ScrollableArea interface
     virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) OVERRIDE;

trunk/Source/WebCore/page/Page.cpp

@@ -177 +177 @@
     , m_visibilityState(PageVisibilityStateVisible)
 #endif
-    , m_displayID(0)
     , m_requestedLayoutMilestones(0)
     , m_headerHeight(0)
@@ -943 +942 @@
 }
 
-void Page::windowScreenDidChange(PlatformDisplayID displayID)
-{
-    m_displayID = displayID;
-    
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
-        if (frame->document())
-            frame->document()->windowScreenDidChange(displayID);
-    }
-}
-
 void Page::suspendScriptedAnimations()
 {

trunk/Source/WebCore/page/Page.h

@@ -303 +303 @@
     bool isInWindow() const { return m_isInWindow; }
 
-    void windowScreenDidChange(PlatformDisplayID);
-
     void suspendScriptedAnimations();
     void resumeScriptedAnimations();
@@ -356 +354 @@
 #endif
 
-    PlatformDisplayID displayID() const { return m_displayID; }
-
     void addLayoutMilestones(LayoutMilestones);
     void removeLayoutMilestones(LayoutMilestones);
@@ -524 +520 @@
     PageVisibilityState m_visibilityState;
 #endif
-    PlatformDisplayID m_displayID;
 
     LayoutMilestones m_requestedLayoutMilestones;

trunk/Source/WebCore/platform/HostWindow.h

@@ -74 +74 @@
     virtual void scheduleAnimation() = 0;
 #endif
+
+    virtual PlatformDisplayID displayID() const = 0;
+    virtual void windowScreenDidChange(PlatformDisplayID) = 0;
 };
 

trunk/Source/WebCore/platform/Widget.cpp

@@ -162 +162 @@
     return point;
 }
-
-PlatformDisplayID Widget::windowDisplayID() const
-{
-    return 0;
-}
 #endif
 

trunk/Source/WebCore/platform/Widget.h

@@ -226 +226 @@
     virtual IntPoint convertToContainingView(const IntPoint&) const;
     virtual IntPoint convertFromContainingView(const IntPoint&) const;
-    
-    // Return the displayID of the screen that this widget's window is primarily on.
-    virtual PlatformDisplayID windowDisplayID() const;
 
 private:

trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm

@@ -28 +28 @@
 
 #import "FloatRect.h"
-#import "Frame.h"
-#import "Page.h"
-#import "Widget.h"
+#import "HostWindow.h"
+#import "ScrollView.h"
 #import "NotImplemented.h"
 
-@implementation NSScreen(WebCoreNSScreenUtilities)
-+ (NSScreen *)screenForDislayID:(PlatformDisplayID)displayID
+namespace WebCore {
+
+static PlatformDisplayID displayIDFromScreen(NSScreen *screen)
+{
+    return (PlatformDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] intValue];
+}
+
+static NSScreen *screenForDisplayID(PlatformDisplayID displayID)
 {
     for (NSScreen *screen in [NSScreen screens]) {
-        if ([screen displayID] == displayID)
+        if (displayIDFromScreen(screen) == displayID)
             return screen;
     }
     return nil;
 }
-
-- (PlatformDisplayID)displayID
-{
-    return (PlatformDisplayID)[[[self deviceDescription] objectForKey:@"NSScreenNumber"] intValue];
-}
-@end
-
-namespace WebCore {
 
 int screenDepth(Widget*)
@@ -69 +66 @@
 // assume that the screen and the page share the same coordinate system.
 
+static PlatformDisplayID displayFromWidget(Widget* widget)
+{
+    if (!widget)
+        return 0;
+    
+    ScrollView* view = widget->root();
+    if (!view)
+        return 0;
+
+    return view->hostWindow()->displayID();
+}
+
 static NSScreen *screenForWidget(Widget* widget, NSWindow *window)
 {
@@ -76 +85 @@
     
     // Didn't get an NSWindow; probably WebKit2. Try using the Widget's display ID.
-    if (NSScreen *screen = widget ? [NSScreen screenForDislayID:widget->windowDisplayID()] : nil)
+    if (NSScreen *screen = screenForDisplayID(displayFromWidget(widget)))
         return screen;
     

trunk/Source/WebCore/platform/mac/WidgetMac.mm

@@ -38 +38 @@
 #import "Page.h"
 #import "PlatformMouseEvent.h"
-#import "PlatformScreenMac.h"
 #import "ScrollView.h"
 #import "WebCoreFrameView.h"
@@ -357 +356 @@
 }
 
-PlatformDisplayID Widget::windowDisplayID() const
-{
-    return [[[platformWidget() window] screen] displayID];
-}
-
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -422 +422 @@
         PlatformDisplayID displayID = 0;
         if (Page* page = this->page())
-            displayID = page->displayID();
+            displayID = page->chrome().displayID();
 
         m_layerUpdater = adoptPtr(new GraphicsLayerUpdater(this, displayID));

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-06-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Move displayID stuff from Widget to Chrome
+        https://bugs.webkit.org/show_bug.cgi?id=117944
+
+        Reviewed by Anders Carlsson.
+
+        In r151877 I polluted Widget with displayID-related stuff. This would
+        be better on HostWindow, so move it there. This is a net code reduction,
+        and eliminates PlatformScreenMac.h, and the NSScreen category.
+
+        * WebView/WebView.mm:
+        (-[WebView doWindowDidChangeScreen]): Go via chrome().
+
 2013-06-21  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -117 +117 @@
 #import <WebCore/BackForwardListImpl.h>
 #import <WebCore/MemoryCache.h>
+#import <WebCore/Chrome.h>
 #import <WebCore/ColorMac.h>
 #import <WebCore/Cursor.h>
@@ -3701 +3702 @@
 {
     if (_private && _private->page)
-        _private->page->windowScreenDidChange((PlatformDisplayID)[[[[[self window] screen] deviceDescription] objectForKey:@"NSScreenNumber"] intValue]);
+        _private->page->chrome().windowScreenDidChange((PlatformDisplayID)[[[[[self window] screen] deviceDescription] objectForKey:@"NSScreenNumber"] intValue]);
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-06-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Move displayID stuff from Widget to Chrome
+        https://bugs.webkit.org/show_bug.cgi?id=117944
+
+        Reviewed by Anders Carlsson.
+
+        In r151877 I polluted Widget with displayID-related stuff. This would
+        be better on HostWindow, so move it there. This is a net code reduction,
+        and eliminates PlatformScreenMac.h, and the NSScreen category.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::windowScreenDidChange): Go via chrome().
+
 2013-06-24  Krzysztof Wolanski  <k.wolanski@samsung.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1251 +1251 @@
 void WebPage::windowScreenDidChange(uint64_t displayID)
 {
-    m_page->windowScreenDidChange(static_cast<PlatformDisplayID>(displayID));
+    m_page->chrome().windowScreenDidChange(static_cast<PlatformDisplayID>(displayID));
 }