author | Kartikaya Gupta <kgupta@mozilla.com> |
Wed, 06 Apr 2016 12:17:52 -0400 | |
changeset 291895 | 0ff845d0898ecc697ce0d49976085823933621c4 |
parent 291894 | 65e9d46daf3ebdc89f12ecfb4bcc88c0257307d3 |
child 291896 | ab06ad17942a7d6e9e25a36cca04069ca9ad3871 |
push id | 74720 |
push user | kgupta@mozilla.com |
push date | Wed, 06 Apr 2016 16:19:04 +0000 |
treeherder | mozilla-inbound@0ff845d0898e [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | me |
bugs | 1151102 |
milestone | 48.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -6254,19 +6254,16 @@ PresShell::Paint(nsView* aViewToP AutoUpdateHitRegion updateHitRegion(this, frame); // Whether or not we should set first paint when painting is // suppressed is debatable. For now we'll do it because // B2G relies on first paint to configure the viewport and // we only want to do that when we have real content to paint. // See Bug 798245 if (mIsFirstPaint && !mPaintingSuppressed) { -#ifdef MOZ_WIDGET_ANDROID - __android_log_print(ANDROID_LOG_INFO, "GeckoBug1151102", "PresShell doing a first-paint"); -#endif layerManager->SetIsFirstPaint(); mIsFirstPaint = false; } layerManager->BeginTransaction(); if (frame && isRetainingManager) { // Try to do an empty transaction, if the frame tree does not
--- a/mobile/android/base/java/org/mozilla/gecko/gfx/GeckoLayerClient.java +++ b/mobile/android/base/java/org/mozilla/gecko/gfx/GeckoLayerClient.java @@ -609,17 +609,16 @@ class GeckoLayerClient implements LayerV // as possible. The call to PanZoomController.abortAnimation accomplishes this by calling the // forceRedraw function, which sends the viewport to gecko. The display port request is // actually a full viewport update, which is fine because if browser.js has somehow moved to // be out of sync with this first-paint viewport, then we force them back in sync. abortPanZoomAnimation(); // Indicate that the document is about to be composited so the // LayerView background can be removed. - Log.i("GeckoBug1151102", "Done first paint; state " + mView.getPaintState()); if (mView.getPaintState() == LayerView.PAINT_START) { mView.setPaintState(LayerView.PAINT_BEFORE_FIRST); } } DisplayPortCalculator.resetPageState(); mDrawTimingQueue.reset(); mContentDocumentIsDisplayed = true;
--- a/mobile/android/base/java/org/mozilla/gecko/gfx/LayerRenderer.java +++ b/mobile/android/base/java/org/mozilla/gecko/gfx/LayerRenderer.java @@ -645,34 +645,32 @@ public class LayerRenderer implements Ta // Remove background color once we've painted. GeckoLayerClient is // responsible for setting this flag before current document is // composited. if (mView.getPaintState() == LayerView.PAINT_BEFORE_FIRST) { mView.post(new Runnable() { @Override public void run() { mView.setSurfaceBackgroundColor(Color.TRANSPARENT); - Log.i("GeckoBug1151102", "Cleared bg color"); } }); mView.setPaintState(LayerView.PAINT_AFTER_FIRST); } mLastFrameTime = mFrameStartTime; } } @Override public void onTabChanged(final Tab tab, Tabs.TabEvents msg, Object data) { // Sets the background of the newly selected tab. This background color // gets cleared in endDrawing(). This function runs on the UI thread, // but other code that touches the paint state is run on the compositor // thread, so this may need to be changed if any problems appear. if (msg == Tabs.TabEvents.SELECTED) { if (mView != null) { - Log.i("GeckoBug1151102", "Tab switch; entering PAINT_START"); mView.setSurfaceBackgroundColor(tab.getBackgroundColor()); mView.setPaintState(LayerView.PAINT_START); } } } public void updateZoomedView(final ByteBuffer data) { ThreadUtils.postToUiThread(new Runnable() {
--- a/mobile/android/base/java/org/mozilla/gecko/gfx/LayerView.java +++ b/mobile/android/base/java/org/mozilla/gecko/gfx/LayerView.java @@ -304,17 +304,16 @@ public class LayerView extends ScrollVie addView(mTextureView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); } else { // This will stop PropertyAnimator from creating a drawing cache (i.e. a bitmap) // from a SurfaceView, which is just not possible (the bitmap will be transparent). setWillNotCacheDrawing(false); mSurfaceView = new LayerSurfaceView(getContext(), this); mSurfaceView.setBackgroundColor(Color.WHITE); - Log.i("GeckoBug1151102", "Initialized surfaceview"); // The "filler" view sits behind the URL bar and should never be // visible. It exists solely to make this LayerView actually // scrollable so that we can shift the surface around on the screen. // Once we drop support for pre-Honeycomb Android versions this // should not be needed; we can just turn LayerView back into a // FrameLayout that holds mSurfaceView and nothing else. mFillerView = new View(getContext()) {
--- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -1056,17 +1056,16 @@ var BrowserApp = { let tab = this.selectedTab; if (!tab) return false; return tab.contentDocumentIsDisplayed; }, contentDocumentChanged: function() { - dump("GeckoBug1151102: Setting first-paint flag on DWU"); window.top.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).isFirstPaint = true; Services.androidBridge.contentDocumentChanged(); }, get tabs() { return this._tabs; },