Changeset 55542 in webkit

Timestamp:

Mar 4, 2010 12:08:38 PM (14 years ago)

Author:

Beth Dakin

Message:

WebCore: This fixes the layering violation I committed yesterday by moving
Page::instanceHandle into its own file just in the WebCore
namespace.

Reviewed by Anders Carlsson.

Added WebCoreInstanceHandle.h + .cpp and removed PageWin.cpp

• WebCore.vcproj/WebCore.vcproj:
• page/win/PageWin.cpp: Removed.

Remove all instance handle code from Page.

• page/Page.h:

New files.

• platform/win/WebCoreInstanceHandle.cpp: Added.
• platform/win/WebCoreInstanceHandle.h: Added.

(WebCore::setInstanceHandle):
(WebCore::instanceHandle):

Switch to WebCore::instanceHandle() instead of
Page::instanceHandle() and include the new header.

• platform/graphics/win/WKCACFLayerRenderer.cpp:

(WebCore::WKCACFLayerRenderer::acceleratedCompositingAvailable):

• platform/win/PasteboardWin.cpp:

(WebCore::Pasteboard::Pasteboard):

• platform/win/PopupMenuWin.cpp:

(WebCore::PopupMenu::show):
(WebCore::PopupMenu::registerClass):

• platform/win/SharedTimerWin.cpp:

(WebCore::initializeOffScreenTimerWindow):

• plugins/win/PluginViewWin.cpp:

(WebCore::registerPluginView):
(WebCore::PluginView::platformStart):

WebKit/win: WebCore::Page::setInstanceHandle() is now just
WebCore::setInstanceHandle()

Reviewed by Anders Carlsson.

• WebKitDLL.cpp:

(DllMain):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.vcproj/WebCore.vcproj (modified) (2 diffs)
• WebCore/page/Page.h (modified) (3 diffs)
• WebCore/page/win/PageWin.cpp (deleted)
• WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp (modified) (2 diffs)
• WebCore/platform/win/PasteboardWin.cpp (modified) (2 diffs)
• WebCore/platform/win/PopupMenuWin.cpp (modified) (3 diffs)
• WebCore/platform/win/SharedTimerWin.cpp (modified) (2 diffs)
• WebCore/platform/win/WebCoreInstanceHandle.cpp (added)
• WebCore/platform/win/WebCoreInstanceHandle.h (added)
• WebCore/plugins/win/PluginViewWin.cpp (modified) (4 diffs)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebKitDLL.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-04  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        This fixes the layering violation I committed yesterday by moving 
+        Page::instanceHandle into its own file just in the WebCore 
+        namespace.
+
+        Added WebCoreInstanceHandle.h + .cpp and removed PageWin.cpp
+        * WebCore.vcproj/WebCore.vcproj:
+        * page/win/PageWin.cpp: Removed.
+
+        Remove all instance handle code from Page.
+        * page/Page.h:
+
+        New files.
+        * platform/win/WebCoreInstanceHandle.cpp: Added.
+        * platform/win/WebCoreInstanceHandle.h: Added.
+        (WebCore::setInstanceHandle):
+        (WebCore::instanceHandle):
+
+        Switch to WebCore::instanceHandle() instead of 
+        Page::instanceHandle() and include the new header.
+        * platform/graphics/win/WKCACFLayerRenderer.cpp:
+        (WebCore::WKCACFLayerRenderer::acceleratedCompositingAvailable):
+        * platform/win/PasteboardWin.cpp:
+        (WebCore::Pasteboard::Pasteboard):
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::PopupMenu::show):
+        (WebCore::PopupMenu::registerClass):
+        * platform/win/SharedTimerWin.cpp:
+        (WebCore::initializeOffScreenTimerWindow):
+        * plugins/win/PluginViewWin.cpp:
+        (WebCore::registerPluginView):
+        (WebCore::PluginView::platformStart):
+
 2010-03-04  Antonio Gomes  <tonikitoo@webkit.org>
 

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -21096 +21096 @@
                                         >
                                 </File>
