diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/bindings/scripts/preprocessor.pm | 3 | ||||
| -rw-r--r-- | Source/WebCore/rendering/RenderLayerBacking.cpp | 3 | ||||
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 4 | ||||
| -rw-r--r-- | Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp | 4 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/Source/WebCore/bindings/scripts/preprocessor.pm b/Source/WebCore/bindings/scripts/preprocessor.pm index cb30f80c0..eb41818cb 100644 --- a/Source/WebCore/bindings/scripts/preprocessor.pm +++ b/Source/WebCore/bindings/scripts/preprocessor.pm @@ -64,6 +64,9 @@ sub applyPreprocessor my @macros = grep { $_ } split(/\s+/, $defines); # grep skips empty macros. @macros = map { "-D$_" } @macros; + # Remove double quotation from $preprocessor + $preprocessor =~ s/\'//g; + my $pid = 0; if ($Config{osname} eq "cygwin" || $Config{osname} eq 'MSWin32') { # This call can fail if Windows rebases cygwin, so retry a few times until it succeeds. diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp index acfc67776..b653a0fb9 100644 --- a/Source/WebCore/rendering/RenderLayerBacking.cpp +++ b/Source/WebCore/rendering/RenderLayerBacking.cpp @@ -315,7 +315,8 @@ void RenderLayerBacking::createPrimaryGraphicsLayer() m_childContainmentLayer = createGraphicsLayer("TiledBacking Flattening Layer"); if (m_isMainFrameRenderViewLayer) { - m_graphicsLayer->setContentsOpaque(true); + bool viewIsTransparent = compositor()->viewHasTransparentBackground(0); + m_graphicsLayer->setContentsOpaque(!viewIsTransparent); m_graphicsLayer->setAppliesPageScale(); } diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp index 25777d8c0..f798aff3b 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp @@ -3348,9 +3348,7 @@ QWebPage::VisibilityState QWebPage::visibilityState() const \fn void QWebPage::scrollRequested(int dx, int dy, const QRect& rectToScroll) This signal is emitted whenever the content given by \a rectToScroll needs - to be scrolled \a dx and \a dy downwards and no view was set. - - \sa view() + to be scrolled \a dx and \a dy downwards. */ /*! diff --git a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp index db3994667..f967a45a6 100644 --- a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp +++ b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp @@ -248,8 +248,8 @@ void QStyleFacadeImp::paintButton(QPainter* painter, QStyleFacade::ButtonType ty QWidget* widget = qobject_cast<QWidget*>(widgetForPainter(painter)); MappedStyleOption<QStyleOptionButton> option(widget, proxyOption); - if (m_style->inherits("QWindowsVistaStyle") || QApplication::style()->inherits("QWindowsVistaStyle")) - option.styleObject = 0; + if (option.styleObject) + option.styleObject->setProperty("_q_no_animation", true); if (type == PushButton) style()->drawControl(QStyle::CE_PushButton, &option, painter, widget); diff --git a/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp b/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp index eebf20d76..8aaadb73c 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp @@ -42,7 +42,7 @@ public: /*! \qmltype WebLoadRequest \instantiates QWebLoadRequest - \inqmlmodule QtWebKit 3.0 + \inqmlmodule QtWebKit \brief A utility class for the WebView::loadingChanged signal. |