Fix up some rebase errors in bug 1230668 r=me a=bustage
authorWes Kocher <wkocher@mozilla.com>
Mon, 11 Jan 2016 11:56:03 -0800
changeset 260901 fceff80a84a32b68d02abc00486fe6c7b86d545b
parent 260900 8c184c30caa6d16f5ec63cce9a77d16f25d2e57e
child 260902 9a92b504c10aedc853786c37cb83f276ba2d733a
push id247
push userkwierso@gmail.com
push dateMon, 11 Jan 2016 19:56:08 +0000
treeherdermozilla-esr38@fceff80a84a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, bustage
bugs1230668
milestone38.5.1
Fix up some rebase errors in bug 1230668 r=me a=bustage
layout/style/nsComputedDOMStyle.cpp
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -434,18 +434,16 @@ nsComputedDOMStyle::GetStyleContextForEl
       return nullptr;
   }
 
   // XXX the !aElement->IsHTML(nsGkAtoms::area)
   // check is needed due to bug 135040 (to avoid using 
   // mPrimaryFrame). Remove it once that's fixed.
   if (!aPseudo && aStyleType == eAll && inDocWithShell &&
       !aElement->IsHTML(nsGkAtoms::area)) {
-  if (!aPseudo && aStyleType == eAll && inDocWithShell &&
-      !aElement->IsHTMLElement(nsGkAtoms::area)) {
     nsIFrame* frame = nsLayoutUtils::GetStyleFrame(aElement);
     if (frame) {
       nsStyleContext* result = frame->StyleContext();
       // Don't use the style context if it was influenced by
       // pseudo-elements, since then it's not the primary style
       // for this element.
       if (!result->HasPseudoElementData()) {
         // this function returns an addrefed style context