summaryrefslogtreecommitdiffstats
path: root/WebKit/win
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/win')
-rw-r--r--WebKit/win/ChangeLog96
-rwxr-xr-xWebKit/win/Interfaces/IWebFramePrivate.idl2
-rw-r--r--WebKit/win/Interfaces/IWebViewPrivate.idl2
-rw-r--r--WebKit/win/Interfaces/WebKit.idl1
-rw-r--r--WebKit/win/WebCoreSupport/WebInspectorClient.cpp7
-rw-r--r--WebKit/win/WebCoreSupport/WebInspectorClient.h16
-rw-r--r--WebKit/win/WebFrame.cpp7
-rw-r--r--WebKit/win/WebFrame.h2
-rw-r--r--WebKit/win/WebView.cpp7
-rw-r--r--WebKit/win/WebView.h2
10 files changed, 127 insertions, 15 deletions
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 2979556..85f67b6 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,99 @@
+2010-06-14 Ilya Tikhonovsky <loislo@chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ WebInspector: On the way to Remote Debugging we want to transfer dom/timeline/etc
+ data from inspected page to WebInspector as JSON string via http. The native
+ serialization to JSON string is supported by InspectorValue's classes. This patch
+ has the implementation of sendMessageToFrontend function. WebKit version of it still
+ uses ScriptFunctionCall and will be switched to another transport a little bit later.
+ https://bugs.webkit.org/show_bug.cgi?id=40134
+
+ * WebCoreSupport/WebInspectorClient.cpp:
+ (WebInspectorClient::WebInspectorClient):
+ (WebInspectorClient::~WebInspectorClient):
+ (WebInspectorClient::openInspectorFrontend):
+ * WebCoreSupport/WebInspectorClient.h:
+
+2010-06-10 Eric Seidel <eric@webkit.org>
+
+ Reviewed by Adam Barth.
+
+ Reduce FrameView.h includes to speed up build times
+ https://bugs.webkit.org/show_bug.cgi?id=40408
+
+ Another fix for Windows.
+
+ * WebView.cpp:
+
+2010-06-09 Sheriff Bot <webkit.review.bot@gmail.com>
+
+ Unreviewed, rolling out r60889.
+ http://trac.webkit.org/changeset/60889
+ https://bugs.webkit.org/show_bug.cgi?id=40365
+
+ gtk bot has some kind of memory corruption (Requested by
+ loislo on #webkit).
+
+ * WebCoreSupport/WebInspectorClient.cpp:
+ (WebInspectorClient::WebInspectorClient):
+ (WebInspectorClient::~WebInspectorClient):
+ (WebInspectorClient::openInspectorFrontend):
+ * WebCoreSupport/WebInspectorClient.h:
+ (WebInspectorClient::frontendClosing):
+
+2010-06-07 Ilya Tikhonovsky <loislo@chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ WebInspector: On the way to Remote Debugging we want to transfer dom/timeline/etc
+ data from inspected page to WebInspector as JSON string via http. The native
+ serialization to JSON string is supported by InspectorValue's classes. This patch
+ has the implementation of sendMessageToFrontend function. WebKit version of it still
+ uses ScriptFunctionCall and will be switched to another transport a little bit later.
+ https://bugs.webkit.org/show_bug.cgi?id=40134
+
+ * WebCoreSupport/WebInspectorClient.cpp:
+ (WebInspectorClient::WebInspectorClient):
+ (WebInspectorClient::~WebInspectorClient):
+ (WebInspectorClient::openInspectorFrontend):
+ * WebCoreSupport/WebInspectorClient.h:
+
+2010-06-08 Antonio Gomes <tonikitoo@webkit.org>
+
+ Reviewed by Ojan Vafai and Darin Adler.
+
+ Refactor platform dependent editing behavior code out of Settings
+ https://bugs.webkit.org/show_bug.cgi?id=39854
+
+ EditingBehavior enum was renamed to EditingBehaviorTypes and moved out from Settings.h to
+ EditingBehaviorTypes.h . Call sites in WebKit/ adjusted accordingly.
+
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+
+2010-06-04 Alice Liu <alice.liu@apple.com>
+
+ Reviewed by Jon Honeycutt.
+
+ WebFrame::paintDocumentRectToContextAtPoint doesn't paint scrollbars
+ https://bugs.webkit.org/show_bug.cgi?id=40034
+ <rdar://problem/7799848>
+
+ * WebFrame.cpp:
+ (WebFrame::paintScrollViewRectToContextAtPoint): Renamed from paintDocumentRectToContextAtPoint.
+ Call paint() instead of paintContents(). Also move the dirtyRect to counteract the moving that happens in paint().
+
+ Just renaming changes:
+ * Interfaces/IWebFramePrivate.idl:
+ * Interfaces/IWebViewPrivate.idl:
+ * WebFrame.h:
+ * WebView.cpp:
+ (WebView::paintScrollViewRectToContextAtPoint):
+ * WebView.h:
+
+ * Interfaces/WebKit.idl: Touched for rebuild.
+
2010-05-30 Daniel Bates <dbates@rim.com>
Unreviewed, attempt to fix the build after http://trac.webkit.org/changeset/60418.
diff --git a/WebKit/win/Interfaces/IWebFramePrivate.idl b/WebKit/win/Interfaces/IWebFramePrivate.idl
index 80a3e24..1b7209d 100755
--- a/WebKit/win/Interfaces/IWebFramePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFramePrivate.idl
@@ -111,5 +111,5 @@ interface IWebFramePrivate : IUnknown
HRESULT layerTreeAsText([out, retval] BSTR* result);
- HRESULT paintDocumentRectToContextAtPoint([in] RECT rect, [in] POINT pt, [in] OLE_HANDLE deviceContext);
+ HRESULT paintScrollViewRectToContextAtPoint([in] RECT rect, [in] POINT pt, [in] OLE_HANDLE deviceContext);
}
diff --git a/WebKit/win/Interfaces/IWebViewPrivate.idl b/WebKit/win/Interfaces/IWebViewPrivate.idl
index 1bf21d5..352ae7e 100644
--- a/WebKit/win/Interfaces/IWebViewPrivate.idl
+++ b/WebKit/win/Interfaces/IWebViewPrivate.idl
@@ -234,7 +234,7 @@ interface IWebViewPrivate : IUnknown
HRESULT nextDisplayIsSynchronous();
- HRESULT paintDocumentRectToContextAtPoint([in] RECT rect, [in] POINT pt, [in] OLE_HANDLE dc);
+ HRESULT paintScrollViewRectToContextAtPoint([in] RECT rect, [in] POINT pt, [in] OLE_HANDLE dc);
[local] HRESULT reportException([in] JSContextRef context, [in] JSValueRef exception);
}
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index 98f5da8..d25cdfe 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -300,4 +300,3 @@ library WebKit
[default] interface IWebUserContentURLPattern;
}
}
-
diff --git a/WebKit/win/WebCoreSupport/WebInspectorClient.cpp b/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
index 3c263e5..34fb827 100644
--- a/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
@@ -69,6 +69,7 @@ static CFBundleRef getWebKitBundle()
WebInspectorClient::WebInspectorClient(WebView* webView)
: m_inspectedWebView(webView)
+ , m_frontendPage(0)
{
ASSERT(m_inspectedWebView);
m_inspectedWebView->viewWindow((OLE_HANDLE*)&m_inspectedWebViewHwnd);
@@ -76,6 +77,7 @@ WebInspectorClient::WebInspectorClient(WebView* webView)
WebInspectorClient::~WebInspectorClient()
{
+ m_frontendPage = 0;
}
void WebInspectorClient::inspectorDestroyed()
@@ -172,8 +174,9 @@ void WebInspectorClient::openInspectorFrontend(InspectorController* inspectorCon
if (FAILED(frontendWebView->topLevelFrame()->loadRequest(request.get())))
return;
- Page* page = core(frontendWebView.get());
- page->inspectorController()->setInspectorFrontendClient(new WebInspectorFrontendClient(m_inspectedWebView, m_inspectedWebViewHwnd, frontendHwnd, frontendWebView, frontendWebViewHwnd, this));
+ m_frontendPage = core(frontendWebView.get());
+ WebInspectorFrontendClient* frontendClient = new WebInspectorFrontendClient(m_inspectedWebView, m_inspectedWebViewHwnd, frontendHwnd, frontendWebView, frontendWebViewHwnd, this);
+ m_frontendPage->inspectorController()->setInspectorFrontendClient(frontendClient);
m_frontendHwnd = frontendHwnd;
}
diff --git a/WebKit/win/WebCoreSupport/WebInspectorClient.h b/WebKit/win/WebCoreSupport/WebInspectorClient.h
index 64773a5..17a8d99 100644
--- a/WebKit/win/WebCoreSupport/WebInspectorClient.h
+++ b/WebKit/win/WebCoreSupport/WebInspectorClient.h
@@ -37,6 +37,12 @@
#include <wtf/OwnPtr.h>
#include <windows.h>
+namespace WebCore {
+
+class Page;
+
+}
+
class WebNodeHighlight;
class WebView;
@@ -55,13 +61,21 @@ public:
virtual void populateSetting(const WebCore::String& key, WebCore::String* value);
virtual void storeSetting(const WebCore::String& key, const WebCore::String& value);
+ virtual bool sendMessageToFrontend(const WebCore::String&);
+
void updateHighlight();
- void frontendClosing() { m_frontendHwnd = 0; }
+ void frontendClosing()
+ {
+ m_frontendHwnd = 0;
+ releaseFrontendPage();
+ }
+ void releaseFrontendPage();
private:
~WebInspectorClient();
WebView* m_inspectedWebView;
+ WebCore::Page* m_frontendPage;
HWND m_inspectedWebViewHwnd;
HWND m_frontendHwnd;
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index 22bd339..75a9c8d 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -359,7 +359,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::paintDocumentRectToContext(
return S_OK;
}
-HRESULT STDMETHODCALLTYPE WebFrame::paintDocumentRectToContextAtPoint(
+HRESULT STDMETHODCALLTYPE WebFrame::paintScrollViewRectToContextAtPoint(
/* [in] */ RECT rect,
/* [in] */ POINT pt,
/* [in] */ OLE_HANDLE deviceContext)
@@ -380,9 +380,8 @@ HRESULT STDMETHODCALLTYPE WebFrame::paintDocumentRectToContextAtPoint(
gc.setShouldIncludeChildWindows(true);
gc.save();
IntRect dirtyRect(rect);
- gc.translate(-pt.x, -pt.y);
- gc.clip(dirtyRect);
- view->paintContents(&gc, rect);
+ dirtyRect.move(-pt.x, -pt.y);
+ view->paint(&gc, dirtyRect);
gc.restore();
return S_OK;
diff --git a/WebKit/win/WebFrame.h b/WebKit/win/WebFrame.h
index b556192..d839f17 100644
--- a/WebKit/win/WebFrame.h
+++ b/WebKit/win/WebFrame.h
@@ -245,7 +245,7 @@ public:
/* [in] */ RECT rect,
/* [in] */ OLE_HANDLE deviceContext);
- virtual HRESULT STDMETHODCALLTYPE paintDocumentRectToContextAtPoint(
+ virtual HRESULT STDMETHODCALLTYPE paintScrollViewRectToContextAtPoint(
/* [in] */ RECT rect,
/* [in] */ POINT pt,
/* [in] */ OLE_HANDLE deviceContext);
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 525108f..a85cc92 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -110,6 +110,7 @@
#include <WebCore/PluginView.h>
#include <WebCore/PopupMenu.h>
#include <WebCore/ProgressTracker.h>
+#include <WebCore/RenderLayer.h>
#include <WebCore/RenderTheme.h>
#include <WebCore/RenderView.h>
#include <WebCore/RenderWidget.h>
@@ -4654,7 +4655,7 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
hr = preferences->editingBehavior(&editingBehavior);
if (FAILED(hr))
return hr;
- settings->setEditingBehavior((EditingBehavior)editingBehavior);
+ settings->setEditingBehaviorType((EditingBehaviorType)editingBehavior);
hr = preferences->usesPageCache(&enabled);
if (FAILED(hr))
@@ -5676,7 +5677,7 @@ HRESULT STDMETHODCALLTYPE WebView::paintDocumentRectToContext(
return m_mainFrame->paintDocumentRectToContext(rect, deviceContext);
}
-HRESULT STDMETHODCALLTYPE WebView::paintDocumentRectToContextAtPoint(
+HRESULT STDMETHODCALLTYPE WebView::paintScrollViewRectToContextAtPoint(
/* [in] */ RECT rect,
/* [in] */ POINT pt,
/* [in] */ OLE_HANDLE deviceContext)
@@ -5687,7 +5688,7 @@ HRESULT STDMETHODCALLTYPE WebView::paintDocumentRectToContextAtPoint(
if (!m_mainFrame)
return E_FAIL;
- return m_mainFrame->paintDocumentRectToContextAtPoint(rect, pt, deviceContext);
+ return m_mainFrame->paintScrollViewRectToContextAtPoint(rect, pt, deviceContext);
}
HRESULT STDMETHODCALLTYPE WebView::reportException(
diff --git a/WebKit/win/WebView.h b/WebKit/win/WebView.h
index d44e6c6..514f376 100644
--- a/WebKit/win/WebView.h
+++ b/WebKit/win/WebView.h
@@ -697,7 +697,7 @@ public:
/* [in] */ RECT rect,
/* [in] */ OLE_HANDLE dc);
- virtual HRESULT STDMETHODCALLTYPE paintDocumentRectToContextAtPoint(
+ virtual HRESULT STDMETHODCALLTYPE paintScrollViewRectToContextAtPoint(
/* [in] */ RECT rect,
/* [in] */ POINT pt,
/* [in] */ OLE_HANDLE dc);
generated by cgit v1.1 at 2025-06-03 23:24:53 +0000