summaryrefslogtreecommitdiffstats
path: root/WebKit/win
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/win')
-rw-r--r--WebKit/win/ChangeLog79
-rwxr-xr-xWebKit/win/Interfaces/IWebFramePrivate.idl4
-rw-r--r--WebKit/win/Interfaces/WebKit.idl1
-rw-r--r--WebKit/win/WebFrame.cpp7
-rw-r--r--WebKit/win/WebFrame.h4
-rw-r--r--WebKit/win/WebKit.vcproj/WebKit.sln14
-rw-r--r--WebKit/win/WebKitGraphics.cpp2
-rw-r--r--WebKit/win/WebView.cpp6
8 files changed, 105 insertions, 12 deletions
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 85f67b6..18f2d73 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,82 @@
+2010-06-21 Nate Chapin <japhet@chromium.org>
+
+ Unreviewed, Windows build fix.
+
+ Update WebFrame to use FrameLoaderStateMachine in
+ firstLayoutDone().
+
+ * WebFrame.cpp:
+ (WebFrame::firstLayoutDone):
+
+2010-06-15 Dumitru Daniliuc <dumi@chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Move isAvailable()/setIsAvailable() from Database/DatabaseSync to AbstractDatabase.
+ https://bugs.webkit.org/show_bug.cgi?id=39041
+
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+
+2010-06-16 Adam Roben <aroben@apple.com>
+
+ Add a "forPrinting" boolean parameter to
+ IWebFramePrivate::renderTreeAsExternalRepresentation
+
+ Fixes <http://webkit.org/b/40727> Respect
+ LayoutTestController::isPrinting on Windows.
+
+ Reviewed by Dan Bernstein.
+
+ * Interfaces/IWebFramePrivate.idl: Renamed the current
+ renderTreeAsExternalRepresentation to unused1, and added a new version
+ that takes a boolean "forPrinting" parameter.
+
+ * Interfaces/WebKit.idl: Touched to force a build.
+
+ * WebFrame.cpp:
+ (WebFrame::renderTreeAsExternalRepresentation): Added a boolean
+ "forPrinting" parameter, and used it to tell externalRepresentation
+ what kind of behavior to use.
+
+ * WebFrame.h: Renamed the old renderTreeAsExternalRepresentation and
+ added the new one.
+
+2010-06-15 Darin Adler <darin@apple.com>
+
+ Reviewed by Adam Barth.
+
+ Move functions out of Frame class that were marked "move to Chrome"
+ https://bugs.webkit.org/show_bug.cgi?id=39636
+
+ * WebView.cpp:
+ (WebView::shouldClose): Call shouldClose on FrameLoader instead of
+ going through Frame.
+
+2010-06-14 Adam Roben <aroben@apple.com>
+
+ Add WebKitLauncherWin to WebKit.sln
+
+ Fixes <http://webkit.org/b/40583>.
+
+ Reviewed by Darin Adler.
+
+ * WebKit.vcproj/WebKit.sln: Added WebKitLauncherWin.vcproj. It depends
+ on WebKitAPITest, so is the last project to build. (Also removed
+ QTMovieWin's direct dependency on JavaScriptCore, since it already has
+ an indirect dependency on it.)
+
+2010-06-14 Chang Shu <chang.shu@nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [win] Make windows compile after API changes.
+
+ https://bugs.webkit.org/show_bug.cgi?id=40434
+
+ * WebKitGraphics.cpp:
+ (WebDrawText):
+
2010-06-14 Ilya Tikhonovsky <loislo@chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebKit/win/Interfaces/IWebFramePrivate.idl b/WebKit/win/Interfaces/IWebFramePrivate.idl
index 1b7209d..b04edfe 100755
--- a/WebKit/win/Interfaces/IWebFramePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFramePrivate.idl
@@ -57,7 +57,7 @@ typedef enum {
interface IWebFramePrivate : IUnknown
{
- HRESULT renderTreeAsExternalRepresentation([out, retval] BSTR* result);
+ HRESULT unused1([out, retval] BSTR*);
HRESULT scrollOffset([out, retval] SIZE* offset);
// FIXME: This shouldn't be needed once IWebDocumentView is implemented.
@@ -112,4 +112,6 @@ interface IWebFramePrivate : IUnknown
HRESULT layerTreeAsText([out, retval] BSTR* result);
HRESULT paintScrollViewRectToContextAtPoint([in] RECT rect, [in] POINT pt, [in] OLE_HANDLE deviceContext);
+
+ HRESULT renderTreeAsExternalRepresentation([in] BOOL forPrinting, [out, retval] BSTR* result);
}
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index d25cdfe..98f5da8 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -300,3 +300,4 @@ library WebKit
[default] interface IWebUserContentURLPattern;
}
}
+
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index 75a9c8d..5705f1e 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -845,8 +845,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::childFrames(
// IWebFramePrivate ------------------------------------------------------
-HRESULT STDMETHODCALLTYPE WebFrame::renderTreeAsExternalRepresentation(
- /* [retval][out] */ BSTR *result)
+HRESULT WebFrame::renderTreeAsExternalRepresentation(BOOL forPrinting, BSTR *result)
{
if (!result)
return E_POINTER;
@@ -855,7 +854,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::renderTreeAsExternalRepresentation(
if (!coreFrame)
return E_FAIL;
- *result = BString(externalRepresentation(coreFrame)).release();
+ *result = BString(externalRepresentation(coreFrame, forPrinting ? RenderAsTextPrintingMode : RenderAsTextBehaviorNormal)).release();
return S_OK;
}
@@ -964,7 +963,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::firstLayoutDone(
if (!coreFrame)
return E_FAIL;
- *result = coreFrame->loader()->firstLayoutDone();
+ *result = coreFrame->loader()->stateMachine()->firstLayoutDone();
return S_OK;
}
diff --git a/WebKit/win/WebFrame.h b/WebKit/win/WebFrame.h
index d839f17..c14ddc9 100644
--- a/WebKit/win/WebFrame.h
+++ b/WebKit/win/WebFrame.h
@@ -155,8 +155,8 @@ public:
virtual /* [local] */ JSGlobalContextRef STDMETHODCALLTYPE globalContext();
// IWebFramePrivate
- virtual HRESULT STDMETHODCALLTYPE renderTreeAsExternalRepresentation(
- /* [retval][out] */ BSTR *result);
+ virtual HRESULT STDMETHODCALLTYPE unused1(BSTR*) { return E_NOTIMPL; }
+ virtual HRESULT STDMETHODCALLTYPE renderTreeAsExternalRepresentation(BOOL forPrinting, BSTR *result);
virtual HRESULT STDMETHODCALLTYPE counterValueForElementById(
/* [in] */ BSTR id,
diff --git a/WebKit/win/WebKit.vcproj/WebKit.sln b/WebKit/win/WebKit.vcproj/WebKit.sln
index 6f437f3..c205704 100644
--- a/WebKit/win/WebKit.vcproj/WebKit.sln
+++ b/WebKit/win/WebKit.vcproj/WebKit.sln
@@ -66,7 +66,6 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QTMovieWin", "..\..\..\WebCore\WebCore.vcproj\QTMovieWin.vcproj", "{E498CA9D-3BD2-4D52-8E37-C8DC76526325}"
ProjectSection(ProjectDependencies) = postProject
{0A324352-B3B6-496C-9E5B-4C7E923E628B} = {0A324352-B3B6-496C-9E5B-4C7E923E628B}
- {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinLauncher", "..\..\..\WebKitTools\WinLauncher\WinLauncher.vcproj", "{114FCA11-216B-4C8C-957E-30A75AE80443}"
@@ -86,6 +85,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitAPITest", "..\..\..\W
{6567DFD4-D6DE-4CD5-825D-17E353D160E1} = {6567DFD4-D6DE-4CD5-825D-17E353D160E1}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitLauncherWin", "..\..\..\WebKitTools\WebKitLauncherWin\WebKitLauncherWin.vcproj", "{D09806DB-E58B-4646-8C9B-61101906C1E2}"
+ ProjectSection(ProjectDependencies) = postProject
+ {626089A3-25D3-4883-A96C-B8C66E036397} = {626089A3-25D3-4883-A96C-B8C66E036397}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_Cairo|Win32 = Debug_Cairo|Win32
@@ -236,6 +240,14 @@ Global
{626089A3-25D3-4883-A96C-B8C66E036397}.Release_Cairo|Win32.Build.0 = Debug|Win32
{626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.ActiveCfg = Debug|Win32
{626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.Build.0 = Debug|Win32
+ {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_Cairo|Win32.ActiveCfg = Release|Win32
+ {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_Cairo|Win32.Build.0 = Release|Win32
+ {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug|Win32.ActiveCfg = Release|Win32
+ {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug|Win32.Build.0 = Release|Win32
+ {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release_Cairo|Win32.ActiveCfg = Release|Win32
+ {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release_Cairo|Win32.Build.0 = Release|Win32
+ {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release|Win32.ActiveCfg = Release|Win32
+ {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/WebKit/win/WebKitGraphics.cpp b/WebKit/win/WebKitGraphics.cpp
index d7123b4..e9e25ab 100644
--- a/WebKit/win/WebKitGraphics.cpp
+++ b/WebKit/win/WebKitGraphics.cpp
@@ -112,7 +112,7 @@ void WebDrawText(WebTextRenderInfo* info)
// Set shadow setting
if (info->structSize == sizeof(WebTextRenderInfo) &&
(info->shadowOffset.cx || info->shadowOffset.cy || info->shadowBlur || info->shadowColor))
- context.setShadow(info->shadowOffset, info->shadowBlur, info->shadowColor, DeviceColorSpace);
+ context.setShadow(FloatSize(info->shadowOffset.cx, info->shadowOffset.cy), info->shadowBlur, info->shadowColor, DeviceColorSpace);
WebCoreDrawTextAtPoint(context, drawString, info->pt, makeFont(*(info->description)), info->color, info->underlinedIndex);
context.restore();
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index a85cc92..a1aa5c2 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -62,6 +62,7 @@
#include <JavaScriptCore/InitializeThreading.h>
#include <JavaScriptCore/JSLock.h>
#include <JavaScriptCore/JSValue.h>
+#include <WebCore/AbstractDatabase.h>
#include <WebCore/AXObjectCache.h>
#include <WebCore/ApplicationCacheStorage.h>
#include <WebCore/BString.h>
@@ -73,7 +74,6 @@
#include <WebCore/ContextMenuController.h>
#include <WebCore/CookieStorageWin.h>
#include <WebCore/Cursor.h>
-#include <WebCore/Database.h>
#include <WebCore/Document.h>
#include <WebCore/DragController.h>
#include <WebCore/DragData.h>
@@ -4710,7 +4710,7 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
hr = prefsPrivate->databasesEnabled(&enabled);
if (FAILED(hr))
return hr;
- Database::setIsAvailable(enabled);
+ AbstractDatabase::setIsAvailable(enabled);
#endif
hr = prefsPrivate->localStorageEnabled(&enabled);
@@ -5197,7 +5197,7 @@ HRESULT STDMETHODCALLTYPE WebView::shouldClose(
*result = TRUE;
if (Frame* frame = m_page->mainFrame())
- *result = frame->shouldClose() ? TRUE : FALSE;
+ *result = frame->loader()->shouldClose();
return S_OK;
}
generated by cgit v1.1 at 2025-08-24 21:43:09 +0000