Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'origin/embedlite' into embedlite_proces…
…sImpl

Conflicts:
	embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp
  • Loading branch information
tmeshkova committed Dec 16, 2014
2 parents 4ae94f8 + f033dfb commit b3b6d44
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
5 changes: 4 additions & 1 deletion embedding/embedlite/embedshared/EmbedLiteViewBaseChild.cpp
Expand Up @@ -981,8 +981,11 @@ EmbedLiteViewBaseChild::RecvInputDataTouchMoveEvent(const ScrollableLayerGuid& a
}

NS_IMETHODIMP
EmbedLiteViewBaseChild::OnLocationChanged(const char* aLocation, bool aCanGoBack, bool aCanGoForward)
EmbedLiteViewBaseChild::OnLocationChanged(const char* aLocation, bool aCanGoBack, bool aCanGoForward, bool aIsSameDocument)
{
if (!aIsSameDocument) {
mHelper->mContentDocumentIsDisplayed = false;
}
return SendOnLocationChanged(nsDependentCString(aLocation), aCanGoBack, aCanGoForward) ? NS_OK : NS_ERROR_FAILURE;
}

Expand Down
Expand Up @@ -118,7 +118,7 @@ EmbedLiteCompositorParent::UpdateTransformState()
NS_ENSURE_TRUE(context, );

if (context->IsOffscreen() && context->OffscreenSize() != mLastViewSize) {
context->ResizeOffscreen(gfx::IntSize(mLastViewSize.width, mLastViewSize.height));
context->ResizeOffscreen(mLastViewSize);
ScheduleRenderOnCompositorThread();
}
}
Expand Down
4 changes: 3 additions & 1 deletion embedding/embedlite/utils/WebBrowserChrome.cpp
Expand Up @@ -303,7 +303,9 @@ WebBrowserChrome::OnLocationChange(nsIWebProgress* aWebProgress,
navigation->GetCanGoBack(&canGoBack);
navigation->GetCanGoForward(&canGoForward);

mListener->OnLocationChanged(spec.get(), canGoBack, canGoForward);
bool isSameDocument = aFlags & nsIWebProgressListener::LOCATION_CHANGE_SAME_DOCUMENT;

mListener->OnLocationChanged(spec.get(), canGoBack, canGoForward, isSameDocument);

// Keep track of hash changes
mLocationHasChanged = slocation.Equals(mLastLocation);
Expand Down
3 changes: 2 additions & 1 deletion embedding/embedlite/utils/nsIEmbedBrowserChromeListener.idl
Expand Up @@ -17,7 +17,8 @@
[scriptable, uuid(ff88f95e-48d9-11e2-bca5-6b3dfc3f4672)]
interface nsIEmbedBrowserChromeListener
{
void onLocationChanged(in string aLocation, in boolean aCanGoBack, in boolean aCanGoForward);
void onLocationChanged(in string aLocation, in boolean aCanGoBack,
in boolean aCanGoForward, in boolean aIsSameDocument);
void onLoadStarted(in string aLocation);
void onLoadFinished();
void onLoadRedirect();
Expand Down

0 comments on commit b3b6d44

Please sign in to comment.