-                                <File
-                                        RelativePath="..\page\win\PageWin.cpp"
-                                        >
-                                </File>
                         </Filter>
                 </Filter>
@@ -22268 +22264 @@
                                 <File
                                         RelativePath="..\platform\win\WCDataObject.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\platform\win\WebCoreInstanceHandle.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\platform\win\WebCoreInstanceHandle.h"
                                         >
                                 </File>

trunk/WebCore/page/Page.h

@@ -30 +30 @@
 #if PLATFORM(MAC)
 #include "SchedulePair.h"
-#endif
-
-#if PLATFORM(WIN) || (PLATFORM(WX) && OS(WINDOWS)) || (PLATFORM(QT) && defined(Q_WS_WIN))
-typedef struct HINSTANCE__* HINSTANCE;
 #endif
 
@@ -208 +204 @@
         JSC::Debugger* debugger() const { return m_debugger; }
 
-#if PLATFORM(WIN) || (PLATFORM(WX) && OS(WINDOWS)) || (PLATFORM(QT) && defined(Q_WS_WIN))
-        // The global DLL or application instance used for all windows.
-        static void setInstanceHandle(HINSTANCE instanceHandle) { s_instanceHandle = instanceHandle; }
-        static HINSTANCE instanceHandle() { return s_instanceHandle; }
-#endif
-
         static void removeAllVisitedLinks();
 
@@ -323 +313 @@
 #endif
 
-#if PLATFORM(WIN) || (PLATFORM(WX) && defined(__WXMSW__)) || (PLATFORM(QT) && defined(Q_WS_WIN))
-        static HINSTANCE s_instanceHandle;
-#endif
-
 #if ENABLE(WML)
         OwnPtr<WMLPageState> m_wmlPageState;

trunk/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp

@@ -30 +30 @@
 #include "WKCACFLayerRenderer.h"
 
-#include "Page.h"
 #include "WKCACFContextFlusher.h"
 #include "WKCACFLayer.h"
+#include "WebCoreInstanceHandle.h"
 #include <CoreGraphics/CGSRegion.h>
 #include <QuartzCore/CACFContext.h>
@@ -153 +153 @@
     wcex.cbSize = sizeof(WNDCLASSEX);
     wcex.lpfnWndProc = DefWindowProc;
-    wcex.hInstance = Page::instanceHandle();
+    wcex.hInstance = WebCore::instanceHandle();
     wcex.lpszClassName = L"CoreAnimationTesterWindowClass";
     ::RegisterClassEx(&wcex);

trunk/WebCore/platform/win/PasteboardWin.cpp

@@ -41 +41 @@
 #include "RenderImage.h"
 #include "TextEncoding.h"
+#include "WebCoreInstanceHandle.h"
 #include "markup.h"
 
@@ -89 +90 @@
     wcex.cbSize = sizeof(WNDCLASSEX);
     wcex.lpfnWndProc    = PasteboardOwnerWndProc;
-    wcex.hInstance      = Page::instanceHandle();
+    wcex.hInstance      = WebCore::instanceHandle();
     wcex.lpszClassName  = L"PasteboardOwnerWindowClass";
     ::RegisterClassEx(&wcex);

trunk/WebCore/platform/win/PopupMenuWin.cpp

@@ -40 +40 @@
 #include "ScrollbarTheme.h"
 #include "SimpleFontData.h"
+#include "WebCoreInstanceHandle.h"
 #include <tchar.h>
 #include <windows.h>
@@ -141 +142 @@
             WS_POPUP | WS_BORDER,
             m_windowRect.x(), m_windowRect.y(), m_windowRect.width(), m_windowRect.height(),
-            hostWindow, 0, Page::instanceHandle(), this);
+            hostWindow, 0, WebCore::instanceHandle(), this);
 
         if (!m_popup)
