Changing tests to be consistent and use self.scm rather then recreating the scm object.
(Missed a couple)
https://bugs.webkit.org/show_bug.cgi?id=106536

Patch by Tim 'mithro' Ansell <mithro@mithis.com> on 2013-01-10
Reviewed by Eric Seidel.

* Scripts/webkitpy/common/checkout/scm/scm_unittest.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@139338 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Manually revert http://trac.webkit.org/changeset/136012
https://bugs.webkit.org/show_bug.cgi?id=106580

Reviewed by Dimitri Glazkov.

Source/WebCore:

136012 broke touch-scrolling of an overflow div in an iframe. Revert manually
to work around conflicts.

* page/EventHandler.cpp:
(WebCore::EventHandler::handleWheelEvent):

LayoutTests:

* fast/events/touch/gesture/touch-gesture-scroll-remove-node-expected.txt: Removed.
* fast/events/touch/gesture/touch-gesture-scroll-remove-node.html: Removed.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@139339 268f45cc-cd09-0410-ab3c-d52691b4dbfc
PDFPlugin: Cmd-/+ should affect PDF page scale
https://bugs.webkit.org/show_bug.cgi?id=103285
<rdar://problem/12710469>

Reviewed by Darin Adler.

Plugins which support handling page scale themselves should also handle
page zoom, as it is a very similar concept.

This patch disables text zoom in the case of a main-frame plugin which supports
page scale factor changes, as it is not needed in the PDFPlugin case
(we can't do text-only scale for PDF), but it could be added later if needed.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::pageZoomFactorDidChange):
* UIProcess/WebPageProxy.h:
(WebPageProxy):
* UIProcess/WebPageProxy.messages.in:
Add WebPageProxy::pageZoomFactorDidChange, to notify WebPageProxy of
out-of-band page zoom factor changes (in this case, from PluginView).

* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::setPageScaleFactor):
Update WebPageProxy's notion of the current page zoom whenever PluginView
is notified of a page scale factor change.

* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setTextZoomFactor): We don't support text zoom in plugins, but
we also don't want it to silently act on the Frame if we have a plugin that
purports to handle page scale itself. Return early if this is the case.
(WebKit::WebPage::pageZoomFactor): For plugins that support page scale factor,
we equate page scale and page zoom. Return the PluginView's page scale factor
in place of the Frame's page zoom factor.
(WebKit::WebPage::setPageZoomFactor): Make page zoom changes in the aforementioned
case affect the PluginView's page scale.
(WebKit::WebPage::setPageAndTextZoomFactors): Ditto.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@139340 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Ensure that WebPageProxy's notion of pageScaleFactor is reset on didCommitLoad
https://bugs.webkit.org/show_bug.cgi?id=103290
<rdar://problem/12752467>

Reviewed by Darin Adler.

When a standard main frame load is committed, we reset the WebPage's
pageScaleFactor, if it's not the default. However, if the previous
page had a full-main-frame plugin that was handling page scaling itself,
WebPageProxy can have a cached pageScaleFactor != 1, while WebPage
now (since the plugin that was overriding (set)pageScaleFactor is gone)
has a pageScaleFactor of 1, causing us to skip the call to reset the
WebPage's pageScaleFactor.

Therefore, when WebPageProxy is notified that a standard main-frame load
is committed, reset its cached notion of the pageScaleFactor.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didCommitLoadForFrame): Add a parameter which corresponds to FrameLoadType, so we can
determine whether a frame load is of FrameLoadTypeStandard (which matches the check to reset page scale in
WebFrameLoaderClient::didCommitLoad), so we can reset m_pageScaleFactor.
* UIProcess/WebPageProxy.h:
(WebPageProxy): Add frameLoadType parameter to didCommitLoadForFrame.
* UIProcess/WebPageProxy.messages.in: Add frameLoadType parameter to didCommitLoadForFrame.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidCommitLoad): Pass frameLoadType parameter to didCommitLoadForFrame.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@139341 268f45cc-cd09-0410-ab3c-d52691b4dbfc