Title: [116863] trunk/Source
- Revision
- 116863
- Author
- [email protected]
- Date
- 2012-05-12 20:51:08 -0700 (Sat, 12 May 2012)
Log Message
[wx] Restore paste implementation and fix a couple typos.
https://bugs.webkit.org/show_bug.cgi?id=86311
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (116862 => 116863)
--- trunk/Source/WebCore/ChangeLog 2012-05-13 01:40:30 UTC (rev 116862)
+++ trunk/Source/WebCore/ChangeLog 2012-05-13 03:51:08 UTC (rev 116863)
@@ -1,3 +1,13 @@
+2012-05-12 Robin Dunn <[email protected]>
+
+ [wx] Restore text paste implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=86311
+
+ Reviewed by Kevin Ollivier.
+
+ * platform/wx/PasteboardWx.cpp:
+ (WebCore::Pasteboard::plainText):
+
2012-05-12 Philip Rogers <[email protected]>
Cleanup before changing attributeName in SVG <animate>
Modified: trunk/Source/WebCore/platform/wx/PasteboardWx.cpp (116862 => 116863)
--- trunk/Source/WebCore/platform/wx/PasteboardWx.cpp 2012-05-13 01:40:30 UTC (rev 116862)
+++ trunk/Source/WebCore/platform/wx/PasteboardWx.cpp 2012-05-13 03:51:08 UTC (rev 116863)
@@ -74,7 +74,15 @@
String Pasteboard::plainText(Frame* frame)
{
- notImplemented();
+ if (wxTheClipboard->Open()) {
+ if (wxTheClipboard->IsSupported(wxDF_TEXT)) {
+ wxTextDataObject data;
+ wxTheClipboard->GetData(data);
+ wxTheClipboard->Close();
+ return data.GetText();
+ }
+ }
+
return String();
}
Modified: trunk/Source/WebKit/wx/ChangeLog (116862 => 116863)
--- trunk/Source/WebKit/wx/ChangeLog 2012-05-13 01:40:30 UTC (rev 116862)
+++ trunk/Source/WebKit/wx/ChangeLog 2012-05-13 03:51:08 UTC (rev 116863)
@@ -1,3 +1,15 @@
+2012-05-12 Robin Dunn <[email protected]>
+
+ [wx] Fix a bug with CanDecreaseTextSize and handling page breaks.
+ https://bugs.webkit.org/show_bug.cgi?id=86311
+
+ Reviewed by Kevin Ollivier.
+
+ * WebFrame.cpp:
+ (WebKit::wxWebFramePrintout::InitializeWithPageSize):
+ * WebView.cpp:
+ (WebKit::WebView::CanDecreaseTextSize):
+
2012-05-11 Robin Dunn <[email protected]>
[wx] Fix backing bitmap creation under wxMSW.
Modified: trunk/Source/WebKit/wx/WebFrame.cpp (116862 => 116863)
--- trunk/Source/WebKit/wx/WebFrame.cpp 2012-05-13 01:40:30 UTC (rev 116862)
+++ trunk/Source/WebKit/wx/WebFrame.cpp 2012-05-13 03:51:08 UTC (rev 116863)
@@ -126,7 +126,7 @@
pageRect.height = pageRect.height * mmToPoints;
}
m_pageWidth = pageRect.width;
- m_printContext.begin(m_pageWidth);
+ m_printContext.begin(m_pageWidth, pageRect.height);
// isPrinting is from the perspective of the PrintContext, so we need this when we call begin.
m_isPrinting = true;
Modified: trunk/Source/WebKit/wx/WebView.cpp (116862 => 116863)
--- trunk/Source/WebKit/wx/WebView.cpp 2012-05-13 01:40:30 UTC (rev 116862)
+++ trunk/Source/WebKit/wx/WebView.cpp 2012-05-13 03:51:08 UTC (rev 116863)
@@ -645,7 +645,7 @@
bool WebView::CanDecreaseTextSize() const
{
if (m_mainFrame)
- m_mainFrame->CanDecreaseTextSize();
+ return m_mainFrame->CanDecreaseTextSize();
return false;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