@@ -724 +725 @@
     wcex.cbClsExtra     = 0;
     wcex.cbWndExtra     = sizeof(PopupMenu*); // For the PopupMenu pointer
-    wcex.hInstance      = Page::instanceHandle();
+    wcex.hInstance      = WebCore::instanceHandle();
     wcex.hIcon          = 0;
     wcex.hCursor        = LoadCursor(0, IDC_ARROW);

trunk/WebCore/platform/win/SharedTimerWin.cpp

@@ -29 +29 @@
 #include "Page.h"
 #include "Settings.h"
+#include "WebCoreInstanceHandle.h"
 #include "Widget.h"
 #include <wtf/Assertions.h>
@@ -126 +127 @@
     wcex.cbSize = sizeof(WNDCLASSEX);
     wcex.lpfnWndProc    = TimerWindowWndProc;
-    wcex.hInstance      = Page::instanceHandle();
+    wcex.hInstance      = WebCore::instanceHandle();
     wcex.lpszClassName  = kTimerWindowClassName;
     RegisterClassEx(&wcex);
 
     timerWindowHandle = CreateWindow(kTimerWindowClassName, 0, 0,
-       CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, HWND_MESSAGE, 0, Page::instanceHandle(), 0);
+       CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, HWND_MESSAGE, 0, WebCore::instanceHandle(), 0);
     timerFiredMessage = RegisterWindowMessage(L"com.apple.WebKit.TimerFired");
 }

trunk/WebCore/plugins/win/PluginViewWin.cpp

@@ -61 +61 @@
 #include "ScriptController.h"
 #include "Settings.h"
+#include "WebCoreInstanceHandle.h"
 #include "c_instance.h"
 #include "npruntime_impl.h"
@@ -289 +290 @@
 
 #if PLATFORM(QT)
-    Page::setInstanceHandle((HINSTANCE)(qWinAppInst()));
-#endif
-
-    ASSERT(Page::instanceHandle());
+    WebCore::setInstanceHandle((HINSTANCE)(qWinAppInst()));
+#endif
+
+    ASSERT(WebCore::instanceHandle());
 
 #if OS(WINCE)
@@ -309 +310 @@
     wcex.cbClsExtra     = 0;
     wcex.cbWndExtra     = 0;
-    wcex.hInstance      = Page::instanceHandle();
+    wcex.hInstance      = WebCore::instanceHandle();
     wcex.hIcon          = 0;
     wcex.hCursor        = LoadCursor(0, IDC_ARROW);
@@ -968 +969 @@
         HWND parentWindowHandle = windowHandleForPageClient(m_parentFrame->view()->hostWindow()->platformPageClient());
         HWND window = ::CreateWindowEx(0, kWebPluginViewdowClassName, 0, flags,
-                                       0, 0, 0, 0, parentWindowHandle, 0, Page::instanceHandle(), 0);
+                                       0, 0, 0, 0, parentWindowHandle, 0, WebCore::instanceHandle(), 0);
 
 #if OS(WINDOWS) && (PLATFORM(QT) || PLATFORM(WX))

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2010-03-04  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        WebCore::Page::setInstanceHandle() is now just 
+        WebCore::setInstanceHandle()
+
+        * WebKitDLL.cpp:
+        (DllMain):
+
 2010-03-03  Alice Liu  <alice.liu@apple.com>
 

trunk/WebKit/win/WebKitDLL.cpp

@@ -37 +37 @@
 #include <WebCore/RenderThemeWin.h>
 #include <WebCore/SharedBuffer.h>
+#include <WebCore/WebCoreInstanceHandle.h>
 #include <WebCore/Widget.h>
 #include <wtf/Vector.h>
@@ -61 +62 @@
             gLockCount = gClassCount = 0;
             gInstance = hModule;
-            WebCore::Page::setInstanceHandle(hModule);
+            WebCore::setInstanceHandle(hModule);
             return TRUE;