[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
kevino at webkit.org
kevino at webkit.org
Wed Dec 22 13:25:30 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6f6396d9902fe7138d495ec86837aa6661bab991
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 14 23:46:58 2010 +0000
[wx] Build fixes after recent changes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67515 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4237d81..6d37089 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-14 Kevin Ollivier <kevino at theolliviers.com>
+
+ [wx] Build fix after move of selectedText() method.
+
+ * platform/wx/PasteboardWx.cpp:
+ (WebCore::Pasteboard::writeSelection):
+
2010-09-14 Adam Barth <abarth at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebCore/platform/wx/PasteboardWx.cpp b/WebCore/platform/wx/PasteboardWx.cpp
index 207c63c..4677d14 100644
--- a/WebCore/platform/wx/PasteboardWx.cpp
+++ b/WebCore/platform/wx/PasteboardWx.cpp
@@ -53,7 +53,7 @@ Pasteboard* Pasteboard::generalPasteboard()
void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete, Frame* frame)
{
if (wxTheClipboard->Open()) {
- wxTheClipboard->SetData( new wxTextDataObject(frame->selectedText()) );
+ wxTheClipboard->SetData( new wxTextDataObject(frame->editor()->selectedText()) );
wxTheClipboard->Close();
}
}
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index d2b7271..c764c5f 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-14 Kevin Ollivier <kevino at theolliviers.com>
+
+ [wx] Build fix after FrameNetworkingContext changes and setZoomLevel changes.
+
+ * WebFrame.cpp:
+ (wxWebFrame::IncreaseTextSize):
+ (wxWebFrame::DecreaseTextSize):
+ (wxWebFrame::ResetTextSize):
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::createNetworkingContext):
+ * WebKitSupport/FrameLoaderClientWx.h:
+ * WebKitSupport/FrameNetworkingContextWx.h: Added.
+ (WebCore::FrameNetworkingContextWx::create):
+ (WebCore::FrameNetworkingContextWx::coreFrame):
+ (WebCore::FrameNetworkingContextWx::FrameNetworkingContextWx):
+
2010-09-13 Enrica Casucci <enrica at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index 3a556d5..f0d68a7 100644
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -373,7 +373,7 @@ void wxWebFrame::IncreaseTextSize()
{
if (CanIncreaseTextSize()) {
m_textMagnifier = m_textMagnifier*TextSizeMultiplierRatio;
- m_impl->frame->view()->setZoomFactor(m_textMagnifier, WebCore::ZoomTextOnly);
+ m_impl->frame->view()->setTextZoomFactor(m_textMagnifier);
}
}
@@ -390,7 +390,7 @@ void wxWebFrame::DecreaseTextSize()
{
if (CanDecreaseTextSize()) {
m_textMagnifier = m_textMagnifier/TextSizeMultiplierRatio;
- m_impl->frame->view()->setZoomFactor(m_textMagnifier, WebCore::ZoomTextOnly);
+ m_impl->frame->view()->setTextZoomFactor(m_textMagnifier);
}
}
@@ -398,7 +398,7 @@ void wxWebFrame::ResetTextSize()
{
m_textMagnifier = 1.0;
if (m_impl->frame && m_impl->frame->view())
- m_impl->frame->view()->setZoomFactor(m_textMagnifier, WebCore::ZoomTextOnly);
+ m_impl->frame->view()->setTextZoomFactor(m_textMagnifier);
}
void wxWebFrame::MakeEditable(bool enable)
diff --git a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
index 0dcbf69..facb387 100644
--- a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
+++ b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
@@ -55,6 +55,7 @@
#include <stdio.h>
+#include "FrameNetworkingContextWx.h"
#include "WebFrame.h"
#include "WebFramePrivate.h"
#include "WebView.h"
@@ -969,4 +970,9 @@ bool FrameLoaderClientWx::shouldUsePluginDocument(const String &mimeType) const
return false;
}
+PassRefPtr<FrameNetworkingContext> FrameLoaderClientWx::createNetworkingContext()
+{
+ return FrameNetworkingContextWx::create(m_frame);
+}
+
}
diff --git a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
index c8c9b83..20b50d3 100644
--- a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
+++ b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
@@ -221,6 +221,8 @@ namespace WebCore {
virtual void registerForIconNotification(bool listen = true);
virtual bool shouldUsePluginDocument(const String &mimeType) const;
+
+ virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext();
private:
wxWebFrame *m_webFrame;
diff --git a/WebKit/wx/WebKitSupport/FrameNetworkingContextWx.h b/WebKit/wx/WebKitSupport/FrameNetworkingContextWx.h
new file mode 100644
index 0000000..3aa2374
--- /dev/null
+++ b/WebKit/wx/WebKitSupport/FrameNetworkingContextWx.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2010 Kevin Ollivier <kevino at theolliviers.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FrameNetworkingContextWx_h
+#define FrameNetworkingContextWx_h
+
+#include "FrameNetworkingContext.h"
+
+namespace WebCore {
+
+class FrameNetworkingContextWx : public WebCore::FrameNetworkingContext {
+public:
+ static PassRefPtr<FrameNetworkingContextWx> create(WebCore::Frame* frame)
+ {
+ return adoptRef(new FrameNetworkingContextWx(frame));
+ }
+
+ WebCore::Frame* coreFrame() const { return frame(); }
+
+private:
+ FrameNetworkingContextWx(WebCore::Frame* frame)
+ : WebCore::FrameNetworkingContext(frame)
+ {
+ }
+};
+
+}
+
+#endif
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5aadec9..a5c6c8f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-14 Kevin Ollivier <kevino at theolliviers.com>
+
+ [wx] Build fix, add newly added directories to the directory list.
+
+ * wx/build/settings.py:
+
2010-09-14 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index 7dfaa5f..cd3358c 100644
--- a/WebKitTools/wx/build/settings.py
+++ b/WebKitTools/wx/build/settings.py
@@ -102,6 +102,7 @@ webcore_dirs = [
'WebCore/bindings/cpp',
'WebCore/bindings/generic',
'WebCore/bindings/js',
+ 'WebCore/bindings/js/specialization',
'WebCore/bridge',
'WebCore/bridge/c',
'WebCore/bridge/jsc',
@@ -141,12 +142,14 @@ webcore_dirs = [
'WebCore/platform/text/transcoder',
'WebCore/plugins',
'WebCore/rendering',
- 'WebCore/rendering/style',
+ 'WebCore/rendering/style',
+ 'WebCore/rendering/svg',
'WebCore/storage',
'WebCore/svg',
'WebCore/svg/animation',
'WebCore/svg/graphics',
'WebCore/svg/graphics/filters',
+
'WebCore/websockets',
'WebCore/xml'
]
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list